Fix styling

rubenvanassche · github-actions[bot] · commit 157584c10919 · 2023-08-01T13:12:04.000Z
diff --git a/src/Actions/DiscoverTypesAction.php b/src/Actions/DiscoverTypesAction.php
@@ -4,13 +4,11 @@
 
 use Spatie\StructureDiscoverer\Discover;
 use Spatie\StructureDiscoverer\Enums\DiscoveredStructureType;
-use Spatie\TypeScriptTransformer\Support\TypeScriptTransformerLog;
-use Spatie\TypeScriptTransformer\TypeScriptTransformerConfig;
 
 class DiscoverTypesAction
 {
     /**
-     * @param array<string> $directories
+     * @param  array<string>  $directories
      * @return array<class-string>
      */
     public function execute(
diff --git a/src/Actions/ProvideTypesAction.php b/src/Actions/ProvideTypesAction.php
@@ -2,9 +2,9 @@
 
 namespace Spatie\TypeScriptTransformer\Actions;
 
-use Spatie\TypeScriptTransformer\TypeProviders\TypesProvider;
 use Spatie\TypeScriptTransformer\Support\TransformedCollection;
 use Spatie\TypeScriptTransformer\Support\TypeScriptTransformerLog;
+use Spatie\TypeScriptTransformer\TypeProviders\TypesProvider;
 use Spatie\TypeScriptTransformer\TypeScriptTransformerConfig;
 
 class ProvideTypesAction
diff --git a/src/Laravel/ClassPropertyProcessors/ReplaceLaravelCollectionByArrayClassPropertyProcessor.php b/src/Laravel/ClassPropertyProcessors/ReplaceLaravelCollectionByArrayClassPropertyProcessor.php
@@ -17,7 +17,6 @@
 use Spatie\TypeScriptTransformer\TypeScript\TypeScriptUnion;
 use Spatie\TypeScriptTransformer\Visitor\Visitor;
 use Spatie\TypeScriptTransformer\Visitor\VisitorOperation;
-use Spatie\TypeScriptTransformer\Visitor\VisitTypeScriptTreeAction;
 
 class ReplaceLaravelCollectionByArrayClassPropertyProcessor implements ClassPropertyProcessor
 {
@@ -44,12 +43,12 @@ public function __construct()
 
             $isRecord = $generic->genericTypes[0] instanceof TypeScriptUnion || $generic->genericTypes[0] instanceof TypeScriptString;
 
-            if($isRecord){
+            if ($isRecord) {
                 return VisitorOperation::replace(new TypeScriptGeneric(
                     new TypeScriptIdentifier('Record'),
                     [
                         $generic->genericTypes[0],
-                        $generic->genericTypes[1]
+                        $generic->genericTypes[1],
                     ]
                 ));
             }
diff --git a/src/Laravel/LaravelNamedRouteTypesProvider.php b/src/Laravel/LaravelNamedRouteTypesProvider.php
@@ -2,7 +2,6 @@
 
 namespace Spatie\TypeScriptTransformer\Laravel;
 
-use Spatie\TypeScriptTransformer\TypeProviders\TypesProvider;
 use Spatie\TypeScriptTransformer\Laravel\Actions\ResolveLaravelRoutControllerCollectionsAction;
 use Spatie\TypeScriptTransformer\Laravel\Routes\RouteClosure;
 use Spatie\TypeScriptTransformer\Laravel\Routes\RouteCollection;
@@ -15,6 +14,7 @@
 use Spatie\TypeScriptTransformer\Support\TransformedCollection;
 use Spatie\TypeScriptTransformer\Support\TypeScriptTransformerLog;
 use Spatie\TypeScriptTransformer\Transformed\Transformed;
+use Spatie\TypeScriptTransformer\TypeProviders\TypesProvider;
 use Spatie\TypeScriptTransformer\TypeScript\TypeReference;
 use Spatie\TypeScriptTransformer\TypeScript\TypeScriptAlias;
 use Spatie\TypeScriptTransformer\TypeScript\TypeScriptFunctionDefinition;
diff --git a/src/Laravel/LaravelRouteActionTypesProvider.php b/src/Laravel/LaravelRouteActionTypesProvider.php
@@ -2,7 +2,6 @@
 
 namespace Spatie\TypeScriptTransformer\Laravel;
 
-use Spatie\TypeScriptTransformer\TypeProviders\TypesProvider;
 use Spatie\TypeScriptTransformer\Laravel\Actions\ResolveLaravelRoutControllerCollectionsAction;
 use Spatie\TypeScriptTransformer\Laravel\Routes\RouteCollection;
 use Spatie\TypeScriptTransformer\Laravel\Routes\RouteController;
@@ -14,6 +13,7 @@
 use Spatie\TypeScriptTransformer\Support\TransformedCollection;
 use Spatie\TypeScriptTransformer\Support\TypeScriptTransformerLog;
 use Spatie\TypeScriptTransformer\Transformed\Transformed;
+use Spatie\TypeScriptTransformer\TypeProviders\TypesProvider;
 use Spatie\TypeScriptTransformer\TypeScript\TypeReference;
 use Spatie\TypeScriptTransformer\TypeScript\TypeScriptAlias;
 use Spatie\TypeScriptTransformer\TypeScript\TypeScriptArray;
diff --git a/src/Laravel/LaravelTypesProvider.php b/src/Laravel/LaravelTypesProvider.php
@@ -6,11 +6,11 @@
 use Illuminate\Database\Eloquent\Collection as EloquentCollection;
 use Illuminate\Pagination\LengthAwarePaginator;
 use Illuminate\Support\Collection;
-use Spatie\TypeScriptTransformer\TypeProviders\TypesProvider;
 use Spatie\TypeScriptTransformer\References\ClassStringReference;
 use Spatie\TypeScriptTransformer\Support\TransformedCollection;
 use Spatie\TypeScriptTransformer\Support\TypeScriptTransformerLog;
 use Spatie\TypeScriptTransformer\Transformed\Transformed;
+use Spatie\TypeScriptTransformer\TypeProviders\TypesProvider;
 use Spatie\TypeScriptTransformer\TypeScript\TypeReference;
 use Spatie\TypeScriptTransformer\TypeScript\TypeScriptAlias;
 use Spatie\TypeScriptTransformer\TypeScript\TypeScriptBoolean;
@@ -31,7 +31,6 @@ public function provide(TypeScriptTransformerConfig $config, TypeScriptTransform
     {
         /** @todo We should only keep these types if they are referenced otherwise they arent't required to be transformed */
         /** @todo writing types in phpdoc syntax would be a lot easier here */
-
         $types->add(
             $this->collection(),
             $this->eloquentCollection(),
@@ -95,7 +94,7 @@ protected function lengthAwarePaginator(): Transformed
                         new TypeScriptProperty('data', new TypeScriptGeneric(
                             new TypeScriptIdentifier('Array'),
                             [new TypeScriptIdentifier('T')],
-                        ),),
+                        ), ),
                         new TypeScriptProperty('links', new TypeScriptObject([
                             new TypeScriptProperty('url', new TypeScriptUnion([
                                 new TypeScriptIdentifier('string'),
diff --git a/src/Laravel/SpatieLaravelTypesProvider.php b/src/Laravel/SpatieLaravelTypesProvider.php
@@ -2,11 +2,11 @@
 
 namespace Spatie\TypeScriptTransformer\Laravel;
 
-use Spatie\TypeScriptTransformer\TypeProviders\TypesProvider;
 use Spatie\TypeScriptTransformer\References\ClassStringReference;
 use Spatie\TypeScriptTransformer\Support\TransformedCollection;
 use Spatie\TypeScriptTransformer\Support\TypeScriptTransformerLog;
 use Spatie\TypeScriptTransformer\Transformed\Transformed;
+use Spatie\TypeScriptTransformer\TypeProviders\TypesProvider;
 use Spatie\TypeScriptTransformer\TypeScript\TypeScriptAlias;
 use Spatie\TypeScriptTransformer\TypeScript\TypeScriptExport;
 use Spatie\TypeScriptTransformer\TypeScript\TypeScriptGeneric;
@@ -23,29 +23,29 @@ public function provide(TypeScriptTransformerConfig $config, TypeScriptTransform
         if (class_exists(\Spatie\LaravelOptions\Options::class)) {
             $optionsType = new Transformed(
                 new TypeScriptExport(new TypeScriptAlias(
-                        new TypeScriptGeneric(
-                            new TypeScriptIdentifier('Options'),
-                            [
-                                new TypeScriptGenericTypeVariable(
-                                    new TypeScriptIdentifier('TValue'),
-                                    default: new TypeScriptIdentifier('string'),
-                                ),
-                                new TypeScriptGenericTypeVariable(
-                                    new TypeScriptIdentifier('TLabel'),
-                                    default: new TypeScriptIdentifier('string'),
-                                ),
-                            ]
-                        ),
-                        new TypeScriptGeneric(
-                            new TypeScriptIdentifier('Array'),
-                            [
-                                new TypeScriptObject([
-                                    new TypeScriptProperty('value', new TypeScriptGenericTypeVariable(new TypeScriptIdentifier('TValue'))),
-                                    new TypeScriptProperty('label', new TypeScriptGenericTypeVariable(new TypeScriptIdentifier('TLabel'))),
-                                ]),
-                            ],
-                        )
+                    new TypeScriptGeneric(
+                        new TypeScriptIdentifier('Options'),
+                        [
+                            new TypeScriptGenericTypeVariable(
+                                new TypeScriptIdentifier('TValue'),
+                                default: new TypeScriptIdentifier('string'),
+                            ),
+                            new TypeScriptGenericTypeVariable(
+                                new TypeScriptIdentifier('TLabel'),
+                                default: new TypeScriptIdentifier('string'),
+                            ),
+                        ]
+                    ),
+                    new TypeScriptGeneric(
+                        new TypeScriptIdentifier('Array'),
+                        [
+                            new TypeScriptObject([
+                                new TypeScriptProperty('value', new TypeScriptGenericTypeVariable(new TypeScriptIdentifier('TValue'))),
+                                new TypeScriptProperty('label', new TypeScriptGenericTypeVariable(new TypeScriptIdentifier('TLabel'))),
+                            ]),
+                        ],
                     )
+                )
                 ),
                 new ClassStringReference(\Spatie\LaravelOptions\Options::class),
                 'Options',
diff --git a/src/Support/VisitorProfile.php b/src/Support/VisitorProfile.php
@@ -4,7 +4,7 @@
 
 class VisitorProfile
 {
-    public static function create():self
+    public static function create(): self
     {
         return new self();
     }
diff --git a/src/Transformed/Transformed.php b/src/Transformed/Transformed.php
@@ -2,7 +2,6 @@
 
 namespace Spatie\TypeScriptTransformer\Transformed;
 
-use ReflectionClass;
 use Spatie\TypeScriptTransformer\References\Reference;
 use Spatie\TypeScriptTransformer\TypeScript\TypeScriptNode;
 
diff --git a/src/TypeProviders/TransformerTypesProvider.php b/src/TypeProviders/TransformerTypesProvider.php
@@ -18,8 +18,8 @@ class TransformerTypesProvider implements TypesProvider
     protected array $transformers;
 
     /**
-     * @param array<class-string<Transformer>|Transformer> $transformers
-     * @param array<string> $directories
+     * @param  array<class-string<Transformer>|Transformer>  $transformers
+     * @param  array<string>  $directories
      */
     public function __construct(
         array $transformers,
@@ -44,15 +44,14 @@ public function provide(
         foreach ($discoveredClasses as $discoveredClass) {
             $transformed = $this->transformType($discoveredClass);
 
-
             if ($transformed) {
                 $types->add($transformed);
             }
         }
     }
 
     /**
-     * @param class-string $type
+     * @param  class-string  $type
      */
     protected function transformType(string $type): ?Transformed
     {
diff --git a/src/TypeProviders/TypesProvider.php b/src/TypeProviders/TypesProvider.php
@@ -4,7 +4,6 @@
 
 use Spatie\TypeScriptTransformer\Support\TransformedCollection;
 use Spatie\TypeScriptTransformer\Support\TypeScriptTransformerLog;
-use Spatie\TypeScriptTransformer\Transformed\Transformed;
 use Spatie\TypeScriptTransformer\TypeScriptTransformerConfig;
 
 interface TypesProvider
diff --git a/src/TypeScript/TypeScriptIndexedAccess.php b/src/TypeScript/TypeScriptIndexedAccess.php
@@ -26,7 +26,6 @@ public function write(WritingContext $context): string
         return "{$this->node->write($context)}".implode('', $segments);
     }
 
-
     public function visitorProfile(): VisitorProfile
     {
         return VisitorProfile::create()->single('node')->iterable('segments');
diff --git a/src/TypeScript/TypeScriptUnion.php b/src/TypeScript/TypeScriptUnion.php
@@ -9,7 +9,7 @@
 class TypeScriptUnion implements TypeScriptNode, TypeScriptVisitableNode
 {
     /**
-     * @param array<TypeScriptNode> $types
+     * @param  array<TypeScriptNode>  $types
      */
     public function __construct(
         public array $types,
diff --git a/src/TypeScriptTransformer.php b/src/TypeScriptTransformer.php
@@ -2,11 +2,10 @@
 
 namespace Spatie\TypeScriptTransformer;
 
-use Spatie\TypeScriptTransformer\Actions\ProvideTypesAction;
 use Spatie\TypeScriptTransformer\Actions\ConnectReferencesAction;
 use Spatie\TypeScriptTransformer\Actions\DiscoverTypesAction;
 use Spatie\TypeScriptTransformer\Actions\FormatFilesAction;
-use Spatie\TypeScriptTransformer\Actions\TransformTypesAction;
+use Spatie\TypeScriptTransformer\Actions\ProvideTypesAction;
 use Spatie\TypeScriptTransformer\Actions\WriteTypesAction;
 use Spatie\TypeScriptTransformer\Support\TransformedCollection;
 use Spatie\TypeScriptTransformer\Support\TypeScriptTransformerLog;
@@ -42,7 +41,6 @@ public function execute(bool $watch = false): TypeScriptTransformerLog
          * - Make it possible to hijack the PHPStan types, or some way to rename a Laravel Collection to an array? Would be easier
          * - When generating routes where we have the full namespace, prepend with ., check Laravel Echo for this
          * - Prettier can run on complete directories, so formatting single files is maybe not required
-
          */
         $transformedCollection = new TransformedCollection();
 
diff --git a/src/TypeScriptTransformerConfig.php b/src/TypeScriptTransformerConfig.php
@@ -2,9 +2,8 @@
 
 namespace Spatie\TypeScriptTransformer;
 
-use Spatie\TypeScriptTransformer\TypeProviders\TypesProvider;
 use Spatie\TypeScriptTransformer\Formatters\Formatter;
-use Spatie\TypeScriptTransformer\Transformers\Transformer;
+use Spatie\TypeScriptTransformer\TypeProviders\TypesProvider;
 use Spatie\TypeScriptTransformer\Writers\Writer;
 
 class TypeScriptTransformerConfig
diff --git a/src/Visitor/Visitor.php b/src/Visitor/Visitor.php
@@ -15,8 +15,8 @@ public static function create(): self
     }
 
     /**
-     * @param array<VisitorClosure> $beforeClosures
-     * @param array<VisitorClosure> $afterClosures
+     * @param  array<VisitorClosure>  $beforeClosures
+     * @param  array<VisitorClosure>  $afterClosures
      */
     public function __construct(
         protected array $beforeClosures = [],
@@ -26,7 +26,7 @@ public function __construct(
 
     public function before(
         Closure $closure,
-        ?array $allowedNodes = null,
+        array $allowedNodes = null,
     ): self {
         $this->beforeClosures[] = new VisitorClosure($closure, $allowedNodes);
 
@@ -35,7 +35,7 @@ public function before(
 
     public function after(
         Closure $closure,
-        ?array $allowedNodes = null,
+        array $allowedNodes = null,
     ): self {
         $this->afterClosures[] = new VisitorClosure($closure, $allowedNodes);
 
@@ -75,7 +75,7 @@ public function execute(
                 try {
                     $node->$singleNodeName = $visited;
                 } catch (Exception $e) {
-                    throw new Exception("Tried setting $singleNodeName on ".get_class($node)." to ".get_class($visited)." but failed.");
+                    throw new Exception("Tried setting $singleNodeName on ".get_class($node).' to '.get_class($visited).' but failed.');
                 }
             }
 

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,6 @@`
`17`	`17`	`use Spatie\TypeScriptTransformer\TypeScript\TypeScriptUnion;`
`18`	`18`	`use Spatie\TypeScriptTransformer\Visitor\Visitor;`
`19`	`19`	`use Spatie\TypeScriptTransformer\Visitor\VisitorOperation;`
`20`		`-use Spatie\TypeScriptTransformer\Visitor\VisitTypeScriptTreeAction;`
`21`	`20`
`22`	`21`	`class ReplaceLaravelCollectionByArrayClassPropertyProcessor implements ClassPropertyProcessor`
`23`	`22`	`{`
`@@ -44,12 +43,12 @@ public function __construct()`
`44`	`43`
`45`	`44`	`$isRecord = $generic->genericTypes[0] instanceof TypeScriptUnion \|\| $generic->genericTypes[0] instanceof TypeScriptString;`
`46`	`45`
`47`		`- if($isRecord){`
	`46`	`+ if ($isRecord) {`
`48`	`47`	`return VisitorOperation::replace(new TypeScriptGeneric(`
`49`	`48`	`new TypeScriptIdentifier('Record'),`
`50`	`49`	`[`
`51`	`50`	`$generic->genericTypes[0],`
`52`		`- $generic->genericTypes[1]`
	`51`	`+ $generic->genericTypes[1],`
`53`	`52`	`]`
`54`	`53`	`));`
`55`	`54`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`
`5`	`5`	`class VisitorProfile`
`6`	`6`	`{`
`7`		`- public static function create():self`
	`7`	`+ public static function create(): self`
`8`	`8`	`{`
`9`	`9`	`return new self();`
`10`	`10`	`}`
Original file line number	Diff line number	Diff line change
`@@ -18,8 +18,8 @@ class TransformerTypesProvider implements TypesProvider`
`18`	`18`	`protected array $transformers;`
`19`	`19`
`20`	`20`	`/**`
`21`		`- * @param array<class-string<Transformer>\|Transformer> $transformers`
`22`		`- * @param array<string> $directories`
	`21`	`+ * @param array<class-string<Transformer>\|Transformer> $transformers`
	`22`	`+ * @param array<string> $directories`
`23`	`23`	`*/`
`24`	`24`	`public function __construct(`
`25`	`25`	`array $transformers,`
`@@ -44,15 +44,14 @@ public function provide(`
`44`	`44`	`foreach ($discoveredClasses as $discoveredClass) {`
`45`	`45`	`$transformed = $this->transformType($discoveredClass);`
`46`	`46`
`47`		`-`
`48`	`47`	`if ($transformed) {`
`49`	`48`	`$types->add($transformed);`
`50`	`49`	`}`
`51`	`50`	`}`
`52`	`51`	`}`
`53`	`52`
`54`	`53`	`/**`
`55`		`- * @param class-string $type`
	`54`	`+ * @param class-string $type`
`56`	`55`	`*/`
`57`	`56`	`protected function transformType(string $type): ?Transformed`
`58`	`57`	`{`