Merge branch 'main' into 2.x

jrushlow · jrushlow · commit f2e0e398f015 · 2024-06-12T08:30:31.000-04:00
* main: minor #325 [dx] keep tooling in one place
diff --git a/composer.json b/composer.json
@@ -17,7 +17,6 @@
         "symfony/framework-bundle": "^6.4.5 | ^7.0",
         "symfony/phpunit-bridge": "^6.4.5 | ^7.0",
         "doctrine/doctrine-bundle": "^2.8",
-        "phpstan/phpstan": "^1.11.x-dev",
         "symfony/process": "^6.4 | ^7.0 | ^7.1"
     },
     "autoload": {
@@ -31,6 +30,17 @@
         }
     },
     "scripts": {
-        "phpstan": "vendor/bin/phpstan"
+        "tools:upgrade": [
+            "@tools:upgrade:php-cs-fixer",
+            "@tools:upgrade:phpstan"
+        ],
+        "tools:upgrade:php-cs-fixer": "composer upgrade -W -d tools/php-cs-fixer",
+        "tools:upgrade:phpstan": "composer upgrade -W -d tools/phpstan",
+        "tools:run": [
+            "@tools:run:php-cs-fixer",
+            "@tools:run:phpstan"
+        ],
+        "tools:run:php-cs-fixer": "tools/php-cs-fixer/vendor/bin/php-cs-fixer fix",
+        "tools:run:phpstan": "tools/phpstan/vendor/bin/phpstan --memory-limit=1G"
     }
 }
diff --git a/tools/.gitignore b/tools/.gitignore
@@ -0,0 +1,2 @@
+**/vendor
+**/composer.lock
diff --git a/tools/php-cs-fixer/composer.json b/tools/php-cs-fixer/composer.json
@@ -0,0 +1,5 @@
+{
+    "require": {
+        "friendsofphp/php-cs-fixer": "^3"
+    }
+}
diff --git a/tools/phpstan/composer.json b/tools/phpstan/composer.json
@@ -0,0 +1,5 @@
+{
+    "require": {
+        "phpstan/phpstan": "^1"
+    }
+}

-Original file line number
+Diff line change
@@ @@ -0,0 +1,5 @@ @@
 +{
 +    "require": {
 +        "friendsofphp/php-cs-fixer": "^3"
 +    }
 +}