Merge branch '5.x' into 5.next

contrib/validate-split-packages-phpstan.php

@@ -38,6 +38,10 @@ foreach ($iterator as $file) {
 }
 ksort($packages);
 
+$mainJsonContent = file_get_contents(dirname(__FILE__, 2) . DS . 'composer.json');
+$mainJson = json_decode($mainJsonContent, true);
+$composerCommand = 'composer require --dev phpstan/phpstan:' . $mainJson['require-dev']['phpstan/phpstan'];
+
 $issues = [];
 foreach ($packages as $path => $package) {
     if (!file_exists($path . 'phpstan.neon.dist')) {
@@ -45,7 +49,11 @@ foreach ($packages as $path => $package) {
     }
 
     $exitCode = null;
-    exec('cd ' . $path . ' && composer install && vendor/bin/phpstan analyze ./', $output, $exitCode);
+    exec(
+        'cd ' . $path . ' && ' . $composerCommand . ' && vendor/bin/phpstan analyze ./',
+        $output,
+        $exitCode
+    );
     if ($exitCode !== 0) {
         $code = $exitCode;
 

src/Database/composer.json

@@ -41,7 +41,6 @@
     },
     "require-dev": {
         "cakephp/i18n": "^5.0",
-        "cakephp/log": "^5.0",
-        "phpstan/phpstan": "1.12.0"
+        "cakephp/log": "^5.0"
     }
 }

src/Datasource/composer.json

@@ -41,7 +41,6 @@
     "require-dev": {
         "cakephp/cache": "^5.0",
         "cakephp/collection": "^5.0",
-        "cakephp/utility": "^5.0",
-        "phpstan/phpstan": "1.12.0"
+        "cakephp/utility": "^5.0"
     }
 }

src/Http/composer.json

@@ -59,7 +59,6 @@
         "cakephp/console": "^5.0",
         "cakephp/orm": "^5.0",
         "cakephp/i18n": "^5.0",
-        "paragonie/csp-builder": "^2.3",
-        "phpstan/phpstan": "1.12.0"
+        "paragonie/csp-builder": "^2.3"
     }
 }

src/ORM/composer.json

@@ -46,7 +46,6 @@
     },
     "require-dev": {
         "cakephp/cache": "^5.0",
-        "cakephp/i18n": "^5.0",
-        "phpstan/phpstan": "1.12.0"
+        "cakephp/i18n": "^5.0"
     }
 }

src/Validation/composer.json

@@ -36,7 +36,6 @@
         }
     },
     "require-dev": {
-        "cakephp/i18n": "^5.0",
-        "phpstan/phpstan": "1.12.0"
+        "cakephp/i18n": "^5.0"
     }
 }