From 4f0a79c61ae1c5d943b77803410173da59ba8326 Mon Sep 17 00:00:00 2001 From: Baptiste Langlade Date: Mon, 24 Nov 2025 13:27:21 +0100 Subject: [PATCH 1/4] remove dependency to innmind/json --- CHANGELOG.md | 6 ++++++ composer.json | 1 - src/Set/UnsafeStrings.php | 8 ++++++-- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1f5de567..a70ad235 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,11 @@ # Changelog +## [Unreleased] + +### Removed + +- Dependency to `innmind/json` + ## 6.6.0 - 2025-11-01 ### Added diff --git a/composer.json b/composer.json index 7dbba764..f70b1178 100644 --- a/composer.json +++ b/composer.json @@ -16,7 +16,6 @@ }, "require": { "php": "~8.2", - "innmind/json": "^1.1", "symfony/var-dumper": "~6.0|~7.0", "phpunit/phpunit": "~10.0|~11.0|~12.0", "phpunit/php-timer": "~6.0|~7.0|~8.0", diff --git a/src/Set/UnsafeStrings.php b/src/Set/UnsafeStrings.php index fc7f296d..a767219d 100644 --- a/src/Set/UnsafeStrings.php +++ b/src/Set/UnsafeStrings.php @@ -7,7 +7,6 @@ Set, Random, }; -use Innmind\Json\Json; /** * @internal @@ -34,7 +33,12 @@ public function __invoke( } /** @var list */ - $values = Json::decode($json); + $values = \json_decode( + $json, + true, + 512, + \JSON_THROW_ON_ERROR, + ); $values = \array_values(\array_filter( $values, $predicate, From 29ee8529e91c080ea592daf425cdeefc7097f7c7 Mon Sep 17 00:00:00 2001 From: Baptiste Langlade Date: Mon, 24 Nov 2025 13:46:55 +0100 Subject: [PATCH 2/4] CS --- src/Set/UnsafeStrings.php | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/Set/UnsafeStrings.php b/src/Set/UnsafeStrings.php index a767219d..c9a52e14 100644 --- a/src/Set/UnsafeStrings.php +++ b/src/Set/UnsafeStrings.php @@ -33,12 +33,7 @@ public function __invoke( } /** @var list */ - $values = \json_decode( - $json, - true, - 512, - \JSON_THROW_ON_ERROR, - ); + $values = \json_decode($json, true, 512, \JSON_THROW_ON_ERROR); $values = \array_values(\array_filter( $values, $predicate, From 454be194c4058bb1ff5c5450438b2964a3faf8bb Mon Sep 17 00:00:00 2001 From: Baptiste Langlade Date: Mon, 24 Nov 2025 13:51:18 +0100 Subject: [PATCH 3/4] Revert "CS" This reverts commit 29ee8529e91c080ea592daf425cdeefc7097f7c7. --- src/Set/UnsafeStrings.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/Set/UnsafeStrings.php b/src/Set/UnsafeStrings.php index c9a52e14..a767219d 100644 --- a/src/Set/UnsafeStrings.php +++ b/src/Set/UnsafeStrings.php @@ -33,7 +33,12 @@ public function __invoke( } /** @var list */ - $values = \json_decode($json, true, 512, \JSON_THROW_ON_ERROR); + $values = \json_decode( + $json, + true, + 512, + \JSON_THROW_ON_ERROR, + ); $values = \array_values(\array_filter( $values, $predicate, From cad72c158c5803d65dce169082ef2a1c52493c1b Mon Sep 17 00:00:00 2001 From: Baptiste Langlade Date: Mon, 24 Nov 2025 13:58:02 +0100 Subject: [PATCH 4/4] disable cache due to github action error --- .github/workflows/ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index fed96fc3..d285e31f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -35,6 +35,7 @@ jobs: uses: "ramsey/composer-install@v3" with: dependency-versions: ${{ matrix.dependencies }} + ignore-cache: true - name: PHPUnit run: vendor/bin/phpunit --fail-on-risky --coverage-clover=coverage.clover - uses: codecov/codecov-action@v4