From cbb7e5e0367c9714da05d36b396e87e98aae6259 Mon Sep 17 00:00:00 2001
From: Matt Glaman <nmd.matt@gmail.com>
Date: Sun, 13 Dec 2020 09:14:18 -0600
Subject: [PATCH 01/39] Initial workflow file

---
 .github/workflows/php.yml | 35 +++++++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)
 create mode 100644 .github/workflows/php.yml

diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
new file mode 100644
index 00000000..ffe7bf6a
--- /dev/null
+++ b/.github/workflows/php.yml
@@ -0,0 +1,35 @@
+name: PHP Composer
+
+on:
+  push:
+  pull_request:
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v2
+
+    - name: Validate composer.json and composer.lock
+      run: composer validate
+
+    - name: Cache Composer packages
+      id: composer-cache
+      uses: actions/cache@v2
+      with:
+        path: vendor
+        key: ${{ runner.os }}-php-${{ hashFiles('**/composer.lock') }}
+        restore-keys: |
+          ${{ runner.os }}-php-
+
+    - name: Install dependencies
+      if: steps.composer-cache.outputs.cache-hit != 'true'
+      run: composer install --prefer-dist --no-progress --no-suggest
+
+    # Add a test script to composer.json, for instance: "test": "vendor/bin/phpunit"
+    # Docs: https://getcomposer.org/doc/articles/scripts.md
+
+    # - name: Run test suite
+    #   run: composer run-script test

From c557fe6ae27b8690b5362ccb2ab098485587fcca Mon Sep 17 00:00:00 2001
From: Matt Glaman <nmd.matt@gmail.com>
Date: Sun, 13 Dec 2020 09:18:58 -0600
Subject: [PATCH 02/39] Add PHPCS and PHPStan to workflow

---
 .github/workflows/php.yml | 54 +++++++++++++++++++--------------------
 1 file changed, 27 insertions(+), 27 deletions(-)

diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
index ffe7bf6a..352c9016 100644
--- a/.github/workflows/php.yml
+++ b/.github/workflows/php.yml
@@ -5,31 +5,31 @@ on:
   pull_request:
 
 jobs:
-  build:
-
-    runs-on: ubuntu-latest
-
+  tests:
+    runs-on: "ubuntu-latest"
+    name: "PHP ${{ matrix.php-version }} Unit Tests"
+    strategy:
+      matrix:
+        php-version:
+          - "7.1"
+          - "7.2"
+          - "7.3"
+          - "7.4"
+          - "8.0"
     steps:
-    - uses: actions/checkout@v2
-
-    - name: Validate composer.json and composer.lock
-      run: composer validate
-
-    - name: Cache Composer packages
-      id: composer-cache
-      uses: actions/cache@v2
-      with:
-        path: vendor
-        key: ${{ runner.os }}-php-${{ hashFiles('**/composer.lock') }}
-        restore-keys: |
-          ${{ runner.os }}-php-
-
-    - name: Install dependencies
-      if: steps.composer-cache.outputs.cache-hit != 'true'
-      run: composer install --prefer-dist --no-progress --no-suggest
-
-    # Add a test script to composer.json, for instance: "test": "vendor/bin/phpunit"
-    # Docs: https://getcomposer.org/doc/articles/scripts.md
-
-    # - name: Run test suite
-    #   run: composer run-script test
+      - name: "Checkout"
+        uses: "actions/checkout@v2"
+      - name: "Install PHP"
+        uses: "shivammathur/setup-php@v2"
+        with:
+          coverage: "none"
+          php-version: "${{ matrix.php-version }}"
+          tools: composer:v2
+      - name: "Install dependencies"
+        run: "composer update --no-progress --prefer-dist"
+      - name: "PHPCS"
+        run: "php vendor/bin/phpcs src"
+      - name: "PHPStan"
+        run: "php vendor/bin/phpstan analayze stc"
+      - name: "PHPUnit"
+        run: "php vendor/bin/phpunit"

From 5b7f627f6603ddc971c5aa1292cfbf2db9e0d961 Mon Sep 17 00:00:00 2001
From: Matt Glaman <nmd.matt@gmail.com>
Date: Sun, 13 Dec 2020 09:24:41 -0600
Subject: [PATCH 03/39] Flag 8.0 as continue-on-error

---
 .github/workflows/php.yml | 6 +++++-
 composer.json             | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
index 352c9016..28a2ce5f 100644
--- a/.github/workflows/php.yml
+++ b/.github/workflows/php.yml
@@ -6,16 +6,20 @@ on:
 
 jobs:
   tests:
+    continue-on-error: ${{ matrix.experimental }}
     runs-on: "ubuntu-latest"
     name: "PHP ${{ matrix.php-version }} Unit Tests"
     strategy:
       matrix:
+        experimental: [false]
         php-version:
           - "7.1"
           - "7.2"
           - "7.3"
           - "7.4"
-          - "8.0"
+        include:
+          - php-version: "8.0"
+            experimental: true
     steps:
       - name: "Checkout"
         uses: "actions/checkout@v2"
diff --git a/composer.json b/composer.json
index 365104a9..35cb422d 100644
--- a/composer.json
+++ b/composer.json
@@ -10,7 +10,7 @@
         }
     ],
     "require": {
-        "php": "^7.1",
+        "php": "^7.1 || ^8.0",
         "nette/finder": "^2.5",
         "phpstan/phpstan": "^0.12.64",
         "symfony/yaml": "~3.4.5|^4.2",

From 24da053873f41054c200d930bfa0c7c0df808594 Mon Sep 17 00:00:00 2001
From: Matt Glaman <nmd.matt@gmail.com>
Date: Sun, 13 Dec 2020 09:26:07 -0600
Subject: [PATCH 04/39] Fix analyze typo

---
 .github/workflows/php.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
index 28a2ce5f..9ed37d07 100644
--- a/.github/workflows/php.yml
+++ b/.github/workflows/php.yml
@@ -34,6 +34,6 @@ jobs:
       - name: "PHPCS"
         run: "php vendor/bin/phpcs src"
       - name: "PHPStan"
-        run: "php vendor/bin/phpstan analayze stc"
+        run: "php vendor/bin/phpstan analyze stc"
       - name: "PHPUnit"
         run: "php vendor/bin/phpunit"

From 78c245443eab62da5891870e5bfbe35bc4d6d860 Mon Sep 17 00:00:00 2001
From: Matt Glaman <nmd.matt@gmail.com>
Date: Sun, 13 Dec 2020 09:27:42 -0600
Subject: [PATCH 05/39] Fix typo for PHPStan command

---
 .github/workflows/php.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
index 9ed37d07..738da326 100644
--- a/.github/workflows/php.yml
+++ b/.github/workflows/php.yml
@@ -34,6 +34,6 @@ jobs:
       - name: "PHPCS"
         run: "php vendor/bin/phpcs src"
       - name: "PHPStan"
-        run: "php vendor/bin/phpstan analyze stc"
+        run: "php vendor/bin/phpstan analyze src"
       - name: "PHPUnit"
         run: "php vendor/bin/phpunit"

From 4a72a4aea4a211729e20a44cf4ed59f728a58eec Mon Sep 17 00:00:00 2001
From: Matt Glaman <nmd.matt@gmail.com>
Date: Sun, 13 Dec 2020 09:39:02 -0600
Subject: [PATCH 06/39] Add Drupal install to workflow

---
 .github/workflows/php.yml | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
index 738da326..8182d534 100644
--- a/.github/workflows/php.yml
+++ b/.github/workflows/php.yml
@@ -17,8 +17,12 @@ jobs:
           - "7.2"
           - "7.3"
           - "7.4"
+        drupal:
+          - "~8.8"
+          - "~8.9"
         include:
           - php-version: "8.0"
+            drupal: "~9.0"
             experimental: true
     steps:
       - name: "Checkout"
@@ -37,3 +41,23 @@ jobs:
         run: "php vendor/bin/phpstan analyze src"
       - name: "PHPUnit"
         run: "php vendor/bin/phpunit"
+
+      - name: Setup Drupal
+        run: |
+          COMPOSER_MEMORY_LIMIT=-1 composer create-project drupal/recommended-project:${{ matrix.drupal }} ~/drupal --no-interaction
+          cd ~/drupal
+          composer config minimum-stability dev
+          composer config prefer-stable true
+          composer config preferred-install dist
+          composer config repositories.0 path $GITHUB_WORKSPACE
+          composer config repositories.1 composer https://packages.drupal.org/8
+          COMPOSER_MEMORY_LIMIT=-1 composer require drupal/core-dev-pinned:${{ matrix.drupal }} --no-suggest
+      - name: "require phpstan-drupal"
+        run: |
+          cd ~/drupal
+          COMPOSER_MEMORY_LIMIT=-1 composer require mglaman/phpstan-drupal *@dev
+          cp $GITHUB_WORKSPACE/tests/fixtures/config/drupal-phpstan.neon phpstan.neon
+      - name: "Test core/install.php"
+        run: |
+          cd ~/drupal
+          ./vendor/bin/phpstan analyze web/core/install.php --debug

From 70f8cbe114f37570618080878618e73f2969318b Mon Sep 17 00:00:00 2001
From: Matt Glaman <nmd.matt@gmail.com>
Date: Sun, 13 Dec 2020 09:45:54 -0600
Subject: [PATCH 07/39] Add remaining TravisCI jobs

---
 .github/workflows/php.yml | 15 ++++++++++++++-
 composer.json             |  2 +-
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
index 8182d534..5c9ea73a 100644
--- a/.github/workflows/php.yml
+++ b/.github/workflows/php.yml
@@ -8,7 +8,7 @@ jobs:
   tests:
     continue-on-error: ${{ matrix.experimental }}
     runs-on: "ubuntu-latest"
-    name: "PHP ${{ matrix.php-version }} Unit Tests"
+    name: "PHP ${{ matrix.php-version }} | Drupal ${{ matrix.drupal }}"
     strategy:
       matrix:
         experimental: [false]
@@ -61,3 +61,16 @@ jobs:
         run: |
           cd ~/drupal
           ./vendor/bin/phpstan analyze web/core/install.php --debug
+      - name: "Test BrowserTestBase is autoloaded"
+        run: |
+          cd ~/drupal
+          ./vendor/bin/phpstan analyze web/core/modules/dynamic_page_cache | grep -q "Class Drupal\Tests\BrowserTestBase not found and could not be autoloaded." && false || true
+      - name: "Verify test fixtures are ignored."
+        run: |
+          cd ~/drupal
+          ./vendor/bin/phpstan analyze web/core/modules/migrate_drupal --no-progress | grep -q "tests/fixtures" && false || true
+      - name: 'Check "Cannot redeclare token_theme() due to blazy_test.module"'
+        run: |
+          cd ~/drupal
+          COMPOSER_MEMORY_LIMIT=-1 composer require drupal/token drupal/blazy
+          ./vendor/bin/phpstan analyze web/modules/contrib/blazy --no-progress || if (($? == 255)); then false; else true; fi
diff --git a/composer.json b/composer.json
index 35cb422d..429fe9a9 100644
--- a/composer.json
+++ b/composer.json
@@ -19,7 +19,7 @@
     "require-dev": {
         "phpstan/phpstan-strict-rules": "^0.12.0",
         "squizlabs/php_codesniffer": "^3.3",
-        "phpunit/phpunit": "^7.5",
+        "phpunit/phpunit": "^7.5 || ^8.0",
         "phpstan/phpstan-deprecation-rules": "~0.12.0",
         "composer/installers": "^1.6",
         "drupal/core-recommended": "^8.8@alpha",

From c34b0f47e969a59e61f559feffbc216ae456cf08 Mon Sep 17 00:00:00 2001
From: Matt Glaman <nmd.matt@gmail.com>
Date: Sun, 13 Dec 2020 09:55:45 -0600
Subject: [PATCH 08/39] Downgrade PHPUnit for D8

---
 .github/workflows/php.yml | 4 ++++
 composer.json             | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
index 5c9ea73a..0ab84f54 100644
--- a/.github/workflows/php.yml
+++ b/.github/workflows/php.yml
@@ -20,6 +20,7 @@ jobs:
         drupal:
           - "~8.8"
           - "~8.9"
+          - "~9.0"
         include:
           - php-version: "8.0"
             drupal: "~9.0"
@@ -35,6 +36,9 @@ jobs:
           tools: composer:v2
       - name: "Install dependencies"
         run: "composer update --no-progress --prefer-dist"
+      - name: "Downgrade PHPUnit"
+        run: "composer require phpunit/phpunit:^7.5"
+        if: ${{ matrix.drupal == "~8.8" || matrix.drupal == "~8.9" }}
       - name: "PHPCS"
         run: "php vendor/bin/phpcs src"
       - name: "PHPStan"
diff --git a/composer.json b/composer.json
index 429fe9a9..309a0987 100644
--- a/composer.json
+++ b/composer.json
@@ -22,7 +22,7 @@
         "phpunit/phpunit": "^7.5 || ^8.0",
         "phpstan/phpstan-deprecation-rules": "~0.12.0",
         "composer/installers": "^1.6",
-        "drupal/core-recommended": "^8.8@alpha",
+        "drupal/core-recommended": "^8.8@alpha || ^9.0",
         "drush/drush": "^9.6"
     },
     "minimum-stability": "dev",

From 7604737cccd76eb6a7b97dd9cca019808d752183 Mon Sep 17 00:00:00 2001
From: Matt Glaman <nmd.matt@gmail.com>
Date: Sun, 13 Dec 2020 10:01:11 -0600
Subject: [PATCH 09/39] Fix workflow syntax error

---
 .github/workflows/php.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
index 0ab84f54..0512c7cd 100644
--- a/.github/workflows/php.yml
+++ b/.github/workflows/php.yml
@@ -38,7 +38,7 @@ jobs:
         run: "composer update --no-progress --prefer-dist"
       - name: "Downgrade PHPUnit"
         run: "composer require phpunit/phpunit:^7.5"
-        if: ${{ matrix.drupal == "~8.8" || matrix.drupal == "~8.9" }}
+        if: ${{ matrix.drupal == '~8.8' || matrix.drupal == '~8.9' }}
       - name: "PHPCS"
         run: "php vendor/bin/phpcs src"
       - name: "PHPStan"

From bb25fec7bdc19cc4050e61eb6013396bf2b02912 Mon Sep 17 00:00:00 2001
From: Matt Glaman <nmd.matt@gmail.com>
Date: Sun, 13 Dec 2020 10:04:02 -0600
Subject: [PATCH 10/39] Downgrade phpunit using `--with-all-dependencies`

---
 .github/workflows/php.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
index 0512c7cd..482dc313 100644
--- a/.github/workflows/php.yml
+++ b/.github/workflows/php.yml
@@ -37,7 +37,7 @@ jobs:
       - name: "Install dependencies"
         run: "composer update --no-progress --prefer-dist"
       - name: "Downgrade PHPUnit"
-        run: "composer require phpunit/phpunit:^7.5"
+        run: "composer require phpunit/phpunit:^7.5 --with-all-dependencies"
         if: ${{ matrix.drupal == '~8.8' || matrix.drupal == '~8.9' }}
       - name: "PHPCS"
         run: "php vendor/bin/phpcs src"

From 53bf7fc5bf2950233736a814f8091501e0b6b8e1 Mon Sep 17 00:00:00 2001
From: Matt Glaman <nmd.matt@gmail.com>
Date: Sun, 13 Dec 2020 10:07:27 -0600
Subject: [PATCH 11/39] 7.1 and 7.2 not support by D9

---
 .github/workflows/php.yml | 12 ++++++++++--
 composer.json             |  2 +-
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
index 482dc313..02adffb8 100644
--- a/.github/workflows/php.yml
+++ b/.github/workflows/php.yml
@@ -2,6 +2,8 @@ name: PHP Composer
 
 on:
   push:
+    branches:
+      - master
   pull_request:
 
 jobs:
@@ -13,8 +15,6 @@ jobs:
       matrix:
         experimental: [false]
         php-version:
-          - "7.1"
-          - "7.2"
           - "7.3"
           - "7.4"
         drupal:
@@ -22,6 +22,14 @@ jobs:
           - "~8.9"
           - "~9.0"
         include:
+          - php-version: "7.1"
+            drupal: "~8.8"
+          - php-version: "7.1"
+            drupal: "~8.9"
+          - php-version: "7.2"
+            drupal: "~8.8"
+          - php-version: "7.2"
+            drupal: "~8.9"
           - php-version: "8.0"
             drupal: "~9.0"
             experimental: true
diff --git a/composer.json b/composer.json
index 309a0987..e85f0d3c 100644
--- a/composer.json
+++ b/composer.json
@@ -23,7 +23,7 @@
         "phpstan/phpstan-deprecation-rules": "~0.12.0",
         "composer/installers": "^1.6",
         "drupal/core-recommended": "^8.8@alpha || ^9.0",
-        "drush/drush": "^9.6"
+        "drush/drush": "^9.6 | ^10.0"
     },
     "minimum-stability": "dev",
     "prefer-stable": true,

From 6d650325a045d72acb8358dbfb6fef96c027c0e9 Mon Sep 17 00:00:00 2001
From: Matt Glaman <nmd.matt@gmail.com>
Date: Sun, 13 Dec 2020 10:08:21 -0600
Subject: [PATCH 12/39] Revert change to `on`

---
 .github/workflows/php.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
index 02adffb8..c717d76a 100644
--- a/.github/workflows/php.yml
+++ b/.github/workflows/php.yml
@@ -2,8 +2,6 @@ name: PHP Composer
 
 on:
   push:
-    branches:
-      - master
   pull_request:
 
 jobs:

From eec90935048b2b82cd6db5cfb6739cc0f49957eb Mon Sep 17 00:00:00 2001
From: Matt Glaman <nmd.matt@gmail.com>
Date: Sun, 13 Dec 2020 10:10:42 -0600
Subject: [PATCH 13/39] Reduce matrix size to get actions to run again

---
 .github/workflows/php.yml | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
index c717d76a..c61c95c9 100644
--- a/.github/workflows/php.yml
+++ b/.github/workflows/php.yml
@@ -20,12 +20,6 @@ jobs:
           - "~8.9"
           - "~9.0"
         include:
-          - php-version: "7.1"
-            drupal: "~8.8"
-          - php-version: "7.1"
-            drupal: "~8.9"
-          - php-version: "7.2"
-            drupal: "~8.8"
           - php-version: "7.2"
             drupal: "~8.9"
           - php-version: "8.0"

From 3aee9c68490caed97113655bc44a7da74815cb0d Mon Sep 17 00:00:00 2001
From: Matt Glaman <nmd.matt@gmail.com>
Date: Sun, 13 Dec 2020 10:12:55 -0600
Subject: [PATCH 14/39] Adjust trigger events

---
 .github/workflows/php.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
index c61c95c9..f1fedf31 100644
--- a/.github/workflows/php.yml
+++ b/.github/workflows/php.yml
@@ -1,8 +1,10 @@
 name: PHP Composer
 
 on:
-  push:
   pull_request:
+  push:
+    branches:
+      - master
 
 jobs:
   tests:

From 02fafe51bf72c7926a836be198b754067f9eba60 Mon Sep 17 00:00:00 2001
From: Matt Glaman <nmd.matt@gmail.com>
Date: Sun, 13 Dec 2020 10:32:51 -0600
Subject: [PATCH 15/39] Ensure PHP extensions; drop 8.8

---
 .github/workflows/php.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
index f1fedf31..6cc8b916 100644
--- a/.github/workflows/php.yml
+++ b/.github/workflows/php.yml
@@ -18,7 +18,6 @@ jobs:
           - "7.3"
           - "7.4"
         drupal:
-          - "~8.8"
           - "~8.9"
           - "~9.0"
         include:
@@ -36,6 +35,7 @@ jobs:
           coverage: "none"
           php-version: "${{ matrix.php-version }}"
           tools: composer:v2
+          extensions: dom, curl, libxml, mbstring, zip, pdo, mysql, pdo_mysql, bcmath, soap, intl, gd, exif, iconv
       - name: "Install dependencies"
         run: "composer update --no-progress --prefer-dist"
       - name: "Downgrade PHPUnit"

From b44054dc3dbfd952ba2fbbf5eaed07453024e9cd Mon Sep 17 00:00:00 2001
From: Matt Glaman <nmd.matt@gmail.com>
Date: Sun, 13 Dec 2020 11:08:16 -0600
Subject: [PATCH 16/39] Only run deprecation rules test on ~8

---
 tests/src/DeprecationRulesTest.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/tests/src/DeprecationRulesTest.php b/tests/src/DeprecationRulesTest.php
index a52595a6..d4f73740 100644
--- a/tests/src/DeprecationRulesTest.php
+++ b/tests/src/DeprecationRulesTest.php
@@ -10,6 +10,9 @@ class DeprecationRulesTest extends AnalyzerTestBase
      */
     public function testDeprecationRules(string $path, int $count, array $errorMessages)
     {
+        if (version_compare('9.0.0', \Drupal::VERSION) !== 1) {
+            $this->markTestSkipped('Only tested on Drupal 8.x.x');
+        }
         $errors = $this->runAnalyze($path);
         $this->assertCount($count, $errors->getErrors(), var_export($errors, true));
         foreach ($errors->getErrors() as $key => $error) {

From bfc6de210d0fb45823172c7438579ee3d31e4394 Mon Sep 17 00:00:00 2001
From: Matt Glaman <nmd.matt@gmail.com>
Date: Sun, 13 Dec 2020 11:10:20 -0600
Subject: [PATCH 17/39] Add cron, ensure to downgrade Drupal along with PHPUnit

---
 .github/workflows/php.yml | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
index 6cc8b916..f696cbbe 100644
--- a/.github/workflows/php.yml
+++ b/.github/workflows/php.yml
@@ -1,10 +1,11 @@
-name: PHP Composer
-
+name: Tests
 on:
-  pull_request:
   push:
-    branches:
-      - master
+    branches: [master]
+  pull_request:
+    branches: [master]
+  schedule:
+    - cron: 0 0 * * *
 
 jobs:
   tests:
@@ -35,18 +36,18 @@ jobs:
           coverage: "none"
           php-version: "${{ matrix.php-version }}"
           tools: composer:v2
-          extensions: dom, curl, libxml, mbstring, zip, pdo, mysql, pdo_mysql, bcmath, soap, intl, gd, exif, iconv
+          extensions: dom, curl, libxml, mbstring, zip, pdo, mysql, pdo_mysql, bcmath, gd, exif, iconv
       - name: "Install dependencies"
         run: "composer update --no-progress --prefer-dist"
-      - name: "Downgrade PHPUnit"
-        run: "composer require phpunit/phpunit:^7.5 --with-all-dependencies"
-        if: ${{ matrix.drupal == '~8.8' || matrix.drupal == '~8.9' }}
+      - name: "Downgrade dev dependencies"
+        run: "composer require phpunit/phpunit:^7.5 drupal/core-recommended:${{ matrix.drupal }} --with-all-dependencies"
+        if: ${{ matrix.drupal == '~8.9' }}
       - name: "PHPCS"
         run: "php vendor/bin/phpcs src"
       - name: "PHPStan"
         run: "php vendor/bin/phpstan analyze src"
       - name: "PHPUnit"
-        run: "php vendor/bin/phpunit"
+        run: "php vendor/bin/phpunit --debug"
 
       - name: Setup Drupal
         run: |

From de7a70f76a62617e20cd4a96da4c55cc70597f0b Mon Sep 17 00:00:00 2001
From: Matt Glaman <nmd.matt@gmail.com>
Date: Sun, 13 Dec 2020 11:10:34 -0600
Subject: [PATCH 18/39] Catch error on SplString concat

---
 tests/src/DrupalIntegrationTest.php | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/tests/src/DrupalIntegrationTest.php b/tests/src/DrupalIntegrationTest.php
index a7c9da87..444237ca 100644
--- a/tests/src/DrupalIntegrationTest.php
+++ b/tests/src/DrupalIntegrationTest.php
@@ -39,8 +39,10 @@ public function testDrupalTestInChildSiteContant() {
     }
 
     public function testExtensionReportsError() {
+        $is_d9 = version_compare('9.0.0', \Drupal::VERSION) !== 1;
         $errors = $this->runAnalyze(__DIR__ . '/../fixtures/drupal/modules/phpstan_fixtures/phpstan_fixtures.module');
-        $this->assertCount(3, $errors->getErrors(), var_export($errors, true));
+        // @todo this only broke on D9.
+        $this->assertCount($is_d9 ? 4 : 3, $errors->getErrors(), var_export($errors, true));
         $this->assertCount(0, $errors->getInternalErrors(), var_export($errors, true));
 
         $errors = $errors->getErrors();
@@ -48,6 +50,10 @@ public function testExtensionReportsError() {
         $this->assertEquals('If condition is always false.', $error->getMessage());
         $error = array_shift($errors);
         $this->assertEquals('Function phpstan_fixtures_MissingReturnRule() should return string but return statement is missing.', $error->getMessage());
+        if ($is_d9) {
+            $error = array_shift($errors);
+            $this->assertEquals('Binary operation "." between SplString and \'/core/includes…\' results in an error.', $error->getMessage());
+        }
         $error = array_shift($errors);
         $this->assertStringContainsString('phpstan_fixtures/phpstan_fixtures.fetch.inc could not be loaded from Drupal\\Core\\Extension\\ModuleHandlerInterface::loadInclude', $error->getMessage());
     }

From 9e62d4fd32abe4f6e22a9a9cd100a01371de90b0 Mon Sep 17 00:00:00 2001
From: Matt Glaman <nmd.matt@gmail.com>
Date: Sun, 13 Dec 2020 11:11:20 -0600
Subject: [PATCH 19/39] Missing experimental falg

---
 .github/workflows/php.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
index f696cbbe..10e71588 100644
--- a/.github/workflows/php.yml
+++ b/.github/workflows/php.yml
@@ -24,6 +24,7 @@ jobs:
         include:
           - php-version: "7.2"
             drupal: "~8.9"
+            experimental: false
           - php-version: "8.0"
             drupal: "~9.0"
             experimental: true

From 003d3d157f51ee9a35147cc47bdc91cd4f4c4028 Mon Sep 17 00:00:00 2001
From: Matt Glaman <nmd.matt@gmail.com>
Date: Wed, 10 Mar 2021 14:09:50 -0600
Subject: [PATCH 20/39] Add Composer 2 support for composer/installers

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

diff --git a/composer.json b/composer.json
index e85f0d3c..1d29f6c4 100644
--- a/composer.json
+++ b/composer.json
@@ -21,7 +21,7 @@
         "squizlabs/php_codesniffer": "^3.3",
         "phpunit/phpunit": "^7.5 || ^8.0",
         "phpstan/phpstan-deprecation-rules": "~0.12.0",
-        "composer/installers": "^1.6",
+        "composer/installers": "2",
         "drupal/core-recommended": "^8.8@alpha || ^9.0",
         "drush/drush": "^9.6 | ^10.0"
     },

From 312a31951d2a1f24ab4c2fab3026286339b93ef2 Mon Sep 17 00:00:00 2001
From: Matt Glaman <nmd.matt@gmail.com>
Date: Wed, 10 Mar 2021 14:13:08 -0600
Subject: [PATCH 21/39] composer/installers again

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

diff --git a/composer.json b/composer.json
index 1d29f6c4..6ef0b91d 100644
--- a/composer.json
+++ b/composer.json
@@ -21,7 +21,7 @@
         "squizlabs/php_codesniffer": "^3.3",
         "phpunit/phpunit": "^7.5 || ^8.0",
         "phpstan/phpstan-deprecation-rules": "~0.12.0",
-        "composer/installers": "2",
+        "composer/installers": "^1.9",
         "drupal/core-recommended": "^8.8@alpha || ^9.0",
         "drush/drush": "^9.6 | ^10.0"
     },

From ab5a07b44fd7dce76ce96bcec2e296b01dcc86f3 Mon Sep 17 00:00:00 2001
From: Matt Glaman <nmd.matt@gmail.com>
Date: Wed, 10 Mar 2021 14:24:47 -0600
Subject: [PATCH 22/39] Reduce the testing matrix

---
 .github/workflows/php.yml | 54 +++++++++++++++++++++++++++++++--------
 1 file changed, 43 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
index 10e71588..b20a09e7 100644
--- a/.github/workflows/php.yml
+++ b/.github/workflows/php.yml
@@ -16,18 +16,18 @@ jobs:
       matrix:
         experimental: [false]
         php-version:
-          - "7.3"
+#          - "7.3"
           - "7.4"
         drupal:
-          - "~8.9"
-          - "~9.0"
-        include:
-          - php-version: "7.2"
-            drupal: "~8.9"
-            experimental: false
-          - php-version: "8.0"
-            drupal: "~9.0"
-            experimental: true
+          - "^8.9"
+          - "^9.0"
+#        include:
+#          - php-version: "7.2"
+#            drupal: "~8.9"
+#            experimental: false
+#          - php-version: "8.0"
+#            drupal: "~9.0"
+#            experimental: true
     steps:
       - name: "Checkout"
         uses: "actions/checkout@v2"
@@ -41,7 +41,7 @@ jobs:
       - name: "Install dependencies"
         run: "composer update --no-progress --prefer-dist"
       - name: "Downgrade dev dependencies"
-        run: "composer require phpunit/phpunit:^7.5 drupal/core-recommended:${{ matrix.drupal }} --with-all-dependencies"
+        run: "composer require phpunit/phpunit:^7.5 drush/drush:~9 drupal/core-recommended:${{ matrix.drupal }} --with-all-dependencies"
         if: ${{ matrix.drupal == '~8.9' }}
       - name: "PHPCS"
         run: "php vendor/bin/phpcs src"
@@ -50,6 +50,38 @@ jobs:
       - name: "PHPUnit"
         run: "php vendor/bin/phpunit --debug"
 
+  build_integration:
+    continue-on-error: ${{ matrix.experimental }}
+    runs-on: "ubuntu-latest"
+    name: "PHP ${{ matrix.php-version }} | Drupal ${{ matrix.drupal }}"
+    strategy:
+      matrix:
+        experimental: [false]
+        php-version:
+#          - "7.3"
+          - "7.4"
+        drupal:
+          - "^8.9"
+          - "^9.0"
+#        include:
+#          - php-version: "7.2"
+#            drupal: "~8.9"
+#            experimental: false
+#          - php-version: "8.0"
+#            drupal: "~9.0"
+#            experimental: true
+    steps:
+      - name: "Checkout"
+        uses: "actions/checkout@v2"
+      - name: "Install PHP"
+        uses: "shivammathur/setup-php@v2"
+        with:
+          coverage: "none"
+          php-version: "${{ matrix.php-version }}"
+          tools: composer:v2
+          extensions: dom, curl, libxml, mbstring, zip, pdo, mysql, pdo_mysql, bcmath, gd, exif, iconv
+      - name: "Install dependencies"
+        run: "composer update --no-dev --no-progress --prefer-dist"
       - name: Setup Drupal
         run: |
           COMPOSER_MEMORY_LIMIT=-1 composer create-project drupal/recommended-project:${{ matrix.drupal }} ~/drupal --no-interaction

From deb74aefac2ae302ce731492b1f6bf35d13e582e Mon Sep 17 00:00:00 2001
From: Matt Glaman <nmd.matt@gmail.com>
Date: Wed, 10 Mar 2021 14:41:17 -0600
Subject: [PATCH 23/39] Add core-dev-pinned to dev dependencies

---
 .github/workflows/php.yml | 6 ++----
 composer.json             | 3 ++-
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
index b20a09e7..2eb664e7 100644
--- a/.github/workflows/php.yml
+++ b/.github/workflows/php.yml
@@ -41,8 +41,8 @@ jobs:
       - name: "Install dependencies"
         run: "composer update --no-progress --prefer-dist"
       - name: "Downgrade dev dependencies"
-        run: "composer require phpunit/phpunit:^7.5 drush/drush:~9 drupal/core-recommended:${{ matrix.drupal }} --with-all-dependencies"
-        if: ${{ matrix.drupal == '~8.9' }}
+        run: "composer require phpunit/phpunit:^7.5 drush/drush:~9 drupal/core-recommended:${{ matrix.drupal }} drupal/core-dev-pinned:${{ matrix.drupal }} --with-all-dependencies"
+        if: ${{ matrix.drupal == '^8.9' }}
       - name: "PHPCS"
         run: "php vendor/bin/phpcs src"
       - name: "PHPStan"
@@ -80,8 +80,6 @@ jobs:
           php-version: "${{ matrix.php-version }}"
           tools: composer:v2
           extensions: dom, curl, libxml, mbstring, zip, pdo, mysql, pdo_mysql, bcmath, gd, exif, iconv
-      - name: "Install dependencies"
-        run: "composer update --no-dev --no-progress --prefer-dist"
       - name: Setup Drupal
         run: |
           COMPOSER_MEMORY_LIMIT=-1 composer create-project drupal/recommended-project:${{ matrix.drupal }} ~/drupal --no-interaction
diff --git a/composer.json b/composer.json
index 6ef0b91d..48d03896 100644
--- a/composer.json
+++ b/composer.json
@@ -19,10 +19,11 @@
     "require-dev": {
         "phpstan/phpstan-strict-rules": "^0.12.0",
         "squizlabs/php_codesniffer": "^3.3",
-        "phpunit/phpunit": "^7.5 || ^8.0",
+        "phpunit/phpunit": "^7.5 || ^8.0 || ^9",
         "phpstan/phpstan-deprecation-rules": "~0.12.0",
         "composer/installers": "^1.9",
         "drupal/core-recommended": "^8.8@alpha || ^9.0",
+        "drupal/core-dev-pinned": "^8.8@alpha || ^9.0",
         "drush/drush": "^9.6 | ^10.0"
     },
     "minimum-stability": "dev",

From b06820451a73531daeeda0977c34dcc70354434c Mon Sep 17 00:00:00 2001
From: Matt Glaman <nmd.matt@gmail.com>
Date: Wed, 10 Mar 2021 14:44:39 -0600
Subject: [PATCH 24/39] PHPUnit 6.5 for 8.9

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

diff --git a/composer.json b/composer.json
index 48d03896..9c718185 100644
--- a/composer.json
+++ b/composer.json
@@ -19,7 +19,7 @@
     "require-dev": {
         "phpstan/phpstan-strict-rules": "^0.12.0",
         "squizlabs/php_codesniffer": "^3.3",
-        "phpunit/phpunit": "^7.5 || ^8.0 || ^9",
+        "phpunit/phpunit": "^6.5 || ^7.5 || ^8.0 || ^9",
         "phpstan/phpstan-deprecation-rules": "~0.12.0",
         "composer/installers": "^1.9",
         "drupal/core-recommended": "^8.8@alpha || ^9.0",

From b9eb16196ce28732edc4f162f4f210f089a171e7 Mon Sep 17 00:00:00 2001
From: Matt Glaman <nmd.matt@gmail.com>
Date: Wed, 10 Mar 2021 14:46:41 -0600
Subject: [PATCH 25/39] Fix downgrade

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

diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
index 2eb664e7..747497b2 100644
--- a/.github/workflows/php.yml
+++ b/.github/workflows/php.yml
@@ -41,7 +41,7 @@ jobs:
       - name: "Install dependencies"
         run: "composer update --no-progress --prefer-dist"
       - name: "Downgrade dev dependencies"
-        run: "composer require phpunit/phpunit:^7.5 drush/drush:~9 drupal/core-recommended:${{ matrix.drupal }} drupal/core-dev-pinned:${{ matrix.drupal }} --with-all-dependencies"
+        run: "composer require phpunit/phpunit:6.5.14 drush/drush:~9 drupal/core-recommended:${{ matrix.drupal }} drupal/core-dev-pinned:${{ matrix.drupal }} --with-all-dependencies"
         if: ${{ matrix.drupal == '^8.9' }}
       - name: "PHPCS"
         run: "php vendor/bin/phpcs src"
@@ -89,7 +89,7 @@ jobs:
           composer config preferred-install dist
           composer config repositories.0 path $GITHUB_WORKSPACE
           composer config repositories.1 composer https://packages.drupal.org/8
-          COMPOSER_MEMORY_LIMIT=-1 composer require drupal/core-dev-pinned:${{ matrix.drupal }} --no-suggest
+          COMPOSER_MEMORY_LIMIT=-1 composer require drupal/core-dev-pinned:${{ matrix.drupal }}
       - name: "require phpstan-drupal"
         run: |
           cd ~/drupal

From 0a6554b9bceabf025dea0847e8850754a134c940 Mon Sep 17 00:00:00 2001
From: Matt Glaman <nmd.matt@gmail.com>
Date: Wed, 10 Mar 2021 14:56:10 -0600
Subject: [PATCH 26/39] Cross phpunit version fix for
 assertStringContainsString

---
 tests/src/DrupalIntegrationTest.php | 30 +++++++++++++++--------------
 1 file changed, 16 insertions(+), 14 deletions(-)

diff --git a/tests/src/DrupalIntegrationTest.php b/tests/src/DrupalIntegrationTest.php
index 444237ca..822bfcda 100644
--- a/tests/src/DrupalIntegrationTest.php
+++ b/tests/src/DrupalIntegrationTest.php
@@ -6,10 +6,11 @@
 
 final class DrupalIntegrationTest extends AnalyzerTestBase {
 
-    public function testInstallPhp() {
+    public function testInstallPhp(): void
+    {
         $errors = $this->runAnalyze(__DIR__ . '/../fixtures/drupal/core/install.php');
-        $this->assertCount(0, $errors->getErrors());
-        $this->assertCount(0, $errors->getInternalErrors());
+        self::assertCount(0, $errors->getErrors());
+        self::assertCount(0, $errors->getInternalErrors());
     }
 
     public function testTestSuiteAutoloading() {
@@ -42,35 +43,36 @@ public function testExtensionReportsError() {
         $is_d9 = version_compare('9.0.0', \Drupal::VERSION) !== 1;
         $errors = $this->runAnalyze(__DIR__ . '/../fixtures/drupal/modules/phpstan_fixtures/phpstan_fixtures.module');
         // @todo this only broke on D9.
-        $this->assertCount($is_d9 ? 4 : 3, $errors->getErrors(), var_export($errors, true));
-        $this->assertCount(0, $errors->getInternalErrors(), var_export($errors, true));
+        self::assertCount($is_d9 ? 4 : 3, $errors->getErrors(), var_export($errors, true));
+        self::assertCount(0, $errors->getInternalErrors(), var_export($errors, true));
 
         $errors = $errors->getErrors();
         $error = array_shift($errors);
-        $this->assertEquals('If condition is always false.', $error->getMessage());
+        self::assertEquals('If condition is always false.', $error->getMessage());
         $error = array_shift($errors);
-        $this->assertEquals('Function phpstan_fixtures_MissingReturnRule() should return string but return statement is missing.', $error->getMessage());
+        self::assertEquals('Function phpstan_fixtures_MissingReturnRule() should return string but return statement is missing.', $error->getMessage());
         if ($is_d9) {
             $error = array_shift($errors);
-            $this->assertEquals('Binary operation "." between SplString and \'/core/includes…\' results in an error.', $error->getMessage());
+            self::assertEquals('Binary operation "." between SplString and \'/core/includes…\' results in an error.', $error->getMessage());
         }
         $error = array_shift($errors);
-        $this->assertStringContainsString('phpstan_fixtures/phpstan_fixtures.fetch.inc could not be loaded from Drupal\\Core\\Extension\\ModuleHandlerInterface::loadInclude', $error->getMessage());
+
+        self::assertNotFalse(strpos($error->getMessage(), 'phpstan_fixtures/phpstan_fixtures.fetch.inc could not be loaded from Drupal\\Core\\Extension\\ModuleHandlerInterface::loadInclude'));
     }
 
-    public function testExtensionTestSuiteAutoloading()
+    public function testExtensionTestSuiteAutoloading(): void
     {
         $paths = [
             __DIR__ . '/../fixtures/drupal/modules/module_with_tests/tests/src/Unit/ModuleWithTestsTest.php',
-//            __DIR__ . '/../fixtures/drupal/modules/module_with_tests/tests/src/Traits/ModuleWithTestsTrait.php',
-//            __DIR__ . '/../fixtures/drupal/modules/module_with_tests/tests/src/TestSite/ModuleWithTestsTestSite.php',
+            __DIR__ . '/../fixtures/drupal/modules/module_with_tests/tests/src/Traits/ModuleWithTestsTrait.php',
+            __DIR__ . '/../fixtures/drupal/modules/module_with_tests/tests/src/TestSite/ModuleWithTestsTestSite.php',
         ];
         foreach ($paths as $path) {
             $errors = $this->runAnalyze($path);
-            $this->assertCount(0, $errors->getErrors(), implode(PHP_EOL, array_map(static function (Error $error) {
+            self::assertCount(0, $errors->getErrors(), implode(PHP_EOL, array_map(static function (Error $error) {
                 return $error->getMessage();
             }, $errors->getErrors())));
-            $this->assertCount(0, $errors->getInternalErrors(), implode(PHP_EOL, $errors->getInternalErrors()));
+            self::assertCount(0, $errors->getInternalErrors(), implode(PHP_EOL, $errors->getInternalErrors()));
         }
     }
 

From 2c108eea4acf8434e9f07bc26e1f5207ada90550 Mon Sep 17 00:00:00 2001
From: Matt Glaman <nmd.matt@gmail.com>
Date: Wed, 10 Mar 2021 15:27:27 -0600
Subject: [PATCH 27/39] Test the UnitTestCase dies

---
 .github/workflows/php.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
index 747497b2..1543d476 100644
--- a/.github/workflows/php.yml
+++ b/.github/workflows/php.yml
@@ -99,6 +99,10 @@ jobs:
         run: |
           cd ~/drupal
           ./vendor/bin/phpstan analyze web/core/install.php --debug
+      - name: "Test core/tests/Drupal/Tests/UnitTestCase.php"
+        run: |
+          cd ~/drupal
+          ./vendor/bin/phpstan analyze core/tests/Drupal/Tests/UnitTestCase.php --debug
       - name: "Test BrowserTestBase is autoloaded"
         run: |
           cd ~/drupal

From 031bf414ced098719def0b4fca567abf857c3d24 Mon Sep 17 00:00:00 2001
From: Matt Glaman <nmd.matt@gmail.com>
Date: Wed, 10 Mar 2021 15:30:31 -0600
Subject: [PATCH 28/39] Forgot `/web`

---
 .github/workflows/php.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
index 1543d476..116dc5da 100644
--- a/.github/workflows/php.yml
+++ b/.github/workflows/php.yml
@@ -102,7 +102,7 @@ jobs:
       - name: "Test core/tests/Drupal/Tests/UnitTestCase.php"
         run: |
           cd ~/drupal
-          ./vendor/bin/phpstan analyze core/tests/Drupal/Tests/UnitTestCase.php --debug
+          ./vendor/bin/phpstan analyze web/core/tests/Drupal/Tests/UnitTestCase.php --debug
       - name: "Test BrowserTestBase is autoloaded"
         run: |
           cd ~/drupal

From 97f9301d69c6d9057d4f4a0cac3a9aadb6c6ddf5 Mon Sep 17 00:00:00 2001
From: Matt Glaman <nmd.matt@gmail.com>
Date: Wed, 10 Mar 2021 15:34:24 -0600
Subject: [PATCH 29/39] Analyze test extended UnitTestCase

---
 .github/workflows/php.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
index 116dc5da..8d28cb43 100644
--- a/.github/workflows/php.yml
+++ b/.github/workflows/php.yml
@@ -102,7 +102,7 @@ jobs:
       - name: "Test core/tests/Drupal/Tests/UnitTestCase.php"
         run: |
           cd ~/drupal
-          ./vendor/bin/phpstan analyze web/core/tests/Drupal/Tests/UnitTestCase.php --debug
+          ./vendor/bin/phpstan analyze web/core/tests/Drupal/Tests/SkippedDeprecationTest.php --debug
       - name: "Test BrowserTestBase is autoloaded"
         run: |
           cd ~/drupal

From 02a48f584cddbeae83962e740dc66e725ffef4b9 Mon Sep 17 00:00:00 2001
From: Matt Glaman <nmd.matt@gmail.com>
Date: Wed, 10 Mar 2021 15:36:56 -0600
Subject: [PATCH 30/39] Add PHPUnit hack for tests

---
 composer.json           |  3 +++
 drupal-phpunit-hack.php | 33 +++++++++++++++++++++++++++++++++
 2 files changed, 36 insertions(+)
 create mode 100644 drupal-phpunit-hack.php

diff --git a/composer.json b/composer.json
index 9c718185..4ef87f01 100644
--- a/composer.json
+++ b/composer.json
@@ -32,6 +32,9 @@
         "phpstan/phpstan-deprecation-rules": "For catching deprecations, especially in Drupal core."
     },
     "autoload": {
+        "files": [
+            "drupal-phpunit-hack.php"
+        ],
         "psr-4": {
             "PHPStan\\": "src/"
         }
diff --git a/drupal-phpunit-hack.php b/drupal-phpunit-hack.php
new file mode 100644
index 00000000..33eb5d3c
--- /dev/null
+++ b/drupal-phpunit-hack.php
@@ -0,0 +1,33 @@
+<?php declare(strict_types=1);
+
+/**
+ * @file
+ *
+ * Implements PHPUnit compatibility hack provided by ClassWriter
+ *
+ * This ensures we can run our PHPUnit tests against 8.9 and 9, and more.
+ *
+ * @see \Drupal\TestTools\PhpUnitCompatibility\PhpUnit8\ClassWriter::mutateTestBase()
+ */
+$autoloader = null;
+if (file_exists(__DIR__ . '/vendor/autoload.php')) {
+    $autoloader = require __DIR__ . '/vendor/autoload.php';
+}
+if (!$autoloader instanceof \Composer\Autoload\ClassLoader) {
+    return;
+}
+
+// Inspired by Symfony's simple-phpunit remove typehints from TestCase.
+$alteredFile = $autoloader->findFile('PHPUnit\Framework\TestCase');
+$phpunit_dir = dirname($alteredFile, 3);
+// Mutate TestCase code to make it compatible with Drupal 8 and 9 tests.
+$alteredCode = file_get_contents($alteredFile);
+$alteredCode = preg_replace('/^    ((?:protected|public)(?: static)? function \w+\(\)): void/m', '    $1', $alteredCode);
+$alteredCode = str_replace("__DIR__ . '/../Util/", "'$phpunit_dir/src/Util/", $alteredCode);
+// Only write when necessary.
+$filename = 'TestCase.php';
+
+if (!file_exists($filename) || md5_file($filename) !== md5($alteredCode)) {
+    file_put_contents($filename, $alteredCode);
+}
+include $filename;

From 6e35bfcfa6f811384b50c020a91fab75a34ad749 Mon Sep 17 00:00:00 2001
From: Matt Glaman <nmd.matt@gmail.com>
Date: Wed, 10 Mar 2021 15:51:25 -0600
Subject: [PATCH 31/39] Make sure mutated test case is ignored

---
 .gitignore              | 4 ++++
 drupal-phpunit-hack.php | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 63a9d0ae..64742e03 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,7 @@ composer.lock
 /vendor/
 /clover.xml
 .circleci/config_local.yml
+
+# Fix PHPUnit compatibility mutated class.
+/src/TestCase.php
+.phpunit.result.cache
diff --git a/drupal-phpunit-hack.php b/drupal-phpunit-hack.php
index 33eb5d3c..19dc7b9e 100644
--- a/drupal-phpunit-hack.php
+++ b/drupal-phpunit-hack.php
@@ -25,7 +25,7 @@
 $alteredCode = preg_replace('/^    ((?:protected|public)(?: static)? function \w+\(\)): void/m', '    $1', $alteredCode);
 $alteredCode = str_replace("__DIR__ . '/../Util/", "'$phpunit_dir/src/Util/", $alteredCode);
 // Only write when necessary.
-$filename = 'TestCase.php';
+$filename = __DIR__ . '/src/TestCase.php';
 
 if (!file_exists($filename) || md5_file($filename) !== md5($alteredCode)) {
     file_put_contents($filename, $alteredCode);

From 232e1264ca0d39df009900d32fa2b52259febd44 Mon Sep 17 00:00:00 2001
From: Matt Glaman <nmd.matt@gmail.com>
Date: Wed, 10 Mar 2021 15:51:42 -0600
Subject: [PATCH 32/39] Fix integration test for d8/d9

---
 tests/src/DrupalIntegrationTest.php | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/tests/src/DrupalIntegrationTest.php b/tests/src/DrupalIntegrationTest.php
index 822bfcda..cdef2432 100644
--- a/tests/src/DrupalIntegrationTest.php
+++ b/tests/src/DrupalIntegrationTest.php
@@ -76,8 +76,11 @@ public function testExtensionTestSuiteAutoloading(): void
         }
     }
 
-    public function testServiceMapping()
+    public function testServiceMapping8()
     {
+        if (version_compare('9.0.0', \Drupal::VERSION) !== 1) {
+            $this->markTestSkipped('Only tested on Drupal 8.x.x');
+        }
         $errorMessages = [
             '\Drupal calls should be avoided in classes, use dependency injection instead',
             'Call to an undefined method Drupal\Core\Entity\EntityManager::thisMethodDoesNotExist().',
@@ -94,6 +97,23 @@ public function testServiceMapping()
         }
     }
 
+    public function testServiceMapping9()
+    {
+        if (version_compare('9.0.0', \Drupal::VERSION) === 1) {
+            $this->markTestSkipped('Only tested on Drupal 9.x.x');
+        }
+        // @todo: the actual error should be the fact `entity.manager` does not exist.
+        $errorMessages = [
+            '\Drupal calls should be avoided in classes, use dependency injection instead',
+        ];
+        $errors = $this->runAnalyze(__DIR__ . '/../fixtures/drupal/modules/phpstan_fixtures/src/TestServicesMappingExtension.php');
+        $this->assertCount(1, $errors->getErrors());
+        $this->assertCount(0, $errors->getInternalErrors());
+        foreach ($errors->getErrors() as $key => $error) {
+            $this->assertEquals($errorMessages[$key], $error->getMessage());
+        }
+    }
+
     public function testAppRootPseudoService() {
         $errors = $this->runAnalyze(__DIR__ . '/../fixtures/drupal/modules/phpstan_fixtures/src/AppRootParameter.php');
         $this->assertCount(0, $errors->getErrors(), var_export($errors, TRUE));

From 4542dadcc1f0fad7e9d5f4b7d56703a078596658 Mon Sep 17 00:00:00 2001
From: Matt Glaman <nmd.matt@gmail.com>
Date: Wed, 10 Mar 2021 15:53:59 -0600
Subject: [PATCH 33/39] Move mutated TestCase out of src

---
 .gitignore              | 2 +-
 drupal-phpunit-hack.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index 64742e03..20d7ee7f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,5 +5,5 @@ composer.lock
 .circleci/config_local.yml
 
 # Fix PHPUnit compatibility mutated class.
-/src/TestCase.php
+/tests/fixtures/TestCase.php
 .phpunit.result.cache
diff --git a/drupal-phpunit-hack.php b/drupal-phpunit-hack.php
index 19dc7b9e..1052325e 100644
--- a/drupal-phpunit-hack.php
+++ b/drupal-phpunit-hack.php
@@ -25,7 +25,7 @@
 $alteredCode = preg_replace('/^    ((?:protected|public)(?: static)? function \w+\(\)): void/m', '    $1', $alteredCode);
 $alteredCode = str_replace("__DIR__ . '/../Util/", "'$phpunit_dir/src/Util/", $alteredCode);
 // Only write when necessary.
-$filename = __DIR__ . '/src/TestCase.php';
+$filename = __DIR__ . '/tests/fixtures/TestCase.php';
 
 if (!file_exists($filename) || md5_file($filename) !== md5($alteredCode)) {
     file_put_contents($filename, $alteredCode);

From 0a4ebb8ec001b110b1427a52cb3727c45d596bd1 Mon Sep 17 00:00:00 2001
From: Matt Glaman <nmd.matt@gmail.com>
Date: Wed, 10 Mar 2021 16:01:09 -0600
Subject: [PATCH 34/39] Updated Drush integration test

---
 .../drush_command/src/Commands/TestDrushCommands.php  |  2 +-
 tests/src/DrushIntegrationTest.php                    | 11 +++++++++--
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/tests/fixtures/drupal/modules/drush_command/src/Commands/TestDrushCommands.php b/tests/fixtures/drupal/modules/drush_command/src/Commands/TestDrushCommands.php
index 84c536ac..dbdc21d9 100644
--- a/tests/fixtures/drupal/modules/drush_command/src/Commands/TestDrushCommands.php
+++ b/tests/fixtures/drupal/modules/drush_command/src/Commands/TestDrushCommands.php
@@ -14,7 +14,7 @@ class TestDrushCommands extends DrushCommands {
     public function example() {
         if (drush_is_osx()) {
             $this->io()->writeln('macOS');
-        } elseif (drush_is_cygwin() || drush_is_mingw()) {
+        } elseif (drush_is_windows()) {
             $this->io()->writeln('Windows');
         } else {
             $this->io()->writeln('Linux ¯\_(ツ)_/¯');
diff --git a/tests/src/DrushIntegrationTest.php b/tests/src/DrushIntegrationTest.php
index 34c63c7e..cafdd110 100644
--- a/tests/src/DrushIntegrationTest.php
+++ b/tests/src/DrushIntegrationTest.php
@@ -9,9 +9,16 @@ final class DrushIntegrationTest extends AnalyzerTestBase
      */
     public function testPaths($path) {
         $errors = $this->runAnalyze($path);
-        $this->assertCount(0, $errors->getErrors(), var_export($errors, TRUE));
+        $errorMessages = [
+            'Call to deprecated function drush_is_windows():
+. Use \\Consolidation\\SiteProcess\\Util\\Escape.',
+        ];
+        $this->assertCount(1, $errors->getErrors(), var_export($errors, TRUE));
         $this->assertCount(0, $errors->getInternalErrors(), var_export($errors, TRUE));
-    }
+        foreach ($errors->getErrors() as $key => $error) {
+            $this->assertEquals($errorMessages[$key], $error->getMessage());
+        }
+        }
 
     public function dataPaths(): \Generator
     {

From 02aae33462be4db57fcf956afd07671700a26603 Mon Sep 17 00:00:00 2001
From: Matt Glaman <nmd.matt@gmail.com>
Date: Wed, 10 Mar 2021 16:06:26 -0600
Subject: [PATCH 35/39] Add back 7.3 testing

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

diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
index 8d28cb43..8bd0a539 100644
--- a/.github/workflows/php.yml
+++ b/.github/workflows/php.yml
@@ -16,7 +16,7 @@ jobs:
       matrix:
         experimental: [false]
         php-version:
-#          - "7.3"
+          - "7.3"
           - "7.4"
         drupal:
           - "^8.9"
@@ -58,7 +58,7 @@ jobs:
       matrix:
         experimental: [false]
         php-version:
-#          - "7.3"
+          - "7.3"
           - "7.4"
         drupal:
           - "^8.9"

From 6bef3cc08981a007a056c655111d0d9c9f22d386 Mon Sep 17 00:00:00 2001
From: Matt Glaman <nmd.matt@gmail.com>
Date: Wed, 10 Mar 2021 16:12:06 -0600
Subject: [PATCH 36/39] Add 7.2 for Drupal 8.9

---
 .github/workflows/php.yml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
index 8bd0a539..7c929820 100644
--- a/.github/workflows/php.yml
+++ b/.github/workflows/php.yml
@@ -21,10 +21,10 @@ jobs:
         drupal:
           - "^8.9"
           - "^9.0"
-#        include:
-#          - php-version: "7.2"
-#            drupal: "~8.9"
-#            experimental: false
+        include:
+          - php-version: "7.2"
+            drupal: "~8.9"
+            experimental: false
 #          - php-version: "8.0"
 #            drupal: "~9.0"
 #            experimental: true
@@ -63,10 +63,10 @@ jobs:
         drupal:
           - "^8.9"
           - "^9.0"
-#        include:
-#          - php-version: "7.2"
-#            drupal: "~8.9"
-#            experimental: false
+        include:
+          - php-version: "7.2"
+            drupal: "~8.9"
+            experimental: false
 #          - php-version: "8.0"
 #            drupal: "~9.0"
 #            experimental: true

From 1577a646cf6a250f46d1749b1224bf0a612c6579 Mon Sep 17 00:00:00 2001
From: Matt Glaman <nmd.matt@gmail.com>
Date: Wed, 10 Mar 2021 16:14:13 -0600
Subject: [PATCH 37/39] Add PHP8/D9

---
 .github/workflows/php.yml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
index 7c929820..7e3aa408 100644
--- a/.github/workflows/php.yml
+++ b/.github/workflows/php.yml
@@ -25,9 +25,9 @@ jobs:
           - php-version: "7.2"
             drupal: "~8.9"
             experimental: false
-#          - php-version: "8.0"
-#            drupal: "~9.0"
-#            experimental: true
+          - php-version: "8.0"
+            drupal: "^9.0"
+            experimental: true
     steps:
       - name: "Checkout"
         uses: "actions/checkout@v2"
@@ -67,9 +67,9 @@ jobs:
           - php-version: "7.2"
             drupal: "~8.9"
             experimental: false
-#          - php-version: "8.0"
-#            drupal: "~9.0"
-#            experimental: true
+          - php-version: "8.0"
+            drupal: "^9.0"
+            experimental: true
     steps:
       - name: "Checkout"
         uses: "actions/checkout@v2"

From fd23117153be4d9cfa531836afb58d0f5ed79478 Mon Sep 17 00:00:00 2001
From: Matt Glaman <nmd.matt@gmail.com>
Date: Wed, 10 Mar 2021 16:26:40 -0600
Subject: [PATCH 38/39] Add with-all-dependencies for php8 build_integration

---
 .github/workflows/php.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
index 7e3aa408..eb30661f 100644
--- a/.github/workflows/php.yml
+++ b/.github/workflows/php.yml
@@ -89,7 +89,7 @@ jobs:
           composer config preferred-install dist
           composer config repositories.0 path $GITHUB_WORKSPACE
           composer config repositories.1 composer https://packages.drupal.org/8
-          COMPOSER_MEMORY_LIMIT=-1 composer require drupal/core-dev-pinned:${{ matrix.drupal }}
+          COMPOSER_MEMORY_LIMIT=-1 composer require drupal/core-dev-pinned:${{ matrix.drupal }} --with-all-dependencies
       - name: "require phpstan-drupal"
         run: |
           cd ~/drupal

From b1958d3f92ecbf51e84ce6387a21b0a109ee80c0 Mon Sep 17 00:00:00 2001
From: Matt Glaman <nmd.matt@gmail.com>
Date: Wed, 10 Mar 2021 16:37:37 -0600
Subject: [PATCH 39/39] Disable PHP8 for now

---
 .github/workflows/php.yml | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
index eb30661f..24cfdb65 100644
--- a/.github/workflows/php.yml
+++ b/.github/workflows/php.yml
@@ -25,9 +25,11 @@ jobs:
           - php-version: "7.2"
             drupal: "~8.9"
             experimental: false
-          - php-version: "8.0"
-            drupal: "^9.0"
-            experimental: true
+# @todo D9 is compat, but drupal/core-dev-pinned is not?
+# core-dev-pinned sets phar-io/manifest to 1.0.3, where ^2.0 is
+#          - php-version: "8.0"
+#            drupal: "^9.0"
+#            experimental: true
     steps:
       - name: "Checkout"
         uses: "actions/checkout@v2"
@@ -67,9 +69,11 @@ jobs:
           - php-version: "7.2"
             drupal: "~8.9"
             experimental: false
-          - php-version: "8.0"
-            drupal: "^9.0"
-            experimental: true
+# @todo D9 is compat, but drupal/core-dev-pinned is not?
+# core-dev-pinned sets phar-io/manifest to 1.0.3, where ^2.0 is
+#          - php-version: "8.0"
+#            drupal: "^9.0"
+#            experimental: true
     steps:
       - name: "Checkout"
         uses: "actions/checkout@v2"