Merge branch 'main' into 2.x-formatter-generic

Author: mglaman

.github/workflows/php.yml

@@ -17,6 +17,7 @@ jobs:
           - "8.1"
           - "8.2"
           - "8.3"
+          - "8.4"
     steps:
       - name: "Checkout"
         uses: "actions/checkout@v4"
@@ -41,12 +42,14 @@ jobs:
       matrix:
         experimental: [false]
         php-version:
-          - "8.1"
-          - "8.2"
           - "8.3"
         drupal:
-          - "^10"
+          - "~11.0.0"
+          - "~11.1.0"
         include:
+          - php-version: "8.1"
+            drupal: "^10.4"
+            experimental: false
           - php-version: "8.3"
             drupal: "11.x-dev"
             experimental: true
@@ -78,11 +81,14 @@ jobs:
       matrix:
         experimental: [false]
         php-version:
-          - "8.1"
-          - "8.2"
+          - "8.3"
         drupal:
-          - "^10"
+          - "~11.0.0"
+          - "~11.1.0"
         include:
+          - php-version: "8.1"
+            drupal: "^10.4"
+            experimental: false
           - php-version: "8.3"
             drupal: "11.x-dev"
             experimental: true
@@ -151,11 +157,14 @@ jobs:
       matrix:
         experimental: [false]
         php-version:
-          - "8.1"
-          - "8.2"
+          - "8.3"
         drupal:
-          - "^10"
+          - "~11.0.0"
+          - "~11.1.0"
         include:
+          - php-version: "8.1"
+            drupal: "^10.4"
+            experimental: false
           - php-version: "8.3"
             drupal: "11.x-dev"
             experimental: true