Merge pull request #42 from thecodingmachine/laravel-9-and-10

moufmouf · web-flow · commit 44a98e440a97 · 2023-04-05T17:43:29.000+02:00
Adding compatibility with Laravel 9 and 10
diff --git a/.github/workflows/continuous_integration.yml b/.github/workflows/continuous_integration.yml
@@ -15,8 +15,13 @@ jobs:
 
     strategy:
       matrix:
-        install-args: ['', '--prefer-lowest']
-        php-version: ['7.4', '8.0']
+        include:
+          - install-args: "--prefer-lowest"
+            php-version: "8.1"
+          - install-args: ""
+            php-version: "8.1"
+          - install-args: ""
+            php-version: "8.2"
       fail-fast: false
 
     steps:
diff --git a/composer.json b/composer.json
@@ -13,26 +13,27 @@
         {
             "name": "David N\u00e9grier",
             "email": "d.negrier@thecodingmachine.com",
-            "homepage": "http://mouf-php.com"
+            "homepage": "https://workadventu.re"
         }
     ],
     "scripts": {
         "test": "phpunit"
     },
     "require": {
-        "php": ">=7.2|^8",
-        "thecodingmachine/graphqlite": "^6.0",
-        "illuminate/console": "^5.7|^6.0|^7|^8|^9",
-        "illuminate/container": "^5.7|^6.0|^7|^8|^9",
-        "illuminate/support": "^5.7|^6.0|^7|^8|^9",
-        "illuminate/cache": "^5.7|^6.0|^7|^8|^9",
+        "php": "^8.1",
+        "thecodingmachine/graphqlite": "^v6.2.1",
+        "illuminate/console": "^9 || ^10",
+        "illuminate/container": "^9 || ^10",
+        "illuminate/support": "^9 || ^10",
+        "illuminate/cache": "^9 || ^10",
         "symfony/psr-http-message-bridge": "^1.3.0 || ^2",
         "laminas/laminas-diactoros": "^2.2.2",
-        "symfony/cache": "^4.3 || ^5 || ^6"
+        "symfony/cache": "^4.3 || ^5 || ^6",
+        "psr/container": "^2.0.2"
     },
     "require-dev": {
-        "orchestra/testbench": "^3.7.7 || ^4 || ^5",
-        "phpunit/phpunit": "^7.5.4 || ^8.3",
+        "orchestra/testbench": "^7 || ^8",
+        "phpunit/phpunit": "^9.6.6 || ^10.0.19",
         "ext-sqlite3": "*"
     },
     "autoload": {
@@ -47,7 +48,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "6.0.x-dev"
+            "dev-master": "6.1.x-dev"
         },
         "laravel": {
             "providers": [
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -1,36 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-<phpunit backupGlobals="false"
-         backupStaticAttributes="false"
-         colors="true"
-         convertErrorsToExceptions="true"
-         convertNoticesToExceptions="true"
-         convertWarningsToExceptions="true"
-         processIsolation="false"
-         stopOnFailure="false"
-         bootstrap="vendor/autoload.php"
->
-    <testsuites>
-        <testsuite name="Test Suite">
-            <directory>./tests/</directory>
-        </testsuite>
-    </testsuites>
-
-    <php>
-        <env name="APP_KEY" value="9E6B382F19C53C5327840752500B0260"/>
-        <env name="APP_DEBUG" value="true"/>
-    </php>
-
-    <filter>
-        <whitelist processUncoveredFilesFromWhitelist="true">
-            <directory suffix=".php">src/</directory>
-            <exclude>
-                <directory suffix=".php">src/routes</directory>
-            </exclude>
-        </whitelist>
-    </filter>
-    <logging>
-        <log type="coverage-html" target="build/coverage" />
-        <log type="coverage-clover" target="build/logs/clover.xml"/>
-    </logging>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" backupGlobals="false" colors="true" processIsolation="false" stopOnFailure="false" bootstrap="vendor/autoload.php" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.0/phpunit.xsd" cacheDirectory=".phpunit.cache" backupStaticProperties="false">
+  <coverage>
+    <include>
+      <directory suffix=".php">src/</directory>
+    </include>
+    <exclude>
+      <directory suffix=".php">src/routes</directory>
+    </exclude>
+    <report>
+      <clover outputFile="build/logs/clover.xml"/>
+      <html outputDirectory="build/coverage"/>
+    </report>
+  </coverage>
+  <testsuites>
+    <testsuite name="Test Suite">
+      <directory>./tests/</directory>
+    </testsuite>
+  </testsuites>
+  <php>
+    <env name="APP_KEY" value="9E6B382F19C53C5327840752500B0260"/>
+    <env name="APP_DEBUG" value="true"/>
+  </php>
+  <logging/>
 </phpunit>
diff --git a/src/Exceptions/ValidateException.php b/src/Exceptions/ValidateException.php
@@ -19,22 +19,11 @@ public static function create(string $message, string $argumentName)
         return $exception;
     }
 
-    /**
-     * @return bool
-     */
-    public function isClientSafe()
+    public function isClientSafe(): bool
     {
         return true;
     }
 
-    /**
-     * @return string
-     */
-    public function getCategory()
-    {
-        return 'Validate';
-    }
-
 
     /**
      * Returns the "extensions" object attached to the GraphQL error.
diff --git a/src/Mappers/PaginatorTypeMapper.php b/src/Mappers/PaginatorTypeMapper.php
@@ -5,6 +5,7 @@
 namespace TheCodingMachine\GraphQLite\Laravel\Mappers;
 
 use GraphQL\Type\Definition\InputObjectType;
+use GraphQL\Type\Definition\NamedType;
 use GraphQL\Type\Definition\NullableType;
 use GraphQL\Type\Definition\OutputType;
 use GraphQL\Type\Definition\Type;
@@ -196,11 +197,11 @@ public function canMapNameToType(string $typeName): bool
      *
      * @param string $typeName The name of the GraphQL type
      *
-     * @return Type&((ResolvableMutableInputInterface&InputObjectType)|MutableObjectType|MutableInterfaceType)
+     * @return Type&NamedType&((ResolvableMutableInputInterface&InputObjectType)|MutableObjectType|MutableInterfaceType)
      *
      * @throws CannotMapTypeExceptionInterface
      */
-    public function mapNameToType(string $typeName): Type
+    public function mapNameToType(string $typeName): Type&NamedType
     {
         if (strpos($typeName, 'LengthAwarePaginatorResult_') === 0) {
             $subTypeName = substr($typeName, 27);
diff --git a/src/Mappers/Parameters/ParameterValidator.php b/src/Mappers/Parameters/ParameterValidator.php
@@ -6,6 +6,7 @@
 
 use GraphQL\Type\Definition\InputType;
 use GraphQL\Type\Definition\ResolveInfo;
+use GraphQL\Type\Definition\Type;
 use Illuminate\Validation\Factory as ValidationFactory;
 use TheCodingMachine\GraphQLite\Exceptions\GraphQLAggregateException;
 use TheCodingMachine\GraphQLite\Laravel\Exceptions\ValidateException;
@@ -45,11 +46,8 @@ public function __construct(InputTypeParameterInterface $parameter, string $para
 
     /**
      * @param array<string, mixed> $args
-     * @param mixed $context
-     *
-     * @return mixed
      */
-    public function resolve(?object $source, array $args, $context, ResolveInfo $info)
+    public function resolve(?object $source, array $args, mixed $context, ResolveInfo $info): mixed
     {
         $value = $this->parameter->resolve($source, $args, $context, $info);
 
@@ -68,7 +66,7 @@ public function resolve(?object $source, array $args, $context, ResolveInfo $inf
         return $value;
     }
 
-    public function getType(): InputType
+    public function getType(): InputType&Type
     {
         return $this->parameter->getType();
     }
@@ -78,10 +76,7 @@ public function hasDefaultValue(): bool
         return $this->parameter->hasDefaultValue();
     }
 
-    /**
-     * @return mixed
-     */
-    public function getDefaultValue()
+    public function getDefaultValue(): mixed
     {
         return $this->parameter->getDefaultValue();
     }
diff --git a/src/SanePsr11ContainerAdapter.php b/src/SanePsr11ContainerAdapter.php
@@ -53,7 +53,7 @@ public function get($id)
      *
      * @return bool
      */
-    public function has($id)
+    public function has($id): bool
     {
         if (class_exists($id) && !$this->container->has($id)) {
             try {
diff --git a/tests/Providers/GraphQLiteServiceProviderTest.php b/tests/Providers/GraphQLiteServiceProviderTest.php
@@ -87,21 +87,19 @@ public function testValidator()
         $response->assertJson([
             'errors' => [
                 [
-                    'message' => 'The foo must be a valid email address.',
                     'extensions' => [
                         'argument' => 'foo',
-                        'category' => 'Validate'
                     ],
                 ],
                 [
-                    'message' => 'The bar must be greater than 42.',
                     'extensions' => [
                         'argument' => 'bar',
-                        'category' => 'Validate'
                     ],
                 ]
             ]
         ]);
+        $this->assertStringContainsString('must be a valid email address.', $response->json('errors')[0]['message']);
+        $this->assertStringContainsString('must be greater than 42.', $response->json('errors')[1]['message']);
 
         $this->assertSame(400, $response->getStatusCode(), $response->getContent());
     }
@@ -114,34 +112,31 @@ public function testValidatorMultiple()
                 [
                     'extensions' => [
                         'argument' => 'foo',
-                        'category' => 'Validate'
                     ],
                 ],
                 [
-                    'message' => 'The foo must be a valid IPv4 address.',
                     'extensions' => [
                         'argument' => 'foo',
-                        'category' => 'Validate'
                     ],
                 ]
             ]
         ]);
 
-        $this->assertStringContainsString('The foo must start with one of the following: 192', $response->json('errors')[0]['message']);
+        $this->assertStringContainsString('must start with one of the following: 192', $response->json('errors')[0]['message']);
+        $this->assertStringContainsString('must be a valid IPv4 address.', $response->json('errors')[1]['message']);
 
         $this->assertSame(400, $response->getStatusCode(), $response->getContent());
         $response = $this->json('POST', '/graphql', ['query' => '{ testValidatorMultiple(foo:"192.168.1") }']);
         $response->assertJson([
             'errors' => [
                 [
-                    'message' => 'The foo must be a valid IPv4 address.',
                     'extensions' => [
                         'argument' => 'foo',
-                        'category' => 'Validate'
                     ],
                 ]
             ]
         ]);
+        $this->assertStringContainsString('must be a valid IPv4 address.', $response->json('errors')[0]['message']);
 
         $this->assertSame(400, $response->getStatusCode(), $response->getContent());
 
@@ -152,12 +147,11 @@ public function testValidatorMultiple()
                 [
                     'extensions' => [
                         'argument' => 'foo',
-                        'category' => 'Validate'
                     ],
                 ]
             ]
         ]);
-        $this->assertStringContainsString('The foo must start with one of the following: 192', $response->json('errors')[0]['message']);
+        $this->assertStringContainsString('must start with one of the following: 192', $response->json('errors')[0]['message']);
 
         $this->assertSame(400, $response->getStatusCode(), $response->getContent());
 

Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,7 @@`
`5`	`5`	`namespace TheCodingMachine\GraphQLite\Laravel\Mappers;`
`6`	`6`
`7`	`7`	`use GraphQL\Type\Definition\InputObjectType;`
	`8`	`+use GraphQL\Type\Definition\NamedType;`
`8`	`9`	`use GraphQL\Type\Definition\NullableType;`
`9`	`10`	`use GraphQL\Type\Definition\OutputType;`
`10`	`11`	`use GraphQL\Type\Definition\Type;`
`@@ -196,11 +197,11 @@ public function canMapNameToType(string $typeName): bool`
`196`	`197`	`*`
`197`	`198`	`* @param string $typeName The name of the GraphQL type`
`198`	`199`	`*`
`199`		`- * @return Type&((ResolvableMutableInputInterface&InputObjectType)\|MutableObjectType\|MutableInterfaceType)`
	`200`	`+ * @return Type&NamedType&((ResolvableMutableInputInterface&InputObjectType)\|MutableObjectType\|MutableInterfaceType)`
`200`	`201`	`*`
`201`	`202`	`* @throws CannotMapTypeExceptionInterface`
`202`	`203`	`*/`
`203`		`- public function mapNameToType(string $typeName): Type`
	`204`	`+ public function mapNameToType(string $typeName): Type&NamedType`
`204`	`205`	`{`
`205`	`206`	`if (strpos($typeName, 'LengthAwarePaginatorResult_') === 0) {`
`206`	`207`	`$subTypeName = substr($typeName, 27);`
Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,7 @@`
`6`	`6`
`7`	`7`	`use GraphQL\Type\Definition\InputType;`
`8`	`8`	`use GraphQL\Type\Definition\ResolveInfo;`
	`9`	`+use GraphQL\Type\Definition\Type;`
`9`	`10`	`use Illuminate\Validation\Factory as ValidationFactory;`
`10`	`11`	`use TheCodingMachine\GraphQLite\Exceptions\GraphQLAggregateException;`
`11`	`12`	`use TheCodingMachine\GraphQLite\Laravel\Exceptions\ValidateException;`
`@@ -45,11 +46,8 @@ public function __construct(InputTypeParameterInterface $parameter, string $para`
`45`	`46`
`46`	`47`	`/**`
`47`	`48`	`* @param array<string, mixed> $args`
`48`		`- * @param mixed $context`
`49`		`- *`
`50`		`- * @return mixed`
`51`	`49`	`*/`
`52`		`- public function resolve(?object $source, array $args, $context, ResolveInfo $info)`
	`50`	`+ public function resolve(?object $source, array $args, mixed $context, ResolveInfo $info): mixed`
`53`	`51`	`{`
`54`	`52`	`$value = $this->parameter->resolve($source, $args, $context, $info);`
`55`	`53`
`@@ -68,7 +66,7 @@ public function resolve(?object $source, array $args, $context, ResolveInfo $inf`
`68`	`66`	`return $value;`
`69`	`67`	`}`
`70`	`68`
`71`		`- public function getType(): InputType`
	`69`	`+ public function getType(): InputType&Type`
`72`	`70`	`{`
`73`	`71`	`return $this->parameter->getType();`
`74`	`72`	`}`
`@@ -78,10 +76,7 @@ public function hasDefaultValue(): bool`
`78`	`76`	`return $this->parameter->hasDefaultValue();`
`79`	`77`	`}`
`80`	`78`
`81`		`- /**`
`82`		`- * @return mixed`
`83`		`- */`
`84`		`- public function getDefaultValue()`
	`79`	`+ public function getDefaultValue(): mixed`
`85`	`80`	`{`
`86`	`81`	`return $this->parameter->getDefaultValue();`
`87`	`82`	`}`
Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ public function get($id)`
`53`	`53`	`*`
`54`	`54`	`* @return bool`
`55`	`55`	`*/`
`56`		`- public function has($id)`
	`56`	`+ public function has($id): bool`
`57`	`57`	`{`
`58`	`58`	`if (class_exists($id) && !$this->container->has($id)) {`
`59`	`59`	`try {`
Original file line number	Diff line number	Diff line change
`@@ -87,21 +87,19 @@ public function testValidator()`
`87`	`87`	`$response->assertJson([`
`88`	`88`	`'errors' => [`
`89`	`89`	`[`
`90`		`- 'message' => 'The foo must be a valid email address.',`
`91`	`90`	`'extensions' => [`
`92`	`91`	`'argument' => 'foo',`
`93`		`- 'category' => 'Validate'`
`94`	`92`	`],`
`95`	`93`	`],`
`96`	`94`	`[`
`97`		`- 'message' => 'The bar must be greater than 42.',`
`98`	`95`	`'extensions' => [`
`99`	`96`	`'argument' => 'bar',`
`100`		`- 'category' => 'Validate'`
`101`	`97`	`],`
`102`	`98`	`]`
`103`	`99`	`]`
`104`	`100`	`]);`
	`101`	`+ $this->assertStringContainsString('must be a valid email address.', $response->json('errors')[0]['message']);`
	`102`	`+ $this->assertStringContainsString('must be greater than 42.', $response->json('errors')[1]['message']);`
`105`	`103`
`106`	`104`	`$this->assertSame(400, $response->getStatusCode(), $response->getContent());`
`107`	`105`	`}`
`@@ -114,34 +112,31 @@ public function testValidatorMultiple()`
`114`	`112`	`[`
`115`	`113`	`'extensions' => [`
`116`	`114`	`'argument' => 'foo',`
`117`		`- 'category' => 'Validate'`
`118`	`115`	`],`
`119`	`116`	`],`
`120`	`117`	`[`
`121`		`- 'message' => 'The foo must be a valid IPv4 address.',`
`122`	`118`	`'extensions' => [`
`123`	`119`	`'argument' => 'foo',`
`124`		`- 'category' => 'Validate'`
`125`	`120`	`],`
`126`	`121`	`]`
`127`	`122`	`]`
`128`	`123`	`]);`
`129`	`124`
`130`		`- $this->assertStringContainsString('The foo must start with one of the following: 192', $response->json('errors')[0]['message']);`
	`125`	`+ $this->assertStringContainsString('must start with one of the following: 192', $response->json('errors')[0]['message']);`
	`126`	`+ $this->assertStringContainsString('must be a valid IPv4 address.', $response->json('errors')[1]['message']);`
`131`	`127`
`132`	`128`	`$this->assertSame(400, $response->getStatusCode(), $response->getContent());`
`133`	`129`	`$response = $this->json('POST', '/graphql', ['query' => '{ testValidatorMultiple(foo:"192.168.1") }']);`
`134`	`130`	`$response->assertJson([`
`135`	`131`	`'errors' => [`
`136`	`132`	`[`
`137`		`- 'message' => 'The foo must be a valid IPv4 address.',`
`138`	`133`	`'extensions' => [`
`139`	`134`	`'argument' => 'foo',`
`140`		`- 'category' => 'Validate'`
`141`	`135`	`],`
`142`	`136`	`]`
`143`	`137`	`]`
`144`	`138`	`]);`
	`139`	`+ $this->assertStringContainsString('must be a valid IPv4 address.', $response->json('errors')[0]['message']);`
`145`	`140`
`146`	`141`	`$this->assertSame(400, $response->getStatusCode(), $response->getContent());`
`147`	`142`
`@@ -152,12 +147,11 @@ public function testValidatorMultiple()`
`152`	`147`	`[`
`153`	`148`	`'extensions' => [`
`154`	`149`	`'argument' => 'foo',`
`155`		`- 'category' => 'Validate'`
`156`	`150`	`],`
`157`	`151`	`]`
`158`	`152`	`]`
`159`	`153`	`]);`
`160`		`- $this->assertStringContainsString('The foo must start with one of the following: 192', $response->json('errors')[0]['message']);`
	`154`	`+ $this->assertStringContainsString('must start with one of the following: 192', $response->json('errors')[0]['message']);`
`161`	`155`
`162`	`156`	`$this->assertSame(400, $response->getStatusCode(), $response->getContent());`
`163`	`157`