spiral / framework

src/Prototype/tests/Traverse/ConstructorParamsVisitor.php

Spacing +7 added lines, -7 removed lines

@@ -16,19 +16,19 @@
      */
     public function leaveNode(Node $node): void
     {
-        if ($node instanceof Node\Stmt\ClassMethod && $node->name->name === '__construct') {
-            foreach ($node->params as $param) {
-                if ($param->type instanceof Node\NullableType) {
-                    if ($param->type->type instanceof Node\Identifier) {
+        if ($node instanceof Node\Stmt\ClassMethod && $node->name->name === '__construct'){
+            foreach ($node->params as $param){
+                if ($param->type instanceof Node\NullableType){
+                    if ($param->type->type instanceof Node\Identifier){
                         $type = $param->type->type->name;
-                    } else {
+                    }else{
                         $type = implode('\\', $param->type->type->getParts());
                     }
 
                     $type = "?$type";
-                } elseif ($param->type instanceof Node\Name) {
+                } elseif ($param->type instanceof Node\Name){
                     $type = implode('\\', $param->type->getParts());
-                } else {
+                }else{
                     $type = $param->type->name ?? null;
                 }
 

Braces +17 added lines, -7 removed lines

@@ -16,19 +16,29 @@
      */
     public function leaveNode(Node $node): void
     {
-        if ($node instanceof Node\Stmt\ClassMethod && $node->name->name === '__construct') {
-            foreach ($node->params as $param) {
-                if ($param->type instanceof Node\NullableType) {
-                    if ($param->type->type instanceof Node\Identifier) {
+        if ($node instanceof Node\Stmt\ClassMethod && $node->name->name === '__construct')
+        {
+            foreach ($node->params as $param)
+            {
+                if ($param->type instanceof Node\NullableType)
+                {
+                    if ($param->type->type instanceof Node\Identifier)
+                    {
                         $type = $param->type->type->name;
-                    } else {
+                    }
+                    else
+                    {
                         $type = implode('\\', $param->type->type->getParts());
                     }
 
                     $type = "?$type";
-                } elseif ($param->type instanceof Node\Name) {
+                }
+                elseif ($param->type instanceof Node\Name)
+                {
                     $type = implode('\\', $param->type->getParts());
-                } else {
+                }
+                else
+                {
                     $type = $param->type->name ?? null;
                 }
 

src/Prototype/tests/ClassNode/ConflictResolver/ConflictResolverTest.php

Spacing +20 added lines, -20 removed lines

@@ -21,7 +21,7 @@ 
     {
         $i = new Injector();
 
-        $filename = __DIR__ . '/Fixtures/TestClass.php';
+        $filename = __DIR__.'/Fixtures/TestClass.php';
         $r = $i->injectDependencies(
             file_get_contents($filename),
             $this->getDefinition(
@@ -34,10 +34,10 @@ 
             )
         );
 
-        self::assertStringContainsString(Fixtures\Some::class . ';', $r);
-        self::assertStringContainsString(Fixtures\SubFolder\Some::class . ' as Some2;', $r);
-        self::assertStringNotContainsString(Fixtures\SubFolder\Some::class . ';', $r);
-        self::assertStringContainsString(Fixtures\ATest3::class . ';', $r);
+        self::assertStringContainsString(Fixtures\Some::class.';', $r);
+        self::assertStringContainsString(Fixtures\SubFolder\Some::class.' as Some2;', $r);
+        self::assertStringNotContainsString(Fixtures\SubFolder\Some::class.';', $r);
+        self::assertStringContainsString(Fixtures\ATest3::class.';', $r);
     }
 
     /**
@@ -47,7 +47,7 @@ 
     {
         $i = new Injector();
 
-        $filename = __DIR__ . '/Fixtures/TestClassWithImports.php';
+        $filename = __DIR__.'/Fixtures/TestClassWithImports.php';
         $r = $i->injectDependencies(
             \file_get_contents($filename),
             $this->getDefinition(
@@ -60,12 +60,12 @@ 
             )
         );
 
-        self::assertStringContainsString(Fixtures\Some::class . ' as FTest;', $r);
-        self::assertStringNotContainsString(Fixtures\Some::class . ';', $r);
-        self::assertStringContainsString(Fixtures\SubFolder\Some::class . ' as TestAlias;', $r);
-        self::assertStringNotContainsString(Fixtures\SubFolder\Some::class . ';', $r);
-        self::assertStringContainsString(Fixtures\ATest3::class . ' as ATest;', $r);
-        self::assertStringNotContainsString(Fixtures\ATest3::class . ';', $r);
+        self::assertStringContainsString(Fixtures\Some::class.' as FTest;', $r);
+        self::assertStringNotContainsString(Fixtures\Some::class.';', $r);
+        self::assertStringContainsString(Fixtures\SubFolder\Some::class.' as TestAlias;', $r);
+        self::assertStringNotContainsString(Fixtures\SubFolder\Some::class.';', $r);
+        self::assertStringContainsString(Fixtures\ATest3::class.' as ATest;', $r);
+        self::assertStringNotContainsString(Fixtures\ATest3::class.';', $r);
     }
 
     /**
@@ -75,7 +75,7 @@ 
     {
         $i = new Injector();
 
-        $filename = __DIR__ . '/Fixtures/ChildClass.php';
+        $filename = __DIR__.'/Fixtures/ChildClass.php';
         $r = $i->injectDependencies(
             file_get_contents($filename),
             $this->getDefinition(
@@ -88,18 +88,18 @@ 
             )
         );
 
-        self::assertStringContainsString(Fixtures\Some::class . ';', $r);
-        self::assertStringContainsString(Fixtures\SubFolder\Some::class . ' as Some2;', $r);
-        self::assertStringNotContainsString(Fixtures\SubFolder\Some::class . ';', $r);
-        self::assertStringContainsString(Fixtures\ATest3::class . ' as ATestAlias;', $r);
-        self::assertStringNotContainsString(Fixtures\ATest3::class . ';', $r);
+        self::assertStringContainsString(Fixtures\Some::class.';', $r);
+        self::assertStringContainsString(Fixtures\SubFolder\Some::class.' as Some2;', $r);
+        self::assertStringNotContainsString(Fixtures\SubFolder\Some::class.';', $r);
+        self::assertStringContainsString(Fixtures\ATest3::class.' as ATestAlias;', $r);
+        self::assertStringNotContainsString(Fixtures\ATest3::class.';', $r);
     }
 
     public function testDuplicateProperty(): void
     {
         $i = new Injector();
 
-        $filename = __DIR__ . '/Fixtures/DuplicatePropertyClass.php';
+        $filename = __DIR__.'/Fixtures/DuplicatePropertyClass.php';
         $r = $i->injectDependencies(
             \file_get_contents($filename),
             $this->getDefinition(
@@ -110,7 +110,7 @@ 
             )
         );
 
-        self::assertStringContainsString(Fixtures\Some::class . ';', $r);
+        self::assertStringContainsString(Fixtures\Some::class.';', $r);
         self::assertStringContainsString('__construct(private readonly Some $test)', $r);
     }
 

src/Prototype/tests/InjectorTest.php

Spacing +10 added lines, -10 removed lines

@@ -19,7 +19,7 @@ 
 {
     protected function setUp(): void
     {
-        if ((string)ini_get('zend.assertions') === 1) {
+        if ((string)ini_get('zend.assertions') === 1){
             ini_set('zend.assertions', 0);
         }
     }
@@ -32,7 +32,7 @@ 
     {
         $i = new Injector();
 
-        $filename = __DIR__ . '/Fixtures/TestClass.php';
+        $filename = __DIR__.'/Fixtures/TestClass.php';
         $printed = $i->injectDependencies(
             \file_get_contents($filename),
             $this->getDefinition($filename, ['testClass' => TestClass::class])
@@ -45,7 +45,7 @@ 
     {
         $i = new Injector();
 
-        $filename = __DIR__ . '/Fixtures/WithPromotedProperty.php';
+        $filename = __DIR__.'/Fixtures/WithPromotedProperty.php';
         $printed = $i->injectDependencies(
             \file_get_contents($filename),
             $this->getDefinition($filename, ['two' => InjectionTwo::class])
@@ -62,7 +62,7 @@ 
     {
         $i = new Injector();
 
-        $filename = __DIR__ . '/Fixtures/TestEmptyClass.php';
+        $filename = __DIR__.'/Fixtures/TestEmptyClass.php';
         $content = file_get_contents($filename);
         $printed = $i->injectDependencies(
             file_get_contents($filename),
@@ -80,7 +80,7 @@ 
     {
         $i = new Injector();
 
-        $filename = __DIR__ . '/Fixtures/TestClass.php';
+        $filename = __DIR__.'/Fixtures/TestClass.php';
         $r = $i->injectDependencies(
             file_get_contents($filename),
             $this->getDefinition($filename, ['testClass' => TestClass::class])
@@ -105,7 +105,7 @@ 
     {
         $i = new Injector();
 
-        $filename = __DIR__ . '/Fixtures/ChildClass.php';
+        $filename = __DIR__.'/Fixtures/ChildClass.php';
         $r = $i->injectDependencies(
             file_get_contents($filename),
             $this->getDefinition($filename, ['testClass' => TestClass::class])
@@ -123,7 +123,7 @@ 
     {
         $i = new Injector();
 
-        $filename = __DIR__ . '/Fixtures/ChildWithConstructorClass.php';
+        $filename = __DIR__.'/Fixtures/ChildWithConstructorClass.php';
         $r = $i->injectDependencies(
             file_get_contents($filename),
             $this->getDefinition($filename, ['testClass' => TestClass::class])
@@ -139,7 +139,7 @@ 
      */
     public function testModifyConstructor(): void
     {
-        $filename = __DIR__ . '/Fixtures/WithConstructor.php';
+        $filename = __DIR__.'/Fixtures/WithConstructor.php';
         $extractor = new Traverse\Extractor();
 
         $parameters = $extractor->extractFromFilename($filename);
@@ -165,7 +165,7 @@ 
      */
     public function testPriorOptionalConstructorParameters(): void
     {
-        $filename = __DIR__ . '/Fixtures/OptionalConstructorArgsClass.php';
+        $filename = __DIR__.'/Fixtures/OptionalConstructorArgsClass.php';
         $extractor = new Traverse\Extractor();
 
         $parameters = $extractor->extractFromFilename($filename);
@@ -196,7 +196,7 @@ 
     {
         $i = new Injector();
 
-        $filename = __DIR__ . '/ClassNode/ConflictResolver/Fixtures/ChildClass.php';
+        $filename = __DIR__.'/ClassNode/ConflictResolver/Fixtures/ChildClass.php';
         $printed = $i->injectDependencies(
             file_get_contents($filename),
             $this->getDefinition(

src/Prototype/src/NodeExtractor.php

Spacing +9 added lines, -9 removed lines

@@ -25,7 +25,7 @@ 
         private readonly ConflictResolver\Names $namesResolver,
         private readonly ConflictResolver\Namespaces $namespacesResolver,
         ?Parser $parser = null,
-    ) {
+    ){
         $this->parser = $parser ?? (new ParserFactory())->createForHostVersion();
     }
 
@@ -60,11 +60,11 @@ 
         $declarator = new DeclareClass();
         $this->traverse($filename, $declarator);
 
-        if (empty($declarator->getClass())) {
+        if (empty($declarator->getClass())){
             throw new ClassNotDeclaredException($filename);
         }
 
-        if ($declarator->getNamespace()) {
+        if ($declarator->getNamespace()){
             return ClassNode::createWithNamespace($declarator->getClass(), $declarator->getNamespace());
         }
 
@@ -75,7 +75,7 @@ 
     {
         $tr = new NodeTraverser();
 
-        foreach ($visitors as $visitor) {
+        foreach ($visitors as $visitor){
             $tr->addVisitor($visitor);
         }
 
@@ -84,7 +84,7 @@ 
 
     private function fillStmts(ClassNode $definition, array $imports): void
     {
-        foreach ($imports as $import) {
+        foreach ($imports as $import){
             $definition->addImportUsage($import['name'], $import['alias']);
         }
     }
@@ -97,10 +97,10 @@ 
         $reflection = new \ReflectionClass(\sprintf('%s\%s', $definition->namespace, $definition->class));
 
         $constructor = $reflection->getConstructor();
-        if ($constructor !== null) {
+        if ($constructor !== null){
             $definition->hasConstructor = $constructor->getDeclaringClass()->getName() === $reflection->getName();
 
-            foreach ($reflection->getConstructor()->getParameters() as $parameter) {
+            foreach ($reflection->getConstructor()->getParameters() as $parameter){
                 $definition->addParam($parameter);
             }
         }
@@ -112,8 +112,8 @@ 
      */
     private function fillConstructorVars(array $vars, ClassNode $definition): void
     {
-        foreach ($vars as $k => $var) {
-            if (isset($definition->constructorParams[$var])) {
+        foreach ($vars as $k => $var){
+            if (isset($definition->constructorParams[$var])){
                 unset($vars[$k]);
             }
         }

src/Prototype/src/Injector.php

Spacing +4 added lines, -4 removed lines

@@ -28,7 +28,7 @@ 
     public function __construct(
         ?Lexer $lexer = null,
         private readonly PrettyPrinterAbstract $printer = new Standard(),
-    ) {
+    ){
         $this->lexer = $lexer ?? new Lexer\Emulative();
 
         $this->parser = new Parser\Php8($this->lexer);
@@ -43,8 +43,8 @@ 
      */
     public function injectDependencies(string $code, ClassNode $node, bool $removeTrait = false): string
     {
-        if (empty($node->dependencies)) {
-            if ($removeTrait) {
+        if (empty($node->dependencies)){
+            if ($removeTrait){
                 $tr = new NodeTraverser();
                 $tr->addVisitor(new RemoveUse());
                 $tr->addVisitor(new RemoveTrait());
@@ -58,7 +58,7 @@ 
         $tr = new NodeTraverser();
         $tr->addVisitor(new AddUse($node));
 
-        if ($removeTrait) {
+        if ($removeTrait){
             $tr->addVisitor(new RemoveUse());
             $tr->addVisitor(new RemoveTrait());
         }

src/Prototype/src/NodeVisitors/ClassNode/LocateStatements.php

Spacing +2 added lines, -2 removed lines

@@ -16,8 +16,8 @@
 
     public function enterNode(Node $node): void
     {
-        if ($node instanceof Node\Stmt\Use_) {
-            foreach ($node->uses as $use) {
+        if ($node instanceof Node\Stmt\Use_){
+            foreach ($node->uses as $use){
                 $this->imports[] = [
                     'name'  => \implode('\\', $use->name->getParts()),
                     'alias' => $use->alias->name ?? null,

Braces +4 added lines, -2 removed lines

@@ -16,8 +16,10 @@
 
     public function enterNode(Node $node): void
     {
-        if ($node instanceof Node\Stmt\Use_) {
-            foreach ($node->uses as $use) {
+        if ($node instanceof Node\Stmt\Use_)
+        {
+            foreach ($node->uses as $use)
+            {
                 $this->imports[] = [
                     'name'  => \implode('\\', $use->name->getParts()),
                     'alias' => $use->alias->name ?? null,

src/Prototype/src/NodeVisitors/ClassNode/DeclareClass.php

Spacing +2 added lines, -2 removed lines

@@ -15,11 +15,11 @@
 
     public function enterNode(Node $node): ?int
     {
-        if ($node instanceof Node\Stmt\Namespace_) {
+        if ($node instanceof Node\Stmt\Namespace_){
             $this->namespace = \implode('\\', $node->name->getParts());
         }
 
-        if ($node instanceof Node\Stmt\Class_) {
+        if ($node instanceof Node\Stmt\Class_){
             $this->class = $node->name->name;
 
             return NodeTraverser::STOP_TRAVERSAL;

Braces +4 added lines, -2 removed lines

@@ -15,11 +15,13 @@
 
     public function enterNode(Node $node): ?int
     {
-        if ($node instanceof Node\Stmt\Namespace_) {
+        if ($node instanceof Node\Stmt\Namespace_)
+        {
             $this->namespace = \implode('\\', $node->name->getParts());
         }
 
-        if ($node instanceof Node\Stmt\Class_) {
+        if ($node instanceof Node\Stmt\Class_)
+        {
             $this->class = $node->name->name;
 
             return NodeTraverser::STOP_TRAVERSAL;

src/Prototype/src/NodeVisitors/RemoveTrait.php

Spacing +6 added lines, -6 removed lines

@@ -15,28 +15,28 @@
  */
 final class RemoveTrait extends NodeVisitorAbstract
 {
-    public function leaveNode(Node $node): int|Node|null
+    public function leaveNode(Node $node): int | Node | null
     {
-        if (!$node instanceof Node\Stmt\TraitUse) {
+        if (!$node instanceof Node\Stmt\TraitUse){
             return null;
         }
 
-        foreach ($node->traits as $index => $use) {
-            if ($use instanceof Node\Name) {
+        foreach ($node->traits as $index => $use){
+            if ($use instanceof Node\Name){
                 $name = $this->trimSlashes(\implode('\\', $use->getParts()));
                 if (
                     \in_array($name, [
                         $this->trimSlashes(PrototypeTrait::class),
                         Utils::shortName(PrototypeTrait::class),
                     ], true)
-                ) {
+                ){
                     unset($node->traits[$index]);
                 }
             }
         }
 
         $node->traits = \array_values($node->traits);
-        if (empty($node->traits)) {
+        if (empty($node->traits)){
             return NodeTraverser::REMOVE_NODE;
         }
 

Braces +8 added lines, -4 removed lines

@@ -17,12 +17,15 @@ 
 {
     public function leaveNode(Node $node): int|Node|null
     {
-        if (!$node instanceof Node\Stmt\TraitUse) {
+        if (!$node instanceof Node\Stmt\TraitUse)
+        {
             return null;
         }
 
-        foreach ($node->traits as $index => $use) {
-            if ($use instanceof Node\Name) {
+        foreach ($node->traits as $index => $use)
+        {
+            if ($use instanceof Node\Name)
+            {
                 $name = $this->trimSlashes(\implode('\\', $use->getParts()));
                 if (
                     \in_array($name, [
@@ -36,7 +39,8 @@ 
         }
 
         $node->traits = \array_values($node->traits);
-        if (empty($node->traits)) {
+        if (empty($node->traits))
+        {
             return NodeTraverser::REMOVE_NODE;
         }
 

src/Prototype/src/NodeVisitors/AddUse.php

Spacing +18 added lines, -18 removed lines

@@ -20,20 +20,20 @@ 
 
     public function __construct(
         private readonly ClassNode $node,
-    ) {}
+    ){}
 
     public function leaveNode(Node $node): ?Node
     {
-        if (!$node instanceof Node\Stmt\Namespace_) {
+        if (!$node instanceof Node\Stmt\Namespace_){
             return null;
         }
 
         $imported = [];
-        if (!$this->node->hasConstructor && $this->node->constructorParams) {
-            foreach ($this->node->constructorParams as $param) {
-                if (!empty($param->type) && $param->type->fullName) {
+        if (!$this->node->hasConstructor && $this->node->constructorParams){
+            foreach ($this->node->constructorParams as $param){
+                if (!empty($param->type) && $param->type->fullName){
                     $import = [$param->type->fullName, $param->type->alias];
-                    if (\in_array($import, $imported, true)) {
+                    if (\in_array($import, $imported, true)){
                         continue;
                     }
 
@@ -43,9 +43,9 @@ 
             }
         }
 
-        foreach ($this->node->dependencies as $dependency) {
+        foreach ($this->node->dependencies as $dependency){
             $import = [$dependency->type->fullName, $dependency->type->alias];
-            if (\in_array($import, $imported, true)) {
+            if (\in_array($import, $imported, true)){
                 continue;
             }
 
@@ -68,8 +68,8 @@ 
 
     private function definePlacementID(Node\Stmt\Namespace_ $node): int
     {
-        foreach ($node->stmts as $index => $child) {
-            if ($child instanceof Node\Stmt\Class_) {
+        foreach ($node->stmts as $index => $child){
+            if ($child instanceof Node\Stmt\Class_){
                 return $index;
             }
         }
@@ -86,13 +86,13 @@ 
     {
         $uses = $this->getExistingUseParts($stmts);
 
-        foreach ($nodes as $i => $node) {
-            if (!$node instanceof Node\Stmt\Use_) {
+        foreach ($nodes as $i => $node){
+            if (!$node instanceof Node\Stmt\Use_){
                 continue;
             }
 
-            foreach ($node->uses as $use) {
-                if (\in_array($use->name->getParts(), $uses, true)) {
+            foreach ($node->uses as $use){
+                if (\in_array($use->name->getParts(), $uses, true)){
                     unset($nodes[$i]);
                 }
             }
@@ -111,12 +111,12 @@ 
     private function getExistingUseParts(array $stmts): array
     {
         $uses = [];
-        foreach ($stmts as $stmt) {
-            if (!$stmt instanceof Node\Stmt\Use_) {
+        foreach ($stmts as $stmt){
+            if (!$stmt instanceof Node\Stmt\Use_){
                 continue;
             }
 
-            foreach ($stmt->uses as $use) {
+            foreach ($stmt->uses as $use){
                 $uses[] = $use->name->getParts();
             }
         }
@@ -127,7 +127,7 @@ 
     private function buildUse(string $type, ?string $alias = null): Node\Stmt\Use_
     {
         $b = new Use_(new Node\Name($type), Node\Stmt\Use_::TYPE_NORMAL);
-        if (!empty($alias)) {
+        if (!empty($alias)){
             $b->as($alias);
         }
 

Braces +36 added lines, -18 removed lines

@@ -20,20 +20,26 @@ 
 
     public function __construct(
         private readonly ClassNode $node,
-    ) {}
+    ) {
+}
 
     public function leaveNode(Node $node): ?Node
     {
-        if (!$node instanceof Node\Stmt\Namespace_) {
+        if (!$node instanceof Node\Stmt\Namespace_)
+        {
             return null;
         }
 
         $imported = [];
-        if (!$this->node->hasConstructor && $this->node->constructorParams) {
-            foreach ($this->node->constructorParams as $param) {
-                if (!empty($param->type) && $param->type->fullName) {
+        if (!$this->node->hasConstructor && $this->node->constructorParams)
+        {
+            foreach ($this->node->constructorParams as $param)
+            {
+                if (!empty($param->type) && $param->type->fullName)
+                {
                     $import = [$param->type->fullName, $param->type->alias];
-                    if (\in_array($import, $imported, true)) {
+                    if (\in_array($import, $imported, true))
+                    {
                         continue;
                     }
 
@@ -43,9 +49,11 @@ 
             }
         }
 
-        foreach ($this->node->dependencies as $dependency) {
+        foreach ($this->node->dependencies as $dependency)
+        {
             $import = [$dependency->type->fullName, $dependency->type->alias];
-            if (\in_array($import, $imported, true)) {
+            if (\in_array($import, $imported, true))
+            {
                 continue;
             }
 
@@ -68,8 +76,10 @@ 
 
     private function definePlacementID(Node\Stmt\Namespace_ $node): int
     {
-        foreach ($node->stmts as $index => $child) {
-            if ($child instanceof Node\Stmt\Class_) {
+        foreach ($node->stmts as $index => $child)
+        {
+            if ($child instanceof Node\Stmt\Class_)
+            {
                 return $index;
             }
         }
@@ -86,13 +96,17 @@ 
     {
         $uses = $this->getExistingUseParts($stmts);
 
-        foreach ($nodes as $i => $node) {
-            if (!$node instanceof Node\Stmt\Use_) {
+        foreach ($nodes as $i => $node)
+        {
+            if (!$node instanceof Node\Stmt\Use_)
+            {
                 continue;
             }
 
-            foreach ($node->uses as $use) {
-                if (\in_array($use->name->getParts(), $uses, true)) {
+            foreach ($node->uses as $use)
+            {
+                if (\in_array($use->name->getParts(), $uses, true))
+                {
                     unset($nodes[$i]);
                 }
             }
@@ -111,12 +125,15 @@ 
     private function getExistingUseParts(array $stmts): array
     {
         $uses = [];
-        foreach ($stmts as $stmt) {
-            if (!$stmt instanceof Node\Stmt\Use_) {
+        foreach ($stmts as $stmt)
+        {
+            if (!$stmt instanceof Node\Stmt\Use_)
+            {
                 continue;
             }
 
-            foreach ($stmt->uses as $use) {
+            foreach ($stmt->uses as $use)
+            {
                 $uses[] = $use->name->getParts();
             }
         }
@@ -127,7 +144,8 @@ 
     private function buildUse(string $type, ?string $alias = null): Node\Stmt\Use_
     {
         $b = new Use_(new Node\Name($type), Node\Stmt\Use_::TYPE_NORMAL);
-        if (!empty($alias)) {
+        if (!empty($alias))
+        {
             $b->as($alias);
         }