From 4b758e98a78ba821a6c56427e7dd237b3efd62e9 Mon Sep 17 00:00:00 2001 From: kamil Date: Mon, 7 Apr 2025 10:26:24 +0200 Subject: [PATCH 1/4] - feat: php and composer packages update --- composer.json | 26 +++++++++++++------------- docker-compose.yml | 2 +- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/composer.json b/composer.json index c9cacf2..3d708d3 100644 --- a/composer.json +++ b/composer.json @@ -10,19 +10,19 @@ "homepage": "https://github.com/blumilksoftware/openapi-toolbox", "license": "MIT", "require": { - "php": "^8.3", - "illuminate/config": "^11.0", - "illuminate/console": "^11.0", - "illuminate/http": "^11.0", - "illuminate/support": "^11.0", - "illuminate/testing": "^11.34", - "kirschbaum-development/laravel-openapi-validator": "^1.0", - "marcelthole/openapi-merge": "^2.3" + "php": "^8.4", + "illuminate/config": "^12.7.2", + "illuminate/console": "^12.7.2", + "illuminate/http": "^12.7.2", + "illuminate/support": "^12.7.2", + "illuminate/testing": "^12.7.2", + "kirschbaum-development/laravel-openapi-validator": "^1.1.0", + "marcelthole/openapi-merge": "^2.4.0" }, "require-dev": { - "blumilksoftware/codestyle": "^4.0", - "orchestra/testbench": "^9.6", - "phpunit/phpunit": "^11.1" + "blumilksoftware/codestyle": "^4.1.0", + "orchestra/testbench": "^10.2.0", + "phpunit/phpunit": "^12.1.0" }, "autoload": { "psr-4": { @@ -35,8 +35,8 @@ } }, "scripts": { - "cs": "./vendor/bin/php-cs-fixer fix --dry-run --diff --config codestyle.php", - "csf": "./vendor/bin/php-cs-fixer fix --diff --config codestyle.php", + "cs": "PHP_CS_FIXER_IGNORE_ENV=on ./vendor/bin/php-cs-fixer fix --dry-run --diff --config codestyle.php", + "csf": "PHP_CS_FIXER_IGNORE_ENV=on ./vendor/bin/php-cs-fixer fix --diff --config codestyle.php", "test": "./vendor/bin/phpunit tests --colors" }, "config": { diff --git a/docker-compose.yml b/docker-compose.yml index 71a7c34..b1ba5c6 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,6 +1,6 @@ services: php: - image: ghcr.io/blumilksoftware/php:8.3 + image: ghcr.io/blumilksoftware/php:8.4 container_name: blumilk-openapi-toolbox-php working_dir: /application user: ${CURRENT_UID:-1000} From 82dc3f34fbd320690f2324937035a38a811f837e Mon Sep 17 00:00:00 2001 From: kamil Date: Mon, 7 Apr 2025 10:27:15 +0200 Subject: [PATCH 2/4] - feat: actions update --- .github/workflows/check.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml index 3dfafc4..6ef5a1b 100644 --- a/.github/workflows/check.yml +++ b/.github/workflows/check.yml @@ -9,11 +9,11 @@ on: jobs: build: name: "Checking the package: testing and linting" - runs-on: ubuntu-20.04 + runs-on: ubuntu-24.04 strategy: matrix: - php: [ "8.3" ] + php: [ "8.3", "8.4" ] steps: - uses: actions/checkout@v2 From ec31a5f466721143359ffb66eae95225a54cb499 Mon Sep 17 00:00:00 2001 From: kamil Date: Mon, 7 Apr 2025 10:31:28 +0200 Subject: [PATCH 3/4] - feat: actions update 2 --- .github/workflows/check.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml index 6ef5a1b..3dc0c37 100644 --- a/.github/workflows/check.yml +++ b/.github/workflows/check.yml @@ -16,16 +16,16 @@ jobs: php: [ "8.3", "8.4" ] steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 # https://github.com/actions/checkout - name: Setup PHP - uses: shivammathur/setup-php@v2 + uses: shivammathur/setup-php@c541c155eee45413f5b09a52248675b1a2575231 # 2.31.1 # https://github.com/shivammathur/setup-php with: php-version: ${{ matrix.php }} coverage: none - name: Cache composer dependencies - uses: actions/cache@v2 + uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf # v4.2.2 # https://github.com/actions/cache with: path: vendor key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }} From 7d1b74bdd8260fec310505400570c4cfa3685a32 Mon Sep 17 00:00:00 2001 From: kamil Date: Mon, 7 Apr 2025 10:37:12 +0200 Subject: [PATCH 4/4] - fix: test fix --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 3d708d3..40414ad 100644 --- a/composer.json +++ b/composer.json @@ -10,7 +10,7 @@ "homepage": "https://github.com/blumilksoftware/openapi-toolbox", "license": "MIT", "require": { - "php": "^8.4", + "php": "^8.3", "illuminate/config": "^12.7.2", "illuminate/console": "^12.7.2", "illuminate/http": "^12.7.2",