Fix styling

rubenvanassche · github-actions[bot] · commit 1c46069a4abf · 2023-07-17T20:34:50.000Z
diff --git a/src/Actions/VisitTypeScriptTreeAction.php b/src/Actions/VisitTypeScriptTreeAction.php
@@ -11,7 +11,7 @@ class VisitTypeScriptTreeAction
     public function execute(
         TypeScriptNode $typeScriptNode,
         Closure $walker,
-        ?array $allowedNodes = null
+        array $allowedNodes = null
     ): void {
         // TODO: would be cool to replace nodes, remove them etc
         // Problem: nodes are sometimes structured in different properties which makes this complicated
diff --git a/src/Laravel/LaravelDefaultTypesProvider.php b/src/Laravel/LaravelDefaultTypesProvider.php
@@ -94,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/RouterGenerator.php b/src/Laravel/RouterGenerator.php
@@ -20,7 +20,6 @@
 use Spatie\TypeScriptTransformer\TypeScript\TypeScriptGenericTypeVariable;
 use Spatie\TypeScriptTransformer\TypeScript\TypeScriptIdentifier;
 use Spatie\TypeScriptTransformer\TypeScript\TypeScriptIndexedAccess;
-use Spatie\TypeScriptTransformer\TypeScript\TypeScriptInterface;
 use Spatie\TypeScriptTransformer\TypeScript\TypeScriptObject;
 use Spatie\TypeScriptTransformer\TypeScript\TypeScriptOperator;
 use Spatie\TypeScriptTransformer\TypeScript\TypeScriptParameter;
@@ -121,7 +120,7 @@ public function provide(): array
                     new TypeScriptParameter('params', new TypeScriptIdentifier('TParams'), isOptional: true),
                 ],
                 new TypeScriptString(),
-                new TypeScriptRaw("let routes = JSON.parse('".json_encode($controllers->toJsObject(), flags: JSON_UNESCAPED_SLASHES). "')")
+                new TypeScriptRaw("let routes = JSON.parse('".json_encode($controllers->toJsObject(), flags: JSON_UNESCAPED_SLASHES)."')")
             ),
             null,
             'route',
diff --git a/src/Laravel/Routes/InvokableRouteController.php b/src/Laravel/Routes/InvokableRouteController.php
@@ -2,7 +2,6 @@
 
 namespace Spatie\TypeScriptTransformer\Laravel\Routes;
 
-use PHPUnit\Runner\Extension\ParameterCollection;
 use Spatie\TypeScriptTransformer\TypeScript\TypeScriptNode;
 use Spatie\TypeScriptTransformer\TypeScript\TypeScriptObject;
 use Spatie\TypeScriptTransformer\TypeScript\TypeScriptProperty;
@@ -11,14 +10,13 @@
 class InvokableRouteController implements RouterStructure
 {
     /**
-     * @param array<string> $methods
+     * @param  array<string>  $methods
      */
     public function __construct(
         public RouteParameterCollection $parameters,
         public array $methods,
         public string $url,
-    )
-    {
+    ) {
     }
 
     public function toTypeScriptNode(): TypeScriptNode
@@ -33,7 +31,7 @@ public function toJsObject(): array
     {
         return [
             'url' => $this->url,
-            'methods' => array_values($this->methods)
+            'methods' => array_values($this->methods),
         ];
     }
 }
diff --git a/src/Laravel/Routes/RouteController.php b/src/Laravel/Routes/RouteController.php
@@ -9,7 +9,7 @@
 class RouteController implements RouterStructure
 {
     /**
-     * @param array<string, RouteControllerAction> $actions
+     * @param  array<string, RouteControllerAction>  $actions
      */
     public function __construct(
         public array $actions,
diff --git a/src/Laravel/Routes/RouteControllerAction.php b/src/Laravel/Routes/RouteControllerAction.php
@@ -10,7 +10,7 @@
 class RouteControllerAction implements RouterStructure
 {
     /**
-     * @param array<string> $methods
+     * @param  array<string>  $methods
      */
     public function __construct(
         public string $name,
diff --git a/src/Laravel/Routes/RouteControllerCollection.php b/src/Laravel/Routes/RouteControllerCollection.php
@@ -9,7 +9,7 @@
 class RouteControllerCollection implements RouterStructure
 {
     /**
-     * @param array<string, RouteController|InvokableRouteController> $controllers
+     * @param  array<string, RouteController|InvokableRouteController>  $controllers
      */
     public function __construct(
         public array $controllers
diff --git a/src/Laravel/Routes/RouteParameterCollection.php b/src/Laravel/Routes/RouteParameterCollection.php
@@ -8,7 +8,7 @@
 class RouteParameterCollection implements RouterStructure
 {
     /**
-     * @param array<RouteParameter> $parameters
+     * @param  array<RouteParameter>  $parameters
      */
     public function __construct(
         public array $parameters,
diff --git a/src/Laravel/SpatieLaravelDefaultTypesProvider.php b/src/Laravel/SpatieLaravelDefaultTypesProvider.php
@@ -22,29 +22,29 @@ public function provide(): array
         if (class_exists(\Spatie\LaravelOptions\Options::class)) {
             $types[] = 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/Transformers/ClassTransformer.php b/src/Transformers/ClassTransformer.php
@@ -84,7 +84,7 @@ protected function getTypeScriptNode(
 
     protected function resolveTypeByAttribute(
         ReflectionClass $reflectionClass,
-        ?ReflectionProperty $property = null,
+        ReflectionProperty $property = null,
     ): ?TypeScriptNode {
         $subject = $property ?? $reflectionClass;
 
diff --git a/src/TypeScript/TypeScriptArray.php b/src/TypeScript/TypeScriptArray.php
@@ -7,7 +7,7 @@
 class TypeScriptArray implements TypeScriptNode, TypeScriptNodeWithChildren
 {
     /**
-     * @param TypeScriptNode[] $types
+     * @param  TypeScriptNode[]  $types
      */
     public function __construct(
         public array $types
@@ -17,7 +17,7 @@ public function __construct(
     public function write(WritingContext $context): string
     {
         $types = implode(', ', array_map(
-            fn(TypeScriptNode $type) => $type->write($context),
+            fn (TypeScriptNode $type) => $type->write($context),
             $this->types
         ));
 
diff --git a/src/TypeScript/TypeScriptIndexedAccess.php b/src/TypeScript/TypeScriptIndexedAccess.php
@@ -2,14 +2,12 @@
 
 namespace Spatie\TypeScriptTransformer\TypeScript;
 
-use PHPStan\PhpDocParser\Ast\Type\TypeNode;
 use Spatie\TypeScriptTransformer\Support\WritingContext;
 
 class TypeScriptIndexedAccess implements TypeScriptNode, TypeScriptNodeWithChildren
 {
     /**
-     * @param TypeScriptIdentifier $node
-     * @param array<TypeScriptNode> $segments
+     * @param  array<TypeScriptNode>  $segments
      */
     public function __construct(
         public TypeScriptIdentifier $node,
@@ -20,11 +18,11 @@ public function __construct(
     public function write(WritingContext $context): string
     {
         $segments = array_map(
-            fn(TypeScriptNode $segment) => "[{$segment->write($context)}]",
+            fn (TypeScriptNode $segment) => "[{$segment->write($context)}]",
             $this->segments
         );
 
-        return "{$this->node->write($context)}" . implode('', $segments);
+        return "{$this->node->write($context)}".implode('', $segments);
     }
 
     public function children(): array

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,6 @@`
`2`	`2`
`3`	`3`	`namespace Spatie\TypeScriptTransformer\Laravel\Routes;`
`4`	`4`
`5`		`-use PHPUnit\Runner\Extension\ParameterCollection;`
`6`	`5`	`use Spatie\TypeScriptTransformer\TypeScript\TypeScriptNode;`
`7`	`6`	`use Spatie\TypeScriptTransformer\TypeScript\TypeScriptObject;`
`8`	`7`	`use Spatie\TypeScriptTransformer\TypeScript\TypeScriptProperty;`
`@@ -11,14 +10,13 @@`
`11`	`10`	`class InvokableRouteController implements RouterStructure`
`12`	`11`	`{`
`13`	`12`	`/**`
`14`		`- * @param array<string> $methods`
	`13`	`+ * @param array<string> $methods`
`15`	`14`	`*/`
`16`	`15`	`public function __construct(`
`17`	`16`	`public RouteParameterCollection $parameters,`
`18`	`17`	`public array $methods,`
`19`	`18`	`public string $url,`
`20`		`- )`
`21`		`- {`
	`19`	`+ ) {`
`22`	`20`	`}`
`23`	`21`
`24`	`22`	`public function toTypeScriptNode(): TypeScriptNode`
`@@ -33,7 +31,7 @@ public function toJsObject(): array`
`33`	`31`	`{`
`34`	`32`	`return [`
`35`	`33`	`'url' => $this->url,`
`36`		`- 'methods' => array_values($this->methods)`
	`34`	`+ 'methods' => array_values($this->methods),`
`37`	`35`	`];`
`38`	`36`	`}`
`39`	`37`	`}`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@`
`9`	`9`	`class RouteController implements RouterStructure`
`10`	`10`	`{`
`11`	`11`	`/**`
`12`		`- * @param array<string, RouteControllerAction> $actions`
	`12`	`+ * @param array<string, RouteControllerAction> $actions`
`13`	`13`	`*/`
`14`	`14`	`public function __construct(`
`15`	`15`	`public array $actions,`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@`
`10`	`10`	`class RouteControllerAction implements RouterStructure`
`11`	`11`	`{`
`12`	`12`	`/**`
`13`		`- * @param array<string> $methods`
	`13`	`+ * @param array<string> $methods`
`14`	`14`	`*/`
`15`	`15`	`public function __construct(`
`16`	`16`	`public string $name,`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@`
`9`	`9`	`class RouteControllerCollection implements RouterStructure`
`10`	`10`	`{`
`11`	`11`	`/**`
`12`		`- * @param array<string, RouteController\|InvokableRouteController> $controllers`
	`12`	`+ * @param array<string, RouteController\|InvokableRouteController> $controllers`
`13`	`13`	`*/`
`14`	`14`	`public function __construct(`
`15`	`15`	`public array $controllers`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`class RouteParameterCollection implements RouterStructure`
`9`	`9`	`{`
`10`	`10`	`/**`
`11`		`- * @param array<RouteParameter> $parameters`
	`11`	`+ * @param array<RouteParameter> $parameters`
`12`	`12`	`*/`
`13`	`13`	`public function __construct(`
`14`	`14`	`public array $parameters,`