Issue #3336307: Drupal 10 and PHP 8.0 support for 3.x and 4.x

Signed-off-by: Jibran Ijaz <jibran.ijaz@gmail.com>

.circleci/config.yml

@@ -6,26 +6,16 @@ workflows:
       - test:
           matrix:
             parameters:
-              php: ["8.0", "8.1"]
-              drupal-version: ["9.4.x", "9.5.x", "10.0.x", "10.1.x"]
-            exclude:
-            - php: "8.0"
-              drupal-version: "10.0.x"
-            - php: "8.0"
-              drupal-version: "10.1.x"
+              php: ["8.1"]
+              drupal-version: ["10.0.x", "10.1.x"]
   # Run nightly tests every day 8 AM.
   nightly:
     jobs:
     - test:
         matrix:
           parameters:
-            php: ["8.0", "8.1"]
-            drupal-version: ["9.4.x", "9.5.x", "10.0.x", "10.1.x"]
-          exclude:
-          - php: "8.0"
-            drupal-version: "10.0.x"
-          - php: "8.0"
-            drupal-version: "10.1.x"
+            php: ["8.1"]
+            drupal-version: ["10.0.x", "10.1.x"]
     triggers:
     - schedule:
         # Weekday (22=10pm UTC). Evaluates to 8am AEST.

composer.json

@@ -23,8 +23,8 @@
   "license": "GPL-2.0-or-later",
   "minimum-stability": "dev",
   "require": {
-    "php": ">=8.0",
-    "drupal/core": "^9.3 || ^10"
+    "php": ">=8.1",
+    "drupal/core": "^10"
   },
   "require-dev": {
     "mglaman/phpstan-drupal": "^1.1",

dynamic_entity_reference.info.yml

@@ -2,8 +2,8 @@ name: Dynamic Entity Reference
 type: module
 description: 'Provides an entity reference field that can reference multiple entity types.'
 package: Field types
-core_version_requirement: ^9.3 || ^10
-php: 8.0
+core_version_requirement: ^10
+php: 8.1
 dependencies:
   - drupal:field
 test_dependencies:

src/Normalizer/DynamicEntityReferenceItemNormalizer.php

@@ -20,7 +20,7 @@ class DynamicEntityReferenceItemNormalizer extends EntityReferenceItemNormalizer
   /**
    * {@inheritdoc}
    */
-  public function normalize($field_item, $format = NULL, array $context = []): array|string|int|float|bool|\ArrayObject|NULL {
+  public function normalize($field_item, $format = NULL, array $context = []) {
     $normalized = parent::normalize($field_item, $format, $context);
     $normalized['target_type'] = $field_item->target_type;
     return $normalized;

tests/modules/dynamic_entity_reference_entity_test/dynamic_entity_reference_entity_test.info.yml

@@ -2,8 +2,8 @@ name: 'Dynamic Entity Reference Entity Test'
 type: module
 description: 'Provides base fields for dynamic_entity_reference tests of entity_test entity type.'
 package: Testing
-core_version_requirement: ^9.3 || ^10
-php: 8.0
+core_version_requirement: ^10
+php: 8.1
 hidden: TRUE
 dependencies:
   - dynamic_entity_reference:dynamic_entity_reference

tests/modules/dynamic_entity_reference_test_entity_provider/dynamic_entity_reference_test_entity_provider.info.yml

@@ -2,8 +2,8 @@ name: 'Dynamic Entity Reference Entity Provider'
 type: module
 description: 'A provider of an entity type.'
 package: Testing
-core_version_requirement: ^9.3 || ^10
-php: 8.0
+core_version_requirement: ^10
+php: 8.1
 hidden: TRUE
 dependencies:
   - dynamic_entity_reference:dynamic_entity_reference

tests/modules/dynamic_entity_reference_test_views/dynamic_entity_reference_test_views.info.yml

@@ -2,8 +2,8 @@ name: 'Dynamic entity reference test views'
 type: module
 description: 'Provides default views for views dynamic entity reference tests.'
 package: Testing
-core_version_requirement: ^9.3 || ^10
-php: 8.0
+core_version_requirement: ^10
+php: 8.1
 hidden: TRUE
 dependencies:
   - dynamic_entity_reference:dynamic_entity_reference