From 30a05fa38c0b6bbfcb336e324fa33a4b497e7dd8 Mon Sep 17 00:00:00 2001 From: Natan Felles Date: Thu, 1 Jan 2026 17:13:10 -0300 Subject: [PATCH 1/9] Require PHP 8.5 --- .github/workflows/tests.yml | 4 ++-- .gitlab-ci.yml | 2 +- composer.json | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index dc2752b..ccf3b38 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -11,7 +11,7 @@ jobs: runs-on: ubuntu-22.04 timeout-minutes: 10 - name: PHP 8.3 + name: PHP 8.5 steps: - name: Checkout @@ -20,7 +20,7 @@ jobs: - name: Setup PHP uses: shivammathur/setup-php@v2 with: - php-version: 8.3 + php-version: 8.5 tools: composer coverage: xdebug diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 79714d2..9fcddee 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,5 +1,5 @@ --- -image: registry.gitlab.com/aplus-framework/images/base:4 +image: registry.gitlab.com/aplus-framework/images/base:6 include: - template: Security/SAST.gitlab-ci.yml diff --git a/composer.json b/composer.json index 3288241..27393f4 100644 --- a/composer.json +++ b/composer.json @@ -33,7 +33,7 @@ } ], "require": { - "php": ">=8.3", + "php": ">=8.5", "ext-posix": "*", "aplus/language": "^4.0" }, From 14b3f08978da51517dd5e039d51cab97e3f6bb8a Mon Sep 17 00:00:00 2001 From: Natan Felles Date: Thu, 1 Jan 2026 17:14:30 -0300 Subject: [PATCH 2/9] Run jobs on Ubuntu 24.04 --- .github/workflows/tests.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index ccf3b38..cfc0dc8 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -8,7 +8,7 @@ on: jobs: tests: - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 timeout-minutes: 10 name: PHP 8.5 @@ -59,7 +59,7 @@ jobs: php-coveralls --coverage_clover=build/logs/clover.xml -v tests-last: - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 timeout-minutes: 10 name: PHP Latest From a681e22ff80194965cf5bf61049ec5dd37f87d86 Mon Sep 17 00:00:00 2001 From: Natan Felles Date: Thu, 1 Jan 2026 17:15:00 -0300 Subject: [PATCH 3/9] Update job name --- .github/workflows/tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index cfc0dc8..2c91c55 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -58,7 +58,7 @@ jobs: composer global require php-coveralls/php-coveralls php-coveralls --coverage_clover=build/logs/clover.xml -v - tests-last: + tests-latest: runs-on: ubuntu-24.04 timeout-minutes: 10 From 4760b94fbc9bec599638c40735adc99273a00526 Mon Sep 17 00:00:00 2001 From: Natan Felles Date: Thu, 1 Jan 2026 17:16:04 -0300 Subject: [PATCH 4/9] Update branch-alias dev-master to 4.x-dev --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 27393f4..adaf7f8 100644 --- a/composer.json +++ b/composer.json @@ -68,7 +68,7 @@ }, "extra": { "branch-alias": { - "dev-master": "3.x-dev" + "dev-master": "4.x-dev" } } } From 5653c213c8214bc79f13acc48b7ba859f9ac7c8d Mon Sep 17 00:00:00 2001 From: Natan Felles Date: Thu, 1 Jan 2026 17:16:21 -0300 Subject: [PATCH 5/9] Upgrade required packages --- composer.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index adaf7f8..a7fcb7a 100644 --- a/composer.json +++ b/composer.json @@ -35,11 +35,11 @@ "require": { "php": ">=8.5", "ext-posix": "*", - "aplus/language": "^4.0" + "aplus/language": "5.x-dev" }, "require-dev": { "ext-xdebug": "*", - "aplus/coding-standard": "^2.8", + "aplus/coding-standard": "^v3.0", "ergebnis/composer-normalize": "^2.25", "jetbrains/phpstorm-attributes": "^1.0", "phpmd/phpmd": "^2.13", From 8e3a47bd38a30642a77d8ecab22c4674787363e0 Mon Sep 17 00:00:00 2001 From: Natan Felles Date: Thu, 1 Jan 2026 17:28:03 -0300 Subject: [PATCH 6/9] Normalize composer.json --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index a7fcb7a..76d48cd 100644 --- a/composer.json +++ b/composer.json @@ -39,7 +39,7 @@ }, "require-dev": { "ext-xdebug": "*", - "aplus/coding-standard": "^v3.0", + "aplus/coding-standard": "^3.0", "ergebnis/composer-normalize": "^2.25", "jetbrains/phpstorm-attributes": "^1.0", "phpmd/phpmd": "^2.13", From f2a566fbb95dca3135d6fb1344994cec6efc234b Mon Sep 17 00:00:00 2001 From: Natan Felles Date: Fri, 2 Jan 2026 20:02:56 -0300 Subject: [PATCH 7/9] Use image with PHP 8.5 --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 41e339d..ccddce0 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,7 +1,7 @@ version: "3" services: package: - image: registry.gitlab.com/aplus-framework/images/package:4 + image: registry.gitlab.com/aplus-framework/images/package:6 container_name: package-cli working_dir: /package volumes: From ed5922441632e83a8ad9d433b78b53321020fc71 Mon Sep 17 00:00:00 2001 From: Natan Felles Date: Wed, 7 Jan 2026 19:27:04 -0300 Subject: [PATCH 8/9] Upgrade required packages --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 76d48cd..4ff767b 100644 --- a/composer.json +++ b/composer.json @@ -35,7 +35,7 @@ "require": { "php": ">=8.5", "ext-posix": "*", - "aplus/language": "5.x-dev" + "aplus/language": "^5.0" }, "require-dev": { "ext-xdebug": "*", From ea92fe0dc04cbfeb6342f1a5d3771d979368de2d Mon Sep 17 00:00:00 2001 From: Natan Felles Date: Thu, 8 Jan 2026 19:17:22 -0300 Subject: [PATCH 9/9] Remove the obsolete 'version' attribute --- docker-compose.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index ccddce0..de955f2 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,4 +1,3 @@ -version: "3" services: package: image: registry.gitlab.com/aplus-framework/images/package:6