Merge pull request #307 from laminas/1.27.x-merge-up-into-2.0.x_AJ1Vgio3

Merge release 1.27.0 into 2.0.x
laminas · Jul 30, 2024 · 4b8a6bd · 4b8a6bd
2 parents 9f142ec + 38e146b
commit 4b8a6bd
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 13 deletions.
diff --git a/.github/workflows/build-and-push-containers.yml b/.github/workflows/build-and-push-containers.yml
@@ -35,7 +35,7 @@ jobs:
           password: ${{ secrets.CONTAINER_PAT }}
 
       - name: Build and push
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           context: .
           file: ./Dockerfile

diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
@@ -43,7 +43,7 @@ jobs:
         uses: docker/setup-buildx-action@v3
 
       - name: Build container for CI pipeline
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           context: .
           load: true
@@ -125,7 +125,7 @@ jobs:
         uses: docker/setup-buildx-action@v3
 
       - name: Build
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           push: false
 

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -33,7 +33,7 @@
         "source-map-loader": "^5.0.0",
         "ts-jest": "^29.0.3",
         "ts-node": "^10.9.1",
-        "typescript": "~5.4.0",
+        "typescript": "~5.5.0",
         "webpack": "^5.74.0",
         "webpack-cli": "^5.0.0"
     }

diff --git a/src/config/app.spec.ts b/src/config/app.spec.ts
@@ -18,9 +18,9 @@ describe('config/app', () => {
             ${'8.1'}                       | ${[ '8.1' ]}
             ${'8.1.0'}                     | ${[ '8.1' ]}
             ${'8.1.12'}                    | ${[ '8.1' ]}
-            ${'^8.1'}                      | ${[ '8.1', '8.2', '8.3' ]}
-            ${'^8.1.0'}                    | ${[ '8.1', '8.2', '8.3' ]}
-            ${'^8.1.12'}                   | ${[ '8.1', '8.2', '8.3' ]}
+            ${'^8.1'}                      | ${[ '8.1', '8.2', '8.3', '8.4' ]}
+            ${'^8.1.0'}                    | ${[ '8.1', '8.2', '8.3', '8.4' ]}
+            ${'^8.1.12'}                   | ${[ '8.1', '8.2', '8.3', '8.4' ]}
             ${'~8.1'}                      | ${[ '8.1' ]}
             ${'~8.1.0'}                    | ${[ '8.1' ]}
             ${'~8.1.12'}                   | ${[ '8.1' ]}
@@ -48,7 +48,7 @@ describe('config/app', () => {
                 codeChecks                    : true,
                 docLinting                    : true,
                 versions                      : [ '8.1' ],
-                stablePhpVersion              : '8.0',
+                stablePhpVersion              : '8.1',
                 minimumPhpVersion             : '8.1',
                 latestPhpVersion              : '8.1',
                 lockedDependenciesExists      : false,

diff --git a/src/config/php.ts b/src/config/php.ts
@@ -2,8 +2,9 @@ export const PHP_80 = '8.0';
 export const PHP_81 = '8.1';
 export const PHP_82 = '8.2';
 export const PHP_83 = '8.3';
+export const PHP_84 = '8.4';
 
-export const CURRENT_STABLE = PHP_80;
+export const CURRENT_STABLE = PHP_81;
 export const CONTAINER_DEFAULT_PHP_VERSION = '@default';
 
 /**
@@ -15,6 +16,7 @@ export const INSTALLABLE_VERSIONS = [
     PHP_81,
     PHP_82,
     PHP_83,
+    PHP_84,
     CONTAINER_DEFAULT_PHP_VERSION,
 ] as const;