Merge branch 'refs/heads/4.x' into development

aplus-framework · Jun 28, 2024 · 43e268f · 43e268f
2 parents a93c905 + 1c6d7a7
commit 43e268f
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -23,7 +23,7 @@ jobs:
           - 3306:3306
         options: --health-cmd="healthcheck.sh --su-mysql --connect --innodb_initialized" --health-interval=10s --health-timeout=5s --health-retries=3
 
-    name: PHP 8.1
+    name: PHP 8.3
 
     steps:
       - name: Checkout
@@ -32,7 +32,7 @@ jobs:
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: 8.1
+          php-version: 8.3
           tools: composer
           coverage: xdebug
 

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -1,5 +1,5 @@
 ---
-image: registry.gitlab.com/aplus-framework/images/base:2
+image: registry.gitlab.com/aplus-framework/images/base:4
 
 include:
   - template: Security/SAST.gitlab-ci.yml

diff --git a/composer.json b/composer.json
@@ -32,11 +32,11 @@
         }
     ],
     "require": {
-        "php": ">=8.1",
+        "php": ">=8.3",
         "ext-simplexml": "*",
         "ext-yaml": "*",
-        "aplus/database": "^3.0",
-        "aplus/helpers": "^3.0"
+        "aplus/database": "^4.0",
+        "aplus/helpers": "^4.0"
     },
     "require-dev": {
         "ext-xdebug": "*",

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -1,7 +1,7 @@
 version: "3"
 services:
   package:
-    image: registry.gitlab.com/aplus-framework/images/package:2
+    image: registry.gitlab.com/aplus-framework/images/package:4
     container_name: package-config
     working_dir: /package
     volumes: