updated namespace convention to allow ExtendType

danielplan · danielplan · commit 46de10ae1192 · 2023-05-02T15:41:28.000+02:00
diff --git a/README.md b/README.md
@@ -49,14 +49,14 @@ The addon provides the following queries:
 
 Before creating your own queries and mutations, you need to create your own
 types. You can do this by creating a class that uses a namespace that starts
-with `GraphQL\Type`. After that, you need to annotate with the `#[Type]`
+with `RexGraphQL\Type`. After that, you need to annotate with the `#[Type]`
 annotation.
 For example:
 
 ```php
 <?php
 
-namespace GraphQL\Type\MyType;
+namespace RexGraphQL\Type\MyType;
 
 use TheCodingMachine\GraphQLite\Annotations\Type;
 
@@ -73,7 +73,7 @@ getter methods with the `#[Field]` annotation. For example:
 ```php
 <?php
 
-namespace GraphQL\Type;
+namespace RexGraphQL\Type;
 
 use TheCodingMachine\GraphQLite\Annotations\Field;
 use TheCodingMachine\GraphQLite\Annotations\Type;
@@ -102,7 +102,7 @@ example:
 ```php
 <?php
 
-namespace GraphQL\Controller;
+namespace RexGraphQL\Controller;
 
 use TheCodingMachine\GraphQLite\Annotations\Mutation;
 use TheCodingMachine\GraphQLite\Annotations\Query;
@@ -138,9 +138,9 @@ array. For example, if the return type is `string[]`, the GraphQL type will be
 ```php
 <?php
 
-namespace GraphQL\Controller;
+namespace RexGraphQL\Controller;
 
-use GraphQL\Type\MyType;
+use RexGraphQL\Type\MyType;
 use TheCodingMachine\GraphQLite\Annotations\Mutation;
 use TheCodingMachine\GraphQLite\Annotations\Query;
 
@@ -183,9 +183,9 @@ Queries and mutations can also have parameters. For example:
 ```php
 <?php
 
-namespace GraphQL\Controller;
+namespace RexGraphQL\Controller;
 
-use GraphQL\Type\MyType;
+use RexGraphQL\Type\MyType;
 use TheCodingMachine\GraphQLite\Annotations\Mutation;
 use TheCodingMachine\GraphQLite\Annotations\Query;
 
diff --git a/lib/Controller/ArticleController.php b/lib/Controller/ArticleController.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace GraphQL\Controller;
+namespace RexGraphQL\Controller;
 
-use GraphQL\Type\Structure\Article;
+use RexGraphQL\Type\Structure\Article;
 use GraphQL\Service\Structure\ArticleService;
 use TheCodingMachine\GraphQLite\Annotations\Query;
 use TheCodingMachine\GraphQLite\Types\ID;
diff --git a/lib/Controller/ArticleSliceController.php b/lib/Controller/ArticleSliceController.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace GraphQL\Controller;
+namespace RexGraphQL\Controller;
 
-use GraphQL\Type\Structure\ArticleSlice;
+use RexGraphQL\Type\Structure\ArticleSlice;
 use GraphQL\Service\Structure\ArticleSliceService;
 use TheCodingMachine\GraphQLite\Annotations\Query;
 use TheCodingMachine\GraphQLite\Types\ID;
diff --git a/lib/Controller/CategoryController.php b/lib/Controller/CategoryController.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace GraphQL\Controller;
+namespace RexGraphQL\Controller;
 
-use GraphQL\Type\Structure\Category;
+use RexGraphQL\Type\Structure\Category;
 use GraphQL\Service\Structure\CategoryService;
 use TheCodingMachine\GraphQLite\Annotations\Query;
 
diff --git a/lib/Controller/ClangController.php b/lib/Controller/ClangController.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace GraphQL\Controller;
+namespace RexGraphQL\Controller;
 
-use GraphQL\Type\Structure\Clang;
+use RexGraphQL\Type\Structure\Clang;
 use GraphQL\Service\Structure\ClangService;
 use TheCodingMachine\GraphQLite\Annotations\Query;
 use TheCodingMachine\GraphQLite\Types\ID;
diff --git a/lib/Controller/ContentTypeController.php b/lib/Controller/ContentTypeController.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace GraphQL\Controller;
+namespace RexGraphQL\Controller;
 
 use GraphQL\Service\Structure\ContentTypeService;
-use GraphQL\Type\Structure\ContentType;
+use RexGraphQL\Type\Structure\ContentType;
 use TheCodingMachine\GraphQLite\Annotations\Query;
 
 class ContentTypeController
diff --git a/lib/Controller/MediaController.php b/lib/Controller/MediaController.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace GraphQL\Controller;
+namespace RexGraphQL\Controller;
 
-use GraphQL\Type\Media\Media;
+use RexGraphQL\Type\Media\Media;
 use GraphQL\Service\Media\MediaService;
 use TheCodingMachine\GraphQLite\Annotations\Query;
 
diff --git a/lib/Controller/NavigationController.php b/lib/Controller/NavigationController.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace GraphQL\Controller;
+namespace RexGraphQL\Controller;
 
 use GraphQL\Service\Navigation\NavigationService;
-use GraphQL\Type\Navigation\NavigationItem;
+use RexGraphQL\Type\Navigation\NavigationItem;
 use TheCodingMachine\GraphQLite\Annotations\Query;
 use TheCodingMachine\GraphQLite\Types\ID;
 
diff --git a/lib/Controller/SprogController.php b/lib/Controller/SprogController.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace GraphQL\Controller;
+namespace RexGraphQL\Controller;
 
-use GraphQL\Type\Sprog\WildCard;
+use RexGraphQL\Type\Sprog\WildCard;
 use GraphQL\Service\Sprog\WildCardService;
 use TheCodingMachine\GraphQLite\Annotations\Query;
 
diff --git a/lib/Endpoint.php b/lib/Endpoint.php
@@ -3,24 +3,28 @@
 namespace GraphQL;
 
 use GraphQL\Error\DebugFlag;
-use GraphQL\Type\SchemaConfig;
-use GraphQL\TypeMapper\RexQueryProviderFactory;
-use GraphQL\TypeMapper\RexTypeMapperFactory;
+use rex;
+use rex_extension;
+use rex_extension_point;
+use rex_response;
+use rex_var;
 use Symfony\Component\DependencyInjection\Container;
 use TheCodingMachine\GraphQLite\Context\Context;
 use TheCodingMachine\GraphQLite\Exceptions\WebonyxErrorHandler;
 use TheCodingMachine\GraphQLite\Schema;
 use TheCodingMachine\GraphQLite\SchemaFactory;
 use Yiisoft\Cache\ArrayCache;
 
+use function is_array;
+
 class Endpoint
 {
     private SchemaFactory $schemaFactory;
 
     public function __construct()
     {
         $this->schemaFactory = new SchemaFactory(
-            new ArrayCache(), new Container()
+            new ArrayCache(), new Container(),
         );
     }
 
@@ -34,16 +38,16 @@ public function executeQuery(): array
             $input['query'],
             null,
             new Context(),
-            $input['variables'] ?? null
+            $input['variables'] ?? null,
         )->setErrorFormatter([WebonyxErrorHandler::class, 'errorFormatter'])
             ->setErrorsHandler([WebonyxErrorHandler::class, 'errorHandler'])
             ->toArray(self::isDebug() ? DebugFlag::INCLUDE_DEBUG_MESSAGE | DebugFlag::INCLUDE_TRACE : DebugFlag::NONE);
     }
 
     private function generateSchema(): Schema
     {
-        $this->schemaFactory->addTypeMapperFactory(new RexTypeMapperFactory());
-        $this->schemaFactory->addQueryProviderFactory(new RexQueryProviderFactory());
+        $this->schemaFactory->addQueryProviderFactory(new \GraphQL\RexQueryProviderFactory());
+        $this->schemaFactory->addTypeMapperFactory(new \GraphQL\RexTypeMapperFactory());
         if (static::isDebug()) {
             $this->schemaFactory->devMode();
         } else {
@@ -55,7 +59,7 @@ private function generateSchema(): Schema
     private function readInput(): array
     {
         $rawInput = file_get_contents('php://input');
-        $value = \rex_var::toArray($rawInput);
+        $value = rex_var::toArray($rawInput);
         if (is_array($value)) {
             return $value;
         }
@@ -64,28 +68,28 @@ private function readInput(): array
 
     public static function registerEndpoint(): void
     {
-        $endpoint = new Endpoint();
+        $endpoint = new self();
         $result = $endpoint->executeQuery();
         static::sendResponse($result);
     }
 
     private static function sendResponse(array $output): void
     {
-        \rex_response::cleanOutputBuffers();
-        \rex_response::sendCacheControl();
-        \rex_response::setStatus(\rex_response::HTTP_OK);
-        \rex_response::setHeader('Access-Control-Allow-Origin', '*');
-        \rex_response::setHeader('Access-Control-Allow-Headers', 'Content-Type');
+        rex_response::cleanOutputBuffers();
+        rex_response::sendCacheControl();
+        rex_response::setStatus(rex_response::HTTP_OK);
+        rex_response::setHeader('Access-Control-Allow-Origin', '*');
+        rex_response::setHeader('Access-Control-Allow-Headers', 'Content-Type');
         $output = json_encode($output);
-        $output = \rex_extension::registerPoint(new \rex_extension_point('GRAPHQL_OUTPUT_FILTER', $output));
-        \rex_response::sendContent($output, 'application/json');
+        $output = rex_extension::registerPoint(new rex_extension_point('GRAPHQL_OUTPUT_FILTER', $output));
+        rex_response::sendContent($output, 'application/json');
         exit;
     }
 
     private static function isDebug(): bool
     {
-        return \rex_extension::registerPoint(
-            new \rex_extension_point('GRAPHQL_DEBUG', \rex::isDebugMode())
+        return rex_extension::registerPoint(
+            new rex_extension_point('GRAPHQL_DEBUG', rex::isDebugMode()),
         );
     }
 }
diff --git a/lib/Service/Media/MediaService.php b/lib/Service/Media/MediaService.php
@@ -2,7 +2,7 @@
 
 namespace GraphQL\Service\Media;
 
-use GraphQL\Type\Media\Media;
+use RexGraphQL\Type\Media\Media;
 
 class MediaService
 {
diff --git a/lib/Service/Navigation/NavigationService.php b/lib/Service/Navigation/NavigationService.php
@@ -2,7 +2,7 @@
 
 namespace GraphQL\Service\Navigation;
 
-use GraphQL\Type\Navigation\NavigationItem;
+use RexGraphQL\Type\Navigation\NavigationItem;
 use TheCodingMachine\GraphQLite\Exceptions\GraphQLException;
 
 class NavigationService
diff --git a/lib/Service/Sprog/WildCardService.php b/lib/Service/Sprog/WildCardService.php
@@ -2,7 +2,7 @@
 
 namespace GraphQL\Service\Sprog;
 
-use GraphQL\Type\Sprog\WildCard;
+use RexGraphQL\Type\Sprog\WildCard;
 
 class WildCardService
 {
diff --git a/lib/Service/Structure/ArticleService.php b/lib/Service/Structure/ArticleService.php
@@ -2,7 +2,7 @@
 
 namespace GraphQL\Service\Structure;
 
-use GraphQL\Type\Structure\Article;
+use RexGraphQL\Type\Structure\Article;
 
 class ArticleService
 {
diff --git a/lib/Service/Structure/ArticleSliceService.php b/lib/Service/Structure/ArticleSliceService.php
@@ -2,7 +2,7 @@
 
 namespace GraphQL\Service\Structure;
 
-use GraphQL\Type\Structure\ArticleSlice;
+use RexGraphQL\Type\Structure\ArticleSlice;
 
 class ArticleSliceService
 {
diff --git a/lib/Service/Structure/CategoryService.php b/lib/Service/Structure/CategoryService.php
@@ -2,7 +2,7 @@
 
 namespace GraphQL\Service\Structure;
 
-use GraphQL\Type\Structure\Category;
+use RexGraphQL\Type\Structure\Category;
 
 class CategoryService
 {
diff --git a/lib/Service/Structure/ClangService.php b/lib/Service/Structure/ClangService.php
@@ -2,7 +2,7 @@
 
 namespace GraphQL\Service\Structure;
 
-use GraphQL\Type\Structure\Clang;
+use RexGraphQL\Type\Structure\Clang;
 use TheCodingMachine\GraphQLite\Exceptions\GraphQLException;
 
 class ClangService
diff --git a/lib/Service/Structure/ContentTypeService.php b/lib/Service/Structure/ContentTypeService.php
@@ -2,7 +2,7 @@
 
 namespace GraphQL\Service\Structure;
 
-use GraphQL\Type\Structure\ContentType;
+use RexGraphQL\Type\Structure\ContentType;
 use rex;
 use rex_addon;
 use rex_clang;
diff --git a/lib/Type/Media/Media.php b/lib/Type/Media/Media.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace GraphQL\Type\Media;
+namespace RexGraphQL\Type\Media;
 
 use TheCodingMachine\GraphQLite\Types\ID;
 use TheCodingMachine\GraphQLite\Annotations\Field;
diff --git a/lib/Type/Navigation/NavigationItem.php b/lib/Type/Navigation/NavigationItem.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace GraphQL\Type\Navigation;
+namespace RexGraphQL\Type\Navigation;
 
 use TheCodingMachine\GraphQLite\Annotations\Field;
 use TheCodingMachine\GraphQLite\Annotations\Type;
@@ -11,13 +11,13 @@ class NavigationItem
 {
 
     private $id;
-    private string $label;
-    private string $url;
+    private ?string $label;
+    private ?string $url;
     private ?int $parentId;
-    private bool $isActive;
-    private bool $internal;
+    private ?bool $isActive;
+    private ?bool $internal;
 
-    public function __construct($id, string $label, string $url, ?int $parentId, bool $isActive, bool $internal)
+    public function __construct(mixed $id = null, ?string $label = null, ?string $url = null, ?int $parentId = null, ?bool $isActive = null, ?bool $internal = null)
     {
         $this->id = $id;
         $this->label = $label;
diff --git a/lib/Type/Sprog/WildCard.php b/lib/Type/Sprog/WildCard.php
@@ -1,21 +1,21 @@
 <?php
 
-namespace GraphQL\Type\Sprog;
+namespace RexGraphQL\Type\Sprog;
 
-use GraphQL\Type\Structure\Clang;
+use RexGraphQL\Type\Structure\Clang;
 use TheCodingMachine\GraphQLite\Annotations\Field;
 use TheCodingMachine\GraphQLite\Annotations\Type;
 use TheCodingMachine\GraphQLite\Types\ID;
 
 #[Type]
 class WildCard
 {
-    private int $id;
-    private string $wildcard;
-    private string $replace;
-    private int $clangId;
+    private ?int $id;
+    private ?string $wildcard;
+    private ?string $replace;
+    private ?int $clangId;
 
-    public function __construct(int $id, string $wildcard, string $replace, int $clangId)
+    public function __construct(int $id = null, string $wildcard= null, string $replace= null, int $clangId= null)
     {
         $this->id = $id;
         $this->wildcard = $wildcard;
diff --git a/lib/Type/Structure/Article.php b/lib/Type/Structure/Article.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace GraphQL\Type\Structure;
+namespace RexGraphQL\Type\Structure;
 
 use DateTimeInterface;
 use rex_article;
diff --git a/lib/Type/Structure/ArticleSlice.php b/lib/Type/Structure/ArticleSlice.php
diff --git a/lib/Type/Structure/Breadcrumb.php b/lib/Type/Structure/Breadcrumb.php
diff --git a/lib/Type/Structure/Category.php b/lib/Type/Structure/Category.php
diff --git a/lib/Type/Structure/Clang.php b/lib/Type/Structure/Clang.php
diff --git a/lib/Type/Structure/ContentType.php b/lib/Type/Structure/ContentType.php
diff --git a/lib/Type/Structure/Metadata.php b/lib/Type/Structure/Metadata.php
diff --git a/lib/TypeMapper/ClassFinder.php b/lib/TypeMapper/ClassFinder.php
diff --git a/lib/TypeMapper/RexQueryProvider.php b/lib/TypeMapper/RexQueryProvider.php
diff --git a/lib/TypeMapper/RexQueryProviderFactory.php b/lib/TypeMapper/RexQueryProviderFactory.php
diff --git a/lib/TypeMapper/RexTypeMapper.php b/lib/TypeMapper/RexTypeMapper.php
diff --git a/lib/TypeMapper/RexTypeMapperFactory.php b/lib/TypeMapper/RexTypeMapperFactory.php

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`
`3`	`3`	`namespace GraphQL\Service\Media;`
`4`	`4`
`5`		`-use GraphQL\Type\Media\Media;`
	`5`	`+use RexGraphQL\Type\Media\Media;`
`6`	`6`
`7`	`7`	`class MediaService`
`8`	`8`	`{`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`
`3`	`3`	`namespace GraphQL\Service\Sprog;`
`4`	`4`
`5`		`-use GraphQL\Type\Sprog\WildCard;`
	`5`	`+use RexGraphQL\Type\Sprog\WildCard;`
`6`	`6`
`7`	`7`	`class WildCardService`
`8`	`8`	`{`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`
`3`	`3`	`namespace GraphQL\Service\Structure;`
`4`	`4`
`5`		`-use GraphQL\Type\Structure\Article;`
	`5`	`+use RexGraphQL\Type\Structure\Article;`
`6`	`6`
`7`	`7`	`class ArticleService`
`8`	`8`	`{`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`
`3`	`3`	`namespace GraphQL\Service\Structure;`
`4`	`4`
`5`		`-use GraphQL\Type\Structure\ArticleSlice;`
	`5`	`+use RexGraphQL\Type\Structure\ArticleSlice;`
`6`	`6`
`7`	`7`	`class ArticleSliceService`
`8`	`8`	`{`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`
`3`	`3`	`namespace GraphQL\Service\Structure;`
`4`	`4`
`5`		`-use GraphQL\Type\Structure\Category;`
	`5`	`+use RexGraphQL\Type\Structure\Category;`
`6`	`6`
`7`	`7`	`class CategoryService`
`8`	`8`	`{`