From e8ed082b0a3972b83ff3f3fa08392fcd5f1073a9 Mon Sep 17 00:00:00 2001
From: Jan Kowalleck <jan.kowalleck@gmail.com>
Date: Mon, 27 Jan 2025 10:50:50 +0100
Subject: [PATCH] chore: streamline tools (#524)

Signed-off-by: Jan Kowalleck <jan.kowalleck@gmail.com>
---
 tools/composer-normalize/composer.json       | 12 ++++++------
 tools/composer-require-checker/composer.json |  9 ++++++---
 tools/composer-unused/composer.json          | 15 +++++++++------
 tools/php-cs-fixer/composer.json             | 11 +++++++----
 tools/phpunit/composer.json                  | 14 ++++++++++----
 tools/psalm/composer.json                    | 13 ++++++++-----
 6 files changed, 46 insertions(+), 28 deletions(-)

diff --git a/tools/composer-normalize/composer.json b/tools/composer-normalize/composer.json
index 6830b41f..0ff9b51e 100644
--- a/tools/composer-normalize/composer.json
+++ b/tools/composer-normalize/composer.json
@@ -1,17 +1,17 @@
 {
     "name": "tools/composer-normalize",
-    "type": "metapackage",
     "description": "composer-normalize",
+    "type": "metapackage",
     "require-dev": {
         "ergebnis/composer-normalize": "2.45.0",
         "roave/security-advisories": "dev-latest"
     },
+    "prefer-stable": true,
     "config": {
-        "preferred-install": "dist",
-        "sort-packages": true,
         "allow-plugins": {
             "ergebnis/composer-normalize": true
-        }
-    },
-    "prefer-stable": true
+        },
+        "preferred-install": "dist",
+        "sort-packages": true
+    }
 }
diff --git a/tools/composer-require-checker/composer.json b/tools/composer-require-checker/composer.json
index 30a96667..30f44609 100644
--- a/tools/composer-require-checker/composer.json
+++ b/tools/composer-require-checker/composer.json
@@ -1,14 +1,17 @@
 {
     "name": "tools/composer-require-checker",
-    "type": "metapackage",
     "description": "composer-require-checker",
+    "type": "metapackage",
+    "require": {
+        "php": "^8.1"
+    },
     "require-dev": {
         "maglnet/composer-require-checker": "4.7.1 || 4.14.0",
         "roave/security-advisories": "dev-latest"
     },
+    "prefer-stable": true,
     "config": {
         "preferred-install": "dist",
         "sort-packages": true
-    },
-    "prefer-stable": true
+    }
 }
diff --git a/tools/composer-unused/composer.json b/tools/composer-unused/composer.json
index 4ce4da32..8aeb48e6 100644
--- a/tools/composer-unused/composer.json
+++ b/tools/composer-unused/composer.json
@@ -1,17 +1,20 @@
 {
     "name": "tools/composer-unused",
-    "type": "metapackage",
     "description": "composer-unused",
+    "type": "metapackage",
+    "require": {
+        "php": "^8.1"
+    },
     "require-dev": {
         "icanhazstring/composer-unused": "0.8.11",
         "roave/security-advisories": "dev-latest"
     },
+    "prefer-stable": true,
     "config": {
-        "preferred-install": "dist",
-        "sort-packages": true,
         "allow-plugins": {
             "icanhazstring/composer-unused": true
-        }
-    },
-    "prefer-stable": true
+        },
+        "preferred-install": "dist",
+        "sort-packages": true
+    }
 }
diff --git a/tools/php-cs-fixer/composer.json b/tools/php-cs-fixer/composer.json
index e3f78659..6d8dc8d5 100644
--- a/tools/php-cs-fixer/composer.json
+++ b/tools/php-cs-fixer/composer.json
@@ -1,14 +1,17 @@
 {
     "name": "tools/php-cs-fixer",
-    "type": "metapackage",
     "description": "php-cs-fixer",
+    "type": "metapackage",
+    "require": {
+        "php": "^8.1"
+    },
     "require-dev": {
-        "friendsofphp/php-cs-fixer": "v3.68.1",
+        "friendsofphp/php-cs-fixer": "3.68.1",
         "roave/security-advisories": "dev-latest"
     },
+    "prefer-stable": true,
     "config": {
         "preferred-install": "dist",
         "sort-packages": true
-    },
-    "prefer-stable": true
+    }
 }
diff --git a/tools/phpunit/composer.json b/tools/phpunit/composer.json
index 6c6048e5..92389eaa 100644
--- a/tools/phpunit/composer.json
+++ b/tools/phpunit/composer.json
@@ -1,14 +1,20 @@
 {
     "name": "tools/phpunit",
-    "type": "metapackage",
     "description": "phpunit",
+    "type": "metapackage",
+    "require": {
+        "php": "^8.1"
+    },
     "require-dev": {
-        "phpunit/phpunit": "10.5.25",
+        "phpunit/phpunit": "10.5.41",
         "roave/security-advisories": "dev-latest"
     },
+    "prefer-stable": true,
     "config": {
+        "allow-plugins": {
+            "composer/package-versions-deprecated": false
+        },
         "preferred-install": "dist",
         "sort-packages": true
-    },
-    "prefer-stable": true
+    }
 }
diff --git a/tools/psalm/composer.json b/tools/psalm/composer.json
index c28f3bbd..da51aec5 100644
--- a/tools/psalm/composer.json
+++ b/tools/psalm/composer.json
@@ -1,14 +1,17 @@
 {
     "name": "tools/psalm",
-    "type": "metapackage",
     "description": "psalm and plugins",
+    "type": "metapackage",
+    "require": {
+        "php": "^8.1"
+    },
     "require-dev": {
-        "vimeo/psalm": "6.0.0",
-        "roave/security-advisories": "dev-latest"
+        "roave/security-advisories": "dev-latest",
+        "vimeo/psalm": "^6.0.0"
     },
+    "prefer-stable": true,
     "config": {
         "preferred-install": "dist",
         "sort-packages": true
-    },
-    "prefer-stable": true
+    }
 }