Merge release 3.13.0 into 4.0.x

.gitattributes

@@ -0,0 +1,15 @@
+*.php text eol=lf
+*.phpt text eol=lf
+/.gitattributes export-ignore
+/.github/ export-ignore
+/.gitignore export-ignore
+/composer.lock export-ignore
+/docs/ export-ignore
+/phpcs.xml.dist export-ignore
+/phpstan.neon export-ignore
+/phpstan-baseline.neon export-ignore
+/phpunit.xml.dist export-ignore
+/renovate.json export-ignore
+/infection.json.dist export-ignore
+/tests/ export-ignore
+/bin/ export-ignore

.github/workflows/coding-standard.yml

@@ -20,7 +20,7 @@ jobs:
         dependencies:
           - "locked"
         php-version:
-          - "8.4"
+          - "8.5"
         operating-system:
           - "ubuntu-latest"
 
@@ -29,12 +29,11 @@ jobs:
         uses: actions/checkout@v6
 
       - name: "Install PHP"
-        uses: "shivammathur/setup-php@2.35.5"
+        uses: "shivammathur/setup-php@2.36.0"
         with:
           coverage: "pcov"
           php-version: "${{ matrix.php-version }}"
           ini-values: memory_limit=-1
-          extensions: pdo_sqlite
 
       - uses: ramsey/composer-install@3.1.1
         with:

.github/workflows/docs-check.yml

@@ -28,12 +28,11 @@ jobs:
               uses: actions/checkout@v6
 
             - name: "Install PHP"
-              uses: "shivammathur/setup-php@2.35.5"
+              uses: "shivammathur/setup-php@2.36.0"
               with:
                   coverage: none
                   php-version: "${{ matrix.php-version }}"
                   ini-values: memory_limit=-1, opcache.enable_cli=1
-                  extensions: pdo_sqlite
 
             - uses: ramsey/composer-install@3.1.1
               with:

.github/workflows/mutation-tests-diff.yml

@@ -0,0 +1,42 @@
+# https://help.github.com/en/categories/automating-your-workflow-with-github-actions
+
+name: "Mutation tests on diff"
+
+on:
+    pull_request:
+
+jobs:
+    mutation-tests-diff:
+        name: "Mutation tests on diff"
+
+        runs-on: ${{ matrix.operating-system }}
+
+        strategy:
+            matrix:
+                dependencies:
+                    - "locked"
+                php-version:
+                    - "8.5"
+                operating-system:
+                    - "ubuntu-latest"
+
+        steps:
+            - name: "Checkout"
+              uses: actions/checkout@v6
+              with:
+                fetch-depth: 0
+
+            - name: "Install PHP"
+              uses: "shivammathur/setup-php@2.36.0"
+              with:
+                  coverage: "pcov"
+                  php-version: "${{ matrix.php-version }}"
+                  ini-values: memory_limit=-1
+                  extensions: pdo_sqlite
+
+            - uses: ramsey/composer-install@3.1.1
+              with:
+                  dependency-versions: ${{ matrix.dependencies }}
+
+            - name: "Infection"
+              run: "vendor/bin/infection --threads=max --git-diff-lines --git-diff-base=origin/$GITHUB_BASE_REF --ignore-msi-with-no-mutations --with-uncovered --min-msi=90 --min-covered-msi=95"

.github/workflows/mutation-tests.yml

@@ -0,0 +1,46 @@
+# https://help.github.com/en/categories/automating-your-workflow-with-github-actions
+
+name: "Mutation tests"
+
+on:
+    pull_request:
+    push:
+        branches:
+            - "[0-9]+.[0-9]+.x"
+            - "renovate/*"
+
+jobs:
+    mutation-tests:
+        name: "Mutation tests"
+
+        runs-on: ${{ matrix.operating-system }}
+
+        strategy:
+            matrix:
+                dependencies:
+                    - "locked"
+                php-version:
+                    - "8.5"
+                operating-system:
+                    - "ubuntu-latest"
+
+        steps:
+            - name: "Checkout"
+              uses: actions/checkout@v6
+
+            - name: "Install PHP"
+              uses: "shivammathur/setup-php@2.36.0"
+              with:
+                  coverage: "pcov"
+                  php-version: "${{ matrix.php-version }}"
+                  ini-values: memory_limit=-1
+                  extensions: pdo_sqlite
+
+            - uses: ramsey/composer-install@3.1.1
+              with:
+                dependency-versions: ${{ matrix.dependencies }}
+
+            - name: "Infection"
+              run: "vendor/bin/infection --threads=max"
+              env:
+                  STRYKER_DASHBOARD_API_KEY: ${{ secrets.STRYKER_DASHBOARD_API_KEY }}

.github/workflows/phpstan.yml

@@ -20,7 +20,7 @@ jobs:
         dependencies:
           - "locked"
         php-version:
-          - "8.4"
+          - "8.5"
         operating-system:
           - "ubuntu-latest"
 
@@ -29,12 +29,11 @@ jobs:
         uses: actions/checkout@v6
 
       - name: "Install PHP"
-        uses: "shivammathur/setup-php@2.35.5"
+        uses: "shivammathur/setup-php@2.36.0"
         with:
           coverage: "pcov"
           php-version: "${{ matrix.php-version }}"
           ini-values: memory_limit=-1
-          extensions: pdo_sqlite
 
       - uses: ramsey/composer-install@3.1.1
         with:

.github/workflows/phpunit.yml

@@ -24,22 +24,23 @@ jobs:
           - "8.2"
           - "8.3"
           - "8.4"
+          - "8.5"
         operating-system:
           - "ubuntu-latest"
           - "windows-latest"
         include:
           - dependencies: "locked"
-            php-version: "8.4"
+            php-version: "8.5"
             operating-system: "ubuntu-latest"
           - dependencies: "locked"
-            php-version: "8.4"
+            php-version: "8.5"
             operating-system: "windows-latest"
     steps:
       - name: "Checkout"
         uses: actions/checkout@v6
 
       - name: "Install PHP"
-        uses: "shivammathur/setup-php@2.35.5"
+        uses: "shivammathur/setup-php@2.36.0"
         with:
           coverage: "pcov"
           php-version: "${{ matrix.php-version }}"

.gitignore

@@ -4,3 +4,5 @@ phpunit.xml
 .phpunit.cache
 .phpcs-cache
 phpstan.neon
+infection.html
+infection.log

Makefile

@@ -20,21 +20,20 @@ phpstan: vendor
 phpstan-baseline: vendor                                                        ## run phpstan static code analyser
 	php -d memory_limit=312M vendor/bin/phpstan analyse --generate-baseline
 
-.PHONY: psalm
-psalm: vendor                                                                   ## run psalm static code analyser
-	vendor/bin/psalm
-
-.PHONY: psalm-baseline
-psalm-baseline: vendor                                                          ## run psalm static code analyser
-	vendor/bin/psalm --update-baseline --set-baseline=baseline.xml
-
-
 .PHONY: phpunit
 phpunit: vendor                                                                 ## run phpunit tests
 	XDEBUG_MODE=coverage vendor/bin/phpunit
 
+.PHONY: infection
+infection: vendor                                                               ## run infection
+	php -d memory_limit=312M vendor/bin/infection --threads=5
+
+.PHONY: infection-diff
+infection-diff: vendor                                                          ## run infection on differences
+	php -d memory_limit=312M vendor/bin/infection --threads=max --git-diff-lines --git-diff-base=origin/HEAD --ignore-msi-with-no-mutations --only-covered --min-msi=80 --min-covered-msi=95
+
 .PHONY: static
-static: psalm phpstan phpcs-check                                               ## run static analyser
+static: phpstan phpcs-check                                               ## run static analyser
 
 test: phpunit                                                                   ## run tests
 
@@ -67,7 +66,3 @@ docs-php-lint: docs-extract-php
 .PHONY: docs-phpcs
 docs-phpcs: docs-extract-php
 	vendor/bin/phpcbf docs_php --exclude=SlevomatCodingStandard.TypeHints.DeclareStrictTypes || true
-
-.PHONY: docs-psalm
-docs-psalm: docs-extract-php
-	vendor/bin/psalm --config=psalm_docs.xml

composer.json

@@ -18,39 +18,37 @@
     }
   ],
   "require": {
-    "php": "~8.2.0 || ~8.3.0 || ~8.4.0",
+    "php": "~8.2.0 || ~8.3.0 || ~8.4.0 || ~8.5.0",
     "patchlevel/event-sourcing": "4.0.x-dev",
-    "symfony/cache": "^6.4.0|^7.0.0",
-    "symfony/config": "^6.4.0|^7.0.0",
-    "symfony/console": "^6.4.1|^7.0.1",
-    "symfony/dependency-injection": "^6.4.1|^7.0.1",
-    "symfony/event-dispatcher": "^6.4.1|^7.0.1",
-    "symfony/finder": "^6.4.0|^7.0.0",
-    "symfony/http-kernel": "^6.4.1|^7.0.1",
-    "symfony/messenger": "^6.4.0|^7.0.0"
+    "symfony/cache": "^6.4.0 || ^7.0.0 || ^8.0.0",
+    "symfony/config": "^6.4.0 || ^7.0.0 || ^8.0.0",
+    "symfony/console": "^6.4.1 || ^7.0.1 || ^8.0.0",
+    "symfony/dependency-injection": "^6.4.1 || ^7.0.1 || ^8.0.0",
+    "symfony/event-dispatcher": "^6.4.1 || ^7.0.1 || ^8.0.0",
+    "symfony/finder": "^6.4.0 || ^7.0.0 || ^8.0.0",
+    "symfony/http-kernel": "^6.4.1 || ^7.0.1 || ^8.0.0",
+    "symfony/messenger": "^6.4.0 || ^7.0.0 || ^8.0.0"
   },
   "require-dev": {
     "ext-pdo_sqlite": "*",
     "doctrine/migrations": "^3.3.2",
-    "doctrine/orm": "^2.19.4|^3.1.2",
-    "infection/infection": "^0.31.0",
+    "doctrine/orm": "^2.19.4 || ^3.1.2",
+    "infection/infection": "^0.31.9",
     "league/commonmark": "^2.4",
     "patchlevel/coding-standard": "^1.3.0",
-    "phpspec/prophecy-phpunit": "^2.1.0",
-    "phpstan/phpstan": "^2.1.0",
-    "phpstan/phpstan-symfony": "^2.0",
-    "phpunit/phpunit": "^10.5.2",
-    "psalm/plugin-symfony": "^5.2.7",
+    "phpstan/phpstan": "^2.1.32",
+    "phpstan/phpstan-symfony": "^2.0.8",
+    "phpunit/phpunit": "^11.5.45",
     "roave/security-advisories": "dev-master",
-    "symfony/uid": "^6.4.0|^7.0.0",
-    "symfony/var-dumper": "^6.4.0|^7.0.0",
-    "symfony/web-profiler-bundle": "^6.4.0|^7.0.0",
-    "vimeo/psalm": "^6.0.0",
+    "symfony/uid": "^6.4.0 || ^7.0.0 || ^8.0.0",
+    "symfony/var-dumper": "^6.4.0 || ^7.0.0 || ^8.0.0",
+    "symfony/web-profiler-bundle": "^6.4.0 || ^7.0.0 || ^8.0.0",
     "wnx/commonmark-markdown-renderer": "^1.4"
   },
   "suggest": {
     "patchlevel/event-sourcing-admin-bundle": "for admin ui",
-    "patchlevel/event-sourcing-psalm-plugin": "for psalm integration"
+    "patchlevel/event-sourcing-psalm-plugin": "for psalm integration",
+    "patchlevel/event-sourcing-phpstan-extension": "for phpstan integration"
   },
   "conflict": {
     "doctrine/doctrine-bundle": "<2.8"