OXDEV-8670 Upgrade GraphQLite to 7.0

Author: tkcreateit

CHANGELOG-v11.md

@@ -11,5 +11,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Replaced `TokenFilterList::fromUserInput` and `TokenSorting::fromUserInput` with direct object instantiation
 - Removed static access for `Legacy::createUniqueIdentifier()` and made it an instance method
 - Updated `MissingSignatureKey` exception to use a constructor instead of a static factory method
+- Upgrade GraphQLite to 7.0
 
 [11.0.0]: https://github.com/OXID-eSales/graphql-base-module/compare/v10.0.0...b-7.3.x

composer.json

@@ -8,7 +8,7 @@
     "require": {
         "php": "^8.2",
         "ext-json": "*",
-        "thecodingmachine/graphqlite": "^6.2",
+        "thecodingmachine/graphqlite": "^7.0",
         "lcobucci/jwt": "^4.1",
         "symfony/cache": "*",
         "ecodev/graphql-upload": "^7.0.0",

src/Framework/Psr4AggregatedFinder.php

@@ -0,0 +1,41 @@
+<?php
+
+/**
+ * Copyright © OXID eSales AG. All rights reserved.
+ * See LICENSE file for license details.
+ */
+
+declare(strict_types=1);
+
+namespace OxidEsales\GraphQL\Base\Framework;
+
+use AppendIterator;
+use Kcs\ClassFinder\Finder\FinderInterface;
+use Kcs\ClassFinder\Finder\Psr4Finder;
+use Kcs\ClassFinder\Finder\ReflectionFilterTrait;
+use Traversable;
+
+/**
+ * @internal This class is not covered by the backward compatibility promise
+ */
+class Psr4AggregatedFinder implements FinderInterface
+{
+    use ReflectionFilterTrait;
+
+    private AppendIterator $iterator;
+
+    public function __construct()
+    {
+        $this->iterator = new AppendIterator();
+    }
+
+    public function addFinder(Psr4Finder $finder): void
+    {
+        $this->iterator->append($finder->getIterator());
+    }
+
+    public function getIterator(): Traversable
+    {
+        return $this->iterator;
+    }
+}

src/Framework/SchemaFactory.php

@@ -9,7 +9,7 @@
 
 namespace OxidEsales\GraphQL\Base\Framework;
 
-use Mouf\Composer\ClassNameMapper;
+use Kcs\ClassFinder\Finder\Psr4Finder;
 use OxidEsales\GraphQL\Base\Service\Authentication;
 use OxidEsales\GraphQL\Base\Service\Authorization;
 use Psr\SimpleCache\CacheInterface;
@@ -60,27 +60,23 @@ public function getSchema(): Schema
             $this->container
         );
 
-        $classNameMapper = new ClassNameMapper();
+        $finder = new Psr4AggregatedFinder();
 
         foreach ($this->namespaceMappers as $namespaceMapper) {
             foreach ($namespaceMapper->getControllerNamespaceMapping() as $namespace => $path) {
-                $classNameMapper->registerPsr4Namespace(
-                    $namespace,
-                    $path
-                );
+                $namespace = $this->trimNamespace($namespace);
+                $finder->addFinder(new Psr4Finder($namespace, $path));
                 $factory->addControllerNameSpace($namespace);
             }
 
             foreach ($namespaceMapper->getTypeNamespaceMapping() as $namespace => $path) {
-                $classNameMapper->registerPsr4Namespace(
-                    $namespace,
-                    $path
-                );
+                $namespace = $this->trimNamespace($namespace);
+                $finder->addFinder(new Psr4Finder($namespace, $path));
                 $factory->addTypeNameSpace($namespace);
             }
         }
 
-        $factory->setClassNameMapper($classNameMapper);
+        $factory->setFinder($finder);
 
         $factory->setAuthenticationService($this->authentication)
             ->setAuthorizationService($this->authorization);
@@ -90,4 +86,12 @@ public function getSchema(): Schema
 
         return $this->schema;
     }
+
+    /**
+     * @deprecated The leading backslash is unnecessary and not recommended. It will not be supported in the future.
+     */
+    private function trimNamespace(string $namespace): string
+    {
+        return ltrim($namespace, '\\');
+    }
 }

src/Service/NamespaceMapper.php

@@ -16,14 +16,14 @@ class NamespaceMapper implements NamespaceMapperInterface
     public function getControllerNamespaceMapping(): array
     {
         return [
-            '\\OxidEsales\\GraphQL\\Base\\Controller' => __DIR__ . '/../Controller/',
+            'OxidEsales\\GraphQL\\Base\\Controller' => __DIR__ . '/../Controller/',
         ];
     }
 
     public function getTypeNamespaceMapping(): array
     {
         return [
-            '\\OxidEsales\\GraphQL\\Base\\DataType' => __DIR__ . '/../DataType/',
+            'OxidEsales\\GraphQL\\Base\\DataType' => __DIR__ . '/../DataType/',
         ];
     }
 }

tests/Integration/Framework/Service/NamespaceMapper.php

@@ -16,14 +16,14 @@ class NamespaceMapper implements NamespaceMapperInterface
     public function getControllerNamespaceMapping(): array
     {
         return [
-            '\\OxidEsales\\GraphQL\\Base\\Tests\\Integration\\Framework\\Controller' => __DIR__ . '/../Controller/',
+            'OxidEsales\\GraphQL\\Base\\Tests\\Integration\\Framework\\Controller' => __DIR__ . '/../Controller/',
         ];
     }
 
     public function getTypeNamespaceMapping(): array
     {
         return [
-            '\\OxidEsales\\GraphQL\\Base\\Tests\\Integration\\Framework\\DataType' => __DIR__ . '/../DataType/',
+            'OxidEsales\\GraphQL\\Base\\Tests\\Integration\\Framework\\DataType' => __DIR__ . '/../DataType/',
         ];
     }
 }