From 6c59f70f36211a9fff9d0c8bc710d94b54826f3a Mon Sep 17 00:00:00 2001 From: Sleon4 Date: Mon, 22 Dec 2025 08:55:58 -0500 Subject: [PATCH] chore: Support for PHP 8.5 has been added --- .github/workflows/php.yml | 13 ++++++++----- Dockerfile | 2 +- composer.json | 6 +++--- composer.lock | 18 +++++++++--------- docker-compose.yml | 2 +- 5 files changed, 22 insertions(+), 19 deletions(-) diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml index ae9aad4..f6045b4 100644 --- a/.github/workflows/php.yml +++ b/.github/workflows/php.yml @@ -15,6 +15,9 @@ on: - 'composer.lock' - 'phpunit.xml' +env: + PHP_VERSION: 8.5 + jobs: install-dependencies: runs-on: ubuntu-latest @@ -26,7 +29,7 @@ jobs: - name: Setup PHP uses: shivammathur/setup-php@v2 with: - php-version: 8.4 + php-version: ${{ env.PHP_VERSION }} extensions: mbstring, gd, zip - name: Install PHP dependencies @@ -58,7 +61,7 @@ jobs: - name: Set up PHP uses: shivammathur/setup-php@v2 with: - php-version: '8.4' + php-version: ${{ env.PHP_VERSION }} extensions: mbstring, gd, zip - name: Restore composer.lock from cache @@ -125,7 +128,7 @@ jobs: - name: Set up PHP uses: shivammathur/setup-php@v2 with: - php-version: '8.4' + php-version: ${{ env.PHP_VERSION }} extensions: mbstring, gd, zip - name: Restore composer.lock from cache @@ -172,7 +175,7 @@ jobs: - name: Setup PHP uses: shivammathur/setup-php@v2 with: - php-version: 8.4 + php-version: ${{ env.PHP_VERSION }} extensions: mbstring, gd, zip, xdebug coverage: xdebug ini-values: | @@ -226,7 +229,7 @@ jobs: - name: Setup PHP uses: shivammathur/setup-php@v2 with: - php-version: 8.4 + php-version: ${{ env.PHP_VERSION }} extensions: mbstring, gd, zip, xdebug coverage: xdebug ini-values: | diff --git a/Dockerfile b/Dockerfile index 697a547..3ee8343 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM php:8.4-apache +FROM php:8.5-apache ARG DEBIAN_FRONTEND=noninteractive # ---------------------------------------------------------------------------------------------------------------------- diff --git a/composer.json b/composer.json index ec6c7b5..96e5b37 100644 --- a/composer.json +++ b/composer.json @@ -14,16 +14,16 @@ } }, "require": { - "php": ">=8.4" + "php": ">=8.5" }, "require-dev": { "phpstan/phpstan": "^2.0", "squizlabs/php_codesniffer": "^3.11 || ^4.0", - "lion/test": "^3.2", "phpunit/phpunit": "^12.0", "vlucas/phpdotenv": "^5.6", "symfony/console": "^8.0", - "overtrue/phplint": "^9.7" + "overtrue/phplint": "^9.7", + "lion/test": "^4.0" }, "config": { "allow-plugins": { diff --git a/composer.lock b/composer.lock index a612e15..8b9380f 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "c1278c66af3de71c20a2aacaa5bb67a3", + "content-hash": "da6a1cbf2044fd3a921e5b672df34149", "packages": [], "packages-dev": [ { @@ -71,21 +71,21 @@ }, { "name": "lion/test", - "version": "v3.14.0", + "version": "v4.0.0", "source": { "type": "git", "url": "https://github.com/lion-packages/test.git", - "reference": "125e0bb33e4e84ecc8ca12dce04b8c19ed081217" + "reference": "87bfdf9dd80b9c4918c025e850e286f0272045fa" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/lion-packages/test/zipball/125e0bb33e4e84ecc8ca12dce04b8c19ed081217", - "reference": "125e0bb33e4e84ecc8ca12dce04b8c19ed081217", + "url": "https://api.github.com/repos/lion-packages/test/zipball/87bfdf9dd80b9c4918c025e850e286f0272045fa", + "reference": "87bfdf9dd80b9c4918c025e850e286f0272045fa", "shasum": "" }, "require": { "ext-gd": "*", - "php": ">=8.4" + "php": ">=8.5" }, "require-dev": { "infection/infection": "^0.29.14 || ^0.31.0", @@ -105,7 +105,7 @@ "license": [ "MIT" ], - "description": "Library to implement testing with helpers that allow easy testing with PHPUnit", + "description": "Library to implement testing with helpers that allow easy testing with PHPUnit.", "homepage": "https://dev.lion-packages.com", "keywords": [ "lion", @@ -116,7 +116,7 @@ "issues": "https://github.com/lion-packages/test/issues", "source": "https://github.com/lion-packages/test" }, - "time": "2025-12-01T13:31:59+00:00" + "time": "2025-12-21T23:48:23+00:00" }, { "name": "myclabs/deep-copy", @@ -3827,7 +3827,7 @@ "prefer-stable": false, "prefer-lowest": false, "platform": { - "php": ">=8.4" + "php": ">=8.5" }, "platform-dev": {}, "plugin-api-version": "2.9.0" diff --git a/docker-compose.yml b/docker-compose.yml index 67557b2..81c27ac 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,5 +1,5 @@ services: - app: + php: container_name: command-php build: context: .