Merge branch 'stable' into develop

Author: jrfnl

.github/workflows/cs.yml

@@ -19,9 +19,6 @@ jobs:
     name: 'Basic CS and QA checks'
     runs-on: ubuntu-latest
 
-    env:
-      XMLLINT_INDENT: '    '
-
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
@@ -53,50 +50,95 @@ jobs:
           # Bust the cache at least once a month - output format: YYYY-MM.
           custom-cache-suffix: $(date -u "+%Y-%m")
 
+      # Validate the XSD and XML files against schema.
+      - name: Validate Docs XSD against schema
+        uses: phpcsstandards/xmllint-validate@v1
+        with:
+          pattern: "DocsXsd/phpcsdocs.xsd"
+          xsd-url: "https://www.w3.org/2012/04/XMLSchema.xsd"
+
+      - name: Validate PHPCSDebug ruleset against schema
+        uses: phpcsstandards/xmllint-validate@v1
+        with:
+          pattern: "PHPCSDebug/ruleset.xml"
+          xsd-file: "vendor/squizlabs/php_codesniffer/phpcs.xsd"
+
+      - name: Validate docs against schema
+        uses: phpcsstandards/xmllint-validate@v1
+        with:
+          pattern: "PHPCSDebug/Docs/*/*Standard.xml"
+          xsd-file: "DocsXsd/phpcsdocs.xsd"
+
+      - name: Validate Project PHPCS ruleset against schema
+        uses: phpcsstandards/xmllint-validate@v1
+        with:
+          pattern: "phpcs.xml.dist"
+          xsd-file: "vendor/squizlabs/php_codesniffer/phpcs.xsd"
+
+      - name: "Validate PHPUnit < 10 config for use with PHPUnit 8"
+        uses: phpcsstandards/xmllint-validate@v1
+        with:
+          pattern: "phpunitlte9.xml.dist"
+          xsd-file: "vendor/phpunit/phpunit/schema/8.5.xsd"
+
+      - name: "Validate PHPUnit < 10 config for use with PHPUnit 9"
+        uses: phpcsstandards/xmllint-validate@v1
+        with:
+          pattern: "phpunitlte9.xml.dist"
+          xsd-file: "vendor/phpunit/phpunit/schema/9.5.xsd"
+
+      - name: "Validate PHPUnit 10+ config for use with PHPUnit 10"
+        uses: phpcsstandards/xmllint-validate@v1
+        with:
+          pattern: "phpunit.xml.dist"
+          xsd-file: "vendor/phpunit/phpunit/schema/10.5.xsd"
+
+      - name: "Validate PHPUnit 10+ config for use with PHPUnit 11"
+        uses: phpcsstandards/xmllint-validate@v1
+        with:
+          pattern: "phpunit.xml.dist"
+          xsd-file: "vendor/phpunit/phpunit/phpunit.xsd"
+
+      # Check the code-style consistency of the PHP files.
+      - name: Check PHP code style
+        id: phpcs
+        run: composer checkcs -- --report-full --report-checkstyle=./phpcs-report.xml
+
+      - name: Show PHPCS results in PR
+        if: ${{ always() && steps.phpcs.outcome == 'failure' }}
+        run: cs2pr ./phpcs-report.xml
+
+  xml-cs:
+    name: 'XML Code style'
+    runs-on: ubuntu-latest
+
+    env:
+      XMLLINT_INDENT: '    '
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
       # Updating the lists can fail intermittently, typically after Microsoft has released a new package.
       # This should not be blocking for this job, so ignore any errors from this step.
       # Ref: https://github.com/dotnet/core/issues/4167
       - name: Update the available packages list
         continue-on-error: true
         run: sudo apt-get update
 
-      # @link http://xmlsoft.org/xmllint.html
       - name: Install xmllint
         run: sudo apt-get install --no-install-recommends -y libxml2-utils
 
-      - name: Download the XSD schema
-        run: curl http://www.w3.org/2001/XMLSchema.xsd --output XMLSchema.xsd
-
       # Show XML violations inline in the file diff.
-      # @link https://github.com/marketplace/actions/xmllint-problem-matcher
       - name: Enable showing XML issues inline
         uses: korelstar/xmllint-problem-matcher@v1
 
-      # Validate the XSD and XML files against schema.
-      - name: Validate Docs XSD against schema
-        run: xmllint --noout --schema XMLSchema.xsd DocsXsd/phpcsdocs.xsd
-
-      - name: Validate PHPCSDebug ruleset against schema
-        run: xmllint --noout --schema vendor/squizlabs/php_codesniffer/phpcs.xsd PHPCSDebug/ruleset.xml
-
-      - name: Validate docs against schema
-        run: xmllint --noout --schema DocsXsd/phpcsdocs.xsd ./PHPCSDebug/Docs/*/*Standard.xml
-
       # Check code-style consistency of the XSD and XML files.
       - name: Check XSD code style
         run: diff -B ./DocsXsd/phpcsdocs.xsd <(xmllint --format "./DocsXsd/phpcsdocs.xsd")
 
       - name: Check Ruleset XML code style
         run: diff -B ./PHPCSDebug/ruleset.xml <(xmllint --format "./PHPCSDebug/ruleset.xml")
 
-      # Check the code-style consistency of the PHP files.
-      - name: Check PHP code style
-        id: phpcs
-        run: composer checkcs -- --report-full --report-checkstyle=./phpcs-report.xml
-
-      - name: Show PHPCS results in PR
-        if: ${{ always() && steps.phpcs.outcome == 'failure' }}
-        run: cs2pr ./phpcs-report.xml
-
   phpstan:
     uses: PHPCSStandards/.github/.github/workflows/reusable-phpstan.yml@main