Merge branch 't3n:master' into task/closure-callback-support-only

.circleci/config.yml

@@ -1,7 +1,7 @@
 version: 2.1
 
 aliases:
-  - &ci-build-image quay.io/yeebase/ci-build:7.2
+  - &ci-build-image quay.io/yeebase/ci-build:7.3
   - &workspace_root ~/workspace
 
   - &save_composer_cache
@@ -16,11 +16,11 @@ aliases:
       - composer-cache-v1-
 
   - &attach_workspace
-     at: *workspace_root
+    at: *workspace_root
 
   - &persist_to_workspace
     root: .
-    paths: 
+    paths:
       - .
 
 jobs:
@@ -32,7 +32,7 @@ jobs:
     steps:
       - checkout
       - restore_cache: *restore_composer_cache
-      
+
       - run: |
           mkdir graphql
           shopt -s extglob dotglob
@@ -61,17 +61,36 @@ jobs:
       FLOW_CONTEXT: Testing
     steps:
       - attach_workspace: *attach_workspace
-      - run:
-          bin/phpunit -c Build/BuildEssentials/PhpUnit/FunctionalTests.xml graphql/Tests/Functional
+      - run: bin/phpunit -c Build/BuildEssentials/PhpUnit/FunctionalTests.xml graphql/Tests/Functional
 
 workflows:
   version: 2
   build_and_test:
     jobs:
-      - checkout
+      - checkout:
+          filters:
+            branches:
+              ignore: /dependabot.*/
       - lint:
           requires:
             - checkout
       - tests:
           requires:
-            - checkout
+            - checkout
+
+  build_and_test_dependabot:
+    jobs:
+      - hold:
+          type: approval
+          filters:
+            branches:
+              only: /dependabot.*/
+      - checkout:
+          requires:
+            - hold
+      - lint:
+          requires:
+            - checkout
+      - tests:
+          requires:
+            - checkout

.dependabot/config.yml

@@ -0,0 +1,6 @@
+version: 1
+update_configs:
+  - package_manager: "php:composer"
+    directory: "/"
+    update_schedule: "weekly"
+    target_branch: "master"

Classes/Controller/GraphQLController.php

@@ -52,14 +52,23 @@ class GraphQLController extends ActionController
     protected $requestLogger;
 
     /**
-     * phpcs:disable SlevomatCodingStandard.TypeHints.TypeHintDeclaration.MissingTraversableParameterTypeHintSpecification
+     * A list of IANA media types which are supported by this controller
      *
+     * @see http://www.iana.org/assignments/media-types/index.html
+     *
+     * @var string[]
+     */
+    protected $supportedMediaTypes = ['application/json'];
+
+    /**
      * @Flow\SkipCsrfProtection
      *
-     * @param string $endpoint
-     * @param string $query
-     * @param array|null $variables
-     * @param string|null $operationName
+     * @param mixed[]|null $variables
+     *
+     * @throws \Neos\Flow\Mvc\Exception\NoSuchArgumentException
+     * @throws InvalidContextException
+     *
+     * @phpcsSuppress PEAR.Commenting.FunctionComment.MissingParamTag
      */
     public function queryAction(string $endpoint, string $query, ?array $variables = null, ?string $operationName = null): string
     {
@@ -100,7 +109,7 @@ public function queryAction(string $endpoint, string $query, ?array $variables =
             $validationRules
         );
 
-        $this->response->setHeader('Content-Type', 'application/json');
+        $this->response->setContentType('application/json');
         return json_encode($result->toArray());
     }
 }

Classes/Exception/InvalidResolverException.php

@@ -0,0 +1,11 @@
+<?php
+
+declare(strict_types=1);
+
+namespace t3n\GraphQL\Exception;
+
+use Neos\Flow\Exception;
+
+class InvalidResolverException extends Exception
+{
+}

Classes/Http/HttpOptionsMiddleware.php

@@ -0,0 +1,40 @@
+<?php
+
+declare(strict_types=1);
+
+namespace t3n\GraphQL\Http;
+
+use GuzzleHttp\Psr7\Response;
+use Neos\Flow\Annotations as Flow;
+use Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\ServerRequestInterface;
+use Psr\Http\Server\MiddlewareInterface;
+use Psr\Http\Server\RequestHandlerInterface;
+
+class HttpOptionsMiddleware implements MiddlewareInterface
+{
+    /**
+     * @Flow\InjectConfiguration("endpoints")
+     *
+     * @var mixed[]
+     */
+    protected $endpoints;
+
+    public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface
+    {
+        if ($request->getMethod() !== 'OPTIONS') {
+            return $handler->handle($request);
+        }
+
+        // We explode the request target because custom routes like /some/custom/route/<endpoint> are
+        // are common. So we double check here if the last part in the route matches a configured
+        // endpoint
+        $endpoint = explode('/', ltrim($request->getRequestTarget(), '\/'));
+
+        if (! isset($this->endpoints[end($endpoint)])) {
+            return $handler->handle($request);
+        }
+
+        return new Response(200, ['Content-Type' => 'application/json', 'Allow' => 'GET, POST'], json_encode(['success' => true]));
+    }
+}

Classes/Package.php

@@ -11,7 +11,7 @@
 use Neos\Flow\Core\Bootstrap;
 use Neos\Flow\Monitor\FileMonitor;
 use Neos\Flow\Package\Package as BasePackage;
-use Neos\Flow\Package\PackageManagerInterface;
+use Neos\Flow\Package\PackageManager;
 use Neos\Utility\Files;
 use Neos\Utility\Unicode\Functions;
 
@@ -22,7 +22,7 @@ class Package extends BasePackage
     /**
      * @param mixed[] $configuration
      */
-    protected function monitorTypeDefResources(array $configuration, PackageManagerInterface $packageManager, FileMonitor $fileMonitor): void
+    protected function monitorTypeDefResources(array $configuration, PackageManager $packageManager, FileMonitor $fileMonitor): void
     {
         $schemas = $configuration['schemas'] ?? null;
         if (is_array($schemas)) {
@@ -44,7 +44,7 @@ protected function monitorTypeDefResources(array $configuration, PackageManagerI
 
         $uriParts = Functions::parse_url($typeDefs);
         /** @var BasePackage $package */
-        $package      = $packageManager->getPackage($uriParts['host']);
+        $package = $packageManager->getPackage($uriParts['host']);
         $absolutePath = Files::concatenatePaths([$package->getResourcesPath(), $uriParts['path']]);
         $fileMonitor->monitorFile($absolutePath);
     }
@@ -61,9 +61,9 @@ public function boot(Bootstrap $bootstrap): void
                 return;
             }
 
-            $graphQLFileMonitor     = FileMonitor::createFileMonitorAtBoot(static::FILE_MONITOR_IDENTIFIER, $bootstrap);
-            $configurationManager   = $bootstrap->getEarlyInstance(ConfigurationManager::class);
-            $packageManager         = $bootstrap->getEarlyInstance(PackageManagerInterface::class);
+            $graphQLFileMonitor = FileMonitor::createFileMonitorAtBoot(static::FILE_MONITOR_IDENTIFIER, $bootstrap);
+            $configurationManager = $bootstrap->getEarlyInstance(ConfigurationManager::class);
+            $packageManager = $bootstrap->getEarlyInstance(PackageManager::class);
             $endpointsConfiguration = $configurationManager->getConfiguration(
                 ConfigurationManager::CONFIGURATION_TYPE_SETTINGS,
                 't3n.GraphQL.endpoints'

Classes/ResolverGeneratorInterface.php

@@ -0,0 +1,19 @@
+<?php
+
+declare(strict_types=1);
+
+namespace t3n\GraphQL;
+
+interface ResolverGeneratorInterface
+{
+    /**
+     * Should return a map with this structure:
+     *
+     * return [
+     *    ['typeName' => \Resolver\Class\Name]
+     * ];
+     *
+     * @return mixed[]
+     */
+    public function generate(): array;
+}

Classes/Resolvers.php

@@ -12,6 +12,7 @@
 use Neos\Flow\Reflection\ReflectionService;
 use ReflectionClass;
 use ReflectionMethod;
+use t3n\GraphQL\Exception\InvalidResolverException;
 
 class Resolvers implements ArrayAccess, IteratorAggregate
 {
@@ -33,6 +34,9 @@ class Resolvers implements ArrayAccess, IteratorAggregate
     /** @var string */
     protected $pathPattern;
 
+    /** @var string */
+    protected $generator;
+
     /** @var mixed[] */
     protected $types = [];
 
@@ -52,7 +56,7 @@ public static function create(): self
     public static function aggregateTypes(ObjectManagerInterface $objectManager): array
     {
         $reflectionService = $objectManager->get(ReflectionService::class);
-        $classNames        = $reflectionService->getAllImplementationClassNamesForInterface(ResolverInterface::class);
+        $classNames = $reflectionService->getAllImplementationClassNamesForInterface(ResolverInterface::class);
 
         $types = [];
         foreach ($classNames as $className) {
@@ -89,9 +93,18 @@ protected function initialize(): void
             return;
         }
 
-        $typeMap         = static::aggregateTypes($this->objectManager);
+        $typeMap = static::aggregateTypes($this->objectManager);
         $resolverClasses = [];
 
+        if ($this->generator) {
+            $generator = $this->objectManager->get($this->generator);
+
+            if (! $generator instanceof ResolverGeneratorInterface) {
+                throw new InvalidResolverException(sprintf('The configured resolver %s generator must implement ResolverGeneratorInterface', $this->generator));
+            }
+            $resolverClasses = $generator->generate();
+        }
+
         if ($this->pathPattern) {
             foreach ($typeMap as $className => $info) {
                 $possibleMatch = str_replace('{Type}', $info['typeName'], $this->pathPattern);
@@ -113,7 +126,7 @@ protected function initialize(): void
         }
 
         foreach ($resolverClasses as $typeName => $className) {
-            $fields                     = $typeMap[$className]['fields'];
+            $fields = $typeMap[$className]['fields'];
             $this->resolvers[$typeName] = [];
             foreach ($fields as $fieldName) {
                 $this->resolvers[$typeName][$fieldName] = function (...$args) use ($className, $fieldName) {
@@ -123,6 +136,12 @@ protected function initialize(): void
         }
     }
 
+    public function withGenerator(string $generatorClassname): self
+    {
+        $this->generator = $generatorClassname;
+        return $this;
+    }
+
     public function withPathPattern(string $pathPattern): self
     {
         $this->pathPattern = trim($pathPattern, '/');

Classes/Service/SchemaService.php

@@ -111,6 +111,13 @@ protected function getSchemaFromConfiguration(array $configuration): array
         }
 
         $resolvers = Resolvers::create();
+
+        if (isset($configuration['resolverGenerator'])) {
+            if ($this->objectManager->isRegistered($configuration['resolverGenerator'])) {
+                $resolvers->withGenerator($configuration['resolverGenerator']);
+            }
+        }
+
         if (isset($configuration['resolverPathPattern'])) {
             $resolvers->withPathPattern($configuration['resolverPathPattern']);
         }
@@ -153,13 +160,21 @@ protected function getMergedSchemaFromConfigurations(array $configuration): Sche
 
         $executableSchemas = [];
 
-        $transforms = [new FlowErrorTransform()];
+        // Determine default error transformer
+        if (array_key_exists('errorTransform', $configuration) && ! empty($configuration['errorTransform']) && class_exists($configuration['errorTransform'])) {
+            $transforms = [new $configuration['errorTransform']()];
+        } else {
+            $transforms = [new FlowErrorTransform()];
+        }
 
         $options = [
             'typeDefs' => [],
             'resolvers' => [],
             'schemaDirectives' => [],
-            'resolverValidationOptions' => ['allowResolversNotInSchema' => true],
+            'resolverValidationOptions' => [
+                'allowResolversNotInSchema' => $configuration['resolverValidationOptions']['allowResolversNotInSchema'] ?? true,
+                'requireResolversForResolveType' => $configuration['resolverValidationOptions']['requireResolversForResolveType'] ?? null,
+            ],
         ];
 
         foreach ($schemaConfigurations as $schemaConfiguration) {

Classes/Transform/FlowErrorTransform.php

@@ -34,7 +34,7 @@ public function transformResult(ExecutionResult $result): ExecutionResult
                 $message = $this->throwableStorage->logThrowable($previousError);
 
                 if (! $this->includeExceptionMessageInOutput) {
-                    $message = preg_replace('/.* - See also: (.+)\.txt$/', 'Internal error ($1)', $message);
+                    $message = preg_replace('/.* - See also: (.+)\.txt$/s', 'Internal error ($1)', $message);
                 }
 
                 return new Error(