diff --git a/modules/ui_patterns_ds/ui_patterns_ds.info.yml b/modules/ui_patterns_ds/ui_patterns_ds.info.yml index 2bbdfa216085249db85bf6eded30e20b78f1cff1..dfbcdb45043ac51aed4882674b02bd1d38a273d2 100644 --- a/modules/ui_patterns_ds/ui_patterns_ds.info.yml +++ b/modules/ui_patterns_ds/ui_patterns_ds.info.yml @@ -1,7 +1,7 @@ name: 'UI Patterns Display Suite' type: module description: 'Use patterns as Display Suite field templates. It also provides Display Suite pattern sources.' -core_version_requirement: ^9 || ^10 +core_version_requirement: ^9 || ^10 || ^11 package: 'User interface' dependencies: - ds:ds diff --git a/modules/ui_patterns_field_group/ui_patterns_field_group.info.yml b/modules/ui_patterns_field_group/ui_patterns_field_group.info.yml index d2a376ebd81f0784f3a58c0f21a67b803f101a7a..4825bca4977c913f0ab371af64bb187b2c121398 100644 --- a/modules/ui_patterns_field_group/ui_patterns_field_group.info.yml +++ b/modules/ui_patterns_field_group/ui_patterns_field_group.info.yml @@ -1,7 +1,7 @@ name: 'UI Patterns Field Group' type: module description: 'Use patterns as field groups templates.' -core_version_requirement: ^9 || ^10 +core_version_requirement: ^9 || ^10 || ^11 package: 'User interface' dependencies: - field_group:field_group diff --git a/modules/ui_patterns_layouts/ui_patterns_layouts.info.yml b/modules/ui_patterns_layouts/ui_patterns_layouts.info.yml index 8cd17ba86874564f6e7b054ba48799060c61dbfb..1a18f8262303bae70f820311c2e9d1292e1b2c0b 100644 --- a/modules/ui_patterns_layouts/ui_patterns_layouts.info.yml +++ b/modules/ui_patterns_layouts/ui_patterns_layouts.info.yml @@ -1,7 +1,7 @@ name: 'UI Patterns Layouts' type: module description: 'Use patterns as layouts via the Layout Discovery module.' -core_version_requirement: ^9 || ^10 +core_version_requirement: ^9 || ^10 || ^11 package: 'User interface' dependencies: - drupal:layout_discovery diff --git a/modules/ui_patterns_library/tests/src/FunctionalJavascript/UiPatternsLibraryOverviewTest.php b/modules/ui_patterns_library/tests/src/FunctionalJavascript/UiPatternsLibraryOverviewTest.php index a0abd0814e569f9f655868e423cabf6a50a1ff52..581063db5a028e74156c39d9b5719903deb5186b 100644 --- a/modules/ui_patterns_library/tests/src/FunctionalJavascript/UiPatternsLibraryOverviewTest.php +++ b/modules/ui_patterns_library/tests/src/FunctionalJavascript/UiPatternsLibraryOverviewTest.php @@ -18,7 +18,7 @@ class UiPatternsLibraryOverviewTest extends WebDriverTestBase { * * Currently no interface to rely on. * - * @var \Drupal\Core\Extension\ModuleExtensionList + * @var \Drupal\Core\Extension\ThemeExtensionList */ protected $moduleExtensionList; diff --git a/modules/ui_patterns_library/ui_patterns_library.info.yml b/modules/ui_patterns_library/ui_patterns_library.info.yml index 627d19d4c7e975446494567535f6ec71d4a8deeb..b561a7328039588eec4d45e9090eed298dea9503 100644 --- a/modules/ui_patterns_library/ui_patterns_library.info.yml +++ b/modules/ui_patterns_library/ui_patterns_library.info.yml @@ -1,7 +1,7 @@ name: 'UI Patterns Library' type: module description: 'Exposed patterns in you modules and themes and display them in a pattern library page.' -core_version_requirement: ^9 || ^10 +core_version_requirement: ^9 || ^10 || ^11 package: 'User interface' dependencies: - ui_patterns:ui_patterns diff --git a/modules/ui_patterns_views/ui_patterns_views.info.yml b/modules/ui_patterns_views/ui_patterns_views.info.yml index 957fc8555a289b3dbd42e404c22bb83d5e43701e..4126e5157433f1db00846e00c6f4fc104fb9b3fb 100644 --- a/modules/ui_patterns_views/ui_patterns_views.info.yml +++ b/modules/ui_patterns_views/ui_patterns_views.info.yml @@ -1,7 +1,7 @@ name: 'UI Patterns Views' type: module description: 'Use patterns as Views templates.' -core_version_requirement: ^9 || ^10 +core_version_requirement: ^9 || ^10 || ^11 package: 'User interface' dependencies: - drupal:views diff --git a/src/Template/TwigExtension.php b/src/Template/TwigExtension.php index 09bd26674966d15ef8a1c793e8e3aafbc68d5122..6479fe39522f3d88f034d16441a7491362137816 100644 --- a/src/Template/TwigExtension.php +++ b/src/Template/TwigExtension.php @@ -27,14 +27,8 @@ class TwigExtension extends AbstractExtension { */ public function getFunctions() { return [ - new TwigFunction('pattern', [ - $this, - 'renderPattern', - ]), - new TwigFunction('pattern_preview', [ - $this, - 'renderPatternPreview', - ]), + new TwigFunction('pattern', $this->renderPattern(...)), + new TwigFunction('pattern_preview', $this->renderPatternPreview(...)), ]; } @@ -43,8 +37,8 @@ class TwigExtension extends AbstractExtension { */ public function getFilters() { return [ - new TwigFilter('add_class', [$this, 'addClass']), - new TwigFilter('set_attribute', [$this, 'setAttribute']), + new TwigFilter('add_class', $this->addClass(...)), + new TwigFilter('set_attribute', $this->setAttribute(...)), ]; } diff --git a/tests/src/Unit/Definition/PatternDefinitionTest.php b/tests/src/Unit/Definition/PatternDefinitionTest.php index 66fb0459b9f99d09b788376880291e9606197620..9d595df43686dc7e024d6821bc9695b74b03fe49 100644 --- a/tests/src/Unit/Definition/PatternDefinitionTest.php +++ b/tests/src/Unit/Definition/PatternDefinitionTest.php @@ -45,7 +45,7 @@ class PatternDefinitionTest extends UiPatternsTestBase { * @return array * Data. */ - public function definitionGettersProvider() { + public static function definitionGettersProvider() { return [ ['getProvider', 'provider', 'my_module'], ['id', 'id', 'pattern_id'], @@ -176,7 +176,7 @@ class PatternDefinitionTest extends UiPatternsTestBase { * @return array * Data. */ - public function hasUseProvider(): array { + public static function hasUseProvider(): array { return [ 'pattern_without_use' => [ [ @@ -267,7 +267,7 @@ class PatternDefinitionTest extends UiPatternsTestBase { * @return array * Data. */ - public function definitionGetLinksProvider(): array { + public static function definitionGetLinksProvider(): array { return [ [ [ @@ -332,7 +332,7 @@ class PatternDefinitionTest extends UiPatternsTestBase { * @return array * Data. */ - public function definitionGetRenderLinksProvider(): array { + public static function definitionGetRenderLinksProvider(): array { return [ [ [ diff --git a/tests/src/Unit/Definition/PatternDefinitionVariantTest.php b/tests/src/Unit/Definition/PatternDefinitionVariantTest.php index 017d26b8a9f2e2ed3b9f4b354f6421378fd05a9f..9683221c7dca4839d6169b58432057f8740df997 100644 --- a/tests/src/Unit/Definition/PatternDefinitionVariantTest.php +++ b/tests/src/Unit/Definition/PatternDefinitionVariantTest.php @@ -93,7 +93,7 @@ class PatternDefinitionVariantTest extends UiPatternsTestBase { * @return array * Data. */ - public function definitionGettersProvider(): array { + public static function definitionGettersProvider(): array { return [ ['getName', 'name', 'Variant name'], ['getLabel', 'label', 'Variant label'], diff --git a/tests/src/Unit/Template/TwigExtensionTest.php b/tests/src/Unit/Template/TwigExtensionTest.php index c692735a76762928a2a9baafd2f8fd45890ffc35..295572ac4de84024c796e36e41b5d87a93e360f7 100644 --- a/tests/src/Unit/Template/TwigExtensionTest.php +++ b/tests/src/Unit/Template/TwigExtensionTest.php @@ -49,7 +49,7 @@ class TwigExtensionTest extends UnitTestCase { * @return \Iterator * An iterator. */ - public function providerTestTwigAddClass(): \Iterator { + public static function providerTestTwigAddClass(): \Iterator { yield 'should add a class on element' => [ ['#type' => 'container'], 'my-class', @@ -136,7 +136,7 @@ class TwigExtensionTest extends UnitTestCase { * @return \Iterator * An iterator. */ - public function providerTestTwigSetAttribute(): \Iterator { + public static function providerTestTwigSetAttribute(): \Iterator { yield 'should add attributes on element' => [ ['#theme' => 'image'], 'title', diff --git a/ui_patterns.info.yml b/ui_patterns.info.yml index cf1fbdb00227cb4f4fea6fd5d8b800b6a1892757..d3d0db0dc74478af202da9238e41efc4d958ac1d 100644 --- a/ui_patterns.info.yml +++ b/ui_patterns.info.yml @@ -1,5 +1,5 @@ name: 'UI Patterns' type: module description: 'UI patterns.' -core_version_requirement: ^9 || ^10 +core_version_requirement: ^9 || ^10 || ^11 package: 'User interface'