From 901ab04addd522729b344dfff95ede64c9686449 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kuba=20Wer=C5=82os?= <werlos@gmail.com>
Date: Fri, 3 Mar 2023 20:24:33 +0100
Subject: [PATCH] Update dev tools

---
 .github/workflows/ci.yaml         |  4 +---
 .gitignore                        |  3 +--
 .php_cs.dist => .php-cs-fixer.php |  8 +-------
 composer.json                     | 10 +++++-----
 dev-tools/composer.json           | 16 ++++++++--------
 5 files changed, 16 insertions(+), 25 deletions(-)
 rename .php_cs.dist => .php-cs-fixer.php (80%)

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index e189e59..2a5dde7 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -11,10 +11,8 @@ jobs:
       - uses: actions/checkout@v3
       - uses: shivammathur/setup-php@v2
         with:
-          php-version: '7.4'
+          php-version: '8.1'
           coverage: none
-          tools: composer:v1
-      - run: composer global require hirak/prestissimo
       - run: composer update --no-progress
       - run: composer update --no-progress --working-dir=dev-tools
       - run: composer info --direct --working-dir=dev-tools | sort
diff --git a/.gitignore b/.gitignore
index 5977581..b496e2f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,4 @@
-/.php_cs
-/.php_cs.cache
+/.php-cs-fixer.cache
 /.phpunit.result.cache
 /composer.lock
 /vendor/
diff --git a/.php_cs.dist b/.php-cs-fixer.php
similarity index 80%
rename from .php_cs.dist
rename to .php-cs-fixer.php
index 47f7718..58ed836 100644
--- a/.php_cs.dist
+++ b/.php-cs-fixer.php
@@ -14,13 +14,7 @@
     ->in(__DIR__)
 ;
 
-if (PHP_VERSION_ID < 70000) {
-    $finder
-        ->notPath('tests/Test/Constraint/IsIdenticalStringForV7.php')
-    ;
-}
-
-return PhpCsFixer\Config::create()
+return (new PhpCsFixer\Config)
     ->setRiskyAllowed(true)
     ->setRules([
         '@PhpCsFixer'               => true,
diff --git a/composer.json b/composer.json
index 23e0b9c..bf6287f 100644
--- a/composer.json
+++ b/composer.json
@@ -1,8 +1,8 @@
 {
     "name": "php-cs-fixer/phpunit-constraint-isidenticalstring",
-    "type": "library",
     "description": "Constraint for testing strings considering not-same line endings.",
     "license": "MIT",
+    "type": "library",
     "authors": [
         {
             "name": "Dariusz Rumiński",
@@ -18,10 +18,6 @@
         "johnkary/phpunit-speedtrap": "^1.1 || ^2.0 || ^3.0",
         "symfony/phpunit-bridge": "^3.2.2 || ^4.0"
     },
-    "config": {
-        "optimize-autoloader": true,
-        "sort-packages": true
-    },
     "autoload": {
         "psr-4": {
             "PhpCsFixer\\PhpunitConstraintIsIdenticalString\\": "src/"
@@ -34,5 +30,9 @@
         "psr-4": {
             "PhpCsFixer\\PhpunitConstraintIsIdenticalString\\Tests\\": "tests/"
         }
+    },
+    "config": {
+        "optimize-autoloader": true,
+        "sort-packages": true
     }
 }
diff --git a/dev-tools/composer.json b/dev-tools/composer.json
index c12a204..1c2f9c1 100644
--- a/dev-tools/composer.json
+++ b/dev-tools/composer.json
@@ -1,18 +1,18 @@
 {
     "require": {
-        "php": "^7.3"
-    },
-    "conflict": {
-        "hhvm": "*"
+        "php": "^8.1"
     },
     "require-dev": {
-        "friendsofphp/php-cs-fixer": "^2.14",
-        "localheinz/composer-normalize": "^1.1",
-        "maglnet/composer-require-checker": "^2.0",
+        "ergebnis/composer-normalize": "*",
+        "maglnet/composer-require-checker": "^3.8",
         "mi-schi/phpmd-extension": "^4.3",
-        "phpmd/phpmd": "^2.6"
+        "php-cs-fixer/shim": "^3.14.4",
+        "phpmd/phpmd": "^2.13"
     },
     "config": {
+        "allow-plugins": {
+            "ergebnis/composer-normalize": true
+        },
         "optimize-autoloader": true,
         "sort-packages": true
     }