Skip to content

Commit 43e268f

Browse files
committed
Merge branch 'refs/heads/4.x' into development
2 parents a93c905 + 1c6d7a7 commit 43e268f

File tree

4 files changed

+7
-7
lines changed

4 files changed

+7
-7
lines changed

.github/workflows/tests.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
- 3306:3306
2424
options: --health-cmd="healthcheck.sh --su-mysql --connect --innodb_initialized" --health-interval=10s --health-timeout=5s --health-retries=3
2525

26-
name: PHP 8.1
26+
name: PHP 8.3
2727

2828
steps:
2929
- name: Checkout
@@ -32,7 +32,7 @@ jobs:
3232
- name: Setup PHP
3333
uses: shivammathur/setup-php@v2
3434
with:
35-
php-version: 8.1
35+
php-version: 8.3
3636
tools: composer
3737
coverage: xdebug
3838

.gitlab-ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
image: registry.gitlab.com/aplus-framework/images/base:2
2+
image: registry.gitlab.com/aplus-framework/images/base:4
33

44
include:
55
- template: Security/SAST.gitlab-ci.yml

composer.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,11 @@
3232
}
3333
],
3434
"require": {
35-
"php": ">=8.1",
35+
"php": ">=8.3",
3636
"ext-simplexml": "*",
3737
"ext-yaml": "*",
38-
"aplus/database": "^3.0",
39-
"aplus/helpers": "^3.0"
38+
"aplus/database": "^4.0",
39+
"aplus/helpers": "^4.0"
4040
},
4141
"require-dev": {
4242
"ext-xdebug": "*",

docker-compose.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
version: "3"
22
services:
33
package:
4-
image: registry.gitlab.com/aplus-framework/images/package:2
4+
image: registry.gitlab.com/aplus-framework/images/package:4
55
container_name: package-config
66
working_dir: /package
77
volumes:

0 commit comments

Comments
 (0)