Resolve conflicts on root with drupal/core-dev:10.0.x (#324)

* Remove drupal/core-dev to avoid conflicts on root

* symfony/phpunit-bridge as dev dependency for drupal/core

* behat/mink as dev dependency for drupal/core

* Do not include drupal/core-dev in 10.0.x update step

* Allows drush/drush ^11.0

* Revert "Allows drush/drush ^11.0"

This reverts commit 77d643a.

* Fix alias in build integration test

* drush ^11.0 on 10.0.x

* Remove alias

* require self with --with-all-dependencies

* try another little trick

* fix conflict on extensions included

* check compat with extracted major version

* ContentEntityConfirmFormBase had @internal removed in 10.0.x

* Drush drush_is* functions removed in 11.x

Author: mglaman

.circleci/config.yml

@@ -43,7 +43,7 @@ commands:
             cd /tmp/drupal
             composer require --dev drupal/core-dev:^8.8
             composer config repositories.1 '{"type": "path", "url": "'${CIRCLE_WORKING_DIRECTORY}'", "options": { "symlink": false }}'
-            composer require --dev mglaman/phpstan-drupal "*"
+            composer require --dev mglaman/phpstan-drupal "*" phpstan/extension-installer
             cat composer.json
             cp ~/repo/tests/fixtures/config/drupal-phpstan.neon /tmp/drupal/phpstan.neon
             ./vendor/bin/phpstan --version

.github/workflows/php.yml

@@ -40,8 +40,8 @@ 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"
-        run: "composer require drupal/core-recommended:${{ matrix.drupal }} drupal/core-dev:${{ matrix.drupal }} --with-all-dependencies --dev --no-update"
+      - name: "Upgrade to drupal/core:10.0.x and drush/drush:^11.0"
+        run: "composer require drupal/core-recommended:${{ matrix.drupal }} drush/drush:^11.0 --with-all-dependencies --dev --no-update"
         if: ${{ matrix.drupal == '10.0.x-dev' }}
       - name: "Add phpspec/prophecy-phpunit"
         run: "composer require phpspec/prophecy-phpunit:^2 --dev --no-update"
@@ -92,7 +92,7 @@ jobs:
       - name: "require phpstan-drupal"
         run: |
           cd ~/drupal
-          COMPOSER_MEMORY_LIMIT=-1 composer require mglaman/phpstan-drupal *@dev
+          COMPOSER_MEMORY_LIMIT=-1 composer require mglaman/phpstan-drupal "dev-${{ github.sha }} as 1.1.99" phpstan/extension-installer --with-all-dependencies
           cp $GITHUB_WORKSPACE/tests/fixtures/config/drupal-phpstan.neon phpstan.neon
       - name: "Test core/install.php"
         run: |

composer.json

@@ -17,15 +17,16 @@
         "webflo/drupal-finder": "^1.2"
     },
     "require-dev": {
+        "behat/mink": "^1.8",
         "composer/installers": "^1.9",
-        "drupal/core-dev": "^8.8@alpha || ^9.0",
         "drupal/core-recommended": "^8.8@alpha || ^9.0",
         "drush/drush": "^9.6 || ^10.0",
         "phpstan/extension-installer": "^1.1",
         "phpstan/phpstan-deprecation-rules": "^1.0",
         "phpstan/phpstan-strict-rules": "^1.0",
         "phpunit/phpunit": "^6.5 || ^7.5 || ^8.0 || ^9",
-        "squizlabs/php_codesniffer": "^3.3"
+        "squizlabs/php_codesniffer": "^3.3",
+        "symfony/phpunit-bridge": "^3.4.3 || ^4.4 || ^5.4 || ^6.0"
     },
     "minimum-stability": "dev",
     "prefer-stable": true,
@@ -67,7 +68,8 @@
     "config": {
         "allow-plugins": {
             "composer/installers": true,
-            "phpstan/extension-installer": true
+            "phpstan/extension-installer": true,
+            "dealerdirect/phpcodesniffer-composer-installer": true
         }
     }
 }

tests/fixtures/config/drupal-phpstan.neon

@@ -3,5 +3,3 @@ parameters:
 	level: 0
 	ignoreErrors:
 		- '#\Drupal calls should be avoided in classes, use dependency injection instead#'
-includes:
-	- vendor/mglaman/phpstan-drupal/extension.neon

tests/fixtures/drupal/modules/drush_command/src/Commands/TestDrushCommands.php

@@ -11,16 +11,6 @@ class TestDrushCommands extends DrushCommands {
      *
      *  @command phpstan:example
      */
-    public function example() {
-        if (drush_is_osx()) {
-            $this->io()->writeln('macOS');
-        } elseif (drush_is_windows()) {
-            $this->io()->writeln('Windows');
-        } else {
-            $this->io()->writeln('Linux ¯\_(ツ)_/¯');
-        }
-    }
-
     public function batchProcess() {
         drush_backend_batch_process();
     }

tests/src/DrushIntegrationTest.php

@@ -18,6 +18,9 @@ protected function getRule(): \PHPStan\Rules\Rule
 
     public function testPaths(): void
     {
+        if (\Drush\Drush::getMajorVersion() === '11') {
+            self::markTestSkipped('No');
+        }
         $this->analyse([
             __DIR__ . '/../fixtures/drupal/modules/drush_command/src/Commands/TestDrushCommands.php'
         ], []);

tests/src/Rules/ClassExtendsInternalClassRuleTest.php

@@ -41,6 +41,11 @@ public static function tearDownAfterClass(): void
      */
     public function testRule(string $path, array $errorMessages): void
     {
+        [$version] = explode('.', \Drupal::VERSION, 2);
+        if ($version === '10'
+            && $path === __DIR__ . '/../../fixtures/drupal/modules/phpstan_fixtures/src/Form/ExtendsContentEntityDeleteForm.php') {
+                self::markTestSkipped('@internal was removed in 10.0.x');
+        }
         $this->analyse([$path], $errorMessages);
     }
 

tests/src/Rules/GetDeprecatedServiceRuleTest.php

@@ -33,8 +33,9 @@ public function testRuleDrupal8(string $path, array $errorMessages): void
      */
     public function testRuleDrupal9(string $path, array $errorMessages): void
     {
+        [$version] = explode('.', \Drupal::VERSION, 2);
         // @phpstan-ignore-next-line
-        if (version_compare('9.0.0', \Drupal::VERSION) === 1) {
+        if ($version !== '9') {
             self::markTestSkipped('Only tested on Drupal 9.x.x');
         }
         // @phpstan-ignore-next-line