Merge branch 'ntr/update-analysis-tools' into '6.2'

NTR - Move phpstan folder up to be the first dependency installed See merge request shopware/6/product/development!176
shopware · Jun 3, 2020 · 25e5d07 · 25e5d07
2 parents 28766e3 + 5c30d61
commit 25e5d07
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 11 deletions.
diff --git a/dev-ops/analyze/tests/TestBootstrap.php b/dev-ops/analyze/tests/TestBootstrap.php
@@ -1,4 +1,4 @@
 <?php declare(strict_types=1);
 
-require __DIR__ . '/../vendor-bin/phpstan/vendor/autoload.php';
+require __DIR__ . '/../vendor-bin/_phpstan/vendor/autoload.php';
 require __DIR__ . '/../vendor/autoload.php';
diff --git a/.../analyze/vendor-bin/phpstan/composer.json → ...analyze/vendor-bin/_phpstan/composer.json b/.../analyze/vendor-bin/phpstan/composer.json → ...analyze/vendor-bin/_phpstan/composer.json
@@ -1,8 +1,8 @@
 {
     "require-dev": {
         "phpstan/extension-installer": "^1.0.4",
-        "phpstan/phpstan": "^0.12.18.25",
-        "phpstan/phpstan-phpunit": "^0.12.8",
+        "phpstan/phpstan": "^0.12.25",
+        "phpstan/phpstan-phpunit": "^0.12.11",
         "phpstan/phpstan-symfony": "^0.12.6"
     },
     "config": {

diff --git a/.../analyze/vendor-bin/phpstan/composer.lock → ...analyze/vendor-bin/_phpstan/composer.lock b/.../analyze/vendor-bin/phpstan/composer.lock → ...analyze/vendor-bin/_phpstan/composer.lock