From c1161cc99379a8eb32441ed53f9b776752dfdc65 Mon Sep 17 00:00:00 2001 From: Pierre <pierredureau@yahoo.fr> Date: Sat, 3 Aug 2024 21:43:14 +0200 Subject: [PATCH] Issue #3465488 by pdureau: Drupal 11 compatibility --- modules/ui_patterns_blocks/ui_patterns_blocks.info.yml | 2 +- modules/ui_patterns_devel/ui_patterns_devel.info.yml | 2 +- .../ui_patterns_field_formatters.info.yml | 2 +- modules/ui_patterns_layouts/ui_patterns_layouts.info.yml | 2 +- modules/ui_patterns_legacy/ui_patterns_legacy.info.yml | 2 +- modules/ui_patterns_library/ui_patterns_library.info.yml | 2 +- modules/ui_patterns_views/ui_patterns_views.info.yml | 2 +- .../Validation/Constraint/RequiredArrayValuesConstraint.php | 4 ++-- ui_patterns.info.yml | 2 +- ui_patterns.services.yml | 4 ++-- 10 files changed, 12 insertions(+), 12 deletions(-) diff --git a/modules/ui_patterns_blocks/ui_patterns_blocks.info.yml b/modules/ui_patterns_blocks/ui_patterns_blocks.info.yml index 8b41d5dcf..88e352d4b 100644 --- a/modules/ui_patterns_blocks/ui_patterns_blocks.info.yml +++ b/modules/ui_patterns_blocks/ui_patterns_blocks.info.yml @@ -1,7 +1,7 @@ name: UI Patterns Blocks type: module description: "Use UI components as blocks plugins." -core_version_requirement: ^10 +core_version_requirement: ^10.3 || ^11 package: User interface dependencies: - ui_patterns:ui_patterns diff --git a/modules/ui_patterns_devel/ui_patterns_devel.info.yml b/modules/ui_patterns_devel/ui_patterns_devel.info.yml index 3d0817347..3c3737c97 100644 --- a/modules/ui_patterns_devel/ui_patterns_devel.info.yml +++ b/modules/ui_patterns_devel/ui_patterns_devel.info.yml @@ -1,7 +1,7 @@ name: UI Patterns Devel type: module description: Provides development aids to UI Patterns developers. -core_version_requirement: ^10 +core_version_requirement: ^10.3 || ^11 package: Development dependencies: - ui_patterns:ui_patterns diff --git a/modules/ui_patterns_field_formatters/ui_patterns_field_formatters.info.yml b/modules/ui_patterns_field_formatters/ui_patterns_field_formatters.info.yml index b30ab67d5..e513263f4 100644 --- a/modules/ui_patterns_field_formatters/ui_patterns_field_formatters.info.yml +++ b/modules/ui_patterns_field_formatters/ui_patterns_field_formatters.info.yml @@ -1,7 +1,7 @@ name: UI Patterns Field Formatters type: module description: Use UI components with field formatters. -core_version_requirement: ^10 +core_version_requirement: ^10.3 || ^11 package: User interface dependencies: - ui_patterns:ui_patterns diff --git a/modules/ui_patterns_layouts/ui_patterns_layouts.info.yml b/modules/ui_patterns_layouts/ui_patterns_layouts.info.yml index 198c9b497..5dc047d66 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 UI components as layouts plugins." -core_version_requirement: ^10 +core_version_requirement: ^10.3 || ^11 package: "User interface" dependencies: - drupal:layout_discovery diff --git a/modules/ui_patterns_legacy/ui_patterns_legacy.info.yml b/modules/ui_patterns_legacy/ui_patterns_legacy.info.yml index 6221865c2..3ada3bf59 100644 --- a/modules/ui_patterns_legacy/ui_patterns_legacy.info.yml +++ b/modules/ui_patterns_legacy/ui_patterns_legacy.info.yml @@ -1,7 +1,7 @@ name: "UI Patterns Legacy" type: module description: "Compatibility layer for UI Patterns 1.x components." -core_version_requirement: ^10 +core_version_requirement: ^10.3 || ^11 package: "User interface" dependencies: - ui_patterns:ui_patterns diff --git a/modules/ui_patterns_library/ui_patterns_library.info.yml b/modules/ui_patterns_library/ui_patterns_library.info.yml index 151e5c289..abec52824 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: "Browse UI components in library pages." -core_version_requirement: ^10 +core_version_requirement: ^10.3 || ^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 be4033ab4..5318877b3 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 UI components with Views rows and styles plugins." -core_version_requirement: ^10 +core_version_requirement: ^10.3 || ^11 package: "User interface" dependencies: - drupal:views diff --git a/src/Plugin/Validation/Constraint/RequiredArrayValuesConstraint.php b/src/Plugin/Validation/Constraint/RequiredArrayValuesConstraint.php index d0ae966a9..6558bbc0b 100644 --- a/src/Plugin/Validation/Constraint/RequiredArrayValuesConstraint.php +++ b/src/Plugin/Validation/Constraint/RequiredArrayValuesConstraint.php @@ -42,14 +42,14 @@ class RequiredArrayValuesConstraint extends SymfonyConstraint { /** * {@inheritdoc} */ - public function getDefaultOption() { + public function getDefaultOption(): string { return 'requiredValues'; } /** * {@inheritdoc} */ - public function getRequiredOptions() { + public function getRequiredOptions(): array { return ['requiredValues']; } diff --git a/ui_patterns.info.yml b/ui_patterns.info.yml index 8e766c5b5..c82ef82ee 100644 --- a/ui_patterns.info.yml +++ b/ui_patterns.info.yml @@ -1,5 +1,5 @@ name: "UI Patterns" type: module description: "Define and expose self-contained UI Components as Drupal plugins and use them seamlessly in Drupal development and site-building." -core_version_requirement: ^10.3 +core_version_requirement: ^10.3 || ^11 package: "User interface" diff --git a/ui_patterns.services.yml b/ui_patterns.services.yml index 38617db58..5b1fd70fb 100644 --- a/ui_patterns.services.yml +++ b/ui_patterns.services.yml @@ -21,12 +21,12 @@ services: class: Drupal\ui_patterns\PropTypePluginManager parent: default_plugin_manager arguments: - - '@ui_patterns.schema_compatibility_checker' + - "@ui_patterns.schema_compatibility_checker" plugin.manager.ui_patterns_prop_type_adapter: class: Drupal\ui_patterns\PropTypeAdapterPluginManager parent: default_plugin_manager arguments: - - '@ui_patterns.schema_compatibility_checker' + - "@ui_patterns.schema_compatibility_checker" plugin.manager.ui_patterns_source: class: Drupal\ui_patterns\SourcePluginManager parent: default_plugin_manager -- GitLab