From 07b8bf3ed3ac5409a519e03948866fab6c844217 Mon Sep 17 00:00:00 2001
From: David Molineus <david.molineus@netzmacht.de>
Date: Fri, 25 Sep 2026 11:03:55 +0200
Subject: [PATCH 1/2] Add branch alias for feature branch

---
 composer.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index ab54834..8c8d3bf 100644
--- a/composer.json
+++ b/composer.json
@@ -35,7 +35,8 @@
   },
   "extra": {
     "branch-alias": {
-      "dev-master": "1.x-dev"
+      "dev-master": "1.x-dev",
+      "dev-feature/fix-plugin-interface": "1.1.x-dev"
     }
   }
 }

From 5c52aadf4a5f53eec775444e9f4b174c37e87c77 Mon Sep 17 00:00:00 2001
From: David Molineus <david.molineus@netzmacht.de>
Date: Fri, 25 Sep 2026 11:08:26 +0200
Subject: [PATCH 2/2] Add FixPluginInterface and FixStage enum

---
 .github/workflows/diagnostics.yml    |  6 -----
 composer.json                        |  2 +-
 src/Version10/FixPluginInterface.php | 36 ++++++++++++++++++++++++++++
 src/Version10/FixStage.php           | 32 +++++++++++++++++++++++++
 tests/Version10/FixStageTest.php     | 34 ++++++++++++++++++++++++++
 5 files changed, 103 insertions(+), 7 deletions(-)
 create mode 100644 src/Version10/FixPluginInterface.php
 create mode 100644 src/Version10/FixStage.php
 create mode 100644 tests/Version10/FixStageTest.php

diff --git a/.github/workflows/diagnostics.yml b/.github/workflows/diagnostics.yml
index c393872..f59084b 100644
--- a/.github/workflows/diagnostics.yml
+++ b/.github/workflows/diagnostics.yml
@@ -17,12 +17,6 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - php: '7.4'
-            phpcq_install: 'update'
-            phpcq_flags: ''
-          - php: '8.0'
-            phpcq_install: 'update'
-            phpcq_flags: ''
           - php: '8.1'
             phpcq_install: 'update'
             phpcq_flags: ''
diff --git a/composer.json b/composer.json
index 8c8d3bf..96838ae 100644
--- a/composer.json
+++ b/composer.json
@@ -17,7 +17,7 @@
     }
   ],
   "require": {
-    "php": "^7.3 || ^8.0",
+    "php": "^8.1",
     "ext-dom": "*"
   },
   "require-dev": {
diff --git a/src/Version10/FixPluginInterface.php b/src/Version10/FixPluginInterface.php
new file mode 100644
index 0000000..15fb556
--- /dev/null
+++ b/src/Version10/FixPluginInterface.php
@@ -0,0 +1,36 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Phpcq\PluginApi\Version10;
+
+use Phpcq\PluginApi\Version10\Configuration\PluginConfigurationInterface;
+use Phpcq\PluginApi\Version10\Task\TaskInterface;
+
+/**
+ * A plugin which is able to fix issues automatically.
+ *
+ * The fix tasks are executed sequentially in "phpcq fix" before the diagnostics are run.
+ */
+interface FixPluginInterface extends ConfigurationPluginInterface
+{
+    /**
+     * The stage in which the fix tasks are executed. The project configuration may override it.
+     */
+    public function getFixStage(): FixStage;
+
+    /**
+     * Process plugin configuration and create fix tasks.
+     *
+     * @param PluginConfigurationInterface $config      The plugin configuration.
+     * @param EnvironmentInterface         $environment The build configuration.
+     *
+     * @return TaskInterface[]
+     *
+     * @psalm-return \Generator<int, TaskInterface>
+     */
+    public function createFixTasks(
+        PluginConfigurationInterface $config,
+        EnvironmentInterface $environment
+    ): iterable;
+}
diff --git a/src/Version10/FixStage.php b/src/Version10/FixStage.php
new file mode 100644
index 0000000..6eb29d6
--- /dev/null
+++ b/src/Version10/FixStage.php
@@ -0,0 +1,32 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Phpcq\PluginApi\Version10;
+
+/**
+ * The stage in which the fix tasks of a plugin are executed.
+ */
+enum FixStage: string
+{
+    /** Normalization of project metadata, e.g. composer.json. */
+    case Normalize = 'normalize';
+
+    /** Structural changes of the code, e.g. rector. */
+    case Refactor = 'refactor';
+
+    /** Pure formatting, always executed last, e.g. phpcbf. */
+    case Format = 'format';
+
+    /**
+     * The execution order. Lower values are executed first.
+     */
+    public function order(): int
+    {
+        return match ($this) {
+            self::Normalize => 0,
+            self::Refactor  => 1,
+            self::Format    => 2,
+        };
+    }
+}
diff --git a/tests/Version10/FixStageTest.php b/tests/Version10/FixStageTest.php
new file mode 100644
index 0000000..83bdff7
--- /dev/null
+++ b/tests/Version10/FixStageTest.php
@@ -0,0 +1,34 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Phpcq\PluginApi\Test\Version10;
+
+use Phpcq\PluginApi\Version10\FixStage;
+use PHPUnit\Framework\TestCase;
+
+use function array_map;
+use function usort;
+
+/** @covers \Phpcq\PluginApi\Version10\FixStage */
+final class FixStageTest extends TestCase
+{
+    public function testBackingValues(): void
+    {
+        self::assertSame(FixStage::Normalize, FixStage::from('normalize'));
+        self::assertSame(FixStage::Refactor, FixStage::from('refactor'));
+        self::assertSame(FixStage::Format, FixStage::from('format'));
+        self::assertNull(FixStage::tryFrom('unknown'));
+    }
+
+    public function testOrderSortsNormalizeRefactorFormat(): void
+    {
+        $stages = [FixStage::Format, FixStage::Normalize, FixStage::Refactor];
+        usort($stages, static fn (FixStage $first, FixStage $second): int => $first->order() <=> $second->order());
+
+        self::assertSame(
+            ['normalize', 'refactor', 'format'],
+            array_map(static fn (FixStage $stage): string => $stage->value, $stages)
+        );
+    }
+}