feat(graphql)!: TypeDefinition can be fully replaced via `Container…

…` (`TypeDefinition::getTypeName()` became is non `static`).
LastDragon-ru · Aug 31, 2023 · 0ee21c7 · 0ee21c7
1 parent cacf098
commit 0ee21c7
Show file tree

Hide file tree

Showing 12 changed files with 19 additions and 19 deletions.
diff --git a/packages/graphql/src/Builder/Contracts/TypeDefinition.php b/packages/graphql/src/Builder/Contracts/TypeDefinition.php
@@ -13,7 +13,7 @@ interface TypeDefinition {
     /**
      * Returns the type name for given Builder and Source.
      */
-    public static function getTypeName(Manipulator $manipulator, BuilderInfo $builder, TypeSource $source): string;
+    public function getTypeName(Manipulator $manipulator, BuilderInfo $builder, TypeSource $source): string;
 
     /**
      * Returns the type definition for given Source if possible. The name must be equal to `$name`.

diff --git a/packages/graphql/src/Builder/Manipulator.php b/packages/graphql/src/Builder/Manipulator.php
@@ -76,8 +76,15 @@ public function getBuilderInfo(): BuilderInfo {
     // <editor-fold desc="TypeProvider">
     // =========================================================================
     public function getType(string $definition, TypeSource $source): string {
+        // Instance (phpstan is not so smart yet...)
+        $instance = Container::getInstance()->make($definition);
+
+        if (!($instance instanceof TypeDefinition)) {
+            throw new TypeDefinitionImpossibleToCreateType($definition, $source);
+        }
+
         // Exists?
-        $name = $definition::getTypeName($this, $this->getBuilderInfo(), $source);
+        $name = $instance->getTypeName($this, $this->getBuilderInfo(), $source);
 
         if ($this->isTypeDefinitionExists($name)) {
             return $name;
@@ -86,13 +93,6 @@ public function getType(string $definition, TypeSource $source): string {
         // Fake
         $this->addFakeTypeDefinition($name);
 
-        // Instance (phpstan is not so smart yet...)
-        $instance = Container::getInstance()->make($definition);
-
-        if (!($instance instanceof TypeDefinition)) {
-            throw new TypeDefinitionImpossibleToCreateType($definition, $source);
-        }
-
         // Create new
         $node = $instance->getTypeDefinition($this, $name, $source);
 

diff --git a/packages/graphql/src/SearchBy/Directives/DirectiveTest.php b/packages/graphql/src/SearchBy/Directives/DirectiveTest.php
@@ -438,7 +438,7 @@ public function call(
                             throw new Exception('should not be called');
                         }
 
-                        public static function getTypeName(
+                        public function getTypeName(
                             Manipulator $manipulator,
                             BuilderInfo $builder,
                             TypeSource $source,

diff --git a/packages/graphql/src/SearchBy/Operators/Complex/RelationType.php b/packages/graphql/src/SearchBy/Operators/Complex/RelationType.php
@@ -19,7 +19,7 @@ public function __construct() {
         // empty
     }
 
-    public static function getTypeName(Manipulator $manipulator, BuilderInfo $builder, TypeSource $source): string {
+    public function getTypeName(Manipulator $manipulator, BuilderInfo $builder, TypeSource $source): string {
         $typeName      = $source->getTypeName();
         $builderName   = $builder->getName();
         $operatorName  = Str::studly(Relation::getName());

diff --git a/packages/graphql/src/SearchBy/Types/Condition.php b/packages/graphql/src/SearchBy/Types/Condition.php
@@ -39,7 +39,7 @@
 use const SORT_REGULAR;
 
 class Condition extends InputObject {
-    public static function getTypeName(Manipulator $manipulator, BuilderInfo $builder, TypeSource $source): string {
+    public function getTypeName(Manipulator $manipulator, BuilderInfo $builder, TypeSource $source): string {
         $typeName      = $source->getTypeName();
         $builderName   = $builder->getName();
         $directiveName = Directive::Name;

diff --git a/packages/graphql/src/SearchBy/Types/Enumeration.php b/packages/graphql/src/SearchBy/Types/Enumeration.php
@@ -17,7 +17,7 @@ public function __construct() {
         // empty
     }
 
-    public static function getTypeName(Manipulator $manipulator, BuilderInfo $builder, TypeSource $source): string {
+    public function getTypeName(Manipulator $manipulator, BuilderInfo $builder, TypeSource $source): string {
         $directiveName = Directive::Name;
         $builderName   = $builder->getName();
         $typeName      = $source->getTypeName();

diff --git a/packages/graphql/src/SearchBy/Types/Flag.php b/packages/graphql/src/SearchBy/Types/Flag.php
@@ -16,7 +16,7 @@ public function __construct() {
         // empty
     }
 
-    public static function getTypeName(Manipulator $manipulator, BuilderInfo $builder, TypeSource $source): string {
+    public function getTypeName(Manipulator $manipulator, BuilderInfo $builder, TypeSource $source): string {
         return Directive::Name.'TypeFlag';
     }
 

diff --git a/packages/graphql/src/SearchBy/Types/Range.php b/packages/graphql/src/SearchBy/Types/Range.php
@@ -16,7 +16,7 @@ public function __construct() {
         // empty
     }
 
-    public static function getTypeName(Manipulator $manipulator, BuilderInfo $builder, TypeSource $source): string {
+    public function getTypeName(Manipulator $manipulator, BuilderInfo $builder, TypeSource $source): string {
         $typeName      = $source->getTypeName();
         $directiveName = Directive::Name;
 

diff --git a/packages/graphql/src/SearchBy/Types/Scalar.php b/packages/graphql/src/SearchBy/Types/Scalar.php
@@ -17,7 +17,7 @@ public function __construct() {
         // empty
     }
 
-    public static function getTypeName(Manipulator $manipulator, BuilderInfo $builder, TypeSource $source): string {
+    public function getTypeName(Manipulator $manipulator, BuilderInfo $builder, TypeSource $source): string {
         $directiveName = Directive::Name;
         $builderName   = $builder->getName();
         $typeName      = $source->getTypeName();

diff --git a/packages/graphql/src/SortBy/Types/Clause.php b/packages/graphql/src/SortBy/Types/Clause.php
@@ -34,7 +34,7 @@
 use const SORT_REGULAR;
 
 class Clause extends InputObject {
-    public static function getTypeName(Manipulator $manipulator, BuilderInfo $builder, TypeSource $source): string {
+    public function getTypeName(Manipulator $manipulator, BuilderInfo $builder, TypeSource $source): string {
         $directiveName = Directive::Name;
         $builderName   = $builder->getName();
         $typeName      = $source->getTypeName();

diff --git a/packages/graphql/src/SortBy/Types/Direction.php b/packages/graphql/src/SortBy/Types/Direction.php
@@ -16,7 +16,7 @@ public function __construct() {
         // empty
     }
 
-    public static function getTypeName(Manipulator $manipulator, BuilderInfo $builder, TypeSource $source): string {
+    public function getTypeName(Manipulator $manipulator, BuilderInfo $builder, TypeSource $source): string {
         return Directive::Name.'TypeDirection';
     }
 

diff --git a/packages/graphql/src/SortBy/Types/Flag.php b/packages/graphql/src/SortBy/Types/Flag.php
@@ -16,7 +16,7 @@ public function __construct() {
         // empty
     }
 
-    public static function getTypeName(Manipulator $manipulator, BuilderInfo $builder, TypeSource $source): string {
+    public function getTypeName(Manipulator $manipulator, BuilderInfo $builder, TypeSource $source): string {
         return Directive::Name.'TypeFlag';
     }