From 3104d38fa0a560f525d331d80be80cdfa38cf360 Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Thu, 24 Feb 2022 11:00:01 +0000
Subject: [PATCH 01/20] Add renovate.json

---
 renovate.json | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 renovate.json

diff --git a/renovate.json b/renovate.json
new file mode 100644
index 0000000..328c07b
--- /dev/null
+++ b/renovate.json
@@ -0,0 +1,6 @@
+{
+  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
+  "extends": [
+    "local>patchlevel/.github:renovate-config"
+  ]
+}

From a8fc8d643878a42e30bf10620e53c47858a39780 Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Tue, 1 Mar 2022 18:03:02 +0000
Subject: [PATCH 02/20] Update actions/checkout action to v3

Signed-off-by: Renovate Bot <bot@renovateapp.com>

| datasource  | package          | from | to |
| ----------- | ---------------- | ---- | -- |
| github-tags | actions/checkout | v2   | v3 |
---
 .../release-on-milestone-closed-triggering-release-event.yml    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/release-on-milestone-closed-triggering-release-event.yml b/.github/workflows/release-on-milestone-closed-triggering-release-event.yml
index 0e5d54b..9388753 100644
--- a/.github/workflows/release-on-milestone-closed-triggering-release-event.yml
+++ b/.github/workflows/release-on-milestone-closed-triggering-release-event.yml
@@ -18,7 +18,7 @@ jobs:
 
         steps:
             - name: "Checkout"
-              uses: "actions/checkout@v2"
+              uses: actions/checkout@v3
 
             - name: "Release"
               uses: "laminas/automatic-releases@v1"

From f365ef5240de4363fddb57d8c6042389ffe0f914 Mon Sep 17 00:00:00 2001
From: David Badura <david.badura@patchlevel.de>
Date: Fri, 18 Feb 2022 17:33:18 +0000
Subject: [PATCH 03/20] try to fix enums

---
 ...tone-closed-triggering-release-event.yaml} |  0
 .github/workflows/test.yaml                   | 43 +++++++++++++++++++
 composer.json                                 |  5 ++-
 phpcs.xml.dist                                |  2 +-
 tests/fixed/enum.php                          |  9 ++++
 5 files changed, 57 insertions(+), 2 deletions(-)
 rename .github/workflows/{release-on-milestone-closed-triggering-release-event.yml => release-on-milestone-closed-triggering-release-event.yaml} (100%)
 create mode 100644 .github/workflows/test.yaml
 create mode 100644 tests/fixed/enum.php

diff --git a/.github/workflows/release-on-milestone-closed-triggering-release-event.yml b/.github/workflows/release-on-milestone-closed-triggering-release-event.yaml
similarity index 100%
rename from .github/workflows/release-on-milestone-closed-triggering-release-event.yml
rename to .github/workflows/release-on-milestone-closed-triggering-release-event.yaml
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
new file mode 100644
index 0000000..d806c99
--- /dev/null
+++ b/.github/workflows/test.yaml
@@ -0,0 +1,43 @@
+# https://help.github.com/en/categories/automating-your-workflow-with-github-actions
+
+name: "Check Coding Standard"
+
+on:
+  pull_request:
+  push:
+    branches:
+      - "[0-9]+.[0-9]+.x"
+
+jobs:
+  static-analysis-coding-standard:
+    name: "Static Analysis by patchlevel/coding-standard"
+
+    runs-on: ${{ matrix.operating-system }}
+
+    strategy:
+      matrix:
+        dependencies:
+          - "highest"
+        php-version:
+          - "8.1"
+        operating-system:
+          - "ubuntu-latest"
+
+    steps:
+      - name: "Checkout"
+        uses: "actions/checkout@v2"
+
+      - name: "Install PHP"
+        uses: "shivammathur/setup-php@v2"
+        with:
+          coverage: "pcov"
+          php-version: "${{ matrix.php-version }}"
+          ini-values: memory_limit=-1
+          extensions: pdo_sqlite
+
+      - uses: "ramsey/composer-install@v2"
+        with:
+          dependency-versions: ${{ matrix.dependencies }}
+
+      - name: "Coding Standard"
+        run: "vendor/bin/phpcs tests/fixed"
diff --git a/composer.json b/composer.json
index 6386c7f..97e73c9 100644
--- a/composer.json
+++ b/composer.json
@@ -33,6 +33,9 @@
         "squizlabs/php_codesniffer": "^3.6.0"
     },
     "config": {
-        "sort-packages": true
+        "sort-packages": true,
+        "allow-plugins": {
+            "dealerdirect/phpcodesniffer-composer-installer": true
+        }
     }
 }
diff --git a/phpcs.xml.dist b/phpcs.xml.dist
index bd6a1d6..31810b7 100644
--- a/phpcs.xml.dist
+++ b/phpcs.xml.dist
@@ -14,5 +14,5 @@
     <arg value="p"/>
     <file>src</file>
 
-    <rule ref="Patchlevel"/>
+    <rule ref="PatchlevelCodingStandard"/>
 </ruleset>
diff --git a/tests/fixed/enum.php b/tests/fixed/enum.php
new file mode 100644
index 0000000..6dc8c52
--- /dev/null
+++ b/tests/fixed/enum.php
@@ -0,0 +1,9 @@
+<?php
+
+enum Suit: string
+{
+    case Hearts = 'H';
+    case Diamonds = 'D';
+    case Clubs = 'C';
+    case Spades = 'S';
+}
\ No newline at end of file

From 30cc1177a608bbb1f45c2e293119d350273844be Mon Sep 17 00:00:00 2001
From: Daniel Badura <daniel.badura@patchlevel.de>
Date: Sun, 27 Mar 2022 11:34:37 +0200
Subject: [PATCH 04/20] renovate

---
 .github/workflows/test.yaml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
index d806c99..431da36 100644
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -7,6 +7,7 @@ on:
   push:
     branches:
       - "[0-9]+.[0-9]+.x"
+      - "renovate/*"
 
 jobs:
   static-analysis-coding-standard:
@@ -17,7 +18,7 @@ jobs:
     strategy:
       matrix:
         dependencies:
-          - "highest"
+          - "locked"
         php-version:
           - "8.1"
         operating-system:

From 508a5911ecabe228ecdd771d5d5b0e80ccd270c4 Mon Sep 17 00:00:00 2001
From: David Badura <david.badura@patchlevel.de>
Date: Sat, 25 Jun 2022 11:24:53 +0200
Subject: [PATCH 05/20] update dependencies

---
 composer.json                            | 6 +++---
 src/PatchlevelCodingStandard/ruleset.xml | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/composer.json b/composer.json
index 97e73c9..bc67efb 100644
--- a/composer.json
+++ b/composer.json
@@ -28,9 +28,9 @@
     ],
     "require": {
         "php": "^7.4 || ^8.0",
-        "dealerdirect/phpcodesniffer-composer-installer": "^0.7.1",
-        "slevomat/coding-standard": "^7.0.10",
-        "squizlabs/php_codesniffer": "^3.6.0"
+        "dealerdirect/phpcodesniffer-composer-installer": "^0.7.2",
+        "slevomat/coding-standard": "^8.1.0",
+        "squizlabs/php_codesniffer": "^3.7.1"
     },
     "config": {
         "sort-packages": true,
diff --git a/src/PatchlevelCodingStandard/ruleset.xml b/src/PatchlevelCodingStandard/ruleset.xml
index 7896faf..5d613c3 100644
--- a/src/PatchlevelCodingStandard/ruleset.xml
+++ b/src/PatchlevelCodingStandard/ruleset.xml
@@ -396,7 +396,7 @@
             </property>
         </properties>
     </rule>
-    <rule ref="SlevomatCodingStandard.TypeHints.PropertyTypeHintSpacing"/>
+    <rule ref="SlevomatCodingStandard.Classes.PropertyDeclaration"/>
     <rule ref="SlevomatCodingStandard.TypeHints.ReturnTypeHint">
         <properties>
             <property name="traversableTypeHints" type="array">

From f1bc7a9a7f10329ce913ee723b49ceb09087d4a1 Mon Sep 17 00:00:00 2001
From: David Badura <david.badura@patchlevel.de>
Date: Sat, 25 Jun 2022 11:30:47 +0200
Subject: [PATCH 06/20] fix cs

---
 tests/fixed/{enum.php => Suit.php} | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
 rename tests/fixed/{enum.php => Suit.php} (69%)

diff --git a/tests/fixed/enum.php b/tests/fixed/Suit.php
similarity index 69%
rename from tests/fixed/enum.php
rename to tests/fixed/Suit.php
index 6dc8c52..d266411 100644
--- a/tests/fixed/enum.php
+++ b/tests/fixed/Suit.php
@@ -1,9 +1,13 @@
 <?php
 
+declare(strict_types=1);
+
+namespace Tests\Fixed;
+
 enum Suit: string
 {
     case Hearts = 'H';
     case Diamonds = 'D';
     case Clubs = 'C';
     case Spades = 'S';
-}
\ No newline at end of file
+}

From a008501ca7428ea222064f7d23319cea1afa9969 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Sun, 26 Jun 2022 09:11:31 +0000
Subject: [PATCH 07/20] Roll back ramsey/composer-install action to 2.1.0

Signed-off-by: Renovate Bot <bot@renovateapp.com>

| datasource  | package                 | from | to    |
| ----------- | ----------------------- | ---- | ----- |
| github-tags | ramsey/composer-install | v2   | 2.1.0 |
---
 .github/workflows/test.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
index 431da36..410ba5d 100644
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -36,7 +36,7 @@ jobs:
           ini-values: memory_limit=-1
           extensions: pdo_sqlite
 
-      - uses: "ramsey/composer-install@v2"
+      - uses: "ramsey/composer-install@2.1.0"
         with:
           dependency-versions: ${{ matrix.dependencies }}
 

From 4f62c16c6a4027b5013c0deaa40f0cec99d7a821 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Sun, 20 Nov 2022 14:36:42 +0000
Subject: [PATCH 08/20] Update ramsey/composer-install action to v2.2.0

| datasource  | package                 | from  | to    |
| ----------- | ----------------------- | ----- | ----- |
| github-tags | ramsey/composer-install | 2.1.0 | 2.2.0 |


Signed-off-by: Renovate Bot <bot@renovateapp.com>
---
 .github/workflows/test.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
index 410ba5d..dd3f91d 100644
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -36,7 +36,7 @@ jobs:
           ini-values: memory_limit=-1
           extensions: pdo_sqlite
 
-      - uses: "ramsey/composer-install@2.1.0"
+      - uses: "ramsey/composer-install@2.2.0"
         with:
           dependency-versions: ${{ matrix.dependencies }}
 

From a6054be246841f41b9ac14238e8431364886f8d9 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Sun, 12 Mar 2023 11:28:40 +0000
Subject: [PATCH 09/20] Update dependency
 dealerdirect/phpcodesniffer-composer-installer to v1

| datasource | package                                        | from  | to    |
| ---------- | ---------------------------------------------- | ----- | ----- |
| packagist  | dealerdirect/phpcodesniffer-composer-installer | 0.7.2 | 1.0.0 |


Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index bc67efb..ee11657 100644
--- a/composer.json
+++ b/composer.json
@@ -28,7 +28,7 @@
     ],
     "require": {
         "php": "^7.4 || ^8.0",
-        "dealerdirect/phpcodesniffer-composer-installer": "^0.7.2",
+        "dealerdirect/phpcodesniffer-composer-installer": "^0.7.2 || ^1.0.0",
         "slevomat/coding-standard": "^8.1.0",
         "squizlabs/php_codesniffer": "^3.7.1"
     },

From 3eb0e87eeb628bd2d2c29f2535d78d74ffc3935c Mon Sep 17 00:00:00 2001
From: David Badura <david.badura@patchlevel.de>
Date: Fri, 2 Jun 2023 11:29:20 +0200
Subject: [PATCH 10/20] re-copy doctrine standard

---
 src/PatchlevelCodingStandard/ruleset.xml | 117 +++++++++++++++++++----
 1 file changed, 101 insertions(+), 16 deletions(-)

diff --git a/src/PatchlevelCodingStandard/ruleset.xml b/src/PatchlevelCodingStandard/ruleset.xml
index 5d613c3..fed7483 100644
--- a/src/PatchlevelCodingStandard/ruleset.xml
+++ b/src/PatchlevelCodingStandard/ruleset.xml
@@ -42,16 +42,16 @@
     <rule ref="Generic.CodeAnalysis.UselessOverridingMethod"/>
     <!-- Forbid inline HTML in PHP code -->
     <rule ref="Generic.Files.InlineHTML"/>
-    <!-- Force whitespace after a type cast -->
-    <rule ref="Generic.Formatting.SpaceAfterCast">
+    <!-- Align corresponding assignment statement tokens -->
+    <rule ref="Generic.Formatting.MultipleStatementAlignment">
         <properties>
-            <property name="spacing" value="0"/>
+            <property name="error" value="true"/>
         </properties>
     </rule>
-    <!-- Force no whitespace after `!` -->
-    <rule ref="Generic.Formatting.SpaceAfterNot">
+    <!-- Force whitespace after a type cast -->
+    <rule ref="Generic.Formatting.SpaceAfterCast">
         <properties>
-            <property name="spacing" value="0" />
+            <property name="spacing" value="0"/>
         </properties>
     </rule>
     <!-- Forbid PHP 4 constructors -->
@@ -108,20 +108,34 @@
     <rule ref="PSR2.ControlStructures.ElseIfDeclaration.NotAllowed">
         <type>error</type>
     </rule>
+    <!-- Disallow multiple attributes inside one #[] -->
+    <rule ref="SlevomatCodingStandard.Attributes.DisallowAttributesJoining"/>
+    <!-- Require only one attribute per line -->
+    <rule ref="SlevomatCodingStandard.Attributes.DisallowMultipleAttributesPerLine"/>
+    <!-- Attributes should be adjoined to the PHP element they belong to -->
+    <rule ref="SlevomatCodingStandard.Attributes.AttributeAndTargetSpacing"/>
+    <!-- Require PHPDoc always before attributes -->
+    <rule ref="SlevomatCodingStandard.Attributes.RequireAttributeAfterDocComment"/>
     <!-- Require that single line arrays have the correct spacing: no space around brackets and one space after comma -->
     <rule ref="SlevomatCodingStandard.Arrays.SingleLineArrayWhitespace"/>
     <!-- Require comma after last element in multi-line array -->
     <rule ref="SlevomatCodingStandard.Arrays.TrailingArrayComma"/>
+    <!-- Require no space before : and 1 space before Enum type -->
+    <rule ref="SlevomatCodingStandard.Classes.BackedEnumTypeSpacing"/>
     <!-- Require presence of constant visibility -->
     <rule ref="SlevomatCodingStandard.Classes.ClassConstantVisibility">
         <properties>
             <property name="fixable" value="true"/>
         </properties>
     </rule>
+    <!-- Enforce consistent constant spacing -->
+    <rule ref="SlevomatCodingStandard.Classes.ConstantSpacing"/>
     <!-- Forbid LSB for constants (static::FOO) -->
     <rule ref="SlevomatCodingStandard.Classes.DisallowLateStaticBindingForConstants"/>
     <!-- Forbid more than one constant declared per statement -->
     <rule ref="SlevomatCodingStandard.Classes.DisallowMultiConstantDefinition"/>
+    <!-- Forbid string expression property fetch ($foo->{'bar'}) -->
+    <rule ref="SlevomatCodingStandard.Classes.DisallowStringExpressionPropertyFetch"/>
     <!-- Forbid empty lines around type declarations -->
     <rule ref="SlevomatCodingStandard.Classes.EmptyLinesAroundClassBraces">
         <properties>
@@ -129,8 +143,25 @@
             <property name="linesCountBeforeClosingBrace" value="0"/>
         </properties>
     </rule>
+    <!-- Add one line around parent call in order to improve readability -->
+    <rule ref="SlevomatCodingStandard.Classes.ParentCallSpacing"/>
+    <!-- Ensure that there are consistent blank lines between properties. -->
+    <rule ref="SlevomatCodingStandard.Classes.PropertySpacing">
+        <properties>
+            <property name="minLinesCountBeforeWithComment" value="0" />
+        </properties>
+    </rule>
     <!-- Require usage of ::class instead of __CLASS__, get_class(), get_class($this), get_called_class() and get_parent_class() -->
     <rule ref="SlevomatCodingStandard.Classes.ModernClassNameReference"/>
+    <!-- https://github.com/slevomat/coding-standard#slevomatcodingstandardclassespropertydeclaration- -->
+    <rule ref="SlevomatCodingStandard.Classes.PropertyDeclaration">
+        <properties>
+            <property name="checkPromoted" value="true"/>
+            <property name="enableMultipleSpacesBetweenModifiersCheck" value="true"/>
+        </properties>
+    </rule>
+    <!-- Require usage of constructor property promotion -->
+    <rule ref="SlevomatCodingStandard.Classes.RequireConstructorPropertyPromotion"/>
     <!-- Forbid uses of multiple traits separated by comma -->
     <rule ref="SlevomatCodingStandard.Classes.TraitUseDeclaration"/>
     <!-- Require no spaces before trait use, between trait uses and one space after trait uses -->
@@ -150,6 +181,8 @@
     <rule ref="SlevomatCodingStandard.Classes.SuperfluousInterfaceNaming"/>
     <!-- Forbid suffix "Trait" for traits -->
     <rule ref="SlevomatCodingStandard.Classes.SuperfluousTraitNaming"/>
+    <!-- Forbid invalid annotation names in standard PHPDoc tags -->
+    <rule ref="SlevomatCodingStandard.Commenting.AnnotationName"/>
     <!-- Require specific order of phpDoc annotations with empty newline between specific groups -->
     <rule ref="SlevomatCodingStandard.Commenting.DocCommentSpacing">
         <properties>
@@ -172,8 +205,16 @@
                     @ODM\,
                     @PHPCR\,
                 "/>
-                <element value="@param"/>
-                <element value="@return"/>
+                <element value="
+                    @param,
+                    @psalm-param,
+                    @phpstan-param,
+                "/>
+                <element value="
+                    @return,
+                    @psalm-return,
+                    @phpstan-return,
+                "/>
                 <element value="@throws"/>
             </property>
         </properties>
@@ -211,8 +252,6 @@
     </rule>
     <!-- Report invalid format of inline phpDocs with @var -->
     <rule ref="SlevomatCodingStandard.Commenting.InlineDocCommentDeclaration"/>
-    <!-- Require comments with single line written as one-liners -->
-    <rule ref="SlevomatCodingStandard.Commenting.RequireOneLinePropertyDocComment"/>
     <!-- Forbid assignments in conditions -->
     <rule ref="SlevomatCodingStandard.ControlStructures.AssignmentInCondition"/>
     <!-- Require consistent spacing for block structures -->
@@ -256,6 +295,8 @@
     <rule ref="SlevomatCodingStandard.ControlStructures.RequireNullCoalesceEqualOperator"/>
     <!-- Require usage of null coalesce operator when possible -->
     <rule ref="SlevomatCodingStandard.ControlStructures.RequireNullCoalesceOperator"/>
+    <!-- Require usage of null safe operator when possible -->
+    <rule ref="SlevomatCodingStandard.ControlStructures.RequireNullSafeObjectOperator"/>
     <!-- Forbid usage of conditions when a simple return can be used -->
     <rule ref="SlevomatCodingStandard.ControlStructures.UselessIfConditionWithReturn"/>
     <!-- Forbid usage of boolean-only ternary operator usage (e.g. $foo ? true : false) -->
@@ -264,6 +305,8 @@
     <rule ref="SlevomatCodingStandard.Exceptions.DeadCatch"/>
     <!-- Require using Throwable instead of Exception -->
     <rule ref="SlevomatCodingStandard.Exceptions.ReferenceThrowableOnly"/>
+    <!-- Require non-capturing catch when the variable with exception is not used. -->
+    <rule ref="SlevomatCodingStandard.Exceptions.RequireNonCapturingCatch" />
     <!-- Ensure Arrow Functions declaration format -->
     <rule ref="SlevomatCodingStandard.Functions.ArrowFunctionDeclaration">
         <properties>
@@ -272,6 +315,30 @@
             <property name="spacesCountAfterArrow" value="1"/>
         </properties>
     </rule>
+    <!-- Disallow trailing commas in single line function calls -->
+    <rule ref="SlevomatCodingStandard.Functions.DisallowTrailingCommaInCall">
+        <properties>
+            <property name="onlySingleLine" value="true" />
+        </properties>
+    </rule>
+    <!-- Disallow trailing commas in single line closure use -->
+    <rule ref="SlevomatCodingStandard.Functions.DisallowTrailingCommaInClosureUse">
+        <properties>
+            <property name="onlySingleLine" value="true" />
+        </properties>
+    </rule>
+    <!-- Disallow trailing commas in single line function declarations -->
+    <rule ref="SlevomatCodingStandard.Functions.DisallowTrailingCommaInDeclaration">
+        <properties>
+            <property name="onlySingleLine" value="true" />
+        </properties>
+    </rule>
+    <!-- Require trailing commas in multiline function calls -->
+    <rule ref="SlevomatCodingStandard.Functions.RequireTrailingCommaInCall"/>
+    <!-- Require trailing commas in multiline closure use -->
+    <rule ref="SlevomatCodingStandard.Functions.RequireTrailingCommaInClosureUse"/>
+    <!-- Require trailing commas in multiline function declarations -->
+    <rule ref="SlevomatCodingStandard.Functions.RequireTrailingCommaInDeclaration"/>
     <!-- Require closures not referencing $this be static -->
     <rule ref="SlevomatCodingStandard.Functions.StaticClosure"/>
     <!-- Forbid unused variables passed to closures via `use` -->
@@ -358,7 +425,12 @@
     <!-- Forbid useless semicolon `;` -->
     <rule ref="SlevomatCodingStandard.PHP.UselessSemicolon"/>
     <!-- Require /* @var type $foo */ and similar simple inline annotations to be replaced by assert() -->
-    <rule ref="SlevomatCodingStandard.PHP.RequireExplicitAssertion"/>
+    <rule ref="SlevomatCodingStandard.PHP.RequireExplicitAssertion">
+        <properties>
+            <property name="enableAdvancedStringTypes" value="true"/>
+            <property name="enableIntegerRanges" value="true"/>
+        </properties>
+    </rule>
     <!-- Require use of short versions of scalar types (i.e. int instead of integer) -->
     <rule ref="SlevomatCodingStandard.TypeHints.LongTypeHints"/>
     <!-- Require the `null` type hint to be in the last position of annotations -->
@@ -396,7 +468,6 @@
             </property>
         </properties>
     </rule>
-    <rule ref="SlevomatCodingStandard.Classes.PropertyDeclaration"/>
     <rule ref="SlevomatCodingStandard.TypeHints.ReturnTypeHint">
         <properties>
             <property name="traversableTypeHints" type="array">
@@ -407,8 +478,18 @@
             </property>
         </properties>
     </rule>
+    <!-- Define unions style -->
+    <rule ref="SlevomatCodingStandard.TypeHints.UnionTypeHintFormat">
+        <properties>
+            <property name="withSpaces" value="no" />
+            <property name="shortNullable" value="no" />
+            <property name="nullPosition" value="last" />
+        </properties>
+    </rule>
     <!-- Forbid useless @var for constants -->
     <rule ref="SlevomatCodingStandard.TypeHints.UselessConstantTypeHint"/>
+    <!-- Require One Line Doc Comment where there's only 1 annotation present -->
+    <rule ref="SlevomatCodingStandard.Commenting.RequireOneLineDocComment"/>
     <!-- Forbid useless phpDocs for functions -->
     <rule ref="SlevomatCodingStandard.Commenting.UselessFunctionDocComment">
         <properties>
@@ -426,6 +507,8 @@
     <rule ref="SlevomatCodingStandard.Variables.DuplicateAssignmentToVariable"/>
     <!-- Forbid useless variables -->
     <rule ref="SlevomatCodingStandard.Variables.UselessVariable"/>
+    <!-- Require nowdoc syntax instead of heredoc when possible -->
+    <rule ref="SlevomatCodingStandard.PHP.RequireNowdoc" />
     <!-- Forbid spaces around square brackets -->
     <rule ref="Squiz.Arrays.ArrayBracketSpacing"/>
     <!-- Force array declaration structure -->
@@ -448,6 +531,11 @@
     <rule ref="Squiz.Classes.ClassFileName"/>
     <!-- Force `self::` for self-reference, force lower-case self, forbid spaces around `::` -->
     <rule ref="Squiz.Classes.SelfMemberReference"/>
+    <!-- Force phpDoc alignment -->
+    <rule ref="Squiz.Commenting.DocCommentAlignment">
+        <!-- Allow extra spaces after star, i.e. for indented annotations -->
+        <exclude name="Squiz.Commenting.DocCommentAlignment.SpaceAfterStar"/>
+    </rule>
     <!-- Force rules for function phpDoc -->
     <rule ref="Squiz.Commenting.FunctionComment">
         <!-- Allow `@throws` without description -->
@@ -511,9 +599,6 @@
     </rule>
     <!-- Forbid strings in `"` unless necessary -->
     <rule ref="Squiz.Strings.DoubleQuoteUsage"/>
-    <rule ref="Squiz.Strings.DoubleQuoteUsage.ContainsVar">
-        <message>Variable "%s" not allowed in double quoted string; use sprintf() or concatenation instead</message>
-    </rule>
     <!-- Forbid braces around string in `echo` -->
     <rule ref="Squiz.Strings.EchoedStrings"/>
     <!-- Forbid spaces in type casts -->
@@ -553,4 +638,4 @@
         <!-- turned off by PSR-12 -> turning back on -->
         <severity>5</severity>
     </rule>
-</ruleset>
+</ruleset>
\ No newline at end of file

From 3325cdee4c23a85a53fb65c7c7373c2d277914f3 Mon Sep 17 00:00:00 2001
From: David Badura <david.badura@patchlevel.de>
Date: Fri, 2 Jun 2023 11:58:19 +0200
Subject: [PATCH 11/20] update dependencies

---
 .github/workflows/test.yaml | 2 +-
 composer.json               | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
index dd3f91d..9dc8b45 100644
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -20,7 +20,7 @@ jobs:
         dependencies:
           - "locked"
         php-version:
-          - "8.1"
+          - "8.2"
         operating-system:
           - "ubuntu-latest"
 
diff --git a/composer.json b/composer.json
index ee11657..b155b0a 100644
--- a/composer.json
+++ b/composer.json
@@ -29,8 +29,8 @@
     "require": {
         "php": "^7.4 || ^8.0",
         "dealerdirect/phpcodesniffer-composer-installer": "^0.7.2 || ^1.0.0",
-        "slevomat/coding-standard": "^8.1.0",
-        "squizlabs/php_codesniffer": "^3.7.1"
+        "slevomat/coding-standard": "^8.12.1",
+        "squizlabs/php_codesniffer": "^3.7.2"
     },
     "config": {
         "sort-packages": true,

From 970c48597be5ee09df85372c9aed54cbdf386c2b Mon Sep 17 00:00:00 2001
From: David Badura <david.badura@patchlevel.de>
Date: Fri, 2 Jun 2023 12:04:09 +0200
Subject: [PATCH 12/20] remove MultipleStatementAlignment

---
 src/PatchlevelCodingStandard/ruleset.xml | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/src/PatchlevelCodingStandard/ruleset.xml b/src/PatchlevelCodingStandard/ruleset.xml
index fed7483..eff770b 100644
--- a/src/PatchlevelCodingStandard/ruleset.xml
+++ b/src/PatchlevelCodingStandard/ruleset.xml
@@ -42,12 +42,6 @@
     <rule ref="Generic.CodeAnalysis.UselessOverridingMethod"/>
     <!-- Forbid inline HTML in PHP code -->
     <rule ref="Generic.Files.InlineHTML"/>
-    <!-- Align corresponding assignment statement tokens -->
-    <rule ref="Generic.Formatting.MultipleStatementAlignment">
-        <properties>
-            <property name="error" value="true"/>
-        </properties>
-    </rule>
     <!-- Force whitespace after a type cast -->
     <rule ref="Generic.Formatting.SpaceAfterCast">
         <properties>

From 9a531a0b06026f4a44c2746069fb0d1ae7705de7 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 14 Jun 2023 15:29:13 +0000
Subject: [PATCH 13/20] Update actions/checkout action to v3

| datasource  | package          | from | to |
| ----------- | ---------------- | ---- | -- |
| github-tags | actions/checkout | v2   | v3 |


Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 .github/workflows/test.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
index 9dc8b45..7260483 100644
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -26,7 +26,7 @@ jobs:
 
     steps:
       - name: "Checkout"
-        uses: "actions/checkout@v2"
+        uses: "actions/checkout@v3"
 
       - name: "Install PHP"
         uses: "shivammathur/setup-php@v2"

From dc051254d42828f92b3195ed6ea251182b8debd9 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 4 Sep 2023 15:10:09 +0000
Subject: [PATCH 14/20] Update actions/checkout action to v4

| datasource  | package          | from | to |
| ----------- | ---------------- | ---- | -- |
| github-tags | actions/checkout | v3   | v4 |


Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 .../release-on-milestone-closed-triggering-release-event.yaml   | 2 +-
 .github/workflows/test.yaml                                     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/release-on-milestone-closed-triggering-release-event.yaml b/.github/workflows/release-on-milestone-closed-triggering-release-event.yaml
index 9388753..0f045dd 100644
--- a/.github/workflows/release-on-milestone-closed-triggering-release-event.yaml
+++ b/.github/workflows/release-on-milestone-closed-triggering-release-event.yaml
@@ -18,7 +18,7 @@ jobs:
 
         steps:
             - name: "Checkout"
-              uses: actions/checkout@v3
+              uses: actions/checkout@v4
 
             - name: "Release"
               uses: "laminas/automatic-releases@v1"
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
index 7260483..695b282 100644
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -26,7 +26,7 @@ jobs:
 
     steps:
       - name: "Checkout"
-        uses: "actions/checkout@v3"
+        uses: "actions/checkout@v4"
 
       - name: "Install PHP"
         uses: "shivammathur/setup-php@v2"

From ec215a79c6f6ffb57e1d6b85278ab1813751f300 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 28 Feb 2024 20:13:08 +0000
Subject: [PATCH 15/20] Update ramsey/composer-install action to v2.3.0

| datasource  | package                 | from  | to    |
| ----------- | ----------------------- | ----- | ----- |
| github-tags | ramsey/composer-install | 2.2.0 | 2.3.0 |


Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 .github/workflows/test.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
index 695b282..58063ce 100644
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -36,7 +36,7 @@ jobs:
           ini-values: memory_limit=-1
           extensions: pdo_sqlite
 
-      - uses: "ramsey/composer-install@2.2.0"
+      - uses: "ramsey/composer-install@2.3.0"
         with:
           dependency-versions: ${{ matrix.dependencies }}
 

From ae75361512849cf1b06e4ecd32206fe4d2c0cebd Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 29 Feb 2024 14:52:38 +0000
Subject: [PATCH 16/20] Update ramsey/composer-install action to v2.3.1

| datasource  | package                 | from  | to    |
| ----------- | ----------------------- | ----- | ----- |
| github-tags | ramsey/composer-install | 2.3.0 | 2.3.1 |


Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 .github/workflows/test.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
index 58063ce..89cb22c 100644
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -36,7 +36,7 @@ jobs:
           ini-values: memory_limit=-1
           extensions: pdo_sqlite
 
-      - uses: "ramsey/composer-install@2.3.0"
+      - uses: "ramsey/composer-install@2.3.1"
         with:
           dependency-versions: ${{ matrix.dependencies }}
 

From e204aecd84532dbc054cff7778db0c265a103405 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 29 Feb 2024 18:12:23 +0000
Subject: [PATCH 17/20] Update ramsey/composer-install action to v3

| datasource  | package                 | from  | to    |
| ----------- | ----------------------- | ----- | ----- |
| github-tags | ramsey/composer-install | 2.3.1 | 3.0.0 |


Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 .github/workflows/test.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
index 89cb22c..f56607e 100644
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -36,7 +36,7 @@ jobs:
           ini-values: memory_limit=-1
           extensions: pdo_sqlite
 
-      - uses: "ramsey/composer-install@2.3.1"
+      - uses: "ramsey/composer-install@3.0.0"
         with:
           dependency-versions: ${{ matrix.dependencies }}
 

From 79a2ffbac24b651bb602d73c65b589a39401c04e Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 6 Mar 2025 02:14:58 +0000
Subject: [PATCH 18/20] Update ramsey/composer-install action to v3.1.0 (#21)

| datasource  | package                 | from  | to    |
| ----------- | ----------------------- | ----- | ----- |
| github-tags | ramsey/composer-install | 3.0.0 | 3.1.0 |

Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 .github/workflows/test.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
index f56607e..08c4032 100644
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -36,7 +36,7 @@ jobs:
           ini-values: memory_limit=-1
           extensions: pdo_sqlite
 
-      - uses: "ramsey/composer-install@3.0.0"
+      - uses: "ramsey/composer-install@3.1.0"
         with:
           dependency-versions: ${{ matrix.dependencies }}
 

From bd884d955b096baefe1ef08e4b512f870f3daeaa Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Sun, 25 May 2025 03:23:21 +0000
Subject: [PATCH 19/20] Update ramsey/composer-install action to v3.1.1 (#22)

| datasource  | package                 | from  | to    |
| ----------- | ----------------------- | ----- | ----- |
| github-tags | ramsey/composer-install | 3.1.0 | 3.1.1 |

Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 .github/workflows/test.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
index 08c4032..f63350d 100644
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -36,7 +36,7 @@ jobs:
           ini-values: memory_limit=-1
           extensions: pdo_sqlite
 
-      - uses: "ramsey/composer-install@3.1.0"
+      - uses: "ramsey/composer-install@3.1.1"
         with:
           dependency-versions: ${{ matrix.dependencies }}
 

From fda9dad90c59b822babc4c5f03ad98ec96ef9dc9 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 11 Aug 2025 13:59:28 +0000
Subject: [PATCH 20/20] Update actions/checkout action to v5

| datasource  | package          | from | to |
| ----------- | ---------------- | ---- | -- |
| github-tags | actions/checkout | v4   | v5 |


Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 .../release-on-milestone-closed-triggering-release-event.yaml   | 2 +-
 .github/workflows/test.yaml                                     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/release-on-milestone-closed-triggering-release-event.yaml b/.github/workflows/release-on-milestone-closed-triggering-release-event.yaml
index 0f045dd..67fae35 100644
--- a/.github/workflows/release-on-milestone-closed-triggering-release-event.yaml
+++ b/.github/workflows/release-on-milestone-closed-triggering-release-event.yaml
@@ -18,7 +18,7 @@ jobs:
 
         steps:
             - name: "Checkout"
-              uses: actions/checkout@v4
+              uses: actions/checkout@v5
 
             - name: "Release"
               uses: "laminas/automatic-releases@v1"
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
index f63350d..2e8dba1 100644
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -26,7 +26,7 @@ jobs:
 
     steps:
       - name: "Checkout"
-        uses: "actions/checkout@v4"
+        uses: "actions/checkout@v5"
 
       - name: "Install PHP"
         uses: "shivammathur/setup-php@v2"