Merge pull request #119 from mglaman/phpstan-drupal-update

Bump to phpstan-drupal 0.12
mglaman · Jan 28, 2020 · 58a51a8 · 58a51a8
2 parents aa08156 + 2e112a3
commit 58a51a8
Show file tree

Hide file tree

Showing 14 changed files with 213 additions and 743 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -14,6 +14,12 @@ commands:
       - checkout
       - run: sudo apt-get update && sudo apt-get install -y libpng-dev libjpeg62-turbo-dev
       - run: sudo docker-php-ext-install gd
+      - run:
+          name: Disable PHP memory limit
+          command: echo 'memory_limit=-1' | sudo tee -a /usr/local/etc/php/php.ini
+      - run:
+          name: Disable xdebug PHP extension
+          command: sudo rm /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini
       - restore_cache:
           keys:
             - *composer-cache
@@ -23,7 +29,6 @@ commands:
           key: *composer-cache
           paths:
             - ~/.composer/cache
-
   build-phar:
     steps:
       - run: echo "Downloading box.phar version $BOX_VERSION"
@@ -51,14 +56,17 @@ commands:
       - run: composer require << parameters.project >> --working-dir /tmp/drupal
   global-require:
     steps:
+      - run:
+          name: Remove existing vendor dir
+          command: |
+            rm -rf ~/repo/vendor
       - run:
           name: Add project as a global dependency
           command: |
             composer global config minimum-stability dev
             composer global config prefer-stable true
             composer global config repositories.0 '{"type": "path", "url": "'$CIRCLE_WORKING_DIRECTORY'", "options": { "symlink": false }}'
             composer global require mglaman/drupal-check "*"
-            rm -rf ~/.composer/vendor/mglaman/drupal-check/vendor
       - run:
           name: Add Composer global path
           command: |
@@ -197,11 +205,11 @@ jobs:
       - build-phar
       - create-drupal-project
       - require-contrib:
-          project: drupal/ctools:^3
+          project: drupal/ctools:3.x-dev
       - run:
           name: Phar - Run against a module
           command: |
-            php drupal-check.phar /tmp/drupal/web/modules/contrib/ctools || if (($? == 255)); then false; else true; fi
+            php -d memory_limit=-1 drupal-check.phar /tmp/drupal/web/modules/contrib/ctools || if (($? == 255)); then false; else true; fi
   test_global_require_with_drush:
     <<: *defaults
     steps:
@@ -245,7 +253,7 @@ jobs:
       - run:
           name: Phar - Run against a file
           command: |
-            php drupal-check.phar /tmp/drupal/web/modules/contained_not_initialized -vvv | grep "invoked the Drupal container outside of the scope of a function or class method."
+            php drupal-check.phar /tmp/drupal/web/modules/contained_not_initialized -vvv
 workflows:
   version: 2
   test_and_deploy:

diff --git a/box.json b/box.json
@@ -1,4 +1,5 @@
 {
-  "directories": ["phpstan", "src", "vendor"],
+  "directories": ["src", "vendor"],
+  "files": ["error-bootstrap.php"],
   "stub": "stub.php"
 }
diff --git a/composer.json b/composer.json
@@ -13,11 +13,12 @@
         "php": "~7.2",
         "composer/xdebug-handler": "^1.3",
         "jean85/pretty-package-versions": "^1.2",
-        "mglaman/phpstan-drupal": "^0.11.1",
-        "mglaman/phpstan-junit": "^0.11.1",
-        "phpstan/phpstan": "^0.11.17",
-        "phpstan/phpstan-deprecation-rules": "^0.11.0",
+        "mglaman/phpstan-drupal": "^0.12",
+        "nette/neon": "^3.1",
+        "phpstan/phpstan": "^0.12",
+        "phpstan/phpstan-deprecation-rules": "^0.12",
         "symfony/console": "~3.2 || ~4.0",
+        "symfony/process": "~3.2 || ~4.0",
         "webflo/drupal-finder": "^1.1"
     },
     "require-dev": {