Merge pull request #780 from patchlevel/3.12.x-merge-up-into-3.13.x_8myIV3w3

DavidBadura · web-flow · commit 421f7ca4f709 · 2025-09-19T13:00:48.000+02:00
Merge release 3.12.1 into 3.13.x
diff --git a/.github/workflows/backward-compatibility-check.yml b/.github/workflows/backward-compatibility-check.yml
@@ -27,7 +27,7 @@ jobs:
           fetch-depth: 0
 
       - name: "Install PHP"
-        uses: "shivammathur/setup-php@2.35.4"
+        uses: "shivammathur/setup-php@2.35.5"
         with:
           coverage: "pcov"
           php-version: "${{ matrix.php-version }}"
diff --git a/.github/workflows/benchmark.yml b/.github/workflows/benchmark.yml
@@ -38,7 +38,7 @@ jobs:
 
     steps:
       - name: "Install PHP"
-        uses: "shivammathur/setup-php@2.35.4"
+        uses: "shivammathur/setup-php@2.35.5"
         with:
           coverage: none
           php-version: "${{ matrix.php-version }}"
diff --git a/.github/workflows/coding-standard.yml b/.github/workflows/coding-standard.yml
@@ -29,7 +29,7 @@ jobs:
               uses: actions/checkout@v5
 
             - name: "Install PHP"
-              uses: "shivammathur/setup-php@2.35.4"
+              uses: "shivammathur/setup-php@2.35.5"
               with:
                   coverage: none
                   php-version: "${{ matrix.php-version }}"
diff --git a/.github/workflows/deptrac.yml b/.github/workflows/deptrac.yml
@@ -29,7 +29,7 @@ jobs:
               uses: actions/checkout@v5
 
             - name: "Install PHP"
-              uses: "shivammathur/setup-php@2.35.4"
+              uses: "shivammathur/setup-php@2.35.5"
               with:
                   coverage: "pcov"
                   php-version: "${{ matrix.php-version }}"
diff --git a/.github/workflows/docs-check.yml b/.github/workflows/docs-check.yml
@@ -28,7 +28,7 @@ jobs:
               uses: actions/checkout@v5
 
             - name: "Install PHP"
-              uses: "shivammathur/setup-php@2.35.4"
+              uses: "shivammathur/setup-php@2.35.5"
               with:
                   coverage: none
                   php-version: "${{ matrix.php-version }}"
diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml
@@ -52,7 +52,7 @@ jobs:
               uses: actions/checkout@v5
 
             - name: "Install PHP"
-              uses: "shivammathur/setup-php@2.35.4"
+              uses: "shivammathur/setup-php@2.35.5"
               with:
                   coverage: "pcov"
                   php-version: "${{ matrix.php-version }}"
@@ -107,7 +107,7 @@ jobs:
           uses: actions/checkout@v5
 
         - name: "Install PHP"
-          uses: "shivammathur/setup-php@2.35.4"
+          uses: "shivammathur/setup-php@2.35.5"
           with:
             coverage: "pcov"
             php-version: "${{ matrix.php-version }}"
@@ -162,7 +162,7 @@ jobs:
           uses: actions/checkout@v5
 
         - name: "Install PHP"
-          uses: "shivammathur/setup-php@2.35.4"
+          uses: "shivammathur/setup-php@2.35.5"
           with:
             coverage: "pcov"
             php-version: "${{ matrix.php-version }}"
@@ -196,7 +196,7 @@ jobs:
           uses: actions/checkout@v5
 
         - name: "Install PHP"
-          uses: "shivammathur/setup-php@2.35.4"
+          uses: "shivammathur/setup-php@2.35.5"
           with:
             coverage: "pcov"
             php-version: "${{ matrix.php-version }}"
diff --git a/.github/workflows/mutation-tests-diff.yml b/.github/workflows/mutation-tests-diff.yml
@@ -27,7 +27,7 @@ jobs:
                 fetch-depth: 0
 
             - name: "Install PHP"
-              uses: "shivammathur/setup-php@2.35.4"
+              uses: "shivammathur/setup-php@2.35.5"
               with:
                   coverage: "pcov"
                   php-version: "${{ matrix.php-version }}"
diff --git a/.github/workflows/mutation-tests.yml b/.github/workflows/mutation-tests.yml
@@ -29,7 +29,7 @@ jobs:
               uses: actions/checkout@v5
 
             - name: "Install PHP"
-              uses: "shivammathur/setup-php@2.35.4"
+              uses: "shivammathur/setup-php@2.35.5"
               with:
                   coverage: "pcov"
                   php-version: "${{ matrix.php-version }}"
diff --git a/.github/workflows/phpstan.yml b/.github/workflows/phpstan.yml
@@ -29,7 +29,7 @@ jobs:
               uses: actions/checkout@v5
 
             - name: "Install PHP"
-              uses: "shivammathur/setup-php@2.35.4"
+              uses: "shivammathur/setup-php@2.35.5"
               with:
                   coverage: none
                   php-version: "${{ matrix.php-version }}"
diff --git a/.github/workflows/psalm.yml b/.github/workflows/psalm.yml
@@ -29,7 +29,7 @@ jobs:
               uses: actions/checkout@v5
 
             - name: "Install PHP"
-              uses: "shivammathur/setup-php@2.35.4"
+              uses: "shivammathur/setup-php@2.35.5"
               with:
                   coverage: none
                   php-version: "${{ matrix.php-version }}"
diff --git a/.github/workflows/unit.yml b/.github/workflows/unit.yml
@@ -40,7 +40,7 @@ jobs:
               uses: actions/checkout@v5
 
             - name: "Install PHP"
-              uses: "shivammathur/setup-php@2.35.4"
+              uses: "shivammathur/setup-php@2.35.5"
               with:
                   coverage: "pcov"
                   php-version: "${{ matrix.php-version }}"
diff --git a/composer.json b/composer.json
@@ -42,7 +42,7 @@
     "league/commonmark": "^2.6.1",
     "patchlevel/coding-standard": "^1.3.0",
     "patchlevel/event-sourcing-psalm-plugin": "^3.1.0",
-    "phpat/phpat": "^0.11.3",
+    "phpat/phpat": "^0.12.0",
     "phpbench/phpbench": "^1.4.1",
     "phpstan/phpstan": "^2.1.11",
     "phpstan/phpstan-phpunit": "^2.0",
diff --git a/composer.lock b/composer.lock
diff --git a/docs/requirements.txt b/docs/requirements.txt
@@ -1,7 +1,7 @@
 mkdocs==1.6.1
 mike==2.1.3
 markdown==3.9
-mkdocs-material==9.6.18
+mkdocs-material==9.6.20
 
 # Markdown extensions
 Pygments==2.19.2
diff --git a/src/Subscription/Engine/ErrorDetected.php b/src/Subscription/Engine/ErrorDetected.php
@@ -6,8 +6,7 @@
 
 use RuntimeException;
 
-use function array_map;
-use function implode;
+use function count;
 use function sprintf;
 
 final class ErrorDetected extends RuntimeException
@@ -16,15 +15,14 @@ final class ErrorDetected extends RuntimeException
     public function __construct(
         public readonly array $errors,
     ) {
-        $sentences = array_map(
-            static fn (Error $error) => sprintf(
-                'Subscription %s: %s',
-                $error->subscriptionId,
-                $error->message,
+        parent::__construct(
+            sprintf(
+                '%s error(s) in subscription engine detected. First error is in "%s" subscription: %s',
+                count($errors),
+                $errors[0]->subscriptionId,
+                $errors[0]->message,
             ),
-            $errors,
+            previous: $errors[0]->throwable,
         );
-
-        parent::__construct("Error in subscription engine detected.\n" . implode("\n", $sentences));
     }
 }
diff --git a/tests/Unit/Subscription/Engine/ErrorDetectedTest.php b/tests/Unit/Subscription/Engine/ErrorDetectedTest.php
@@ -24,8 +24,12 @@ public function testError(): void
 
         self::assertSame($errors, $errorDetected->errors);
         self::assertSame(
-            "Error in subscription engine detected.\nSubscription id1: error1\nSubscription id2: error2",
+            '2 error(s) in subscription engine detected. First error is in "id1" subscription: error1',
             $errorDetected->getMessage(),
         );
+        self::assertSame(
+            $errors[0]->throwable,
+            $errorDetected->getPrevious(),
+        );
     }
 }
diff --git a/tools/composer.lock b/tools/composer.lock
