From 0ae8fe6ab45fb25afff769e06180e80a794fdd57 Mon Sep 17 00:00:00 2001 From: Danny van der Sluijs Date: Tue, 11 Feb 2025 09:10:45 +0100 Subject: [PATCH 1/2] fix: Upgrade php cs fixer to latest --- .gitignore | 2 +- .php-cs-fixer.dist.php | 2 +- composer.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 59e2f7db..1591d558 100644 --- a/.gitignore +++ b/.gitignore @@ -6,7 +6,7 @@ coverage .project .settings .php_cs -.php_cs.cache +.php-cs-fixer.cache composer.lock docs-api phpunit.xml diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php index df516fb8..5edb9296 100644 --- a/.php-cs-fixer.dist.php +++ b/.php-cs-fixer.dist.php @@ -2,7 +2,7 @@ $finder = new PhpCsFixer\Finder(); $config = new PhpCsFixer\Config('json-schema'); -$finder->in(__DIR__); +$finder->in([__DIR__ . '/src', __DIR__ . '/tests']); /* Based on ^2.1 of php-cs-fixer */ $config diff --git a/composer.json b/composer.json index bbeca2f7..0befa020 100644 --- a/composer.json +++ b/composer.json @@ -33,7 +33,7 @@ "icecave/parity": "^3.0" }, "require-dev": { - "friendsofphp/php-cs-fixer": "~2.2.20 || ~2.19.0", + "friendsofphp/php-cs-fixer": "3.3.0", "json-schema/json-schema-test-suite": "1.2.0", "phpunit/phpunit": "^8.5", "phpspec/prophecy": "^1.19", From 19a33818eb97390f8e31647a7dd9f11fe69e62f4 Mon Sep 17 00:00:00 2001 From: Danny van der Sluijs Date: Tue, 11 Feb 2025 09:14:54 +0100 Subject: [PATCH 2/2] docs: add changelog entry --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index dc12e635..86f20f67 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Added - Welcome first time contributors ([#782](https://github.com/jsonrainbow/json-schema/pull/782)) +### Fixed +- Upgrade php cs fixer to latest ([#783](https://github.com/jsonrainbow/json-schema/pull/783)) + ### Changed - Used PHPStan's int-mask-of type where applicable ([#779](https://github.com/jsonrainbow/json-schema/pull/779)) - Fixed some PHPStan errors ([#781](https://github.com/jsonrainbow/json-schema/pull/781))