Fix styling

src/Support/ComplexTypeHandler/JsonResourceHandler.php

@@ -4,18 +4,12 @@
 
 use Dedoc\Scramble\Support\ClassAstHelper;
 use Dedoc\Scramble\Support\Generator\Types\OpenApiTypeHelper;
-use Dedoc\Scramble\Support\Infer\Handler\ReturnTypeGettingExtensions;
-use Dedoc\Scramble\Support\ResponseExtractor\ModelInfo;
 use Dedoc\Scramble\Support\Type\Identifier;
 use Dedoc\Scramble\Support\Type\ObjectType;
 use Dedoc\Scramble\Support\Type\Type;
-use Dedoc\Scramble\Support\TypeHandlers\TypeHandlers;
-use Illuminate\Database\Eloquent\Model;
 use Illuminate\Http\Resources\Json\JsonResource;
 use Illuminate\Http\Resources\Json\ResourceCollection;
-use Illuminate\Support\Str;
 use PhpParser\Node\Expr\Array_;
-use Symfony\Component\Yaml\Yaml;
 
 class JsonResourceHandler
 {

src/Support/Generator/Types/ObjectType.php

@@ -41,7 +41,6 @@ public function toArray()
         $result = parent::toArray();
 
         try {
-
             if (count($this->properties)) {
                 $properties = [];
                 foreach ($this->properties as $name => $property) {

src/Support/Generator/Types/OpenApiTypeHelper.php

@@ -61,6 +61,7 @@ public static function fromType(\Dedoc\Scramble\Support\Type\AbstractType $type)
                     if (! $item->isOptional) {
                         $requiredKeys[] = $item->key;
                     }
+
                     return [
                         $item->key => static::fromType($item),
                     ];
@@ -86,7 +87,7 @@ public static function fromType(\Dedoc\Scramble\Support\Type\AbstractType $type)
             }
         } elseif ($type instanceof Union) {
             if (count($type->types) === 2 && collect($type->types)->contains(fn ($t) => $t instanceof \Dedoc\Scramble\Support\Type\NullType)) {
-                $notNullType = collect($type->types)->first(fn ($t) => !($t instanceof \Dedoc\Scramble\Support\Type\NullType));
+                $notNullType = collect($type->types)->first(fn ($t) => ! ($t instanceof \Dedoc\Scramble\Support\Type\NullType));
                 if ($notNullType) {
                     $openApiType = static::fromType($notNullType)->nullable(true);
                 } else {

src/Support/Infer/Handler/ArrayHandler.php

@@ -2,9 +2,7 @@
 
 namespace Dedoc\Scramble\Support\Infer\Handler;
 
-use Dedoc\Scramble\Support\Type\ArrayItemType_;
 use Dedoc\Scramble\Support\Type\ArrayType;
-use Dedoc\Scramble\Support\Type\UnknownType;
 use PhpParser\Node;
 
 class ArrayHandler

src/Support/Infer/Handler/FunctionLikeHandler.php

@@ -3,7 +3,6 @@
 namespace Dedoc\Scramble\Support\Infer\Handler;
 
 use Dedoc\Scramble\Support\Infer\Scope\Scope;
-use Dedoc\Scramble\Support\Infer\Scope\ScopeContext;
 use Dedoc\Scramble\Support\Type\FunctionLikeType;
 use Dedoc\Scramble\Support\Type\FunctionType;
 use Dedoc\Scramble\Support\Type\TypeHelper;

src/Support/Infer/Handler/NewHandler.php

@@ -2,17 +2,8 @@
 
 namespace Dedoc\Scramble\Support\Infer\Handler;
 
-use Dedoc\Scramble\Support\Infer\Scope\Scope;
-use Dedoc\Scramble\Support\Type\FunctionLikeType;
-use Dedoc\Scramble\Support\Type\FunctionType;
-use Dedoc\Scramble\Support\Type\Identifier;
-use Dedoc\Scramble\Support\Type\IntegerType;
 use Dedoc\Scramble\Support\Type\ObjectType;
-use Dedoc\Scramble\Support\Type\StringType;
-use Dedoc\Scramble\Support\Type\Union;
 use PhpParser\Node;
-use PhpParser\Node\FunctionLike;
-use PhpParser\NodeFinder;
 
 class NewHandler
 {

src/Support/Infer/Handler/ReturnTypeGettingExtensions.php

@@ -6,7 +6,7 @@
 
 class ReturnTypeGettingExtensions
 {
-    static $extensions = [];
+    public static $extensions = [];
 
     public function shouldHandle($node)
     {
@@ -22,6 +22,7 @@ function ($acc, $extensionClass) use ($node) {
                 if ($type) {
                     return $type;
                 }
+
                 return $acc;
             },
         );

src/Support/Infer/Handler/ScalarHandler.php

@@ -2,15 +2,9 @@
 
 namespace Dedoc\Scramble\Support\Infer\Handler;
 
-use Dedoc\Scramble\Support\Infer\Scope\Scope;
-use Dedoc\Scramble\Support\Type\FunctionLikeType;
-use Dedoc\Scramble\Support\Type\FunctionType;
 use Dedoc\Scramble\Support\Type\IntegerType;
 use Dedoc\Scramble\Support\Type\StringType;
-use Dedoc\Scramble\Support\Type\Union;
 use PhpParser\Node;
-use PhpParser\Node\FunctionLike;
-use PhpParser\NodeFinder;
 
 class ScalarHandler
 {
@@ -23,11 +17,13 @@ public function leave(Node\Scalar $node)
     {
         if ($node instanceof Node\Scalar\String_) {
             $node->setAttribute('type', new StringType());
+
             return;
         }
 
         if ($node instanceof Node\Scalar\LNumber) {
             $node->setAttribute('type', new IntegerType());
+
             return;
         }
     }

src/Support/Infer/Scope/Scope.php

@@ -21,7 +21,7 @@ public function __construct(ScopeContext $context, callable $namesResolver, ?Sco
 
     public function isInClass()
     {
-        return !!$this->context->class;
+        return (bool) $this->context->class;
     }
 
     public function class(): ?ObjectType

src/Support/Infer/Scope/ScopeContext.php

@@ -11,6 +11,7 @@ class ScopeContext
     public function setClass(?ObjectType $class): ScopeContext
     {
         $this->class = $class;
+
         return $this;
     }
 }

src/Support/Infer/TypeInferringVisitor.php

@@ -92,6 +92,7 @@ private function getOrCreateScope()
         if (! isset($this->scope)) {
             $this->scope = new Scope(new ScopeContext, $this->namesResolver);
         }
+
         return $this->scope;
     }
 }

src/Support/InferExtensions/JsonResourceTypeInfer.php

@@ -20,7 +20,7 @@
 
 class JsonResourceTypeInfer
 {
-    static $jsonResourcesModelTypesCache = [];
+    public static $jsonResourcesModelTypesCache = [];
 
     public function getNodeReturnType(Node $node, Scope $scope)
     {
@@ -43,28 +43,28 @@ public function getNodeReturnType(Node $node, Scope $scope)
          * $this->mergeWhen()
          */
         if ($this->isMethodCallToThis($node, ['merge', 'mergeWhen'])) {
-            if(! $type = $node->args[count($node->args) - 1]->value->getAttribute('type') ?? null) {
+            if (! $type = $node->args[count($node->args) - 1]->value->getAttribute('type') ?? null) {
                 return null;
             }
 
             if ($type instanceof FunctionType) {
                 $type = $type->getReturnType();
             }
 
-            return (new Generic(
+            return new Generic(
                 new Identifier(MergeValue::class),
                 [
                     $node->name->name === 'merge' ? new LiteralBooleanType(true) : new BooleanType(),
-                    $type
+                    $type,
                 ],
-            ));
+            );
         }
 
         /*
          * $this->when()
          */
         if ($this->isMethodCallToThis($node, ['when'])) {
-            if(! $type = $node->args[count($node->args) - 1]->value->getAttribute('type') ?? null) {
+            if (! $type = $node->args[count($node->args) - 1]->value->getAttribute('type') ?? null) {
                 return null;
             }
 
@@ -115,7 +115,6 @@ private static function modelType(ObjectType $jsonClass, Scope $scope): Type
         return static::$jsonResourcesModelTypesCache[$jsonClass->name] = $modelType;
     }
 
-
     private static function getModelName(string $jsonResourceClassName, \ReflectionClass $reflectionClass, callable $getFqName)
     {
         $phpDoc = $reflectionClass->getDocComment() ?: '';

src/Support/ResponseExtractor/ResponsesExtractor.php

@@ -7,9 +7,6 @@
 use Dedoc\Scramble\Support\Generator\Response;
 use Dedoc\Scramble\Support\Generator\Schema;
 use Dedoc\Scramble\Support\RouteInfo;
-use Dedoc\Scramble\Support\Type\Generic;
-use Dedoc\Scramble\Support\Type\Type;
-use Dedoc\Scramble\Support\TypeHandlers\TypeHandlers;
 use Illuminate\Support\Arr;
 
 class ResponsesExtractor
@@ -24,7 +21,7 @@ public function __construct(RouteInfo $routeInfo)
     public function __invoke()
     {
         return collect(Arr::wrap([$this->routeInfo->getHandledReturnType()]))
-            ->filter(fn ($t) => !! $t[1])
+            ->filter(fn ($t) => (bool) $t[1])
             ->map(function ($type) {
                 $type = $type[1];
 

src/Support/RouteInfo.php

@@ -5,7 +5,6 @@
 use Dedoc\Scramble\Support\ComplexTypeHandler\ComplexTypeHandlers;
 use Dedoc\Scramble\Support\Infer\TypeInferringVisitor;
 use Dedoc\Scramble\Support\Type\FunctionLikeType;
-use Dedoc\Scramble\Support\Type\Identifier;
 use Dedoc\Scramble\Support\TypeHandlers\PhpDocTypeWalker;
 use Dedoc\Scramble\Support\TypeHandlers\ResolveFqnPhpDocTypeVisitor;
 use Dedoc\Scramble\Support\TypeHandlers\TypeHandlers;
@@ -85,7 +84,6 @@ public function phpDoc(): PhpDocNode
             }
         }
 
-
         return $this->phpDoc;
     }
 

src/Support/Type/ArrayItemType_.php

@@ -8,15 +8,16 @@ class ArrayItemType_ extends AbstractType
 {
     /** @var string|int|null */
     public $key;
+
     public Type $value;
+
     public bool $isOptional;
 
     public function __construct(
         $key,
         Type $value,
         bool $isOptional = false
-    )
-    {
+    ) {
         $this->key = $key;
         $this->value = $value;
         $this->isOptional = $isOptional;

src/Support/Type/ArrayType.php

@@ -22,6 +22,7 @@ public function isSame(Type $type)
     public function toString(): string
     {
         $numIndex = 0;
+
         return sprintf(
             'array{%s}',
             implode(', ', array_map(function (ArrayItemType_ $item) use (&$numIndex) {

src/Support/Type/FunctionType.php

@@ -19,6 +19,7 @@ public function __construct(
     public function setReturnType(Type $type): self
     {
         $this->returnType = $type;
+
         return $this;
     }
 

src/Support/Type/ObjectType.php

@@ -14,8 +14,7 @@ class ObjectType extends AbstractType
     public function __construct(
         string $name,
         array $properties = []
-    )
-    {
+    ) {
         $this->name = $name;
         $this->properties = $properties;
     }

src/Support/TypeHandlers/PhpDocTypeWalker.php

@@ -2,7 +2,6 @@
 
 namespace Dedoc\Scramble\Support\TypeHandlers;
 
-use Dedoc\Scramble\Support\Type\ArrayType;
 use PHPStan\PhpDocParser\Ast\Type\ArrayShapeItemNode;
 use PHPStan\PhpDocParser\Ast\Type\ArrayShapeNode;
 use PHPStan\PhpDocParser\Ast\Type\ArrayTypeNode;

tests/InferTypesTest.php

@@ -1,10 +1,9 @@
 <?php
 
 use Dedoc\Scramble\Support\ClassAstHelper;
-use Dedoc\Scramble\Support\Generator\Types\OpenApiTypeHelper;
+use Illuminate\Foundation\Testing\RefreshDatabase;
 use Illuminate\Http\Resources\Json\JsonResource;
 use PhpParser\Node\Stmt\ClassMethod;
-use Illuminate\Foundation\Testing\RefreshDatabase;
 use function Spatie\Snapshots\assertMatchesTextSnapshot;
 
 uses(RefreshDatabase::class);
@@ -28,7 +27,7 @@ class InferTypesTest_SampleClass
 {
     public function wow($request)
     {
-        return (new BrandEdge($request));
+        return new BrandEdge($request);
     }
 }
 

tests/TestCase.php

@@ -34,6 +34,6 @@ public function getEnvironmentSetUp($app)
 
     protected function defineDatabaseMigrations()
     {
-        $this->loadMigrationsFrom(__DIR__ . '/migrations');
+        $this->loadMigrationsFrom(__DIR__.'/migrations');
     }
 }