Optimize config processing

src/Definition/ConfigProcessor.php

@@ -6,7 +6,7 @@
 
 use Overblog\GraphQLBundle\Definition\ConfigProcessor\ConfigProcessorInterface;
 
-final class ConfigProcessor implements ConfigProcessorInterface
+final class ConfigProcessor
 {
     /**
      * @var ConfigProcessorInterface[]
@@ -30,12 +30,12 @@ public function register(ConfigProcessorInterface $configProcessor): void
         $this->processors[] = $configProcessor;
     }
 
-    public function process(LazyConfig $lazyConfig): LazyConfig
+    public function process(array $config): array
     {
-        foreach ($this->getProcessors() as $processor) {
-            $lazyConfig = $processor->process($lazyConfig);
+        foreach ($this->processors as $processor) {
+            $config = $processor->process($config);
         }
 
-        return $lazyConfig;
+        return $config;
     }
 }

src/Definition/ConfigProcessor/AclConfigProcessor.php

@@ -5,7 +5,6 @@
 namespace Overblog\GraphQLBundle\Definition\ConfigProcessor;
 
 use GraphQL\Type\Definition\ResolveInfo;
-use Overblog\GraphQLBundle\Definition\LazyConfig;
 use Overblog\GraphQLBundle\Error\UserWarning;
 use Overblog\GraphQLBundle\Resolver\AccessResolver;
 use function is_array;
@@ -29,6 +28,7 @@ public static function acl(array $fields, AccessResolver $accessResolver, callab
         $deniedAccess = static function (): void {
             throw new UserWarning('Access denied to this field.');
         };
+
         foreach ($fields as &$field) {
             if (is_array($field) && isset($field['access']) && true !== $field['access']) {
                 $accessChecker = $field['access'];
@@ -47,21 +47,17 @@ public static function acl(array $fields, AccessResolver $accessResolver, callab
         return $fields;
     }
 
-    public function process(LazyConfig $lazyConfig): LazyConfig
+    public function process(array $config): array
     {
-        $lazyConfig->addPostLoader(function ($config) {
-            if (isset($config['fields']) && is_callable($config['fields'])) {
-                $config['fields'] = function () use ($config) {
-                    $fields = $config['fields']();
-
-                    return static::acl($fields, $this->accessResolver, $this->defaultResolver);
-                };
-            }
+        if (isset($config['fields']) && is_callable($config['fields'])) {
+            $config['fields'] = function () use ($config) {
+                $fields = $config['fields']();
 
-            return $config;
-        });
+                return static::acl($fields, $this->accessResolver, $this->defaultResolver);
+            };
+        }
 
-        return $lazyConfig;
+        return $config;
     }
 
     private static function findFieldResolver(array $field, ResolveInfo $info, callable $defaultResolver): callable

src/Definition/ConfigProcessor/ConfigProcessorInterface.php

@@ -4,9 +4,7 @@
 
 namespace Overblog\GraphQLBundle\Definition\ConfigProcessor;
 
-use Overblog\GraphQLBundle\Definition\LazyConfig;
-
 interface ConfigProcessorInterface
 {
-    public function process(LazyConfig $lazyConfig): LazyConfig;
+    public function process(array $config): array;
 }

src/Definition/ConfigProcessor/PublicFieldsFilterConfigProcessor.php

@@ -4,9 +4,7 @@
 
 namespace Overblog\GraphQLBundle\Definition\ConfigProcessor;
 
-use Overblog\GraphQLBundle\Definition\LazyConfig;
 use function array_filter;
-use function call_user_func;
 use function is_array;
 use function is_callable;
 use const ARRAY_FILTER_USE_BOTH;
@@ -21,7 +19,7 @@ function ($field, $fieldName) {
                 $exposed = true;
 
                 if (is_array($field) && isset($field['public']) && is_callable($field['public'])) {
-                    $exposed = (bool) call_user_func($field['public'], $fieldName);
+                    $exposed = (bool) $field['public']($fieldName);
                 }
 
                 return $exposed;
@@ -30,20 +28,16 @@ function ($field, $fieldName) {
         );
     }
 
-    public function process(LazyConfig $lazyConfig): LazyConfig
+    public function process(array $config): array
     {
-        $lazyConfig->addPostLoader(function ($config) {
-            if (isset($config['fields']) && is_callable($config['fields'])) {
-                $config['fields'] = function () use ($config) {
-                    $fields = $config['fields']();
+        if (isset($config['fields']) && is_callable($config['fields'])) {
+            $config['fields'] = function () use ($config) {
+                $fields = $config['fields']();
 
-                    return static::filter($fields);
-                };
-            }
+                return static::filter($fields);
+            };
+        }
 
-            return $config;
-        });
-
-        return $lazyConfig;
+        return $config;
     }
 }

src/Definition/ConfigProcessor/WrapArgumentConfigProcessor.php

@@ -5,7 +5,6 @@
 namespace Overblog\GraphQLBundle\Definition\ConfigProcessor;
 
 use Overblog\GraphQLBundle\Definition\ArgumentFactory;
-use Overblog\GraphQLBundle\Definition\LazyConfig;
 use function is_array;
 use function is_callable;
 
@@ -18,28 +17,25 @@ public function __construct(ArgumentFactory $argumentFactory)
         $this->argumentFactory = $argumentFactory;
     }
 
-    public function process(LazyConfig $lazyConfig): LazyConfig
+    public function process(array $config): array
     {
-        $lazyConfig->addPostLoader(function ($config) {
-            if (isset($config['resolveField']) && is_callable($config['resolveField'])) {
-                $config['resolveField'] = $this->argumentFactory->wrapResolverArgs($config['resolveField']);
-            }
+        if (isset($config['resolveField']) && is_callable($config['resolveField'])) {
+            $config['resolveField'] = $this->argumentFactory->wrapResolverArgs($config['resolveField']);
+        }
 
-            if (isset($config['fields'])) {
-                $config['fields'] = function () use ($config) {
-                    $fields = $config['fields'];
-                    if (is_callable($config['fields'])) {
-                        $fields = $config['fields']();
-                    }
+        if (isset($config['fields'])) {
+            $config['fields'] = function () use ($config) {
+                $fields = $config['fields'];
 
-                    return $this->wrapFieldsArgument($fields);
-                };
-            }
+                if (is_callable($config['fields'])) {
+                    $fields = $config['fields']();
+                }
 
-            return $config;
-        });
+                return $this->wrapFieldsArgument($fields);
+            };
+        }
 
-        return $lazyConfig;
+        return $config;
     }
 
     private function wrapFieldsArgument(array $fields): array

src/Generator/TypeBuilder.php

@@ -25,7 +25,6 @@
 use Murtukov\PHPCodeGenerator\Utils;
 use Overblog\GraphQLBundle\Definition\ConfigProcessor;
 use Overblog\GraphQLBundle\Definition\GlobalVariables;
-use Overblog\GraphQLBundle\Definition\LazyConfig;
 use Overblog\GraphQLBundle\Definition\Type\CustomScalarType;
 use Overblog\GraphQLBundle\Definition\Type\GeneratedTypeInterface;
 use Overblog\GraphQLBundle\Error\ResolveErrors;
@@ -135,12 +134,10 @@ public function build(array $config, string $type): PhpFile
 
         $class->createConstructor()
             ->addArgument('configProcessor', ConfigProcessor::class)
-            ->addArgument(TypeGenerator::GLOBAL_VARS, GlobalVariables::class, null)
-            ->append('$configLoader = ', $this->buildConfigLoader($config))
-            ->append('$config = $configProcessor->process(LazyConfig::create($configLoader, '.$this->globalVars.'))->load()')
-            ->append('parent::__construct($config)');
-
-        $this->file->addUse(LazyConfig::class);
+            ->addArgument(TypeGenerator::GLOBAL_VARS, GlobalVariables::class)
+            ->append('$config = ', $this->buildConfig($config))
+            ->emptyLine()
+            ->append('parent::__construct($configProcessor->process($config))');
 
         return $this->file;
     }
@@ -201,12 +198,12 @@ protected function wrapTypeRecursive($typeNode)
     }
 
     /**
-     * Builds an arrow function with an array as the return value. Content of
-     * the array depends on the GraphQL type that is currently being generated.
+     * Builds a config array compatible with webonyx/graphql-php type system. The content
+     * of the array depends on the GraphQL type that is currently being generated.
      *
      * Render example (object):
      *
-     *      fn() => [
+     *      [
      *          'name' => self::NAME,
      *          'description' => 'Root query type',
      *          'fields' => fn() => [
@@ -223,7 +220,7 @@ protected function wrapTypeRecursive($typeNode)
      *
      * Render example (input-object):
      *
-     *      fn() => [
+     *      [
      *          'name' => self::NAME,
      *          'description' => 'Some description.',
      *          'validation' => {@see buildValidationRules}
@@ -235,7 +232,7 @@ protected function wrapTypeRecursive($typeNode)
      *
      * Render example (interface)
      *
-     *      fn() => [
+     *      [
      *          'name' => self::NAME,
      *          'description' => 'Some description.',
      *          'fields' => fn() => [
@@ -247,7 +244,7 @@ protected function wrapTypeRecursive($typeNode)
      *
      * Render example (union):
      *
-     *      fn() => [
+     *      [
      *          'name' => self::NAME,
      *          'description' => 'Some description.',
      *          'types' => fn() => [
@@ -259,7 +256,7 @@ protected function wrapTypeRecursive($typeNode)
      *
      * Render example (custom-scalar):
      *
-     *      fn() => [
+     *      [
      *          'name' => self::NAME,
      *          'description' => 'Some description'
      *          'serialize' => {@see buildScalarCallback},
@@ -269,7 +266,7 @@ protected function wrapTypeRecursive($typeNode)
      *
      * Render example (enum):
      *
-     *      fn() => [
+     *      [
      *          'name' => self::NAME,
      *          'values' => [
      *              'PUBLISHED' => ['value' => 1],
@@ -285,7 +282,7 @@ protected function wrapTypeRecursive($typeNode)
      * @throws GeneratorException
      * @throws UnrecognizedValueTypeException
      */
-    protected function buildConfigLoader(array $config): ArrowFunction
+    protected function buildConfig(array $config): Collection
     {
         // Convert to an object for a better readability
         $c = (object) $config;
@@ -351,7 +348,7 @@ protected function buildConfigLoader(array $config): ArrowFunction
             }
         }
 
-        return new ArrowFunction($configLoader);
+        return $configLoader; // @phpstan-ignore-line
     }
 
     /**

src/Resolver/AccessResolver.php

@@ -114,7 +114,7 @@ function (Edge $edge) use ($accessChecker, $resolveArgs) {
     private function hasAccess(callable $accessChecker, array $resolveArgs = [], $object = null)
     {
         $resolveArgs[] = $object;
-        $accessOrPromise = call_user_func_array($accessChecker, $resolveArgs);
+        $accessOrPromise = $accessChecker(...$resolveArgs);
 
         return $accessOrPromise;
     }