Merge pull request #146 from vaimo/feature/symfony-console-8

Feature/symfony console 8

Author: jooname

.github/workflows/ci.yml

@@ -10,17 +10,16 @@ jobs:
     strategy:
       matrix:
         versions: [
-          { php: "7.0.33", composer: 2.2.26 },
-          { php: "7.1", composer: 2.2.26 },
-          { php: "7.2", composer: 2.2.26 },
-          { php: "7.3", composer: 2.2.26 },
-          { php: "7.4", composer: 2.3.10 },
-          { php: "8.0", composer: 2.3.10 },
-          { php: "8.1", composer: 2.3.10 },
-          { php: "8.2", composer: 2.7.9 },
-          { php: "8.3", composer: 2.7.9 },
-          { php: "8.4", composer: 2.8.12 },
-          { php: "8.5", composer: 2.9.4 }
+          { php: "7.1.33", composer: 2.2.26 },
+          { php: "7.2.34", composer: 2.2.26 },
+          { php: "7.3.33", composer: 2.2.26 },
+          { php: "7.4.33", composer: 2.3.10 },
+          { php: "8.0.30", composer: 2.3.10 },
+          { php: "8.1.34", composer: 2.3.10 },
+          { php: "8.2.30", composer: 2.7.9 },
+          { php: "8.3.30", composer: 2.7.9 },
+          { php: "8.4.17", composer: 2.8.12 },
+          { php: "8.5.2", composer: 2.9.4 }
         ]
     steps:
       - uses: actions/checkout@v3

README.md

@@ -142,3 +142,11 @@ auto-loader generation), developers are advised to re-execute `composer install`
 Ideally, plugins should always be updated with explicit `--no-plugins` flag added to the `composer update`
 call to avoid issues that plugin usage with potentially mixed logic from two different plugin releases
 being in use.
+
+## Composer 1
+
+After officially dying in late 2025, hopefully this is not a concern for many, but in case you do
+need the patcher with Composer 1, we're suggesting using version 5.5.4 of the package. This is the
+last version where we've been able to verify Composer 1 support. Version 5 may still receive some
+updates, and we try to make sure they're backwards compatible, but means to verify this have become
+very limited.

changelog.json

@@ -4,6 +4,33 @@
         "possible to generate change-logs in other formats as well (when needed) and to do automatic releases based on",
         "added change-log records. More on how to use it: https://github.com/vaimo/composer-changelogs"
     ],
+    "6.0.0": {
+        "breaking": [
+            "Dropped possibility to install the package with Composer 1 as we haven't been able to guarantee the support since 5.5.4",
+            "Dropped possibility to install the package with PHP 7.0 in favor of symfony/console 8",
+            "Updated Composer command classes with symfony/console 8 support, which include void return types that are only supported in PHP >=7.1"
+        ],
+        "feature": [
+            "Added support for symfony/console 8"
+        ],
+        "maintenance": [
+            "Updated README files related to Composer 1 and release branches"
+        ]
+    },
+    "5.6.0": {
+        "feature": [
+            "Added support for symfony/console 7: https://github.com/vaimo/composer-patches/pull/139"
+        ],
+        "maintenance": [
+            "Dropped Composer 1 from Github workflows of the repository",
+            "Updated testsuite and dependency checks ran in workflows to take symfony/console 7 into account"
+        ]
+    },
+    "5.5.4": {
+        "fix": [
+            "Updated vaimo/topological-sort dependency to allow installing latest version with PHP compatibility improvements: https://github.com/vaimo/composer-patches/pull/135"
+        ]
+    },
     "5.5.3": {
         "fix": [
             "Fix issue where Composer version comparisons did not work in preview builds of Composer: https://github.com/vaimo/composer-patches/pull/134"

composer.json

@@ -4,17 +4,17 @@
     "license": "MIT",
     "description": "Applies a patch from a local or remote file to any package that is part of a given composer project. Patches can be defined both on project and on package level. Optional support for patch versioning, sequencing, custom patch applier configuration and patch command for testing/troubleshooting added patches.",
     "require": {
-        "php": ">=7.0.0",
+        "php": ">=7.1.0",
         "ext-json": "*",
-        "composer-plugin-api": "^1.0 || ^2.0",
-        "composer-runtime-api": "^1.0 || ^2.0",
+        "composer-plugin-api": "^2.0",
+        "composer-runtime-api": "^2.0",
         "loophp/phposinfo": "^1.6 || ^1.7",
         "seld/jsonlint": "^1.7.1",
-        "symfony/console": "^3.0 || ^4.0 || ^5.0 || ^6.0 || ^7.0",
+        "symfony/console": "^4.0 || ^5.0 || ^6.0 || ^7.0 || ^8.0",
         "vaimo/topological-sort": "^1.0 || ^2.0"
     },
     "require-dev": {
-        "composer/composer": "^1.0 || ^2.0",
+        "composer/composer": "^2.0",
         "vaimo/composer-patches-proxy": "1.0.0",
         "phpcompatibility/php-compatibility": ">=9.1.1",
         "squizlabs/php_codesniffer": ">=2.9.2",

docs/DEVELOPMENT.md

@@ -17,10 +17,9 @@ making the changes there and merging them upwards to newer MAJOR versions.
 Note that when dealing with bug-fixes, developer MUST use the lowest MAJOR version as starting point that 
 has said bug/issue rather than just fixing it on the latest line.
 
-> **Note:** As of 2025 although we have major branches for versions 3 and 4, these have not been maintained! There's
-> also currently no intention to do so, since master branch (version 5) is so far ahead of the two. If there's ever
-> going to be version 6 of the package, then we should continue the practice of maintaining also past major versions.
-> Until then this instruction about using lowest major release branch can be ignored!
+> **Note:** As of 2025 although we have major branches for versions 3 and 4, these have not been maintained!
+> There's also currently no intention to do so, since version 5 is so far ahead of the two. Consider
+> version 5 the lowest MAJOR release branch!
 
 ## Commands
 

src/Composer/Commands/ApplyCommand.php

@@ -7,7 +7,7 @@
 
 class ApplyCommand extends \Vaimo\ComposerPatches\Composer\Commands\PatchCommand
 {
-    protected function configure()
+    protected function configure(): void
     {
         parent::configure();
 

src/Composer/Commands/ListCommand.php

@@ -25,7 +25,7 @@
  */
 class ListCommand extends \Composer\Command\BaseCommand
 {
-    protected function configure()
+    protected function configure(): void
     {
         parent::configure();
 

src/Composer/Commands/PatchCommand.php

@@ -24,7 +24,7 @@
  */
 class PatchCommand extends \Composer\Command\BaseCommand
 {
-    protected function configure()
+    protected function configure(): void
     {
         $this->setName('patch');
         $this->setDescription('Apply registered patches to current project');

src/Composer/Commands/RedoCommand.php

@@ -9,7 +9,7 @@
 
 class RedoCommand extends \Vaimo\ComposerPatches\Composer\Commands\PatchCommand
 {
-    protected function configure()
+    protected function configure(): void
     {
         parent::configure();
 

src/Composer/Commands/UndoCommand.php

@@ -9,7 +9,7 @@
 
 class UndoCommand extends \Vaimo\ComposerPatches\Composer\Commands\PatchCommand
 {
-    protected function configure()
+    protected function configure(): void
     {
         parent::configure();