Merge pull request #507 from dkarlovi/php84

feat: PHP 8.4
jakzal · Dec 11, 2024 · 5df45ea · 5df45ea
2 parents add3fe6 + 8d22e2f
commit 5df45ea
Show file tree

Hide file tree

Showing 8 changed files with 93 additions and 108 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -20,7 +20,7 @@ jobs:
         name: Build and test
         strategy:
             matrix:
-                php: [8.1, 8.2, 8.3]
+                php: [8.1, 8.2, 8.3, 8.4]
                 deps: [high]
                 include:
                     -   php: 8.1
@@ -61,7 +61,7 @@ jobs:
         needs: tests
         strategy:
             matrix:
-                php: [8.1, 8.2, 8.3]
+                php: [8.1, 8.2, 8.3, 8.4]
 
         steps:
             -   uses: actions/checkout@v4
@@ -79,10 +79,9 @@ jobs:
                 with:
                     name: toolbox.phar
                     path: build/
-
             -   run: make test-integration
                 env:
-                    GITHUB_AUTH_TOKEN: ${{ secrets.ACCESS_TOKEN }}
+                    GITHUB_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
     publish-phars:
         runs-on: ubuntu-latest

diff --git a/README.md b/README.md
diff --git a/bin/devkit.php b/bin/devkit.php
@@ -73,19 +73,20 @@ protected function execute(InputInterface $input, OutputInterface $output)
             $readmePath = $input->getOption('readme');
             $tools = $this->loadTools($jsonPath);
 
-            $toolsList = '| Name | Description | PHP 8.1 | PHP 8.2 | PHP 8.3 |' . PHP_EOL;
-            $toolsList .= '| :--- | :---------- | :------ | :------ | :------ |' . PHP_EOL;
+            $toolsList = '| Name | Description | PHP 8.1 | PHP 8.2 | PHP 8.3 | PHP 8.4 |' . PHP_EOL;
+            $toolsList .= '| :--- | :---------- | :------ | :------ | :------ | :------ |' . PHP_EOL;
             $toolsList .= $tools->sort(function (Tool $left, Tool $right) {
                 return strcasecmp($left->name(), $right->name());
             })->reduce('', function ($acc, Tool $tool) {
 
-                return $acc . sprintf('| %s | [%s](%s) | %s | %s | %s |',
+                return $acc . sprintf('| %s | [%s](%s) | %s | %s | %s | %s |',
                         $tool->name(),
                         $tool->summary(),
                         $tool->website(),
                         in_array('exclude-php:8.1', $tool->tags(), true) ? '&#x274C;' : '&#x2705;',
                         in_array('exclude-php:8.2', $tool->tags(), true) ? '&#x274C;' : '&#x2705;',
-                        in_array('exclude-php:8.3', $tool->tags(), true) ? '&#x274C;' : '&#x2705;'
+                        in_array('exclude-php:8.3', $tool->tags(), true) ? '&#x274C;' : '&#x2705;',
+                        in_array('exclude-php:8.4', $tool->tags(), true) ? '&#x274C;' : '&#x2705;',
                     ) . PHP_EOL;
             });
 

diff --git a/composer.json b/composer.json
@@ -3,7 +3,7 @@
     "description": "Helps to discover and install tools",
     "type": "project",
     "require": {
-        "php": "~8.1.0 || ~8.2.0 || ~8.3.0",
+        "php": "~8.1.0 || ~8.2.0 || ~8.3.0 || ~8.4.0",
         "symfony/console": "^5.4.31 || ^6.3",
         "psr/container": "^2.0"
     },

diff --git a/resources/architecture.json b/resources/architecture.json
@@ -42,20 +42,6 @@
             "test": "pdepend --version",
             "tags": ["featured", "architecture"]
         },
-        {
-            "name": "php-coupling-detector",
-            "summary": "Detects code coupling issues",
-            "website": "https://akeneo.github.io/php-coupling-detector/",
-            "command": {
-                "composer-bin-plugin": {
-                    "package": "akeneo/php-coupling-detector",
-                    "namespace": "tools",
-                    "links": {"%target-dir%/php-coupling-detector": "php-coupling-detector"}
-                }
-            },
-            "test": "php-coupling-detector list",
-            "tags": ["exclude-php:8.1", "exclude-php:8.2", "exclude-php:8.3", "architecture"]
-        },
         {
             "name": "phparkitect",
             "summary": "Helps to put architectural constraints in a PHP code base",

diff --git a/resources/checkstyle.json b/resources/checkstyle.json
@@ -40,7 +40,7 @@
                 }
             },
             "test": "php-cs-fixer list",
-            "tags": ["featured", "checkstyle"]
+            "tags": ["featured", "checkstyle", "exclude-php:8.4"]
         },
         {
             "name": "phpcbf",

diff --git a/resources/compatibility.json b/resources/compatibility.json
@@ -28,7 +28,7 @@
                 }
             },
             "test": "roave-backward-compatibility-check --version",
-            "tags": ["compatibility"]
+            "tags": ["compatibility", "exclude-php:8.4"]
         }
     ]
 }
diff --git a/resources/test.json b/resources/test.json
@@ -110,7 +110,7 @@
                 }
             },
             "test": "phpspec --version",
-            "tags": ["exclude-php:8.3", "exclude-php:8.2", "featured", "test"]
+            "tags": ["exclude-php:8.4", "exclude-php:8.3", "exclude-php:8.2", "featured", "test"]
         },
         {
             "name": "phpunit",