spiral / framework

src/Prototype/src/Command/ListCommand.php

Spacing +2 added lines, -2 removed lines

@@ -22,7 +22,7 @@ 
     public function perform(): void
     {
         $prototyped = $this->locator->getTargetClasses();
-        if ($prototyped === []) {
+        if ($prototyped === []){
             $this->writeln('<comment>No prototyped classes found.</comment>');
 
             return;
@@ -30,7 +30,7 @@ 
 
         $grid = $this->table(['Class:', 'Property:', 'Target:']);
 
-        foreach ($prototyped as $class) {
+        foreach ($prototyped as $class){
             $proto = $this->getPrototypeProperties($class, $prototyped);
 
             $grid->addRow([$class->getName(), $this->mergeNames($proto), $this->mergeTargets($proto)]);

Braces +4 added lines, -2 removed lines

@@ -22,7 +22,8 @@ 
     public function perform(): void
     {
         $prototyped = $this->locator->getTargetClasses();
-        if ($prototyped === []) {
+        if ($prototyped === [])
+        {
             $this->writeln('<comment>No prototyped classes found.</comment>');
 
             return;
@@ -30,7 +31,8 @@ 
 
         $grid = $this->table(['Class:', 'Property:', 'Target:']);
 
-        foreach ($prototyped as $class) {
+        foreach ($prototyped as $class)
+        {
             $proto = $this->getPrototypeProperties($class, $prototyped);
 
             $grid->addRow([$class->getName(), $this->mergeNames($proto), $this->mergeTargets($proto)]);

src/Prototype/src/Command/AbstractCommand.php

Spacing +9 added lines, -9 removed lines

@@ -58,7 +58,7 @@ 
         $results = [$this->readProperties($class)];
 
         $parent = $class->getParentClass();
-        while ($parent instanceof \ReflectionClass && isset($all[$parent->getName()])) {
+        while ($parent instanceof \ReflectionClass && isset($all[$parent->getName()])){
             $results[] = $this->readProperties($parent);
             $parent = $parent->getParentClass();
         }
@@ -91,8 +91,8 @@ 
     {
         $result = [];
 
-        foreach ($properties as $target) {
-            if ($target instanceof \Throwable) {
+        foreach ($properties as $target){
+            if ($target instanceof \Throwable){
                 $result[] = sprintf(
                     '<fg=red>%s [f: %s, l: %s]</fg=red>',
                     $target->getMessage(),
@@ -102,7 +102,7 @@ 
                 continue;
             }
 
-            if ($target === null) {
+            if ($target === null){
                 $result[] = '<fg=yellow>undefined</fg=yellow>';
                 continue;
             }
@@ -115,16 +115,16 @@ 
 
     private function readProperties(\ReflectionClass $class): array
     {
-        if (isset($this->cache[$class->getFileName()])) {
+        if (isset($this->cache[$class->getFileName()])){
             $proto = $this->cache[$class->getFileName()];
-        } else {
+        }else{
             $proto = $this->getExtractor()->getPrototypeProperties(file_get_contents($class->getFilename()));
             $this->cache[$class->getFileName()] = $proto;
         }
 
         $result = [];
-        foreach ($proto as $name) {
-            if (!isset($result[$name])) {
+        foreach ($proto as $name){
+            if (!isset($result[$name])){
                 $result[$name] = $this->registry->resolveProperty($name);
             }
         }
@@ -134,7 +134,7 @@ 
 
     private function reverse(array $results): ?\Generator
     {
-        foreach (array_reverse($results) as $result) {
+        foreach (array_reverse($results) as $result){
             yield from $result;
         }
     }

Braces +19 added lines, -9 removed lines

@@ -58,7 +58,8 @@ 
         $results = [$this->readProperties($class)];
 
         $parent = $class->getParentClass();
-        while ($parent instanceof \ReflectionClass && isset($all[$parent->getName()])) {
+        while ($parent instanceof \ReflectionClass && isset($all[$parent->getName()]))
+        {
             $results[] = $this->readProperties($parent);
             $parent = $parent->getParentClass();
         }
@@ -91,8 +92,10 @@ 
     {
         $result = [];
 
-        foreach ($properties as $target) {
-            if ($target instanceof \Throwable) {
+        foreach ($properties as $target)
+        {
+            if ($target instanceof \Throwable)
+            {
                 $result[] = sprintf(
                     '<fg=red>%s [f: %s, l: %s]</fg=red>',
                     $target->getMessage(),
@@ -102,7 +105,8 @@ 
                 continue;
             }
 
-            if ($target === null) {
+            if ($target === null)
+            {
                 $result[] = '<fg=yellow>undefined</fg=yellow>';
                 continue;
             }
@@ -115,16 +119,21 @@ 
 
     private function readProperties(\ReflectionClass $class): array
     {
-        if (isset($this->cache[$class->getFileName()])) {
+        if (isset($this->cache[$class->getFileName()]))
+        {
             $proto = $this->cache[$class->getFileName()];
-        } else {
+        }
+        else
+        {
             $proto = $this->getExtractor()->getPrototypeProperties(file_get_contents($class->getFilename()));
             $this->cache[$class->getFileName()] = $proto;
         }
 
         $result = [];
-        foreach ($proto as $name) {
-            if (!isset($result[$name])) {
+        foreach ($proto as $name)
+        {
+            if (!isset($result[$name]))
+            {
                 $result[$name] = $this->registry->resolveProperty($name);
             }
         }
@@ -134,7 +143,8 @@ 
 
     private function reverse(array $results): ?\Generator
     {
-        foreach (array_reverse($results) as $result) {
+        foreach (array_reverse($results) as $result)
+        {
             yield from $result;
         }
     }

src/Prototype/src/Command/InjectCommand.php

Braces +25 added lines, -12 removed lines

@@ -55,7 +55,8 @@ 
     public function perform(): void
     {
         $prototyped = $this->locator->getTargetClasses();
-        if ($prototyped === []) {
+        if ($prototyped === [])
+        {
             $this->writeln('<comment>No prototyped classes found.</comment>');
 
             return;
@@ -63,18 +64,23 @@ 
 
         $targets = [];
 
-        foreach ($prototyped as $class) {
+        foreach ($prototyped as $class)
+        {
             $proto = $this->getPrototypeProperties($class, $prototyped);
-            if (empty($proto)) {
+            if (empty($proto))
+            {
                 $modified = $this->modify($class, $proto);
-                if ($modified !== null) {
+                if ($modified !== null)
+                {
                     $targets[] = $modified;
                 }
                 continue;
             }
 
-            foreach ($proto as $target) {
-                if ($target instanceof \Throwable) {
+            foreach ($proto as $target)
+            {
+                if ($target instanceof \Throwable)
+                {
                     $targets[] = [
                         $class->getName(),
                         $target->getMessage(),
@@ -83,7 +89,8 @@ 
                     continue 2;
                 }
 
-                if ($target === null) {
+                if ($target === null)
+                {
                     continue 2;
                 }
             }
@@ -91,14 +98,17 @@ 
             $targets[] = [$class->getName(), $this->mergeNames($proto), $this->mergeTargets($proto)];
 
             $modified = $this->modify($class, $proto);
-            if ($modified !== null) {
+            if ($modified !== null)
+            {
                 $targets[] = $modified;
             }
         }
 
-        if (!empty($targets)) {
+        if (!empty($targets))
+        {
             $grid = $this->table(['Class:', 'Property:', 'Target:']);
-            foreach ($targets as $target) {
+            foreach ($targets as $target)
+            {
                 $grid->addRow($target);
             }
 
@@ -109,7 +119,8 @@ 
     private function modify(\ReflectionClass $class, array $proto): ?array
     {
         $classDefinition = $this->extractor->extract($class->getFilename(), $proto);
-        try {
+        try
+        {
             $modified = $this->injector->injectDependencies(
                 file_get_contents($class->getFileName()),
                 $classDefinition,
@@ -120,7 +131,9 @@ 
 
             file_put_contents($class->getFileName(), $modified);
             return null;
-        } catch (\Throwable $e) {
+        }
+        catch (\Throwable $e)
+        {
             return [$class->getName(), $e->getMessage(), "{$e->getFile()}:L{$e->getLine()}"];
         }
     }

Spacing +12 added lines, -12 removed lines

@@ -51,7 +51,7 @@ 
     public function perform(): void
     {
         $prototyped = $this->locator->getTargetClasses();
-        if ($prototyped === []) {
+        if ($prototyped === []){
             $this->writeln('<comment>No prototyped classes found.</comment>');
 
             return;
@@ -59,18 +59,18 @@ 
 
         $targets = [];
 
-        foreach ($prototyped as $class) {
+        foreach ($prototyped as $class){
             $proto = $this->getPrototypeProperties($class, $prototyped);
-            if (empty($proto)) {
+            if (empty($proto)){
                 $modified = $this->modify($class, $proto);
-                if ($modified !== null) {
+                if ($modified !== null){
                     $targets[] = $modified;
                 }
                 continue;
             }
 
-            foreach ($proto as $target) {
-                if ($target instanceof \Throwable) {
+            foreach ($proto as $target){
+                if ($target instanceof \Throwable){
                     $targets[] = [
                         $class->getName(),
                         $target->getMessage(),
@@ -79,7 +79,7 @@ 
                     continue 2;
                 }
 
-                if ($target === null) {
+                if ($target === null){
                     continue 2;
                 }
             }
@@ -87,14 +87,14 @@ 
             $targets[] = [$class->getName(), $this->mergeNames($proto), $this->mergeTargets($proto)];
 
             $modified = $this->modify($class, $proto);
-            if ($modified !== null) {
+            if ($modified !== null){
                 $targets[] = $modified;
             }
         }
 
-        if (!empty($targets)) {
+        if (!empty($targets)){
             $grid = $this->table(['Class:', 'Property:', 'Target:']);
-            foreach ($targets as $target) {
+            foreach ($targets as $target){
                 $grid->addRow($target);
             }
 
@@ -105,7 +105,7 @@ 
     private function modify(\ReflectionClass $class, array $proto): ?array
     {
         $classDefinition = $this->extractor->extract($class->getFilename(), $proto);
-        try {
+        try{
             $modified = $this->injector->injectDependencies(
                 file_get_contents($class->getFileName()),
                 $classDefinition,
@@ -116,7 +116,7 @@ 
 
             file_put_contents($class->getFileName(), $modified);
             return null;
-        } catch (\Throwable $e) {
+        }catch (\Throwable $e){
             return [$class->getName(), $e->getMessage(), "{$e->getFile()}:L{$e->getLine()}"];
         }
     }

src/Prototype/tests/InjectorTest.php

Spacing +14 added lines, -14 removed lines

@@ -27,7 +27,7 @@ 
 
     public function setUp(): void
     {
-        if ((string)ini_get('zend.assertions') === 1) {
+        if ((string)ini_get('zend.assertions') === 1){
             ini_set('zend.assertions', 0);
         }
     }
@@ -40,7 +40,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])
@@ -66,7 +66,7 @@ 
     ): void {
         $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]),
@@ -75,15 +75,15 @@ 
             $noPhpDoc
         );
 
-        if ($expectedTypedProperty) {
+        if ($expectedTypedProperty){
             $this->assertStringContainsString('private TestClass $testClass;', $printed);
-        } else {
+        }else{
             $this->assertStringNotContainsString('private TestClass $testClass;', $printed);
         }
 
-        if ($expectedPhpDoc) {
+        if ($expectedPhpDoc){
             $this->assertRegExp('/@var TestClass[\s|\r\n]/', $printed);
-        } else {
+        }else{
             $this->assertNotRegExp('/@var TestClass[\s|\r\n]/', $printed);
         }
     }
@@ -106,7 +106,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),
@@ -124,7 +124,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])
@@ -149,7 +149,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])
@@ -167,7 +167,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])
@@ -183,7 +183,7 @@ 
      */
     public function testModifyConstructor(): void
     {
-        $filename = __DIR__ . '/Fixtures/WithConstructor.php';
+        $filename = __DIR__.'/Fixtures/WithConstructor.php';
         $extractor = new Traverse\Extractor();
 
         $parameters = $extractor->extractFromFilename($filename);
@@ -209,7 +209,7 @@ 
      */
     public function testPriorOptionalConstructorParameters(): void
     {
-        $filename = __DIR__ . '/Fixtures/OptionalConstructorArgsClass.php';
+        $filename = __DIR__.'/Fixtures/OptionalConstructorArgsClass.php';
         $extractor = new Traverse\Extractor();
 
         $parameters = $extractor->extractFromFilename($filename);
@@ -240,7 +240,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/NodeVisitors/UpdateConstructor.php

Spacing +26 added lines, -26 removed lines

@@ -42,13 +42,13 @@ 
      */
     public function leaveNode(Node $node)
     {
-        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);
         }
 
@@ -66,7 +66,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));
             array_unshift(
                 $constructor->stmts,
@@ -92,34 +92,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 = "?$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(
@@ -154,18 +154,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 = "$type|null";
                     }
 
@@ -173,7 +173,7 @@ 
                         sprintf($param->isVariadic ? '%s ...$%s' : '%s $%s', $type, $param->name),
                         'param'
                     );
-                } else {
+                }else{
                     $params[] = new Annotation\Line(
                         sprintf('$%s', $param->name),
                         'param'
@@ -184,12 +184,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;
@@ -198,7 +198,7 @@ 
             $previous = $line;
         }
 
-        if ($previous !== null && !$previous->isEmpty()) {
+        if ($previous !== null && !$previous->isEmpty()){
             $placementID++;
         }
 
@@ -213,9 +213,9 @@ 
      */
     private function getPropertyType(Dependency $dependency): string
     {
-        foreach ($this->definition->getStmts() as $stmt) {
-            if ($stmt->name === $dependency->type->fullName) {
-                if ($stmt->alias) {
+        foreach ($this->definition->getStmts() as $stmt){
+            if ($stmt->name === $dependency->type->fullName){
+                if ($stmt->alias){
                     return $stmt->alias;
                 }
             }
@@ -230,15 +230,15 @@ 
      */
     private function getParamType(ClassNode\ConstructorParam $param): string
     {
-        foreach ($this->definition->getStmts() as $stmt) {
-            if ($stmt->name === $param->type->fullName) {
-                if ($stmt->alias) {
+        foreach ($this->definition->getStmts() as $stmt){
+            if ($stmt->name === $param->type->fullName){
+                if ($stmt->alias){
                     return $stmt->alias;
                 }
             }
         }
 
-        if ($param->type->alias) {
+        if ($param->type->alias){
             return $param->type->alias;
         }
 

Braces +53 added lines, -26 removed lines

@@ -42,13 +42,15 @@ 
      */
     public function leaveNode(Node $node)
     {
-        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);
         }
 
@@ -66,7 +68,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));
             array_unshift(
                 $constructor->stmts,
@@ -92,34 +95,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 = "?$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(
@@ -154,18 +164,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 = "$type|null";
                     }
 
@@ -173,7 +188,9 @@ 
                         sprintf($param->isVariadic ? '%s ...$%s' : '%s $%s', $type, $param->name),
                         'param'
                     );
-                } else {
+                }
+                else
+                {
                     $params[] = new Annotation\Line(
                         sprintf('$%s', $param->name),
                         'param'
@@ -184,12 +201,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;
@@ -198,7 +217,8 @@ 
             $previous = $line;
         }
 
-        if ($previous !== null && !$previous->isEmpty()) {
+        if ($previous !== null && !$previous->isEmpty())
+        {
             $placementID++;
         }
 
@@ -213,9 +233,12 @@ 
      */
     private function getPropertyType(Dependency $dependency): string
     {
-        foreach ($this->definition->getStmts() as $stmt) {
-            if ($stmt->name === $dependency->type->fullName) {
-                if ($stmt->alias) {
+        foreach ($this->definition->getStmts() as $stmt)
+        {
+            if ($stmt->name === $dependency->type->fullName)
+            {
+                if ($stmt->alias)
+                {
                     return $stmt->alias;
                 }
             }
@@ -230,15 +253,19 @@ 
      */
     private function getParamType(ClassNode\ConstructorParam $param): string
     {
-        foreach ($this->definition->getStmts() as $stmt) {
-            if ($stmt->name === $param->type->fullName) {
-                if ($stmt->alias) {
+        foreach ($this->definition->getStmts() as $stmt)
+        {
+            if ($stmt->name === $param->type->fullName)
+            {
+                if ($stmt->alias)
+                {
                     return $stmt->alias;
                 }
             }
         }
 
-        if ($param->type->alias) {
+        if ($param->type->alias)
+        {
             return $param->type->alias;
         }