From 04d489209fbe0d1da7c6f98c88218a0f1723031a Mon Sep 17 00:00:00 2001 From: Sergei Predvoditelev Date: Sat, 20 Dec 2025 18:24:23 +0300 Subject: [PATCH 1/3] PHP 8.5 support + Update dependencies --- .github/workflows/build.yml | 1 + .../composer-dependency-analyzer.yml | 1 + .github/workflows/cs.yml | 2 +- CHANGELOG.md | 2 + README.md | 2 +- composer.json | 60 +++++++++---------- 6 files changed, 36 insertions(+), 32 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d889c9cb..c77942bb 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -43,6 +43,7 @@ jobs: - "8.2" - "8.3" - "8.4" + - "8.5" steps: - name: Checkout. diff --git a/.github/workflows/composer-dependency-analyzer.yml b/.github/workflows/composer-dependency-analyzer.yml index fe8b0172..f45fcc41 100644 --- a/.github/workflows/composer-dependency-analyzer.yml +++ b/.github/workflows/composer-dependency-analyzer.yml @@ -38,6 +38,7 @@ jobs: - "8.2" - "8.3" - "8.4" + - "8.5" steps: - name: Checkout diff --git a/.github/workflows/cs.yml b/.github/workflows/cs.yml index 10e2f43d..4f4ecc26 100644 --- a/.github/workflows/cs.yml +++ b/.github/workflows/cs.yml @@ -27,7 +27,7 @@ jobs: - name: Install PHP uses: shivammathur/setup-php@v2 with: - php-version: 8.4 + php-version: 8.2 tools: composer:v2 coverage: none diff --git a/CHANGELOG.md b/CHANGELOG.md index 3863703a..e45b26ae 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,8 @@ - Enh #250: Prune unused container and do not detach on `make prod-deploy` (@samdark) - New #248, #249: Add Makefile `stop` goal for stopping Docker containers (@samdark, @vjik) +- Enh #254: Add PHP 8.5 support (@vjik) +- Enh #254: Update composer dependencies (@vjik) ## 1.0.0 October 02, 2025 diff --git a/README.md b/README.md index 686759bf..80a51bba 100644 --- a/README.md +++ b/README.md @@ -29,7 +29,7 @@ templates: ## Requirements -- PHP 8.2 or higher. +- PHP 8.2 - 8.5. ## Installation diff --git a/composer.json b/composer.json index 98659676..b5bae53e 100644 --- a/composer.json +++ b/composer.json @@ -29,7 +29,7 @@ } ], "require": { - "php": "^8.2", + "php": "8.2 - 8.5", "ext-filter": "*", "httpsoft/http-message": "^1.1.6", "psr/container": "^2.0.2", @@ -38,46 +38,46 @@ "psr/http-server-handler": "^1.0.2", "psr/http-server-middleware": "^1.0.2", "psr/log": "^3.0.2", - "symfony/console": "^7.3.4", - "yiisoft/aliases": "^3.1", - "yiisoft/config": "^1.6", + "symfony/console": "^7.4.1", + "yiisoft/aliases": "^3.1.1", + "yiisoft/config": "^1.6.2", "yiisoft/data": "^1.0.1", - "yiisoft/data-response": "^2.1.1", - "yiisoft/definitions": "^3.4", - "yiisoft/di": "^1.4", - "yiisoft/error-handler": "^4.3", - "yiisoft/http": "^1.2", - "yiisoft/hydrator": "^1.6.2", - "yiisoft/injector": "^1.2", + "yiisoft/data-response": "^2.1.2", + "yiisoft/definitions": "^3.4.1", + "yiisoft/di": "^1.4.1", + "yiisoft/error-handler": "^4.3.1", + "yiisoft/http": "^1.3", + "yiisoft/hydrator": "^1.6.3", + "yiisoft/injector": "^1.2.1", "yiisoft/input-http": "^1.0.1", - "yiisoft/log": "^2.1.1", - "yiisoft/log-target-file": "^3.0", - "yiisoft/middleware-dispatcher": "^5.3", + "yiisoft/log": "^2.2.0", + "yiisoft/log-target-file": "^3.1", + "yiisoft/middleware-dispatcher": "^5.4", "yiisoft/request-body-parser": "^1.2.0", "yiisoft/request-provider": "^1.2", - "yiisoft/router": "^4.0.1", - "yiisoft/router-fastroute": "^4.0.2", - "yiisoft/validator": "^2.5", - "yiisoft/yii-console": "^2.4", - "yiisoft/yii-http": "^1.1.0", - "yiisoft/yii-runner-console": "^2.2", - "yiisoft/yii-runner-http": "^3.2" + "yiisoft/router": "^4.0.2", + "yiisoft/router-fastroute": "^4.0.3", + "yiisoft/validator": "^2.5.1", + "yiisoft/yii-console": "^2.4.2", + "yiisoft/yii-http": "^1.1.1", + "yiisoft/yii-runner-console": "^2.2.1", + "yiisoft/yii-runner-http": "^3.2.1" }, "require-dev": { "codeception/c3": "^2.9", - "codeception/codeception": "^5.3.2", - "codeception/lib-innerbrowser": "^4.0.6", - "codeception/module-asserts": "^3.2", + "codeception/codeception": "^5.3.3", + "codeception/lib-innerbrowser": "^4.0.8", + "codeception/module-asserts": "^3.2.1", "codeception/module-cli": "^2.0.1", "codeception/module-db": "^3.2.2", "codeception/module-phpbrowser": "^3.0.2", "codeception/module-rest": "^3.4.1", - "friendsofphp/php-cs-fixer": "^3.88.2", - "phpunit/phpunit": "^11.5.42", - "rector/rector": "^2.1.7", - "roave/infection-static-analysis-plugin": "^1.39", - "shipmonk/composer-dependency-analyser": "^1.8.3", - "vimeo/psalm": "^6.13.1" + "friendsofphp/php-cs-fixer": "^3.92.3", + "phpunit/phpunit": "^11.5.46", + "rector/rector": "^2.2.14", + "roave/infection-static-analysis-plugin": "^1.40", + "shipmonk/composer-dependency-analyser": "^1.8.4", + "vimeo/psalm": "^6.14.2" }, "autoload": { "psr-4": { From 4fe58316f0746f3cd49b0c1535e0bcb841dac365 Mon Sep 17 00:00:00 2001 From: Sergei Predvoditelev Date: Sun, 21 Dec 2025 08:25:52 +0300 Subject: [PATCH 2/3] improve --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index b5bae53e..ad5f48d6 100644 --- a/composer.json +++ b/composer.json @@ -53,7 +53,7 @@ "yiisoft/log": "^2.2.0", "yiisoft/log-target-file": "^3.1", "yiisoft/middleware-dispatcher": "^5.4", - "yiisoft/request-body-parser": "^1.2.0", + "yiisoft/request-body-parser": "^1.2.1", "yiisoft/request-provider": "^1.2", "yiisoft/router": "^4.0.2", "yiisoft/router-fastroute": "^4.0.3", From be45f269d94bcb72f287a2770dba9fe65d08ca1b Mon Sep 17 00:00:00 2001 From: Sergei Predvoditelev Date: Sun, 21 Dec 2025 08:28:07 +0300 Subject: [PATCH 3/3] fix --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c77942bb..170c4dc5 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -54,7 +54,7 @@ jobs: with: coverage: false extensions: fileinfo, intl - ini-values: date.timezone='UTC' + ini-values: date.timezone='UTC', register_argc_argv=On php-version: ${{ matrix.php }} - name: Install Composer dependencies