Skip to content
Snippets Groups Projects
Commit 1b406341 authored by Florent Torregrosa's avatar Florent Torregrosa
Browse files

Issue #3435188 by Grimreaper: Automated Drupal 11 compatibility fixes for ui_patterns

parent 04fecfdc
No related branches found
No related tags found
1 merge request!131Issue #3435188 by Grimreaper: Automated Drupal 11 compatibility fixes for ui_patterns
Pipeline #268220 passed with warnings
Showing with 18 additions and 24 deletions
name: 'UI Patterns Display Suite' name: 'UI Patterns Display Suite'
type: module type: module
description: 'Use patterns as Display Suite field templates. It also provides Display Suite pattern sources.' 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' package: 'User interface'
dependencies: dependencies:
- ds:ds - ds:ds
......
name: 'UI Patterns Field Group' name: 'UI Patterns Field Group'
type: module type: module
description: 'Use patterns as field groups templates.' description: 'Use patterns as field groups templates.'
core_version_requirement: ^9 || ^10 core_version_requirement: ^9 || ^10 || ^11
package: 'User interface' package: 'User interface'
dependencies: dependencies:
- field_group:field_group - field_group:field_group
......
name: 'UI Patterns Layouts' name: 'UI Patterns Layouts'
type: module type: module
description: 'Use patterns as layouts via the Layout Discovery 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' package: 'User interface'
dependencies: dependencies:
- drupal:layout_discovery - drupal:layout_discovery
......
...@@ -18,7 +18,7 @@ class UiPatternsLibraryOverviewTest extends WebDriverTestBase { ...@@ -18,7 +18,7 @@ class UiPatternsLibraryOverviewTest extends WebDriverTestBase {
* *
* Currently no interface to rely on. * Currently no interface to rely on.
* *
* @var \Drupal\Core\Extension\ModuleExtensionList * @var \Drupal\Core\Extension\ThemeExtensionList
*/ */
protected $moduleExtensionList; protected $moduleExtensionList;
......
name: 'UI Patterns Library' name: 'UI Patterns Library'
type: module type: module
description: 'Exposed patterns in you modules and themes and display them in a pattern library page.' 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' package: 'User interface'
dependencies: dependencies:
- ui_patterns:ui_patterns - ui_patterns:ui_patterns
name: 'UI Patterns Views' name: 'UI Patterns Views'
type: module type: module
description: 'Use patterns as Views templates.' description: 'Use patterns as Views templates.'
core_version_requirement: ^9 || ^10 core_version_requirement: ^9 || ^10 || ^11
package: 'User interface' package: 'User interface'
dependencies: dependencies:
- drupal:views - drupal:views
......
...@@ -27,14 +27,8 @@ class TwigExtension extends AbstractExtension { ...@@ -27,14 +27,8 @@ class TwigExtension extends AbstractExtension {
*/ */
public function getFunctions() { public function getFunctions() {
return [ return [
new TwigFunction('pattern', [ new TwigFunction('pattern', $this->renderPattern(...)),
$this, new TwigFunction('pattern_preview', $this->renderPatternPreview(...)),
'renderPattern',
]),
new TwigFunction('pattern_preview', [
$this,
'renderPatternPreview',
]),
]; ];
} }
...@@ -43,8 +37,8 @@ class TwigExtension extends AbstractExtension { ...@@ -43,8 +37,8 @@ class TwigExtension extends AbstractExtension {
*/ */
public function getFilters() { public function getFilters() {
return [ return [
new TwigFilter('add_class', [$this, 'addClass']), new TwigFilter('add_class', $this->addClass(...)),
new TwigFilter('set_attribute', [$this, 'setAttribute']), new TwigFilter('set_attribute', $this->setAttribute(...)),
]; ];
} }
......
...@@ -45,7 +45,7 @@ class PatternDefinitionTest extends UiPatternsTestBase { ...@@ -45,7 +45,7 @@ class PatternDefinitionTest extends UiPatternsTestBase {
* @return array * @return array
* Data. * Data.
*/ */
public function definitionGettersProvider() { public static function definitionGettersProvider() {
return [ return [
['getProvider', 'provider', 'my_module'], ['getProvider', 'provider', 'my_module'],
['id', 'id', 'pattern_id'], ['id', 'id', 'pattern_id'],
...@@ -176,7 +176,7 @@ class PatternDefinitionTest extends UiPatternsTestBase { ...@@ -176,7 +176,7 @@ class PatternDefinitionTest extends UiPatternsTestBase {
* @return array * @return array
* Data. * Data.
*/ */
public function hasUseProvider(): array { public static function hasUseProvider(): array {
return [ return [
'pattern_without_use' => [ 'pattern_without_use' => [
[ [
...@@ -267,7 +267,7 @@ class PatternDefinitionTest extends UiPatternsTestBase { ...@@ -267,7 +267,7 @@ class PatternDefinitionTest extends UiPatternsTestBase {
* @return array * @return array
* Data. * Data.
*/ */
public function definitionGetLinksProvider(): array { public static function definitionGetLinksProvider(): array {
return [ return [
[ [
[ [
...@@ -332,7 +332,7 @@ class PatternDefinitionTest extends UiPatternsTestBase { ...@@ -332,7 +332,7 @@ class PatternDefinitionTest extends UiPatternsTestBase {
* @return array * @return array
* Data. * Data.
*/ */
public function definitionGetRenderLinksProvider(): array { public static function definitionGetRenderLinksProvider(): array {
return [ return [
[ [
[ [
......
...@@ -93,7 +93,7 @@ class PatternDefinitionVariantTest extends UiPatternsTestBase { ...@@ -93,7 +93,7 @@ class PatternDefinitionVariantTest extends UiPatternsTestBase {
* @return array * @return array
* Data. * Data.
*/ */
public function definitionGettersProvider(): array { public static function definitionGettersProvider(): array {
return [ return [
['getName', 'name', 'Variant name'], ['getName', 'name', 'Variant name'],
['getLabel', 'label', 'Variant label'], ['getLabel', 'label', 'Variant label'],
......
...@@ -49,7 +49,7 @@ class TwigExtensionTest extends UnitTestCase { ...@@ -49,7 +49,7 @@ class TwigExtensionTest extends UnitTestCase {
* @return \Iterator * @return \Iterator
* An iterator. * An iterator.
*/ */
public function providerTestTwigAddClass(): \Iterator { public static function providerTestTwigAddClass(): \Iterator {
yield 'should add a class on element' => [ yield 'should add a class on element' => [
['#type' => 'container'], ['#type' => 'container'],
'my-class', 'my-class',
...@@ -136,7 +136,7 @@ class TwigExtensionTest extends UnitTestCase { ...@@ -136,7 +136,7 @@ class TwigExtensionTest extends UnitTestCase {
* @return \Iterator * @return \Iterator
* An iterator. * An iterator.
*/ */
public function providerTestTwigSetAttribute(): \Iterator { public static function providerTestTwigSetAttribute(): \Iterator {
yield 'should add attributes on element' => [ yield 'should add attributes on element' => [
['#theme' => 'image'], ['#theme' => 'image'],
'title', 'title',
......
name: 'UI Patterns' name: 'UI Patterns'
type: module type: module
description: 'UI patterns.' description: 'UI patterns.'
core_version_requirement: ^9 || ^10 core_version_requirement: ^9 || ^10 || ^11
package: 'User interface' package: 'User interface'
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment