From 3901f88e731041ffac630458fa2ee9b43c6ba212 Mon Sep 17 00:00:00 2001 From: Benedikt Franke Date: Wed, 12 Feb 2025 14:09:21 +0100 Subject: [PATCH 1/4] Allow thecodingmachine/safe 3 --- README.md | 2 +- composer.json | 2 +- src/RequestParser.php | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 9275db2..0271ee3 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ Utilities for using GraphQL with Laravel Install through composer -```bash +```shell composer require laragraph/utils ``` diff --git a/composer.json b/composer.json index 37174b2..275bc28 100644 --- a/composer.json +++ b/composer.json @@ -18,7 +18,7 @@ "php": "^7.2 || ^8", "illuminate/contracts": "~5.6.0 || ~5.7.0 || ~5.8.0 || ^6 || ^7 || ^8 || ^9 || ^10 || ^11", "illuminate/http": "~5.6.0 || ~5.7.0 || ~5.8.0 || ^6 || ^7 || ^8 || ^9 || ^10 || ^11", - "thecodingmachine/safe": "^1.1 || ^2", + "thecodingmachine/safe": "^1.1 || ^2 || ^3", "webonyx/graphql-php": "^0.13.2 || ^14 || ^15" }, "require-dev": { diff --git a/src/RequestParser.php b/src/RequestParser.php index 98469b9..dd4616f 100644 --- a/src/RequestParser.php +++ b/src/RequestParser.php @@ -7,6 +7,7 @@ use Illuminate\Support\Arr; use Illuminate\Support\Str; use Safe\Exceptions\JsonException; + use function Safe\json_decode; /** Follows https://github.com/graphql/graphql-over-http/blob/main/spec/GraphQLOverHTTP.md. */ From fd25b51dd8234d4a366177bd785feedebd3c0f0c Mon Sep 17 00:00:00 2001 From: spawnia Date: Wed, 12 Feb 2025 13:10:16 +0000 Subject: [PATCH 2/4] Apply php-cs-fixer changes --- src/RequestParser.php | 1 - 1 file changed, 1 deletion(-) diff --git a/src/RequestParser.php b/src/RequestParser.php index dd4616f..98469b9 100644 --- a/src/RequestParser.php +++ b/src/RequestParser.php @@ -7,7 +7,6 @@ use Illuminate\Support\Arr; use Illuminate\Support\Str; use Safe\Exceptions\JsonException; - use function Safe\json_decode; /** Follows https://github.com/graphql/graphql-over-http/blob/main/spec/GraphQLOverHTTP.md. */ From 71dface19d4b0721887fe0f889724677aea60572 Mon Sep 17 00:00:00 2001 From: Benedikt Franke Date: Wed, 12 Feb 2025 14:13:59 +0100 Subject: [PATCH 3/4] update fixer --- .github/workflows/autoformat.yml | 2 +- src/RequestParser.php | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/autoformat.yml b/.github/workflows/autoformat.yml index ad35661..c4f597c 100644 --- a/.github/workflows/autoformat.yml +++ b/.github/workflows/autoformat.yml @@ -52,7 +52,7 @@ jobs: with: coverage: none extensions: mbstring - php-version: 7.2 + php-version: 7.4 - run: composer install --no-interaction --no-progress diff --git a/src/RequestParser.php b/src/RequestParser.php index 98469b9..dd4616f 100644 --- a/src/RequestParser.php +++ b/src/RequestParser.php @@ -7,6 +7,7 @@ use Illuminate\Support\Arr; use Illuminate\Support\Str; use Safe\Exceptions\JsonException; + use function Safe\json_decode; /** Follows https://github.com/graphql/graphql-over-http/blob/main/spec/GraphQLOverHTTP.md. */ From 7ed51cc8536f5b4c96b8a161f3d2c100bc2fa13c Mon Sep 17 00:00:00 2001 From: Benedikt Franke Date: Wed, 12 Feb 2025 14:14:31 +0100 Subject: [PATCH 4/4] changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index fe221ec..98413e4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Added - Support Laravel 12 https://github.com/laragraph/utils/pull/20 +- Support `thecodingmachine/safe` 3 https://github.com/laragraph/utils/pull/21 ## v2.1.0