OEL-0000: Fix d10 upgrade leftovers.

composer.json

@@ -22,7 +22,7 @@
         "drupal/core-composer-scaffold": "^10",
         "drupal/core-dev": "^10",
         "drupal/description_list_field": "^1.0@alpha",
-        "drupal/entity_reference_revisions": "^1.10",
+        "drupal/entity_reference_revisions": "^1.11",
         "drupal/extra_field": "^2.3",
         "drupal/facets_form": "^1.0.0-alpha6",
         "drupal/field_group": "^3.4",
@@ -31,6 +31,7 @@
         "drupal/typed_link": "^2.0.1",
         "drush/drush": "^11.1",
         "mikey179/vfsstream": "^1.6.10",
+        "nikic/php-parser": "^4",
         "openeuropa/code-review": "^2.0.0-alpha6",
         "openeuropa/oe_authentication": "^1.11",
         "openeuropa/oe_contact_forms": "~1.11",
@@ -81,11 +82,6 @@
                 }
             }
         },
-        "patches": {
-            "drupal/entity_reference_revisions": {
-                "https://www.drupal.org/project/entity_reference_revisions/issues/2937835": "https://www.drupal.org/files/issues/2021-03-26/entity_reference_revisions-field_formatter_label-2937835-36.patch"
-            }
-        },
         "drupal-scaffold": {
             "locations": {
                 "web-root": "./build"
@@ -104,7 +100,10 @@
             "build/themes/contrib/{$name}": [
                 "type:drupal-theme"
             ]
-        }
+        },
+        "_readme": [
+            "Explicit requirement of nikic/php-parser ^4 as later versions are not compatible with grumphp @see https://github.com/phpro/grumphp/issues/1119"
+        ]
     },
     "config": {
         "sort-packages": true,

modules/oe_whitelabel_helper/tests/src/Kernel/Plugin/Field/FieldFormatter/AddressInlineFormatterTest.php

@@ -15,7 +15,7 @@ class AddressInlineFormatterTest extends FormatterTestBase {
   /**
    * {@inheritdoc}
    */
-  public static $modules = [
+  protected static $modules = [
     'oe_whitelabel_helper',
   ];
 

modules/oe_whitelabel_link_lists/oe_whitelabel_link_lists.info.yml

@@ -2,7 +2,7 @@ name: OpenEuropa Whitelabel Link Lists
 type: module
 description: Companion module for the OE Link Lists module.
 package: OpenEuropa Whitelabel Theme
-core_version_requirement: ^9.4 || ^10
+core_version_requirement: ^10
 
 dependencies:
   - oe_link_lists:oe_link_lists

modules/oe_whitelabel_paragraphs/tests/src/Kernel/AbstractKernelTestBase.php

@@ -61,7 +61,7 @@ protected function setUp(): void {
     // enhancers.
     // @see CurrentUserContext::getRuntimeContexts().
     // @see EntityConverter::convert().
-    module_load_include('install', 'user');
+    $this->container->get('module_handler')->loadInclude('user', 'install');
     user_install();
   }
 

modules/oe_whitelabel_paragraphs/tests/src/Kernel/Paragraphs/MediaParagraphsTest.php

@@ -40,7 +40,7 @@ protected function setUp(): void {
       'oe_media_iframe',
     ]);
     // Call the install hook of the Media module.
-    module_load_include('install', 'media');
+    $this->container->get('module_handler')->loadInclude('media', 'install');
     media_install();
   }
 

tests/src/Kernel/ContentRenderTestBase.php

@@ -85,7 +85,7 @@ protected function setUp(): void {
       ->grantPermission('view media')
       ->save();
 
-    module_load_include('install', 'oe_content');
+    $this->container->get('module_handler')->loadInclude('oe_content', 'install');
     oe_content_install(FALSE);
 
     $this->nodeViewBuilder = $this->container->get('entity_type.manager')->getViewBuilder('node');

tests/src/Kernel/ProjectRenderTest.php

@@ -46,7 +46,7 @@ protected function setUp(): void {
       'oe_whitelabel_extra_project',
     ]);
 
-    module_load_include('install', 'oe_whitelabel_extra_project');
+    $this->container->get('module_handler')->loadInclude('oe_whitelabel_extra_project', 'install');
     oe_whitelabel_extra_project_install(FALSE);
   }