Skip to content

Commit 4b8a6bd

Browse files
authored
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
2 parents 9f142ec + 38e146b commit 4b8a6bd

File tree

6 files changed

+16
-13
lines changed

6 files changed

+16
-13
lines changed

.github/workflows/build-and-push-containers.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
password: ${{ secrets.CONTAINER_PAT }}
3636

3737
- name: Build and push
38-
uses: docker/build-push-action@v5
38+
uses: docker/build-push-action@v6
3939
with:
4040
context: .
4141
file: ./Dockerfile

.github/workflows/continuous-integration.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ jobs:
4343
uses: docker/setup-buildx-action@v3
4444

4545
- name: Build container for CI pipeline
46-
uses: docker/build-push-action@v5
46+
uses: docker/build-push-action@v6
4747
with:
4848
context: .
4949
load: true
@@ -125,7 +125,7 @@ jobs:
125125
uses: docker/setup-buildx-action@v3
126126

127127
- name: Build
128-
uses: docker/build-push-action@v5
128+
uses: docker/build-push-action@v6
129129
with:
130130
push: false
131131

package-lock.json

Lines changed: 5 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
"source-map-loader": "^5.0.0",
3434
"ts-jest": "^29.0.3",
3535
"ts-node": "^10.9.1",
36-
"typescript": "~5.4.0",
36+
"typescript": "~5.5.0",
3737
"webpack": "^5.74.0",
3838
"webpack-cli": "^5.0.0"
3939
}

src/config/app.spec.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ describe('config/app', () => {
1818
${'8.1'} | ${[ '8.1' ]}
1919
${'8.1.0'} | ${[ '8.1' ]}
2020
${'8.1.12'} | ${[ '8.1' ]}
21-
${'^8.1'} | ${[ '8.1', '8.2', '8.3' ]}
22-
${'^8.1.0'} | ${[ '8.1', '8.2', '8.3' ]}
23-
${'^8.1.12'} | ${[ '8.1', '8.2', '8.3' ]}
21+
${'^8.1'} | ${[ '8.1', '8.2', '8.3', '8.4' ]}
22+
${'^8.1.0'} | ${[ '8.1', '8.2', '8.3', '8.4' ]}
23+
${'^8.1.12'} | ${[ '8.1', '8.2', '8.3', '8.4' ]}
2424
${'~8.1'} | ${[ '8.1' ]}
2525
${'~8.1.0'} | ${[ '8.1' ]}
2626
${'~8.1.12'} | ${[ '8.1' ]}
@@ -48,7 +48,7 @@ describe('config/app', () => {
4848
codeChecks : true,
4949
docLinting : true,
5050
versions : [ '8.1' ],
51-
stablePhpVersion : '8.0',
51+
stablePhpVersion : '8.1',
5252
minimumPhpVersion : '8.1',
5353
latestPhpVersion : '8.1',
5454
lockedDependenciesExists : false,

src/config/php.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,9 @@ export const PHP_80 = '8.0';
22
export const PHP_81 = '8.1';
33
export const PHP_82 = '8.2';
44
export const PHP_83 = '8.3';
5+
export const PHP_84 = '8.4';
56

6-
export const CURRENT_STABLE = PHP_80;
7+
export const CURRENT_STABLE = PHP_81;
78
export const CONTAINER_DEFAULT_PHP_VERSION = '@default';
89

910
/**
@@ -15,6 +16,7 @@ export const INSTALLABLE_VERSIONS = [
1516
PHP_81,
1617
PHP_82,
1718
PHP_83,
19+
PHP_84,
1820
CONTAINER_DEFAULT_PHP_VERSION,
1921
] as const;
2022

0 commit comments

Comments
 (0)