Merge pull request #149 from mglaman/remove-phpstan-conflict

Remove PHPStan conflict

Author: mglaman

composer.json

@@ -12,7 +12,7 @@
     "require": {
         "php": "^7.1",
         "nette/finder": "^2.5",
-        "phpstan/phpstan": "^0.12.26",
+        "phpstan/phpstan": "^0.12.64",
         "symfony/yaml": "~3.4.5|^4.2",
         "webflo/drupal-finder": "^1.2"
     },
@@ -38,9 +38,6 @@
     "autoload-dev": {
         "classmap": ["tests/src"]
     },
-    "conflict": {
-        "phpstan/phpstan": "^0.12.43"
-    },
     "extra": {
         "branch-alias": {
             "dev-master": "0.12-dev"

src/Drupal/DrupalAutoloader.php

@@ -102,6 +102,14 @@ public function register(Container $container): void
         $this->loadLegacyIncludes();
         require_once $this->drupalRoot . '/core/tests/bootstrap.php';
 
+        // class_alias is not supported by OptimizedDirectorySourceLocator or AutoloadSourceLocator,
+        // so we manually load this PHPUnit compatibility trait that exists in Drupal 8.
+        $phpunitCompatTraitFilepath = $this->drupalRoot . '/core/tests/Drupal/Tests/PhpunitCompatibilityTrait.php';
+        if (file_exists($phpunitCompatTraitFilepath)) {
+            require_once $phpunitCompatTraitFilepath;
+            $this->autoloader->addClassMap(['Drupal\\Tests\\PhpunitCompatibilityTrait' => $phpunitCompatTraitFilepath]);
+        }
+
         foreach ($this->moduleData as $extension) {
             $this->loadExtension($extension);
 

tests/src/DrupalIntegrationTest.php

@@ -56,8 +56,8 @@ public function testExtensionTestSuiteAutoloading()
     {
         $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);