stanning

Author: shmax

src/Type/Definition/ListOfType.php

@@ -9,27 +9,24 @@
 class ListOfType extends Type implements WrappingType, OutputType, NullableType, InputType
 {
     /** @var ObjectType|InterfaceType|UnionType|ScalarType|InputObjectType|EnumType */
-    private $_ofType;
+    private $ofType;
 
     /**
      * @param callable|Type $type
      */
     public function __construct($type)
     {
-        $this->_ofType = is_callable($type) ? $type : Type::assertType($type);
+        $this->ofType = is_callable($type) ? $type : Type::assertType($type);
     }
 
     public function toString() : string
     {
-        return '[' . $this->ofType->toString() . ']';
+        return '[' . $this->getOfType()->toString() . ']';
     }
 
-    public function __get($name)
+    public function getOfType()
     {
-        switch ($name) {
-            case 'ofType':
-                return Type::resolveLazyType($this->_ofType);
-        }
+        return Type::resolveLazyType($this->ofType);
     }
 
     /**
@@ -39,7 +36,7 @@ public function __get($name)
      */
     public function getWrappedType($recurse = false)
     {
-        $type = $this->ofType;
+        $type = $this->getOfType();
 
         return $recurse && $type instanceof WrappingType
             ? $type->getWrappedType($recurse)

src/Type/Definition/NonNull.php

@@ -10,22 +10,14 @@
 class NonNull extends Type implements WrappingType, OutputType, InputType
 {
     /** @var NullableType */
-    private $_ofType;
+    private $ofType;
 
     /**
      * @param NullableType $type
      */
     public function __construct($type)
     {
-        $this->_ofType = is_callable($type) ? $type : self::assertNullableType($type);
-    }
-
-    public function __get($name)
-    {
-        switch ($name) {
-            case 'ofType':
-                return Type::resolveLazyType($this->_ofType);
-        }
+        $this->ofType = is_callable($type) ? $type : self::assertNullableType($type);
     }
 
     /**
@@ -66,14 +58,19 @@ public function toString()
         return $this->getWrappedType()->toString() . '!';
     }
 
+    public function getOfType()
+    {
+        return Type::resolveLazyType($this->ofType);
+    }
+
     /**
      * @param bool $recurse
      *
      * @return Type
      */
     public function getWrappedType($recurse = false)
     {
-        $type = $this->ofType;
+        $type = $this->getOfType();
 
         return $recurse && $type instanceof WrappingType
             ? $type->getWrappedType($recurse)

src/Type/Definition/UnionType.php

@@ -8,6 +8,7 @@
 use GraphQL\Language\AST\UnionTypeDefinitionNode;
 use GraphQL\Language\AST\UnionTypeExtensionNode;
 use GraphQL\Utils\Utils;
+use function array_map;
 use function call_user_func;
 use function is_array;
 use function is_callable;
@@ -87,9 +88,9 @@ public function getTypes()
                 );
             }
 
-            $this->types = array_map(function($type) {
-            	return Type::resolveLazyType($type);
-			},$types);
+            $this->types = array_map(static function ($type) {
+                return Type::resolveLazyType($type);
+            }, $types);
         }
 
         return $this->types;

src/Type/Schema.php

@@ -424,7 +424,7 @@ private function getPossibleTypeMap()
                     }
                 } elseif ($type instanceof UnionType) {
                     foreach ($type->getTypes() as $innerType) {
-						$this->possibleTypeMap[$type->name][$innerType->name] = $innerType;
+                        $this->possibleTypeMap[$type->name][$innerType->name] = $innerType;
                     }
                 }
             }

src/Utils/SchemaExtender.php

@@ -296,7 +296,7 @@ protected static function extendImplementedInterfaces(ObjectType $type) : array
     protected static function extendType($typeDef)
     {
         if ($typeDef instanceof ListOfType) {
-            return Type::listOf(static::extendType($typeDef->ofType));
+            return Type::listOf(static::extendType($typeDef->getOfType()));
         }
 
         if ($typeDef instanceof NonNull) {