Switch testing against 10.1.x-dev to 11.x-dev branch (#565)

Co-authored-by: Matt Glaman <[email protected]>

Author: Boegie

.github/workflows/php.yml

@@ -48,12 +48,12 @@ jobs:
         include:
           - php-version: "8.0"
             drupal: "^9.0"
-            experimental: true
+            experimental: false
           - php-version: "8.1"
             drupal: "^10.0"
             experimental: false
           - php-version: "8.1"
-            drupal: "10.1.x-dev"
+            drupal: "11.x-dev"
             experimental: true
     steps:
       - name: "Checkout"
@@ -68,9 +68,9 @@ jobs:
       - name: "Downgrade dev dependencies"
         run: "composer require phpunit/phpunit:6.5.14 drush/drush:~9 drupal/core-recommended:${{ matrix.drupal }} drupal/core-dev:${{ matrix.drupal }} --with-all-dependencies --dev --no-update"
         if: ${{ matrix.drupal == '^8.9' }}
-      - name: "Upgrade to drupal/core:10.0.x and drush/drush:^11.0"
+      - name: "Upgrade to drupal/core:${{ matrix.drupal }}"
         run: "composer require drupal/core-recommended:${{ matrix.drupal }} --with-all-dependencies --dev --no-update"
-        if: ${{ matrix.drupal == '10.0.x-dev' || matrix.drupal == '10.1.x-dev' }}
+        if: ${{ matrix.drupal == '^10.0' || matrix.drupal == '11.x-dev' }}
       - name: "Add phpspec/prophecy-phpunit"
         run: "composer require phpspec/prophecy-phpunit:^2 --dev --no-update"
         if: ${{ matrix.drupal != '^8.9' }}
@@ -97,9 +97,9 @@ jobs:
         include:
           - php-version: "8.0"
             drupal: "^9.0"
-            experimental: true
+            experimental: false
           - php-version: "8.1"
-            drupal: "10.0.x-dev"
+            drupal: "11.x-dev"
             experimental: true
     steps:
       - name: "Checkout"
@@ -142,14 +142,14 @@ jobs:
           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"'
-        if: ${{ matrix.drupal != '10.0.x-dev' }}
+        if: ${{ matrix.drupal != '11.x-dev' }}
         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
           COMPOSER_MEMORY_LIMIT=-1 composer remove drupal/token drupal/blazy
       - name: 'Check "Cannot redeclare video_embed_media_media_bundle_insert()"'
-        if: ${{ matrix.drupal != '10.0.x-dev' }}
+        if: ${{ matrix.drupal != '11.x-dev' }}
         run: |
           cd ~/drupal
           COMPOSER_MEMORY_LIMIT=-1 composer require drupal/video_embed_field drupal/slick
@@ -172,7 +172,7 @@ jobs:
           - "^9.0"
         include:
           - php-version: "8.1"
-            drupal: "10.0.x-dev"
+            drupal: "11.x-dev"
             experimental: true
     steps:
       - name: "Checkout"

tests/src/Rules/ClassExtendsInternalClassRuleTest.php

@@ -42,7 +42,7 @@ public static function tearDownAfterClass(): void
     public function testRule(string $path, array $errorMessages): void
     {
         [$version, $minor] = explode('.', \Drupal::VERSION, 3);
-        if (($version === '10' || ($version === '9' && (int) $minor >= 4))
+        if (($version >= '10' || ($version === '9' && (int) $minor >= 4))
             && $path === __DIR__ . '/../../fixtures/drupal/modules/phpstan_fixtures/src/Form/ExtendsContentEntityDeleteForm.php') {
                 self::markTestSkipped('@internal was removed in 10.0.x and 9.4.x');
         }

tests/src/Rules/RequestStackGetMainRequestRuleTest.php

@@ -19,8 +19,8 @@ public function testRule(): void
         [$version] = explode('.', \Drupal::VERSION, 2);
         if ($version === '8') {
             $this->analyse([__DIR__.'/data/request-stack.php'], []);
-        } elseif ($version === '10') {
-            self::markTestSkipped('Not tested on 10.x.x');
+        } elseif ($version >= '10') {
+            self::markTestSkipped('Not tested on 10.x.x or higher');
         } else {
             $this->analyse(
                 [__DIR__.'/data/request-stack.php'],

tests/src/Rules/SymfonyCmfRouteObjectInterfaceConstantsRuleTest.php

@@ -19,8 +19,8 @@ public function testRule(): void
         [$version] = explode('.', \Drupal::VERSION, 2);
         if ($version === '8') {
             $this->analyse([__DIR__.'/data/symfony-cmf-routing.php'], []);
-        } elseif ($version === '10') {
-            self::markTestSkipped('Not tested on 10.x.x');
+        } elseif ($version >= '10') {
+            self::markTestSkipped('Not tested on 10.x.x or higher');
         } else {
             $this->analyse(
                 [__DIR__.'/data/symfony-cmf-routing.php'],

tests/src/Rules/SymfonyCmfRoutingInClassMethodSignatureRuleTest.php

@@ -19,8 +19,8 @@ public function testRule(): void
         [$version] = explode('.', \Drupal::VERSION, 2);
         if ($version === '8') {
             $this->analyse([__DIR__.'/data/symfony-cmf-routing.php'], []);
-        } elseif ($version === '10') {
-            self::markTestSkipped('Not tested on 10.x.x');
+        } elseif ($version >= '10') {
+            self::markTestSkipped('Not tested on 10.x.x or higher');
         } else {
             $this->analyse(
                 [__DIR__.'/data/symfony-cmf-routing.php'],