Fix styling

rubenvanassche · github-actions[bot] · commit 809cfac91054 · 2023-07-04T09:26:38.000Z
diff --git a/src/Actions/AppendDefaultTypesAction.php b/src/Actions/AppendDefaultTypesAction.php
@@ -16,8 +16,7 @@ public function __construct(
     }
 
     /**
-     * @param array<Transformed> $transformed
-     *
+     * @param  array<Transformed>  $transformed
      * @return array<Transformed>
      */
     public function execute(array $transformed): array
diff --git a/src/Actions/ConnectReferencesAction.php b/src/Actions/ConnectReferencesAction.php
@@ -18,7 +18,7 @@ public function __construct(
     }
 
     /**
-     * @param array<Transformed> $transformed
+     * @param  array<Transformed>  $transformed
      */
     public function execute(array $transformed): ReferenceMap
     {
diff --git a/src/Actions/DiscoverTypesAction.php b/src/Actions/DiscoverTypesAction.php
@@ -12,8 +12,7 @@ class DiscoverTypesAction
     public function __construct(
         public TypeScriptTransformerConfig $config,
         public TypeScriptTransformerLog $log,
-    )
-    {
+    ) {
     }
 
     /** @return array<string> */
diff --git a/src/Actions/FindClassNameFqcnAction.php b/src/Actions/FindClassNameFqcnAction.php
@@ -26,7 +26,7 @@ public function execute(ReflectionClass $reflectionClass, string $className): ?s
 
         $guessedFqcn = "{$reflectionClass->getNamespaceName()}\\{$className}";
 
-        if(class_exists($guessedFqcn)){
+        if (class_exists($guessedFqcn)) {
             return $this->cleanupClassname($guessedFqcn);
         }
 
@@ -46,8 +46,7 @@ protected function loadUsages(ReflectionClass $reflectionClass): UsageCollection
 
     protected function cleanupClassname(
         string $classname
-    ):string
-    {
+    ): string {
         return ltrim($classname, '\\');
     }
 }
diff --git a/src/Actions/FormatFilesAction.php b/src/Actions/FormatFilesAction.php
@@ -11,8 +11,7 @@ class FormatFilesAction
     public function __construct(
         public TypeScriptTransformerConfig $config,
         public TypeScriptTransformerLog $log,
-    )
-    {
+    ) {
     }
 
     /**
diff --git a/src/Actions/ParseUseDefinitionsAction.php b/src/Actions/ParseUseDefinitionsAction.php
@@ -20,7 +20,6 @@ public function execute(
         string $filename,
     ): UsageCollection {
         /** @todo refactor this to the structure discoverer package, it is copied from there */
-
         try {
             $contents = file_get_contents($filename);
 
diff --git a/src/Actions/SplitTransformedPerLocationAction.php b/src/Actions/SplitTransformedPerLocationAction.php
@@ -8,8 +8,7 @@
 class SplitTransformedPerLocationAction
 {
     /**
-     * @param  array<Transformed> $transformedTypes
-     *
+     * @param  array<Transformed>  $transformedTypes
      * @return array<Location>
      */
     public function execute(array $transformedTypes): array
diff --git a/src/Actions/TransformTypesAction.php b/src/Actions/TransformTypesAction.php
@@ -19,7 +19,6 @@ public function __construct(
 
     /**
      * @param  array<string>  $types
-     *
      * @return array<Transformed>
      */
     public function execute(array $types): array
diff --git a/src/Actions/WriteTypesAction.php b/src/Actions/WriteTypesAction.php
@@ -19,8 +19,7 @@ public function __construct(
     public function execute(
         array $transformed,
         ReferenceMap $referenceMap
-    ): array
-    {
+    ): array {
         return $this->config->writer->output($transformed, $referenceMap);
     }
 }
diff --git a/src/Attributes/LiteralTypeScriptType.php b/src/Attributes/LiteralTypeScriptType.php
@@ -10,9 +10,9 @@
 #[Attribute]
 class LiteralTypeScriptType implements TypeScriptTransformableAttribute
 {
-    private string | array $typeScript;
+    private string|array $typeScript;
 
-    public function __construct(string | array $typeScript)
+    public function __construct(string|array $typeScript)
     {
         $this->typeScript = $typeScript;
     }
diff --git a/src/Attributes/TypeScriptType.php b/src/Attributes/TypeScriptType.php
@@ -11,9 +11,9 @@
 #[Attribute]
 class TypeScriptType implements TypeScriptTransformableAttribute
 {
-    private array | string $type;
+    private array|string $type;
 
-    public function __construct(string | array $type)
+    public function __construct(string|array $type)
     {
         $this->type = $type;
     }
diff --git a/src/Laravel/SpatieLaravelDefaultTypesProvider.php b/src/Laravel/SpatieLaravelDefaultTypesProvider.php
@@ -22,14 +22,14 @@ public function provide(): array
         if (class_exists(\Spatie\LaravelOptions\Options::class)) {
             $types[] = new Transformed(
                 new TypeScriptExport(new TypeScriptAlias(
-                        new TypeScriptIdentifier('Options'),
-                        new TypeScriptArray(
-                            new TypeScriptObject([
-                                new TypeScriptProperty('label', new TypeScriptString()),
-                                new TypeScriptProperty('value', new TypeScriptString()),
-                            ]),
-                        )
+                    new TypeScriptIdentifier('Options'),
+                    new TypeScriptArray(
+                        new TypeScriptObject([
+                            new TypeScriptProperty('label', new TypeScriptString()),
+                            new TypeScriptProperty('value', new TypeScriptString()),
+                        ]),
                     )
+                )
                 ),
                 new ClassStringReference(\Spatie\LaravelOptions\Options::class),
                 'Options',
diff --git a/src/References/FunctionReference.php b/src/References/FunctionReference.php
@@ -6,8 +6,7 @@ class FunctionReference implements Reference
 {
     public function __construct(
         public string $name,
-    )
-    {
+    ) {
     }
 
     public function getKey(): string
diff --git a/src/Support/WritingContext.php b/src/Support/WritingContext.php
@@ -8,7 +8,7 @@
 class WritingContext
 {
     /**
-     * @param callable(Reference):string $referenceWriter
+     * @param  callable(Reference):string  $referenceWriter
      */
     public function __construct(
         public Closure $referenceWriter,
diff --git a/src/Transformed/Transformed.php b/src/Transformed/Transformed.php
@@ -4,14 +4,13 @@
 
 use ReflectionClass;
 use Spatie\TypeScriptTransformer\References\Reference;
-use Spatie\TypeScriptTransformer\Support\Import;
 use Spatie\TypeScriptTransformer\TypeScript\TypeScriptNode;
 
 class Transformed
 {
     /**
-     * @param array<string> $location
-     * @param array<Reference> $references
+     * @param  array<string>  $location
+     * @param  array<Reference>  $references
      */
     public function __construct(
         public TypeScriptNode $typeScriptNode,
diff --git a/src/Transformers/ClassTransformer.php b/src/Transformers/ClassTransformer.php
@@ -4,7 +4,6 @@
 
 use ReflectionClass;
 use ReflectionProperty;
-use Spatie\TypeScriptTransformer\Actions\FindClassNameFqcnAction;
 use Spatie\TypeScriptTransformer\Actions\ParseUseDefinitionsAction;
 use Spatie\TypeScriptTransformer\Actions\TranspilePhpStanTypeToTypeScriptTypeAction;
 use Spatie\TypeScriptTransformer\Actions\TranspileReflectionTypeToTypeScriptTypeAction;
diff --git a/src/Transformers/DataClassTransformer.php b/src/Transformers/DataClassTransformer.php
@@ -4,8 +4,6 @@
 
 use ReflectionClass;
 use ReflectionProperty;
-use Spatie\StructureDiscoverer\Collections\UsageCollection;
-use Spatie\TypeScriptTransformer\Actions\FindClassNameFqcnAction;
 use Spatie\TypeScriptTransformer\TypeScript\TypeReference;
 use Spatie\TypeScriptTransformer\TypeScript\TypeScriptProperty;
 use Spatie\TypeScriptTransformer\TypeScript\TypeScriptUnion;
diff --git a/src/Transformers/EnumTransformer.php b/src/Transformers/EnumTransformer.php
@@ -9,11 +9,11 @@
 use Spatie\TypeScriptTransformer\Transformed\Transformed;
 use Spatie\TypeScriptTransformer\Transformed\Untransformable;
 use Spatie\TypeScriptTransformer\TypeScript\TypeScriptAlias;
-use Spatie\TypeScriptTransformer\TypeScript\TypeScriptExport;
-use Spatie\TypeScriptTransformer\TypeScript\TypeScriptNode;
 use Spatie\TypeScriptTransformer\TypeScript\TypeScriptEnum;
+use Spatie\TypeScriptTransformer\TypeScript\TypeScriptExport;
 use Spatie\TypeScriptTransformer\TypeScript\TypeScriptIdentifier;
 use Spatie\TypeScriptTransformer\TypeScript\TypeScriptLiteral;
+use Spatie\TypeScriptTransformer\TypeScript\TypeScriptNode;
 use Spatie\TypeScriptTransformer\TypeScript\TypeScriptUnion;
 use UnitEnum;
 
diff --git a/src/TypeScript/TypeScriptGeneric.php b/src/TypeScript/TypeScriptGeneric.php
@@ -7,7 +7,7 @@
 class TypeScriptGeneric implements TypeScriptNode, TypeScriptNodeWithChildren
 {
     /**
-     * @param array<TypeScriptNode> $genericTypes
+     * @param  array<TypeScriptNode>  $genericTypes
      */
     public function __construct(
         public TypeScriptNode $type,
diff --git a/src/TypeScript/TypeScriptIdentifier.php b/src/TypeScript/TypeScriptIdentifier.php
@@ -8,8 +8,7 @@ class TypeScriptIdentifier implements TypeScriptNode
 {
     public function __construct(
         public string $name,
-    )
-    {
+    ) {
     }
 
     public function write(WritingContext $context): string
diff --git a/src/TypeScript/TypeScriptImport.php b/src/TypeScript/TypeScriptImport.php
@@ -9,14 +9,13 @@ class TypeScriptImport implements TypeScriptNode
     public function __construct(
         public string $path,
         public array $names,
-    )
-    {
+    ) {
     }
 
     public function write(WritingContext $context): string
     {
         $names = implode(', ', $this->names);
 
-        return "import { {$names} } from '{$this->path}';" . PHP_EOL;
+        return "import { {$names} } from '{$this->path}';".PHP_EOL;
     }
 }
diff --git a/src/TypeScript/TypeScriptInterface.php b/src/TypeScript/TypeScriptInterface.php
@@ -7,9 +7,8 @@
 class TypeScriptInterface implements TypeScriptNode, TypeScriptNodeWithChildren
 {
     /**
-     * @param string $name
-     * @param array<TypeScriptProperty> $properties
-     * @param array<TypeScriptMethod> $methods
+     * @param  array<TypeScriptProperty>  $properties
+     * @param  array<TypeScriptMethod>  $methods
      */
     public function __construct(
         public string $name,
diff --git a/src/TypeScript/TypeScriptMethod.php b/src/TypeScript/TypeScriptMethod.php
@@ -7,7 +7,7 @@
 class TypeScriptMethod implements TypeScriptNode, TypeScriptNodeWithChildren
 {
     /**
-     * @param array<TypeScriptParameter> $parameters
+     * @param  array<TypeScriptParameter>  $parameters
      */
     public function __construct(
         public string $name,
diff --git a/src/TypeScript/TypeScriptObject.php b/src/TypeScript/TypeScriptObject.php
@@ -7,7 +7,7 @@
 class TypeScriptObject implements TypeScriptNode, TypeScriptNodeWithChildren
 {
     /**
-     * @param array<TypeScriptProperty> $properties
+     * @param  array<TypeScriptProperty>  $properties
      */
     public function __construct(
         public array $properties
diff --git a/src/TypeScript/TypeScriptUnion.php b/src/TypeScript/TypeScriptUnion.php
@@ -8,7 +8,7 @@
 class TypeScriptUnion implements TypeScriptNode, TypeScriptNodeWithChildren
 {
     /**
-     * @param array<TypeScriptNode> $types
+     * @param  array<TypeScriptNode>  $types
      */
     public function __construct(
         public array $types,
diff --git a/src/TypeScriptTransformer.php b/src/TypeScriptTransformer.php
@@ -6,7 +6,6 @@
 use Spatie\TypeScriptTransformer\Actions\ConnectReferencesAction;
 use Spatie\TypeScriptTransformer\Actions\DiscoverTypesAction;
 use Spatie\TypeScriptTransformer\Actions\FormatFilesAction;
-use Spatie\TypeScriptTransformer\Actions\ReplaceTypeReferencesAction;
 use Spatie\TypeScriptTransformer\Actions\TransformTypesAction;
 use Spatie\TypeScriptTransformer\Actions\WriteTypesAction;
 use Spatie\TypeScriptTransformer\Support\TypeScriptTransformerLog;
diff --git a/src/TypeScriptTransformerConfig.php b/src/TypeScriptTransformerConfig.php
@@ -11,7 +11,7 @@
     /**
      * @param  array<string>  $directories
      * @param  array<Transformer>  $transformers
-     * @param  array<class-string<DefaultTypesProvider>> $defaultTypeProviders
+     * @param  array<class-string<DefaultTypesProvider>>  $defaultTypeProviders
      */
     public function __construct(
         public array $directories,
diff --git a/src/Writers/ModuleWriter.php b/src/Writers/ModuleWriter.php
@@ -50,7 +50,7 @@ protected function writeLocation(
     ): WrittenFile {
         $imports = $this->resolveImports($location, $referenceMap);
 
-        $path = "{$this->path}/".implode('/', $location->segments)."/";
+        $path = "{$this->path}/".implode('/', $location->segments).'/';
 
         $output = '';
 
diff --git a/src/Writers/Writer.php b/src/Writers/Writer.php
@@ -4,7 +4,6 @@
 
 use Spatie\TypeScriptTransformer\Collections\ReferenceMap;
 use Spatie\TypeScriptTransformer\Support\WrittenFile;
-use Spatie\TypeScriptTransformer\Transformed\Transformed;
 
 interface Writer
 {
diff --git a/tests/Actions/ResolveRelativePathActionTest.php b/tests/Actions/ResolveRelativePathActionTest.php
@@ -1,6 +1,5 @@
 <?php
 
-
 use Spatie\TypeScriptTransformer\Actions\ResolveRelativePathAction;
 
 it('will return the correct path', function (array $current, array $requested, ?string $expected) {
diff --git a/tests/Actions/TranspileReflectionTypeToTypeScriptTypeActionTest.php b/tests/Actions/TranspileReflectionTypeToTypeScriptTypeActionTest.php
@@ -113,10 +113,10 @@
     ];
 
     // @todo figure out this one
-//    yield [
-//        'static',
-//        new TypeReference(new ClassStringReference(PhpTypesStub::class)),
-//    ];
+    //    yield [
+    //        'static',
+    //        new TypeReference(new ClassStringReference(PhpTypesStub::class)),
+    //    ];
 
     yield [
         'parent',
diff --git a/tests/Stubs/PhpDocTypesStub.php b/tests/Stubs/PhpDocTypesStub.php
@@ -13,19 +13,19 @@ class PhpDocTypesStub extends stdClass
     /** @var bool */
     public $bool;
 
-    /** @var boolean */
+    /** @var bool */
     public $boolean;
 
     /** @var int */
     public $int;
 
-    /** @var integer */
+    /** @var int */
     public $integer;
 
     /** @var float */
     public $float;
 
-    /** @var double */
+    /** @var float */
     public $double;
 
     /** @var mixed */
diff --git a/tests/Stubs/PhpTypesStub.php b/tests/Stubs/PhpTypesStub.php
@@ -30,7 +30,9 @@ class PhpTypesStub extends stdClass
 
     public Collection&Arrayable $intersection;
 
-    public (Collection&Arrayable)|null $bnf;
+    public (Collection&Arrayable)
+
+|null $bnf;
 
     public self $self;
 

Original file line number	Diff line number	Diff line change
`@@ -16,8 +16,7 @@ public function __construct(`
`16`	`16`	`}`
`17`	`17`
`18`	`18`	`/**`
`19`		`- * @param array<Transformed> $transformed`
`20`		`- *`
	`19`	`+ * @param array<Transformed> $transformed`
`21`	`20`	`* @return array<Transformed>`
`22`	`21`	`*/`
`23`	`22`	`public function execute(array $transformed): array`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ public function __construct(`
`18`	`18`	`}`
`19`	`19`
`20`	`20`	`/**`
`21`		`- * @param array<Transformed> $transformed`
	`21`	`+ * @param array<Transformed> $transformed`
`22`	`22`	`*/`
`23`	`23`	`public function execute(array $transformed): ReferenceMap`
`24`	`24`	`{`
Original file line number	Diff line number	Diff line change
`@@ -12,8 +12,7 @@ class DiscoverTypesAction`
`12`	`12`	`public function __construct(`
`13`	`13`	`public TypeScriptTransformerConfig $config,`
`14`	`14`	`public TypeScriptTransformerLog $log,`
`15`		`- )`
`16`		`- {`
	`15`	`+ ) {`
`17`	`16`	`}`
`18`	`17`
`19`	`18`	`/** @return array<string> */`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ public function execute(ReflectionClass $reflectionClass, string $className): ?s`
`26`	`26`
`27`	`27`	`$guessedFqcn = "{$reflectionClass->getNamespaceName()}\\{$className}";`
`28`	`28`
`29`		`- if(class_exists($guessedFqcn)){`
	`29`	`+ if (class_exists($guessedFqcn)) {`
`30`	`30`	`return $this->cleanupClassname($guessedFqcn);`
`31`	`31`	`}`
`32`	`32`
`@@ -46,8 +46,7 @@ protected function loadUsages(ReflectionClass $reflectionClass): UsageCollection`
`46`	`46`
`47`	`47`	`protected function cleanupClassname(`
`48`	`48`	`string $classname`
`49`		`- ):string`
`50`		`- {`
	`49`	`+ ): string {`
`51`	`50`	`return ltrim($classname, '\\');`
`52`	`51`	`}`
`53`	`52`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,8 +11,7 @@ class FormatFilesAction`
`11`	`11`	`public function __construct(`
`12`	`12`	`public TypeScriptTransformerConfig $config,`
`13`	`13`	`public TypeScriptTransformerLog $log,`
`14`		`- )`
`15`		`- {`
	`14`	`+ ) {`
`16`	`15`	`}`
`17`	`16`
`18`	`17`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -19,8 +19,7 @@ public function __construct(`
`19`	`19`	`public function execute(`
`20`	`20`	`array $transformed,`
`21`	`21`	`ReferenceMap $referenceMap`
`22`		`- ): array`
`23`		`- {`
	`22`	`+ ): array {`
`24`	`23`	`return $this->config->writer->output($transformed, $referenceMap);`
`25`	`24`	`}`
`26`	`25`	`}`
Original file line number	Diff line number	Diff line change
`@@ -10,9 +10,9 @@`
`10`	`10`	`#[Attribute]`
`11`	`11`	`class LiteralTypeScriptType implements TypeScriptTransformableAttribute`
`12`	`12`	`{`
`13`		`- private string \| array $typeScript;`
	`13`	`+ private string\|array $typeScript;`
`14`	`14`
`15`		`- public function __construct(string \| array $typeScript)`
	`15`	`+ public function __construct(string\|array $typeScript)`
`16`	`16`	`{`
`17`	`17`	`$this->typeScript = $typeScript;`
`18`	`18`	`}`