From 5a986743510e8ce1e83c981436b3c33ac932926f Mon Sep 17 00:00:00 2001
From: Alex Skrypnyk <alex@integratedexperts.com>
Date: Fri, 7 Oct 2022 01:57:44 +1100
Subject: [PATCH 01/16] Added Rector and Drupal check.

---
 .gitignore    |  3 +++
 composer.json | 43 ++++++++++++++++++++++++++++++++++++++-----
 2 files changed, 41 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index 50dd546..102fcde 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,5 +5,8 @@ composer.lock
 reports
 vendor
 drush
+/drupal
 
 .phpunit.result.cache
+/.editorconfig
+/.gitattributes
diff --git a/composer.json b/composer.json
index 21d2e23..f5f4071 100644
--- a/composer.json
+++ b/composer.json
@@ -15,25 +15,35 @@
     "php": ">=7.4",
     "symfony/process": "~2.5|~3.0|~4.4|^6",
     "symfony/dependency-injection": "~2.6|~3.0|~4.4|^6",
-    "drupal/core-utility": "^8.4 || ^9 || ^10.0.0-alpha1"
+    "drupal/core-utility": "^8.4 || ^9 || ^10@beta"
   },
   "require-dev": {
+    "composer/installers": "^2.1",
     "drupal/coder": "~8.3.0",
     "phpspec/phpspec": "~2.0 || ~4.0 || ~6.1 || dev-main",
     "phpunit/phpunit": "~6.0 || ~7.0 || ^9",
     "mockery/mockery": "^0.9.4",
+    "drupal/core-composer-scaffold": "^10@beta",
+    "drupal/core-recommended": "^10@beta",
+    "drupal/mailsystem": "^4.4",
     "drush-ops/behat-drush-endpoint": "*",
     "php-parallel-lint/php-parallel-lint": "^1.0",
-    "dms/phpunit-arraysubset-asserts": "^0.4.0"
+    "dms/phpunit-arraysubset-asserts": "^0.4.0",
+    "mglaman/drupal-check": "^1",
+    "palantirnet/drupal-rector": "^0.13"
   },
   "scripts": {
+    "post-install-cmd": [
+      "cp ./vendor/palantirnet/drupal-rector/rector.php drupal/."
+    ],
     "test": [
       "composer validate --no-interaction",
       "parallel-lint src spec tests",
       "phpunit",
       "phpspec run -f pretty --no-interaction",
-      "phpcs --standard=./phpcs-ruleset.xml ."
-
+      "phpcs --standard=./phpcs-ruleset.xml --ignore=drupal .",
+      "./vendor/bin/drupal-check --drupal-root=drupal ./src/Drupal/Driver/Cores/Drupal8.php ./src/Drupal/Driver/Fields/Drupal8",
+      "cd drupal && ../vendor/bin/rector process ../src/Drupal/Driver/Cores/Drupal8.php ../src/Drupal/Driver/Fields/Drupal8 --dry-run"
     ]
   },
   "autoload": {
@@ -42,14 +52,37 @@
       "Drupal\\Tests\\Driver" : "tests/"
     }
   },
+  "repositories": {
+    "drupal": {
+      "type": "composer",
+      "url": "https://packages.drupal.org/8"
+    }
+  },
+  "prefer-stable": true,
+  "minimum-stability": "beta",
   "extra": {
     "branch-alias": {
       "dev-master": "2.3.x-dev"
+    },
+    "installer-paths": {
+      "drupal/core": [
+        "type:drupal-core"
+      ],
+      "drupal/modules/{$name}": [
+        "type:drupal-module"
+      ]
+    },
+    "drupal-scaffold": {
+      "locations": {
+        "web-root": "drupal/"
+      }
     }
   },
   "config": {
     "allow-plugins": {
-      "dealerdirect/phpcodesniffer-composer-installer": true
+      "dealerdirect/phpcodesniffer-composer-installer": true,
+      "drupal/core-composer-scaffold": true,
+      "composer/installers": true
     }
   }
 }

From 8177f645a229f40ba88b4c20daffe1a124c54445 Mon Sep 17 00:00:00 2001
From: Alex Skrypnyk <alex@integratedexperts.com>
Date: Fri, 7 Oct 2022 02:31:56 +1100
Subject: [PATCH 02/16] Fixed Drupal 10 code compatibility.

---
 src/Drupal/Driver/Cores/Drupal7.php             |  2 +-
 src/Drupal/Driver/Cores/Drupal8.php             | 17 ++++++++++++-----
 .../Driver/Fields/Drupal8/AbstractHandler.php   |  2 +-
 .../Driver/Fields/Drupal8/ImageHandler.php      |  4 +---
 4 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/src/Drupal/Driver/Cores/Drupal7.php b/src/Drupal/Driver/Cores/Drupal7.php
index 7c8d133..4736104 100644
--- a/src/Drupal/Driver/Cores/Drupal7.php
+++ b/src/Drupal/Driver/Cores/Drupal7.php
@@ -346,7 +346,7 @@ public function languageCreate(\stdClass $language) {
 
     // If the language code is not valid then throw an InvalidArgumentException.
     if (!isset($predefined_languages[$language->langcode])) {
-      throw new InvalidArgumentException("There is no predefined language with langcode '{$language->langcode}'.");
+      throw new \InvalidArgumentException("There is no predefined language with langcode '{$language->langcode}'.");
     }
 
     // Enable a language only if it has not been enabled already.
diff --git a/src/Drupal/Driver/Cores/Drupal8.php b/src/Drupal/Driver/Cores/Drupal8.php
index 4379c16..4f021ab 100644
--- a/src/Drupal/Driver/Cores/Drupal8.php
+++ b/src/Drupal/Driver/Cores/Drupal8.php
@@ -4,6 +4,7 @@
 
 use Drupal\Core\DrupalKernel;
 use Drupal\Core\Field\BaseFieldDefinition;
+use Drupal\Core\Routing\RouteObjectInterface;
 use Drupal\Driver\Exception\BootstrapException;
 use Drupal\field\Entity\FieldStorageConfig;
 use Drupal\language\Entity\ConfigurableLanguage;
@@ -15,7 +16,6 @@
 use Drupal\taxonomy\TermInterface;
 use Drupal\user\Entity\Role;
 use Drupal\user\Entity\User;
-use Symfony\Cmf\Component\Routing\RouteObjectInterface;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\Routing\Route;
 
@@ -75,6 +75,7 @@ public function clearCache() {
    */
   public function nodeCreate($node) {
     // Throw an exception if the node type is missing or does not exist.
+    /** @var \Drupal\node\Entity\Node $node */
     if (!isset($node->type) || !$node->type) {
       throw new \Exception("Cannot create content because it is missing the required property 'type'.");
     }
@@ -83,11 +84,12 @@ public function nodeCreate($node) {
     $bundle_info = \Drupal::service('entity_type.bundle.info');
     $bundles = $bundle_info->getBundleInfo('node');
     if (!in_array($node->type, array_keys($bundles))) {
-      throw new \Exception("Cannot create content because provided content type '$node->type' does not exist.");
+      throw new \Exception(sprintf('Cannot create content because provided content type %s does not exist.', $node->type));
     }
     // If 'author' is set, remap it to 'uid'.
     if (isset($node->author)) {
       $user = user_load_by_name($node->author);
+      /** @var \Drupal\user\Entity\User $user */
       if ($user) {
         $node->uid = $user->id();
       }
@@ -329,8 +331,13 @@ public function termCreate(\stdClass $term) {
     $term->vid = $term->vocabulary_machine_name;
 
     if (isset($term->parent)) {
-      $parent = \taxonomy_term_load_multiple_by_name($term->parent, $term->vocabulary_machine_name);
+      $query = \Drupal::entityQuery('taxonomy_term')
+        ->accessCheck(FALSE)
+        ->condition('id', $term->parent)
+        ->condition('vid', $term->vocabulary_machine_name);
+      $parent = $query->execute();
       if (!empty($parent)) {
+        /** @var \Drupal\taxonomy\Entity\Term $parent */
         $parent = reset($parent);
         $term->parent = $parent->id();
       }
@@ -385,7 +392,7 @@ public function getExtensionPathList() {
    * @param array $base_fields
    *   Base fields to be expanded in addition to user defined fields.
    */
-  public function expandEntityBaseFields($entity_type, \stdClass $entity, array $base_fields) {
+  public function expandEntityBaseFields($entity_type, $entity, array $base_fields) {
     $this->expandEntityFields($entity_type, $entity, $base_fields);
   }
 
@@ -436,7 +443,7 @@ public function languageCreate(\stdClass $language) {
     if (!ConfigurableLanguage::load($langcode)) {
       $created_language = ConfigurableLanguage::createFromLangcode($language->langcode);
       if (!$created_language) {
-        throw new InvalidArgumentException("There is no predefined language with langcode '{$langcode}'.");
+        throw new \InvalidArgumentException("There is no predefined language with langcode '{$langcode}'.");
       }
       $created_language->save();
       return $language;
diff --git a/src/Drupal/Driver/Fields/Drupal8/AbstractHandler.php b/src/Drupal/Driver/Fields/Drupal8/AbstractHandler.php
index cda97d5..395a703 100644
--- a/src/Drupal/Driver/Fields/Drupal8/AbstractHandler.php
+++ b/src/Drupal/Driver/Fields/Drupal8/AbstractHandler.php
@@ -35,7 +35,7 @@ abstract class AbstractHandler implements FieldHandlerInterface {
    * @throws \Exception
    *   Thrown when the given field name does not exist on the entity.
    */
-  public function __construct(\stdClass $entity, $entity_type, $field_name) {
+  public function __construct($entity, $entity_type, $field_name) {
     if (empty($entity_type)) {
       throw new \Exception("You must specify an entity type in order to parse entity fields.");
     }
diff --git a/src/Drupal/Driver/Fields/Drupal8/ImageHandler.php b/src/Drupal/Driver/Fields/Drupal8/ImageHandler.php
index d042bfb..b314fcc 100644
--- a/src/Drupal/Driver/Fields/Drupal8/ImageHandler.php
+++ b/src/Drupal/Driver/Fields/Drupal8/ImageHandler.php
@@ -17,9 +17,7 @@ public function expand($values) {
     }
 
     /** @var \Drupal\file\FileInterface $file */
-    $file = file_save_data(
-      $data,
-      'public://' . uniqid() . '.jpg');
+    $file = \Drupal::service('file.repository')->writeData($data, 'public://' . uniqid() . '.jpg');
 
     if (FALSE === $file) {
       throw new \Exception("Error saving file");

From 3e746a289615583a4383c74e575af01dadbdc2a3 Mon Sep 17 00:00:00 2001
From: Alex Skrypnyk <alex@integratedexperts.com>
Date: Fri, 7 Oct 2022 02:36:04 +1100
Subject: [PATCH 03/16] Updated CI matrix to use only PHP 8.1 supported by
 Drupal 10.

---
 .travis.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 69e2c7c..40ffc30 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,8 +1,6 @@
 language: php
 
 php:
-  - 7.4
-  - 8.0
   - 8.1
 
 install:

From aee6f67628b1150c2fa6b352c04cb7a920b1f959 Mon Sep 17 00:00:00 2001
From: Alex Skrypnyk <alex@integratedexperts.com>
Date: Fri, 7 Oct 2022 02:39:06 +1100
Subject: [PATCH 04/16] Updated mockery version.

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index f5f4071..c0709cf 100644
--- a/composer.json
+++ b/composer.json
@@ -22,7 +22,7 @@
     "drupal/coder": "~8.3.0",
     "phpspec/phpspec": "~2.0 || ~4.0 || ~6.1 || dev-main",
     "phpunit/phpunit": "~6.0 || ~7.0 || ^9",
-    "mockery/mockery": "^0.9.4",
+    "mockery/mockery": "^1.5",
     "drupal/core-composer-scaffold": "^10@beta",
     "drupal/core-recommended": "^10@beta",
     "drupal/mailsystem": "^4.4",

From e45edffe50b1841f8bc2d925431a4e659a04b015 Mon Sep 17 00:00:00 2001
From: Alex Skrypnyk <alex@integratedexperts.com>
Date: Fri, 7 Oct 2022 02:42:40 +1100
Subject: [PATCH 05/16] Fixed Recotr config.

---
 composer.json | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/composer.json b/composer.json
index c0709cf..424ab94 100644
--- a/composer.json
+++ b/composer.json
@@ -33,9 +33,6 @@
     "palantirnet/drupal-rector": "^0.13"
   },
   "scripts": {
-    "post-install-cmd": [
-      "cp ./vendor/palantirnet/drupal-rector/rector.php drupal/."
-    ],
     "test": [
       "composer validate --no-interaction",
       "parallel-lint src spec tests",
@@ -43,7 +40,9 @@
       "phpspec run -f pretty --no-interaction",
       "phpcs --standard=./phpcs-ruleset.xml --ignore=drupal .",
       "./vendor/bin/drupal-check --drupal-root=drupal ./src/Drupal/Driver/Cores/Drupal8.php ./src/Drupal/Driver/Fields/Drupal8",
-      "cd drupal && ../vendor/bin/rector process ../src/Drupal/Driver/Cores/Drupal8.php ../src/Drupal/Driver/Fields/Drupal8 --dry-run"
+      "cp ./vendor/palantirnet/drupal-rector/rector.php drupal/.",
+      "cd drupal && ../vendor/bin/rector process ../src/Drupal/Driver/Cores/Drupal8.php --dry-run",
+      "cd drupal && ../vendor/bin/rector process ../src/Drupal/Driver/Fields/Drupal8 --dry-run"
     ]
   },
   "autoload": {

From 0fda7a9366b339a4fdbbc42578374ec254a2b5e3 Mon Sep 17 00:00:00 2001
From: Alex Skrypnyk <alex@integratedexperts.com>
Date: Wed, 12 Oct 2022 14:54:41 +1100
Subject: [PATCH 06/16] [#251] Fixed compatibility with Symfony\Process v4+ for
 Drush driver.

---
 src/Drupal/Driver/DrushDriver.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Drupal/Driver/DrushDriver.php b/src/Drupal/Driver/DrushDriver.php
index 2086e8a..bc50179 100644
--- a/src/Drupal/Driver/DrushDriver.php
+++ b/src/Drupal/Driver/DrushDriver.php
@@ -414,7 +414,7 @@ public function drush($command, array $arguments = [], array $options = []) {
     // Add any global arguments.
     $global = $this->getArguments();
 
-    $process = new Process("{$this->binary} {$alias} {$string_options} {$global} {$command} {$arguments}");
+    $process = Process::fromShellCommandline("{$this->binary} {$alias} {$string_options} {$global} {$command} {$arguments}");
     $process->setTimeout(3600);
     $process->run();
 

From 16963d86db6f3f2f9aa7e5f6f530842ea545ec30 Mon Sep 17 00:00:00 2001
From: Alex Skrypnyk <alex@integratedexperts.com>
Date: Fri, 14 Oct 2022 09:37:47 +1100
Subject: [PATCH 07/16] Moved PHPCS exclusion to the phpcs config file.

---
 composer.json     | 2 +-
 phpcs-ruleset.xml | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 424ab94..055110b 100644
--- a/composer.json
+++ b/composer.json
@@ -38,7 +38,7 @@
       "parallel-lint src spec tests",
       "phpunit",
       "phpspec run -f pretty --no-interaction",
-      "phpcs --standard=./phpcs-ruleset.xml --ignore=drupal .",
+      "phpcs --standard=./phpcs-ruleset.xml .",
       "./vendor/bin/drupal-check --drupal-root=drupal ./src/Drupal/Driver/Cores/Drupal8.php ./src/Drupal/Driver/Fields/Drupal8",
       "cp ./vendor/palantirnet/drupal-rector/rector.php drupal/.",
       "cd drupal && ../vendor/bin/rector process ../src/Drupal/Driver/Cores/Drupal8.php --dry-run",
diff --git a/phpcs-ruleset.xml b/phpcs-ruleset.xml
index 97abe68..f87e72f 100644
--- a/phpcs-ruleset.xml
+++ b/phpcs-ruleset.xml
@@ -24,5 +24,6 @@
     <exclude-pattern>*/vendor/*</exclude-pattern>
     <exclude-pattern>*/CHANGELOG.md</exclude-pattern>
     <exclude-pattern>*/README.md</exclude-pattern>
+    <exclude-pattern>./drupal/*</exclude-pattern>
 
 </ruleset>

From 4bfaa47c52d4624faaa87468b4a856fb7e6d306f Mon Sep 17 00:00:00 2001
From: Alex Skrypnyk <alex@integratedexperts.com>
Date: Fri, 14 Oct 2022 09:39:29 +1100
Subject: [PATCH 08/16] Added conflict to composer.json to indicate
 incompatibility with old Drupal versions.

---
 composer.json | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/composer.json b/composer.json
index 055110b..e6367c6 100644
--- a/composer.json
+++ b/composer.json
@@ -32,6 +32,9 @@
     "mglaman/drupal-check": "^1",
     "palantirnet/drupal-rector": "^0.13"
   },
+  "conflict": {
+    "drupal/core": ">=8.0 <9.3"
+  },
   "scripts": {
     "test": [
       "composer validate --no-interaction",

From 4499c712c815106433c63fcc11f77a5461eaf93e Mon Sep 17 00:00:00 2001
From: Alex Skrypnyk <alex@integratedexperts.com>
Date: Fri, 14 Oct 2022 09:43:24 +1100
Subject: [PATCH 09/16] Reverted argument type changes and updated docblocks.

---
 src/Drupal/Driver/Cores/Drupal8.php                  | 4 ++--
 src/Drupal/Driver/Fields/Drupal8/AbstractHandler.php | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Drupal/Driver/Cores/Drupal8.php b/src/Drupal/Driver/Cores/Drupal8.php
index 4f021ab..f3ce528 100644
--- a/src/Drupal/Driver/Cores/Drupal8.php
+++ b/src/Drupal/Driver/Cores/Drupal8.php
@@ -387,12 +387,12 @@ public function getExtensionPathList() {
    *
    * @param string $entity_type
    *   The entity type for which to return the field types.
-   * @param object $entity
+   * @param \StdClass $entity
    *   Entity object.
    * @param array $base_fields
    *   Base fields to be expanded in addition to user defined fields.
    */
-  public function expandEntityBaseFields($entity_type, $entity, array $base_fields) {
+  public function expandEntityBaseFields($entity_type, \StdClass $entity, array $base_fields) {
     $this->expandEntityFields($entity_type, $entity, $base_fields);
   }
 
diff --git a/src/Drupal/Driver/Fields/Drupal8/AbstractHandler.php b/src/Drupal/Driver/Fields/Drupal8/AbstractHandler.php
index 395a703..62bb0f3 100644
--- a/src/Drupal/Driver/Fields/Drupal8/AbstractHandler.php
+++ b/src/Drupal/Driver/Fields/Drupal8/AbstractHandler.php
@@ -25,7 +25,7 @@ abstract class AbstractHandler implements FieldHandlerInterface {
   /**
    * Constructs an AbstractHandler object.
    *
-   * @param object $entity
+   * @param \StdClass $entity
    *   The simulated entity object containing field information.
    * @param string $entity_type
    *   The entity type.
@@ -35,7 +35,7 @@ abstract class AbstractHandler implements FieldHandlerInterface {
    * @throws \Exception
    *   Thrown when the given field name does not exist on the entity.
    */
-  public function __construct($entity, $entity_type, $field_name) {
+  public function __construct(\StdClass $entity, $entity_type, $field_name) {
     if (empty($entity_type)) {
       throw new \Exception("You must specify an entity type in order to parse entity fields.");
     }

From 2143a5061a205df35ef243cc5941fa8618e43ac2 Mon Sep 17 00:00:00 2001
From: Alex Skrypnyk <alex@integratedexperts.com>
Date: Fri, 14 Oct 2022 09:55:57 +1100
Subject: [PATCH 10/16] Added back testing using PHP 8.0.

---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.travis.yml b/.travis.yml
index 40ffc30..151f78f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,7 @@
 language: php
 
 php:
+  - 8.0
   - 8.1
 
 install:

From 6da53e8cf3a393c7a816980ee10d5c150b320152 Mon Sep 17 00:00:00 2001
From: Alex Skrypnyk <alex@integratedexperts.com>
Date: Fri, 14 Oct 2022 10:20:56 +1100
Subject: [PATCH 11/16] Revert "Added back testing using PHP 8.0."

This reverts commit 2143a5061a205df35ef243cc5941fa8618e43ac2.
---
 .travis.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 151f78f..40ffc30 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +1,6 @@
 language: php
 
 php:
-  - 8.0
   - 8.1
 
 install:

From eb018dd1f1411d7f67c805c861aa94f22a150713 Mon Sep 17 00:00:00 2001
From: Alex Skrypnyk <alex@drevops.com>
Date: Tue, 25 Oct 2022 10:25:12 +1100
Subject: [PATCH 12/16] Revert "Revert "Added back testing using PHP 8.0.""

This reverts commit 6da53e8cf3a393c7a816980ee10d5c150b320152.
---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.travis.yml b/.travis.yml
index 40ffc30..151f78f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,7 @@
 language: php
 
 php:
+  - 8.0
   - 8.1
 
 install:

From 282ff13a16a7edefa681f6e1ac5278c062aa4b0f Mon Sep 17 00:00:00 2001
From: Alex Skrypnyk <alex@drevops.com>
Date: Tue, 25 Oct 2022 10:26:24 +1100
Subject: [PATCH 13/16] Updated core and recommended packages to allow lower
 versions.

---
 composer.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/composer.json b/composer.json
index e6367c6..cc67e23 100644
--- a/composer.json
+++ b/composer.json
@@ -23,8 +23,8 @@
     "phpspec/phpspec": "~2.0 || ~4.0 || ~6.1 || dev-main",
     "phpunit/phpunit": "~6.0 || ~7.0 || ^9",
     "mockery/mockery": "^1.5",
-    "drupal/core-composer-scaffold": "^10@beta",
-    "drupal/core-recommended": "^10@beta",
+    "drupal/core-composer-scaffold": "^8.4 || ^9 || ^10@beta",
+    "drupal/core-recommended": "^8.4 || ^9 || ^10@beta",
     "drupal/mailsystem": "^4.4",
     "drush-ops/behat-drush-endpoint": "*",
     "php-parallel-lint/php-parallel-lint": "^1.0",

From e033ac956d447480147a4408973684cfe320b7e5 Mon Sep 17 00:00:00 2001
From: Alex Skrypnyk <alex@drevops.com>
Date: Wed, 23 Nov 2022 17:35:39 +1100
Subject: [PATCH 14/16] Updated GH actions to include D10 version.

---
 .github/workflows/ci.yml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 0132916..425f6f5 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -7,12 +7,10 @@ jobs:
       fail-fast: false
       matrix:
         php_version: ["7.4", "8.0", "8.1"]
-        drupal_version: ["9"]
+        drupal_version: ["9", "10"]
         exclude:
           - php_version: "7.4"
             drupal_version: "10"
-          - php_version: "8.0"
-            drupal_version: "10"
     env:
       PHP_VERSION: ${{ matrix.php_version }}
       DRUPAL_VERSION: ${{ matrix.drupal_version }}

From b17388f1c254dd51f0fc246e808c3cb25a569be6 Mon Sep 17 00:00:00 2001
From: Alex Skrypnyk <alex@drevops.com>
Date: Wed, 23 Nov 2022 17:46:44 +1100
Subject: [PATCH 15/16] Added phpunit-bridge.

---
 composer.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index cc67e23..e2f660b 100644
--- a/composer.json
+++ b/composer.json
@@ -30,7 +30,8 @@
     "php-parallel-lint/php-parallel-lint": "^1.0",
     "dms/phpunit-arraysubset-asserts": "^0.4.0",
     "mglaman/drupal-check": "^1",
-    "palantirnet/drupal-rector": "^0.13"
+    "palantirnet/drupal-rector": "^0.13",
+    "symfony/phpunit-bridge": "^6.1"
   },
   "conflict": {
     "drupal/core": ">=8.0 <9.3"

From 03ae7c9ea5a0071ea6d49a8868f5ad5ae0163bb6 Mon Sep 17 00:00:00 2001
From: Alex Skrypnyk <alex@drevops.com>
Date: Wed, 23 Nov 2022 17:48:32 +1100
Subject: [PATCH 16/16] Exclude D10 from building on 8.0.

---
 .github/workflows/ci.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 425f6f5..5ec2adb 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -11,6 +11,8 @@ jobs:
         exclude:
           - php_version: "7.4"
             drupal_version: "10"
+          - php_version: "8.0"
+            drupal_version: "10"
     env:
       PHP_VERSION: ${{ matrix.php_version }}
       DRUPAL_VERSION: ${{ matrix.drupal_version }}