Merge branch '6.0' of github.com:thecodingmachine/graphqlite-bundle i…

…nto 6.0
thecodingmachine · Jun 26, 2023 · ecf9fc0 · ecf9fc0
2 parents 1b05b88 + 6ddc70d
commit ecf9fc0
Show file tree

Hide file tree

Showing 13 changed files with 39 additions and 54 deletions.
diff --git a/Command/DumpSchemaCommand.php b/Command/DumpSchemaCommand.php
@@ -4,8 +4,9 @@
 
 namespace TheCodingMachine\GraphQLite\Bundle\Command;
 
-use GraphQL\Type\Definition\TypeWithFields;
+use GraphQL\Type\Schema as TypeSchema;
 use GraphQL\Utils\SchemaPrinter;
+use Symfony\Component\Console\Attribute\AsCommand;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
@@ -16,10 +17,9 @@
 /**
  * Shamelessly stolen from Api Platform
  */
+#[AsCommand('graphqlite:dump-schema')]
 class DumpSchemaCommand extends Command
 {
-    protected static $defaultName = 'graphqlite:dump-schema';
-
     /**
      * @var Schema
      */
@@ -43,10 +43,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
     {
         $io = new SymfonyStyle($input, $output);
 
-        // Trying to guarantee deterministic order
-        $this->sortSchema();
-
-        $schemaExport = SchemaPrinter::doPrint($this->schema);
+        $schemaExport = SchemaPrinterForGraphQLite::doPrint($this->schema, ['sortTypes' => true]);
 
         $filename = $input->getOption('output');
         if (\is_string($filename)) {
@@ -58,24 +55,16 @@ protected function execute(InputInterface $input, OutputInterface $output): int
 
         return 0;
     }
+}
 
-    private function sortSchema(): void
-    {
-        $config = $this->schema->getConfig();
-
-        $refl = new \ReflectionProperty(TypeWithFields::class, 'fields');
-        $refl->setAccessible(true);
-
-        if ($config->query) {
-            $fields = $config->query->getFields();
-            ksort($fields);
-            $refl->setValue($config->query, $fields);
-        }
+class SchemaPrinterForGraphQLite extends SchemaPrinter {
 
-        if ($config->mutation) {
-            $fields = $config->mutation->getFields();
-            ksort($fields);
-            $refl->setValue($config->mutation, $fields);
-        }
+    protected static function hasDefaultRootOperationTypes(TypeSchema $schema): bool
+    {
+        return $schema->getQueryType() === $schema->getType('Query')
+            && $schema->getMutationType() === $schema->getType('Mutation')
+            // Commenting this out because graphqlite cannot map Subscription type 
+            // && $schema->getSubscriptionType() === $schema->getType('Subscription');
+        ;
     }
-}
+}
diff --git a/Controller/GraphQLiteController.php b/Controller/GraphQLiteController.php
@@ -79,7 +79,7 @@ public function handleRequest(Request $request): Response
                 throw new \RuntimeException('Invalid JSON received in POST body: '.json_last_error_msg());
             }
             if (!is_array($parsedBody)){
-                throw new \RuntimeException('Expecting associative array from request, got ' . gettype($content));
+                throw new \RuntimeException('Expecting associative array from request, got ' . gettype($parsedBody));
             }
             $psr7Request = $psr7Request->withParsedBody($parsedBody);
         }

diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php
@@ -8,6 +8,9 @@
 
 class Configuration implements ConfigurationInterface
 {
+    /**
+     * @return TreeBuilder
+     */
     public function getConfigTreeBuilder()
     {
         $treeBuilder = new TreeBuilder('graphqlite');

diff --git a/DependencyInjection/GraphQLiteCompilerPass.php b/DependencyInjection/GraphQLiteCompilerPass.php
@@ -162,7 +162,7 @@ public function process(ContainerBuilder $container): void
         // ServerConfig rules
         $serverConfigDefinition = $container->findDefinition(ServerConfig::class);
         $rulesDefinition = [];
-        if ($container->getParameter('graphqlite.security.introspection') === false) {
+        if ($container->getParameter('graphqlite.security.disableIntrospection')) {
             $rulesDefinition[] =  $container->findDefinition(DisableIntrospection::class);
         }
 

diff --git a/DependencyInjection/GraphQLiteExtension.php b/DependencyInjection/GraphQLiteExtension.php
@@ -72,7 +72,7 @@ function($namespace): string {
         $container->setParameter('graphqlite.namespace.types', $namespaceType);
         $container->setParameter('graphqlite.security.enable_login', $enableLogin);
         $container->setParameter('graphqlite.security.enable_me', $enableMe);
-        $container->setParameter('graphqlite.security.introspection', $config['security']['introspection'] ?? true);
+        $container->setParameter('graphqlite.security.disableIntrospection', !($config['security']['introspection'] ?? true));
         $container->setParameter('graphqlite.security.maximum_query_complexity', $config['security']['maximum_query_complexity'] ?? null);
         $container->setParameter('graphqlite.security.maximum_query_depth', $config['security']['maximum_query_depth'] ?? null);
         $container->setParameter('graphqlite.security.firewall_name', $config['security']['firewall_name'] ?? 'main');

diff --git a/GraphiQL/EndpointResolver.php b/GraphiQL/EndpointResolver.php
@@ -19,6 +19,9 @@ public function __construct(RequestStack $requestStack)
         $this->requestStack = $requestStack;
     }
 
+    /**
+     * @return string
+     */
     public function getBySchema($name)
     {
         if ('default' === $name) {
@@ -31,6 +34,9 @@ public function getBySchema($name)
         throw GraphQLEndpointInvalidSchemaException::forSchemaAndResolver($name, self::class);
     }
 
+    /**
+     * @return string
+     */
     public function getDefault()
     {
         return $this->getBySchema('default');

diff --git a/Mappers/RequestParameter.php b/Mappers/RequestParameter.php
@@ -15,10 +15,8 @@ class RequestParameter implements ParameterInterface
     /**
      * @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, $context, ResolveInfo $info): mixed
     {
         if (!$context instanceof SymfonyRequestContextInterface) {
             throw new GraphQLException('Cannot type-hint on a Symfony Request object in your query/mutation/field. The request context must implement SymfonyRequestContextInterface.');

diff --git a/Resources/config/container/graphqlite.xml b/Resources/config/container/graphqlite.xml
@@ -74,7 +74,9 @@
             </call>
         </service>
 
-        <service id="GraphQL\Validator\Rules\DisableIntrospection" />
+        <service id="GraphQL\Validator\Rules\DisableIntrospection">
+            <argument key="$enabled">%graphqlite.security.disableIntrospection%</argument>
+        </service>
 
         <service id="GraphQL\Validator\Rules\QueryComplexity" />
 

diff --git a/Server/ServerConfig.php b/Server/ServerConfig.php
@@ -20,11 +20,9 @@ class ServerConfig extends \GraphQL\Server\ServerConfig
      *
      * @param ValidationRule[]|callable $validationRules
      *
-     * @return \GraphQL\Server\ServerConfig
-     *
      * @api
      */
-    public function setValidationRules($validationRules)
+    public function setValidationRules($validationRules): \GraphQL\Server\ServerConfig
     {
         parent::setValidationRules(
             function (OperationParams $params, DocumentNode $doc, string $operationType) use ($validationRules): array {

diff --git a/Tests/Fixtures/Controller/MyException.php b/Tests/Fixtures/Controller/MyException.php
@@ -4,34 +4,23 @@
 namespace TheCodingMachine\GraphQLite\Bundle\Tests\Fixtures\Controller;
 
 
-use GraphQL\Error\ClientAware;
+use TheCodingMachine\GraphQLite\Exceptions\GraphQLExceptionInterface;
 
-class MyException extends \Exception implements ClientAware
+class MyException extends \Exception implements GraphQLExceptionInterface
 {
 
     /**
      * Returns true when exception message is safe to be displayed to a client.
      *
-     * @return bool
-     *
      * @api
      */
-    public function isClientSafe()
+    public function isClientSafe(): bool
     {
         return true;
     }
 
-    /**
-     * Returns string describing a category of the error.
-     *
-     * Value "graphql" is reserved for errors produced by query parsing or validation, do not use it.
-     *
-     * @return string
-     *
-     * @api
-     */
-    public function getCategory()
+    public function getExtensions(): array
     {
-        return 'foobar';
+        return ['category' => 'foobar'];
     }
 }
diff --git a/Tests/Fixtures/Controller/TestGraphqlController.php b/Tests/Fixtures/Controller/TestGraphqlController.php
@@ -81,7 +81,7 @@ public function triggerException(int $code = 0): string
     public function triggerAggregateException(): string
     {
         $exception1 = new GraphQLException('foo', 401);
-        $exception2 = new GraphQLException('bar', 404, null, 'MyCat', ['field' => 'baz']);
+        $exception2 = new GraphQLException('bar', 404, null, 'MyCat', ['field' => 'baz', 'category' => 'MyCat']);
         throw new GraphQLAggregateException([$exception1, $exception2]);
     }
 

diff --git a/Tests/FunctionalTest.php b/Tests/FunctionalTest.php
@@ -457,7 +457,7 @@ public function testWithIntrospection(): void
 
     public function testDisableIntrospection(): void
     {
-        $kernel = new GraphQLiteTestingKernel(true, null, true, null, false, 2, 2);
+        $kernel = new GraphQLiteTestingKernel(true, null, true, null, false, 3, 2);
         $kernel->boot();
 
         $parameters = ['query' => '

diff --git a/composer.json b/composer.json
@@ -34,7 +34,7 @@
   "require-dev": {
     "symfony/security-bundle": "^6",
     "symfony/yaml": "^6",
-    "beberlei/porpaginas": "^1.2",
+    "beberlei/porpaginas": "^1.2 || ^2.0",
     "php-coveralls/php-coveralls": "^2.1.0",
     "symfony/phpunit-bridge": "^6",
     "phpstan/phpstan": "^1.8",