spiral / framework

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

Spacing +20 added lines, -20 removed lines

@@ -24,7 +24,7 @@ 
     {
         $i = new Injector();
 
-        $filename = __DIR__ . '/Fixtures/TestClass.php';
+        $filename = __DIR__.'/Fixtures/TestClass.php';
         $r = $i->injectDependencies(
             file_get_contents($filename),
             $this->getDefinition(
@@ -37,14 +37,14 @@ 
             )
         );
 
-        $this->assertStringContainsString(Fixtures\Test::class . ';', $r);
+        $this->assertStringContainsString(Fixtures\Test::class.';', $r);
         $this->assertStringContainsString('private Test $test', $r);
 
-        $this->assertStringContainsString(Fixtures\SubFolder\Test::class . ' as Test2;', $r);
-        $this->assertStringNotContainsString(Fixtures\SubFolder\Test::class . ';', $r);
+        $this->assertStringContainsString(Fixtures\SubFolder\Test::class.' as Test2;', $r);
+        $this->assertStringNotContainsString(Fixtures\SubFolder\Test::class.';', $r);
         $this->assertStringContainsString('private Test2 $test2', $r);
 
-        $this->assertStringContainsString(Fixtures\ATest3::class . ';', $r);
+        $this->assertStringContainsString(Fixtures\ATest3::class.';', $r);
         $this->assertStringContainsString('private ATest3 $test3', $r);
     }
 
@@ -55,7 +55,7 @@ 
     {
         $i = new Injector();
 
-        $filename = __DIR__ . '/Fixtures/TestClassWithImports.php';
+        $filename = __DIR__.'/Fixtures/TestClassWithImports.php';
         $r = $i->injectDependencies(
             file_get_contents($filename),
             $this->getDefinition(
@@ -68,16 +68,16 @@ 
             )
         );
 
-        $this->assertStringContainsString(Fixtures\Test::class . ' as FTest;', $r);
-        $this->assertStringNotContainsString(Fixtures\Test::class . ';', $r);
+        $this->assertStringContainsString(Fixtures\Test::class.' as FTest;', $r);
+        $this->assertStringNotContainsString(Fixtures\Test::class.';', $r);
         $this->assertStringContainsString('private FTest $test', $r);
 
-        $this->assertStringContainsString(Fixtures\SubFolder\Test::class . ' as TestAlias;', $r);
-        $this->assertStringNotContainsString(Fixtures\SubFolder\Test::class . ';', $r);
+        $this->assertStringContainsString(Fixtures\SubFolder\Test::class.' as TestAlias;', $r);
+        $this->assertStringNotContainsString(Fixtures\SubFolder\Test::class.';', $r);
         $this->assertStringContainsString('private TestAlias $test2', $r);
 
-        $this->assertStringContainsString(Fixtures\ATest3::class . ' as ATest;', $r);
-        $this->assertStringNotContainsString(Fixtures\ATest3::class . ';', $r);
+        $this->assertStringContainsString(Fixtures\ATest3::class.' as ATest;', $r);
+        $this->assertStringNotContainsString(Fixtures\ATest3::class.';', $r);
         $this->assertStringContainsString('private ATest $test3', $r);
     }
 
@@ -88,7 +88,7 @@ 
     {
         $i = new Injector();
 
-        $filename = __DIR__ . '/Fixtures/ChildClass.php';
+        $filename = __DIR__.'/Fixtures/ChildClass.php';
         $r = $i->injectDependencies(
             file_get_contents($filename),
             $this->getDefinition(
@@ -101,15 +101,15 @@ 
             )
         );
 
-        $this->assertStringContainsString(Fixtures\Test::class . ';', $r);
+        $this->assertStringContainsString(Fixtures\Test::class.';', $r);
         $this->assertStringContainsString('private Test $test', $r);
 
-        $this->assertStringContainsString(Fixtures\SubFolder\Test::class . ' as Test2;', $r);
-        $this->assertStringNotContainsString(Fixtures\SubFolder\Test::class . ';', $r);
+        $this->assertStringContainsString(Fixtures\SubFolder\Test::class.' as Test2;', $r);
+        $this->assertStringNotContainsString(Fixtures\SubFolder\Test::class.';', $r);
         $this->assertStringContainsString('private Test2 $test2', $r);
 
-        $this->assertStringContainsString(Fixtures\ATest3::class . ' as ATestAlias;', $r);
-        $this->assertStringNotContainsString(Fixtures\ATest3::class . ';', $r);
+        $this->assertStringContainsString(Fixtures\ATest3::class.' as ATestAlias;', $r);
+        $this->assertStringNotContainsString(Fixtures\ATest3::class.';', $r);
         $this->assertStringContainsString('private ATestAlias $test3', $r);
     }
 
@@ -117,7 +117,7 @@ 
     {
         $i = new Injector();
 
-        $filename = __DIR__ . '/Fixtures/DuplicatePropertyClass.php';
+        $filename = __DIR__.'/Fixtures/DuplicatePropertyClass.php';
         $r = $i->injectDependencies(
             file_get_contents($filename),
             $this->getDefinition(
@@ -128,7 +128,7 @@ 
             )
         );
 
-        $this->assertStringContainsString(Fixtures\Test::class . ';', $r);
+        $this->assertStringContainsString(Fixtures\Test::class.';', $r);
         $this->assertStringContainsString('__construct(private Test $test)', $r);
     }
 

src/Prototype/tests/InjectorTest.php

Spacing +10 added lines, -10 removed lines

@@ -21,7 +21,7 @@ 
 
     public function setUp(): void
     {
-        if ((string)ini_get('zend.assertions') === 1) {
+        if ((string)ini_get('zend.assertions') === 1){
             ini_set('zend.assertions', 0);
         }
     }
@@ -34,7 +34,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])
@@ -47,7 +47,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])
@@ -67,7 +67,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),
@@ -85,7 +85,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])
@@ -110,7 +110,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])
@@ -128,7 +128,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])
@@ -144,7 +144,7 @@ 
      */
     public function testModifyConstructor(): void
     {
-        $filename = __DIR__ . '/Fixtures/WithConstructor.php';
+        $filename = __DIR__.'/Fixtures/WithConstructor.php';
         $extractor = new Traverse\Extractor();
 
         $parameters = $extractor->extractFromFilename($filename);
@@ -170,7 +170,7 @@ 
      */
     public function testPriorOptionalConstructorParameters(): void
     {
-        $filename = __DIR__ . '/Fixtures/OptionalConstructorArgsClass.php';
+        $filename = __DIR__.'/Fixtures/OptionalConstructorArgsClass.php';
         $extractor = new Traverse\Extractor();
 
         $parameters = $extractor->extractFromFilename($filename);
@@ -201,7 +201,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(

Braces +2 added lines, -1 removed lines

@@ -21,7 +21,8 @@
 
     public function setUp(): void
     {
-        if ((string)ini_get('zend.assertions') === 1) {
+        if ((string)ini_get('zend.assertions') === 1)
+        {
             ini_set('zend.assertions', 0);
         }
     }

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([
             'usedAttributes' => [
                 'comments',
@@ -51,8 +51,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());
@@ -66,7 +66,7 @@ 
         $tr = new NodeTraverser();
         $tr->addVisitor(new AddUse($node));
 
-        if ($removeTrait) {
+        if ($removeTrait){
             $tr->addVisitor(new RemoveUse());
             $tr->addVisitor(new RemoveTrait());
         }

Braces +6 added lines, -3 removed lines

@@ -51,8 +51,10 @@ 
      */
     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());
@@ -66,7 +68,8 @@ 
         $tr = new NodeTraverser();
         $tr->addVisitor(new AddUse($node));
 
-        if ($removeTrait) {
+        if ($removeTrait)
+        {
             $tr->addVisitor(new RemoveUse());
             $tr->addVisitor(new RemoveTrait());
         }

src/Prototype/src/NodeVisitors/LocateProperties.php

Spacing +6 added lines, -6 removed lines

@@ -39,26 +39,26 @@
             $node->var instanceof Node\Expr\Variable &&
             $node->var->name === 'this' &&
             $node->name instanceof Node\Identifier
-        ) {
+        ){
             $this->requested[$node->name->name] = $node->name->name;
         }
 
-        if ($node instanceof Node\Stmt\Property) {
-            foreach ($node->props as $prop) {
-                if ($prop instanceof Node\Stmt\PropertyProperty) {
+        if ($node instanceof Node\Stmt\Property){
+            foreach ($node->props as $prop){
+                if ($prop instanceof Node\Stmt\PropertyProperty){
                     $this->properties[$prop->name->name] = $prop->name->name;
                 }
             }
         }
 
-        if ($this->isPromotedProperty($node)) {
+        if ($this->isPromotedProperty($node)){
             $this->properties[$node->var->name] = $node->var->name;
         }
     }
 
     private function isPromotedProperty(Node $node): bool
     {
-        if (!$node instanceof Node\Param) {
+        if (!$node instanceof Node\Param){
             return false;
         }
 

Braces +10 added lines, -5 removed lines

@@ -43,22 +43,27 @@
             $this->requested[$node->name->name] = $node->name->name;
         }
 
-        if ($node instanceof Node\Stmt\Property) {
-            foreach ($node->props as $prop) {
-                if ($prop instanceof Node\Stmt\PropertyProperty) {
+        if ($node instanceof Node\Stmt\Property)
+        {
+            foreach ($node->props as $prop)
+            {
+                if ($prop instanceof Node\Stmt\PropertyProperty)
+                {
                     $this->properties[$prop->name->name] = $prop->name->name;
                 }
             }
         }
 
-        if ($this->isPromotedProperty($node)) {
+        if ($this->isPromotedProperty($node))
+        {
             $this->properties[$node->var->name] = $node->var->name;
         }
     }
 
     private function isPromotedProperty(Node $node): bool
     {
-        if (!$node instanceof Node\Param) {
+        if (!$node instanceof Node\Param)
+        {
             return false;
         }
 

Upper-Lower-Casing +3 added lines, -3 removed lines

@@ -62,8 +62,8 @@
             return false;
         }
 
-        return $node->flags === Modifiers::PUBLIC
-            || $node->flags === Modifiers::PROTECTED
-            || $node->flags === Modifiers::PRIVATE;
+        return $node->flags === Modifiers::public
+            || $node->flags === Modifiers::protected
+            || $node->flags === Modifiers::private;
     }
 }

src/Prototype/src/NodeVisitors/UpdateConstructor.php

Spacing +26 added lines, -26 removed lines

@@ -20,18 +20,18 @@ 
 {
     public function __construct(
         private readonly ClassNode $definition
-    ) {
+    ){
     }
 
-    public function leaveNode(Node $node): int|Node|null
+    public function leaveNode(Node $node): int | Node | null
     {
-        if (!$node instanceof Node\Stmt\Class_) {
+        if (!$node instanceof Node\Stmt\Class_){
             return null;
         }
 
         $constructor = $this->getConstructorAttribute($node);
         $this->addDependencies($constructor);
-        if (!$this->definition->hasConstructor && $this->definition->constructorParams) {
+        if (!$this->definition->hasConstructor && $this->definition->constructorParams){
             $this->addParentConstructorCall($constructor);
         }
 
@@ -43,7 +43,7 @@ 
      */
     private function addDependencies(Node\Stmt\ClassMethod $constructor): void
     {
-        foreach ($this->definition->dependencies as $dependency) {
+        foreach ($this->definition->dependencies as $dependency){
             \array_unshift($constructor->params, $this->buildConstructorParam($dependency));
         }
     }
@@ -60,34 +60,34 @@ 
     private function addParentConstructorCall(Node\Stmt\ClassMethod $constructor): void
     {
         $parentConstructorDependencies = [];
-        foreach ($this->definition->constructorParams as $param) {
+        foreach ($this->definition->constructorParams as $param){
             $parentConstructorDependencies[] = new Node\Arg(new Node\Expr\Variable($param->name));
 
             $cp = new Param($param->name);
-            if (!empty($param->type)) {
+            if (!empty($param->type)){
                 $type = $this->getParamType($param);
-                if ($param->nullable) {
+                if ($param->nullable){
                     $type = \sprintf('?%s', $type);
                 }
 
                 $cp->setType(new Node\Name($type));
             }
 
-            if ($param->byRef) {
+            if ($param->byRef){
                 $cp->makeByRef();
             }
 
-            if ($param->isVariadic) {
+            if ($param->isVariadic){
                 $cp->makeVariadic();
             }
 
-            if ($param->hasDefault) {
+            if ($param->hasDefault){
                 $cp->setDefault($param->default);
             }
             $constructor->params[] = $cp->getNode();
         }
 
-        if ($parentConstructorDependencies !== []) {
+        if ($parentConstructorDependencies !== []){
             \array_unshift(
                 $constructor->stmts,
                 new Node\Stmt\Expression(
@@ -115,18 +115,18 @@ 
 
         $params = [];
 
-        foreach ($this->definition->dependencies as $dependency) {
+        foreach ($this->definition->dependencies as $dependency){
             $params[] = new Annotation\Line(
                 \sprintf('%s $%s', $this->getPropertyType($dependency), $dependency->var),
                 'param'
             );
         }
 
-        if (!$this->definition->hasConstructor) {
-            foreach ($this->definition->constructorParams as $param) {
-                if (!empty($param->type)) {
+        if (!$this->definition->hasConstructor){
+            foreach ($this->definition->constructorParams as $param){
+                if (!empty($param->type)){
                     $type = $this->getParamType($param);
-                    if ($param->nullable) {
+                    if ($param->nullable){
                         $type = \sprintf('%s|null', $type);
                     }
 
@@ -134,7 +134,7 @@ 
                         \sprintf($param->isVariadic ? '%s ...$%s' : '%s $%s', $type, $param->name),
                         'param'
                     );
-                } else {
+                }else{
                     $params[] = new Annotation\Line(
                         \sprintf('$%s', $param->name),
                         'param'
@@ -145,12 +145,12 @@ 
 
         $placementID = 0;
         $previous = null;
-        foreach ($an->lines as $index => $line) {
+        foreach ($an->lines as $index => $line){
             // always next node
             $placementID = $index + 1;
 
             // inject before this parameters
-            if ($line->is(['throws', 'return'])) {
+            if ($line->is(['throws', 'return'])){
                 // insert before given node
                 $placementID--;
                 break;
@@ -159,7 +159,7 @@ 
             $previous = $line;
         }
 
-        if ($previous !== null && !$previous->isEmpty()) {
+        if ($previous !== null && !$previous->isEmpty()){
             $placementID++;
         }
 
@@ -170,8 +170,8 @@ 
 
     private function getPropertyType(Dependency $dependency): string
     {
-        foreach ($this->definition->getStmts() as $stmt) {
-            if ($stmt->name === $dependency->type->fullName && $stmt->alias) {
+        foreach ($this->definition->getStmts() as $stmt){
+            if ($stmt->name === $dependency->type->fullName && $stmt->alias){
                 return $stmt->alias;
             }
         }
@@ -181,13 +181,13 @@ 
 
     private function getParamType(ClassNode\ConstructorParam $param): string
     {
-        foreach ($this->definition->getStmts() as $stmt) {
-            if ($stmt->name === $param->type->fullName && $stmt->alias) {
+        foreach ($this->definition->getStmts() as $stmt){
+            if ($stmt->name === $param->type->fullName && $stmt->alias){
                 return $stmt->alias;
             }
         }
 
-        if ($param->type->alias) {
+        if ($param->type->alias){
             return $param->type->alias;
         }
 

Braces +49 added lines, -24 removed lines

@@ -25,13 +25,15 @@ 
 
     public function leaveNode(Node $node): int|Node|null
     {
-        if (!$node instanceof Node\Stmt\Class_) {
+        if (!$node instanceof Node\Stmt\Class_)
+        {
             return null;
         }
 
         $constructor = $this->getConstructorAttribute($node);
         $this->addDependencies($constructor);
-        if (!$this->definition->hasConstructor && $this->definition->constructorParams) {
+        if (!$this->definition->hasConstructor && $this->definition->constructorParams)
+        {
             $this->addParentConstructorCall($constructor);
         }
 
@@ -43,7 +45,8 @@ 
      */
     private function addDependencies(Node\Stmt\ClassMethod $constructor): void
     {
-        foreach ($this->definition->dependencies as $dependency) {
+        foreach ($this->definition->dependencies as $dependency)
+        {
             \array_unshift($constructor->params, $this->buildConstructorParam($dependency));
         }
     }
@@ -60,34 +63,41 @@ 
     private function addParentConstructorCall(Node\Stmt\ClassMethod $constructor): void
     {
         $parentConstructorDependencies = [];
-        foreach ($this->definition->constructorParams as $param) {
+        foreach ($this->definition->constructorParams as $param)
+        {
             $parentConstructorDependencies[] = new Node\Arg(new Node\Expr\Variable($param->name));
 
             $cp = new Param($param->name);
-            if (!empty($param->type)) {
+            if (!empty($param->type))
+            {
                 $type = $this->getParamType($param);
-                if ($param->nullable) {
+                if ($param->nullable)
+                {
                     $type = \sprintf('?%s', $type);
                 }
 
                 $cp->setType(new Node\Name($type));
             }
 
-            if ($param->byRef) {
+            if ($param->byRef)
+            {
                 $cp->makeByRef();
             }
 
-            if ($param->isVariadic) {
+            if ($param->isVariadic)
+            {
                 $cp->makeVariadic();
             }
 
-            if ($param->hasDefault) {
+            if ($param->hasDefault)
+            {
                 $cp->setDefault($param->default);
             }
             $constructor->params[] = $cp->getNode();
         }
 
-        if ($parentConstructorDependencies !== []) {
+        if ($parentConstructorDependencies !== [])
+        {
             \array_unshift(
                 $constructor->stmts,
                 new Node\Stmt\Expression(
@@ -115,18 +125,23 @@ 
 
         $params = [];
 
-        foreach ($this->definition->dependencies as $dependency) {
+        foreach ($this->definition->dependencies as $dependency)
+        {
             $params[] = new Annotation\Line(
                 \sprintf('%s $%s', $this->getPropertyType($dependency), $dependency->var),
                 'param'
             );
         }
 
-        if (!$this->definition->hasConstructor) {
-            foreach ($this->definition->constructorParams as $param) {
-                if (!empty($param->type)) {
+        if (!$this->definition->hasConstructor)
+        {
+            foreach ($this->definition->constructorParams as $param)
+            {
+                if (!empty($param->type))
+                {
                     $type = $this->getParamType($param);
-                    if ($param->nullable) {
+                    if ($param->nullable)
+                    {
                         $type = \sprintf('%s|null', $type);
                     }
 
@@ -134,7 +149,9 @@ 
                         \sprintf($param->isVariadic ? '%s ...$%s' : '%s $%s', $type, $param->name),
                         'param'
                     );
-                } else {
+                }
+                else
+                {
                     $params[] = new Annotation\Line(
                         \sprintf('$%s', $param->name),
                         'param'
@@ -145,12 +162,14 @@ 
 
         $placementID = 0;
         $previous = null;
-        foreach ($an->lines as $index => $line) {
+        foreach ($an->lines as $index => $line)
+        {
             // always next node
             $placementID = $index + 1;
 
             // inject before this parameters
-            if ($line->is(['throws', 'return'])) {
+            if ($line->is(['throws', 'return']))
+            {
                 // insert before given node
                 $placementID--;
                 break;
@@ -159,7 +178,8 @@ 
             $previous = $line;
         }
 
-        if ($previous !== null && !$previous->isEmpty()) {
+        if ($previous !== null && !$previous->isEmpty())
+        {
             $placementID++;
         }
 
@@ -170,8 +190,10 @@ 
 
     private function getPropertyType(Dependency $dependency): string
     {
-        foreach ($this->definition->getStmts() as $stmt) {
-            if ($stmt->name === $dependency->type->fullName && $stmt->alias) {
+        foreach ($this->definition->getStmts() as $stmt)
+        {
+            if ($stmt->name === $dependency->type->fullName && $stmt->alias)
+            {
                 return $stmt->alias;
             }
         }
@@ -181,13 +203,16 @@ 
 
     private function getParamType(ClassNode\ConstructorParam $param): string
     {
-        foreach ($this->definition->getStmts() as $stmt) {
-            if ($stmt->name === $param->type->fullName && $stmt->alias) {
+        foreach ($this->definition->getStmts() as $stmt)
+        {
+            if ($stmt->name === $param->type->fullName && $stmt->alias)
+            {
                 return $stmt->alias;
             }
         }
 
-        if ($param->type->alias) {
+        if ($param->type->alias)
+        {
             return $param->type->alias;
         }