Merge pull request #129 from brambaud/phpstan-deprecated-autoload_files

Replace deprecated autoload_files parameter

Author: mglaman

.circleci/config.yml

@@ -77,7 +77,7 @@ jobs:
           name: Run against a module
           command: |
             cd /tmp/drupal
-            ./vendor/bin/phpstan analyze core/modules/dynamic_page_cache --debug
+            ./vendor/bin/phpstan analyze --memory-limit=256M core/modules/dynamic_page_cache --debug
   test_drupal_project:
     <<: *defaults
     steps:
@@ -93,7 +93,7 @@ jobs:
           name: Run against a module
           command: |
             cd /tmp/drupal
-            ./vendor/bin/phpstan analyze web/core/modules/dynamic_page_cache --debug
+            ./vendor/bin/phpstan analyze --memory-limit=256M web/core/modules/dynamic_page_cache --debug
   test_upgrade_status:
     <<: *defaults
     steps:

composer.json

@@ -12,7 +12,7 @@
     "require": {
         "php": "^7.1",
         "nette/finder": "^2.5",
-        "phpstan/phpstan": "^0.12.0",
+        "phpstan/phpstan": "^0.12.26",
         "symfony/yaml": "~3.4.5|^4.2",
         "webflo/drupal-finder": "^1.2"
     },

extension.neon

@@ -1,9 +1,9 @@
 parameters:
-	autoload_files:
+	bootstrapFiles:
 		- drupal-autoloader.php
 	excludes_analyse:
-		- *.api.php
-		- */tests/fixtures/*.php
+		- '*.api.php'
+		- '*/tests/fixtures/*.php'
 	fileExtensions:
 		- module
 		- theme

tests/fixtures/drupal/modules/phpstan_fixtures/src/TestServicesMappingExtension.php

@@ -8,7 +8,6 @@ class TestServicesMappingExtension {
     public function test() {
         $entity_manager = \Drupal::getContainer()->get('entity.manager');
         $doesNotExist = $entity_manager->thisMethodDoesNotExist();
-        // @todo this should be throwing deprecations...
         $definitions = $entity_manager->getDefinitions();
     }
 }

tests/src/AnalyzerTestBase.php

@@ -24,7 +24,7 @@ protected function runAnalyze(string $path) {
         $fileHelper = $container->getByType(FileHelper::class);
         assert($fileHelper !== null);
 
-        $autoloadFiles = $container->getParameter('autoload_files');
+        $autoloadFiles = $container->getParameter('bootstrapFiles');
         $this->assertEquals([dirname(__DIR__, 2) . '/drupal-autoloader.php'], $autoloadFiles);
         if ($autoloadFiles !== null) {
             foreach ($autoloadFiles as $autoloadFile) {

tests/src/BootstrapTest.php

@@ -55,7 +55,7 @@ private function doDrupalBootstrap()
         $fileHelper = $container->getByType(FileHelper::class);
         assert($fileHelper !== null);
 
-        $autoloadFiles = $container->getParameter('autoload_files');
+        $autoloadFiles = $container->getParameter('bootstrapFiles');
         $this->assertEquals([dirname(__DIR__, 2) . '/drupal-autoloader.php'], $autoloadFiles);
         if ($autoloadFiles !== null) {
             foreach ($autoloadFiles as $autoloadFile) {

tests/src/DrupalIntegrationTest.php

@@ -71,7 +71,7 @@ public function testServiceMapping() {
 instead.'
         ];
         $errors = $this->runAnalyze(__DIR__ . '/../fixtures/drupal/modules/phpstan_fixtures/src/TestServicesMappingExtension.php');
-        $this->assertCount(3, $errors->getErrors(), var_export($errors->getErrors(), true));
+        $this->assertCount(3, $errors->getErrors());
         $this->assertCount(0, $errors->getInternalErrors());
         foreach ($errors->getErrors() as $key => $error) {
             $this->assertEquals($errorMessages[$key], $error->getMessage());