Merge remote-tracking branch 'origin/12.0.x' into 13.0.x

Author: greg0ire

.github/dependabot.yml

@@ -19,3 +19,9 @@ updates:
     - 7.0.2
     - 7.0.4
     - 7.0.5
+- package-ecosystem: "github-actions"
+  directory: "/"
+  schedule:
+    interval: "weekly"
+  labels:
+    - "CI"

.github/workflows/ci-dockerfile.yml

@@ -22,7 +22,7 @@ jobs:
     runs-on: "ubuntu-22.04"
 
     steps:
-      - uses: "actions/checkout@v3"
+      - uses: "actions/checkout@v4"
 
       - name: "Lint Dockerfile"
         uses: "hadolint/[email protected]"

.github/workflows/ci-shell-scripts.yml

@@ -24,7 +24,7 @@ jobs:
 
     steps:
       - name: "Checkout"
-        uses: "actions/checkout@v3"
+        uses: "actions/checkout@v4"
 
       - name: "Lint shell scripts with ShellCheck"
         uses: "ludeeus/[email protected]"

.github/workflows/continuous-integration.yml

@@ -23,7 +23,7 @@ jobs:
 
     steps:
       - name: "Checkout"
-        uses: "actions/checkout@v2"
+        uses: "actions/checkout@v4"
 
       - name: "Install PHP"
         uses: "shivammathur/setup-php@v2"
@@ -56,7 +56,7 @@ jobs:
 
     steps:
       - name: "Checkout"
-        uses: "actions/checkout@v2"
+        uses: "actions/checkout@v4"
 
       - name: "Install PHP"
         uses: "shivammathur/setup-php@v2"
@@ -100,7 +100,7 @@ jobs:
 
     steps:
       - name: "Checkout"
-        uses: "actions/checkout@v2"
+        uses: "actions/checkout@v4"
 
       - name: "Install PHP"
         uses: "shivammathur/setup-php@v2"
@@ -139,7 +139,7 @@ jobs:
 
     steps:
       - name: "Checkout"
-        uses: "actions/checkout@v2"
+        uses: "actions/checkout@v4"
 
       - name: "Install PHP"
         uses: "shivammathur/setup-php@v2"

.github/workflows/release-on-milestone-closed.yml

@@ -8,7 +8,7 @@ on:
 jobs:
   release:
     name: "Git tag, release & create merge-up PR"
-    uses: "doctrine/.github/.github/workflows/release-on-milestone-closed.yml@2.0.0"
+    uses: "doctrine/.github/.github/workflows/release-on-milestone-closed.yml@7.2.2"
     secrets:
       GIT_AUTHOR_EMAIL: ${{ secrets.GIT_AUTHOR_EMAIL }}
       GIT_AUTHOR_NAME: ${{ secrets.GIT_AUTHOR_NAME }}

.github/workflows/website-schema.yml

@@ -18,4 +18,4 @@ on:
 jobs:
   json-validate:
     name: "Validate JSON schema"
-    uses: "doctrine/.github/.github/workflows/website-schema.yml@7.1.0"
+    uses: "doctrine/.github/.github/workflows/website-schema.yml@7.2.2"

phpcs.xml.dist

@@ -6,17 +6,17 @@
 >
     <description>Check the code of the sniffs in doctrine/coding-standards.</description>
 
-    <arg name="basepath" value="."/>
-    <arg name="extensions" value="php"/>
+    <arg name="basepath" value="." />
+    <arg name="extensions" value="php" />
     <arg name="colors" />
 
     <!-- Show progress of the run -->
-    <arg value="p"/>
+    <arg value="p" />
 
     <!--Show sniff codes in all reports -->
-    <arg value="s"/>
+    <arg value="s" />
 
-    <rule ref="Doctrine"/>
+    <rule ref="Doctrine" />
 
     <file>lib</file>
 </ruleset>

tests/expected_report.txt

@@ -54,9 +54,9 @@ tests/input/use-ordering.php                          1       0
 tests/input/useless-semicolon.php                     2       0
 tests/input/UselessConditions.php                     21      0
 ----------------------------------------------------------------------
-A TOTAL OF 476 ERRORS AND 2 WARNINGS WERE FOUND IN 50 FILES
+A TOTAL OF 478 ERRORS AND 2 WARNINGS WERE FOUND IN 50 FILES
 ----------------------------------------------------------------------
-PHPCBF CAN FIX 391 OF THESE SNIFF VIOLATIONS AUTOMATICALLY
+PHPCBF CAN FIX 393 OF THESE SNIFF VIOLATIONS AUTOMATICALLY
 ----------------------------------------------------------------------
 
 

tests/php74-compatibility.patch

@@ -55,11 +55,11 @@ index 8547171..f01ece0 100644
 -tests/input/UselessConditions.php                     21      0
 +tests/input/UselessConditions.php                     20      0
  ----------------------------------------------------------------------
--A TOTAL OF 476 ERRORS AND 2 WARNINGS WERE FOUND IN 50 FILES
-+A TOTAL OF 429 ERRORS AND 2 WARNINGS WERE FOUND IN 47 FILES
+-A TOTAL OF 478 ERRORS AND 2 WARNINGS WERE FOUND IN 50 FILES
++A TOTAL OF 431 ERRORS AND 2 WARNINGS WERE FOUND IN 47 FILES
  ----------------------------------------------------------------------
--PHPCBF CAN FIX 391 OF THESE SNIFF VIOLATIONS AUTOMATICALLY
-+PHPCBF CAN FIX 345 OF THESE SNIFF VIOLATIONS AUTOMATICALLY
+-PHPCBF CAN FIX 393 OF THESE SNIFF VIOLATIONS AUTOMATICALLY
++PHPCBF CAN FIX 347 OF THESE SNIFF VIOLATIONS AUTOMATICALLY
  ----------------------------------------------------------------------
 
 

tests/php80-compatibility.patch

@@ -31,10 +31,10 @@ index 9b19b9e..760ee4a 100644
  tests/input/useless-semicolon.php                     2       0
  tests/input/UselessConditions.php                     21      0
  ----------------------------------------------------------------------
--A TOTAL OF 476 ERRORS AND 2 WARNINGS WERE FOUND IN 50 FILES
+-A TOTAL OF 478 ERRORS AND 2 WARNINGS WERE FOUND IN 50 FILES
 +A TOTAL OF 459 ERRORS AND 2 WARNINGS WERE FOUND IN 49 FILES
  ----------------------------------------------------------------------
--PHPCBF CAN FIX 391 OF THESE SNIFF VIOLATIONS AUTOMATICALLY
+-PHPCBF CAN FIX 393 OF THESE SNIFF VIOLATIONS AUTOMATICALLY
 +PHPCBF CAN FIX 375 OF THESE SNIFF VIOLATIONS AUTOMATICALLY
  ----------------------------------------------------------------------