Merge branch '1.x' into 2.x

Yoast · Nov 23, 2023 · 970e8ba · 970e8ba
2 parents a8ef9ea + 3629599
commit 970e8ba
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -20,9 +20,9 @@ jobs:
 
     strategy:
       matrix:
-        php: ['5.6', '7.0', '7.1', '7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3']
+        php: ['5.6', '7.0', '7.1', '7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3', '8.4']
 
-    continue-on-error: ${{ matrix.php == '8.3' }}
+    continue-on-error: ${{ matrix.php == '8.4' }}
 
     name: "Lint: PHP ${{ matrix.php }}"
 
@@ -44,14 +44,14 @@ jobs:
       # Install dependencies and handle caching in one go.
       # @link https://github.com/marketplace/actions/install-composer-dependencies
       - name: Install Composer dependencies - normal
-        if: matrix.php != '8.3'
+        if: matrix.php != '8.4'
         uses: "ramsey/composer-install@v2"
         with:
           # Bust the cache at least once a month - output format: YYYY-MM.
           custom-cache-suffix: $(date -u "+%Y-%m")
 
       - name: Install Composer dependencies - ignore PHP restrictions
-        if: matrix.php == '8.3'
+        if: matrix.php == '8.4'
         uses: "ramsey/composer-install@v2"
         with:
           composer-options: --ignore-platform-req=php+

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -20,7 +20,7 @@ jobs:
 
     strategy:
       matrix:
-        php: ['5.6', '7.0', '7.1', '7.2', '7.3', '7.4', '8.0', '8.1', '8.2']
+        php: ['5.6', '7.0', '7.1', '7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3']
         phpunit: ['auto']
         coverage: [true]
         experimental: [false]
@@ -84,13 +84,13 @@ jobs:
             phpunit: '9.3.0'
             coverage: true
             experimental: false
-          - php: '8.2'
+          - php: '8.3'
             phpunit: '10.1.0'
             coverage: true
             experimental: false
 
           # Experimental builds.
-          - php: '8.3'
+          - php: '8.4'
             phpunit: '^9.6'
             coverage: false
             experimental: true
@@ -99,7 +99,7 @@ jobs:
             coverage: false
             experimental: true
 
-          - php: '8.2'
+          - php: '8.3'
             phpunit: 'dev-main'
             coverage: false
             experimental: true
@@ -129,14 +129,14 @@ jobs:
       # Install dependencies and handle caching in one go.
       # @link https://github.com/marketplace/actions/install-composer-dependencies
       - name: Install Composer dependencies - normal
-        if: matrix.php != '8.3'
+        if: matrix.php != '8.4'
         uses: "ramsey/composer-install@v2"
         with:
           # Bust the cache at least once a month - output format: YYYY-MM.
           custom-cache-suffix: $(date -u "+%Y-%m")
 
       - name: Install Composer dependencies - ignore PHP restrictions
-        if: matrix.php == '8.3'
+        if: matrix.php == '8.4'
         uses: "ramsey/composer-install@v2"
         with:
           composer-options: --ignore-platform-req=php+