spiral / framework

src/Prototype/src/Injector.php

Spacing +4 added lines, -4 removed lines

@@ -47,7 +47,7 @@ 
      */
     public function __construct(Lexer $lexer = null, PrettyPrinterAbstract $printer = null)
     {
-        if ($lexer === null) {
+        if ($lexer === null){
             $lexer = new Lexer\Emulative([
                 'usedAttributes' => [
                     'comments',
@@ -86,8 +86,8 @@ 
         bool $useTypedProperties = false,
         bool $noPhpDoc = 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());
@@ -101,7 +101,7 @@ 
         $tr = new NodeTraverser();
         $tr->addVisitor(new AddUse($node));
 
-        if ($removeTrait) {
+        if ($removeTrait){
             $tr->addVisitor(new RemoveUse());
             $tr->addVisitor(new RemoveTrait());
         }

Braces +8 added lines, -4 removed lines

@@ -47,7 +47,8 @@ 
      */
     public function __construct(Lexer $lexer = null, PrettyPrinterAbstract $printer = null)
     {
-        if ($lexer === null) {
+        if ($lexer === null)
+        {
             $lexer = new Lexer\Emulative([
                 'usedAttributes' => [
                     'comments',
@@ -86,8 +87,10 @@ 
         bool $useTypedProperties = false,
         bool $noPhpDoc = 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());
@@ -101,7 +104,8 @@ 
         $tr = new NodeTraverser();
         $tr->addVisitor(new AddUse($node));
 
-        if ($removeTrait) {
+        if ($removeTrait)
+        {
             $tr->addVisitor(new RemoveUse());
             $tr->addVisitor(new RemoveTrait());
         }

src/Prototype/tests/BackwardCompatibilityTrait.php

Spacing +2 added lines, -2 removed lines

@@ -19,7 +19,7 @@ 
      */
     public static function assertRegExp(string $pattern, string $string, string $message = ''): void
     {
-        if (\method_exists(Assert::class, 'assertMatchesRegularExpression')) {
+        if (\method_exists(Assert::class, 'assertMatchesRegularExpression')){
             Assert::assertMatchesRegularExpression($pattern, $string, $message);
 
             return;
@@ -35,7 +35,7 @@ 
      */
     public static function assertNotRegExp(string $pattern, string $string, string $message = ''): void
     {
-        if (\method_exists(Assert::class, 'assertDoesNotMatchRegularExpression')) {
+        if (\method_exists(Assert::class, 'assertDoesNotMatchRegularExpression')){
             Assert::assertDoesNotMatchRegularExpression($pattern, $string, $message);
 
             return;

Braces +4 added lines, -2 removed lines

@@ -19,7 +19,8 @@ 
      */
     public static function assertRegExp(string $pattern, string $string, string $message = ''): void
     {
-        if (\method_exists(Assert::class, 'assertMatchesRegularExpression')) {
+        if (\method_exists(Assert::class, 'assertMatchesRegularExpression'))
+        {
             Assert::assertMatchesRegularExpression($pattern, $string, $message);
 
             return;
@@ -35,7 +36,8 @@ 
      */
     public static function assertNotRegExp(string $pattern, string $string, string $message = ''): void
     {
-        if (\method_exists(Assert::class, 'assertDoesNotMatchRegularExpression')) {
+        if (\method_exists(Assert::class, 'assertDoesNotMatchRegularExpression'))
+        {
             Assert::assertDoesNotMatchRegularExpression($pattern, $string, $message);
 
             return;

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';
         $traverser = new Traverse\Extractor();
 
         $parameters = $traverser->extractFromFilename($filename);
@@ -209,7 +209,7 @@ 
      */
     public function testPriorOptionalConstructorParameters(): void
     {
-        $filename = __DIR__ . '/Fixtures/OptionalConstructorArgsClass.php';
+        $filename = __DIR__.'/Fixtures/OptionalConstructorArgsClass.php';
         $traverser = new Traverse\Extractor();
 
         $parameters = $traverser->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(

Braces +12 added lines, -5 removed lines

@@ -27,7 +27,8 @@ 
 
     public function setUp(): void
     {
-        if ((string)ini_get('zend.assertions') === 1) {
+        if ((string)ini_get('zend.assertions') === 1)
+        {
             ini_set('zend.assertions', 0);
         }
     }
@@ -75,15 +76,21 @@ 
             $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);
         }
     }

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

Spacing +20 added lines, -20 removed lines

@@ -23,7 +23,7 @@ 
     {
         $i = new Injector();
 
-        $filename = __DIR__ . '/Fixtures/TestClass.php';
+        $filename = __DIR__.'/Fixtures/TestClass.php';
         $r = $i->injectDependencies(
             file_get_contents($filename),
             $this->getDefinition(
@@ -36,16 +36,16 @@ 
             )
         );
 
-        $this->assertStringContainsString(Fixtures\Test::class . ';', $r);
+        $this->assertStringContainsString(Fixtures\Test::class.';', $r);
         $this->assertRegExp('/@var Test[\s|\r\n]/', $r);
         $this->assertStringContainsString('@param 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->assertRegExp('/@var Test2[\s|\r\n]/', $r);
         $this->assertStringContainsString('@param Test2 $test2', $r);
 
-        $this->assertStringContainsString(Fixtures\ATest3::class . ';', $r);
+        $this->assertStringContainsString(Fixtures\ATest3::class.';', $r);
         $this->assertRegExp('/@var ATest3[\s|\r\n]/', $r);
         $this->assertStringContainsString('@param ATest3 $test3', $r);
     }
@@ -57,7 +57,7 @@ 
     {
         $i = new Injector();
 
-        $filename = __DIR__ . '/Fixtures/TestClassWithImports.php';
+        $filename = __DIR__.'/Fixtures/TestClassWithImports.php';
         $r = $i->injectDependencies(
             file_get_contents($filename),
             $this->getDefinition(
@@ -70,18 +70,18 @@ 
             )
         );
 
-        $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->assertRegExp('/@var FTest[\s|\r\n]/', $r);
         $this->assertStringContainsString('@param 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->assertRegExp('/@var TestAlias[\s|\r\n]/', $r);
         $this->assertStringContainsString('@param 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->assertRegExp('/@var ATest[\s|\r\n]/', $r);
         $this->assertStringContainsString('@param ATest $test3', $r);
     }
@@ -93,7 +93,7 @@ 
     {
         $i = new Injector();
 
-        $filename = __DIR__ . '/Fixtures/ChildClass.php';
+        $filename = __DIR__.'/Fixtures/ChildClass.php';
         $r = $i->injectDependencies(
             file_get_contents($filename),
             $this->getDefinition(
@@ -106,17 +106,17 @@ 
             )
         );
 
-        $this->assertStringContainsString(Fixtures\Test::class . ';', $r);
+        $this->assertStringContainsString(Fixtures\Test::class.';', $r);
         $this->assertRegExp('/@var Test[\s|\r\n]/', $r);
         $this->assertStringContainsString('@param 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->assertRegExp('/@var Test2[\s|\r\n]/', $r);
         $this->assertStringContainsString('@param 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->assertRegExp('/@var ATestAlias[\s|\r\n]/', $r);
         $this->assertStringContainsString('@param ATestAlias $test3', $r);
     }
@@ -125,7 +125,7 @@ 
     {
         $i = new Injector();
 
-        $filename = __DIR__ . '/Fixtures/DuplicatePropertyClass.php';
+        $filename = __DIR__.'/Fixtures/DuplicatePropertyClass.php';
         $r = $i->injectDependencies(
             file_get_contents($filename),
             $this->getDefinition(
@@ -136,7 +136,7 @@ 
             )
         );
 
-        $this->assertStringContainsString(Fixtures\Test::class . ';', $r);
+        $this->assertStringContainsString(Fixtures\Test::class.';', $r);
         $this->assertRegExp('/@var Test[\s|\r\n]/', $r);
         $this->assertStringContainsString('@param Test $test', $r);
         $this->assertStringContainsString('__construct(Test $test)', $r);

src/Prototype/src/NodeVisitors/AddProperty.php

Spacing +8 added lines, -8 removed lines

@@ -46,12 +46,12 @@ 
      */
     public function leaveNode(Node $node)
     {
-        if (!$node instanceof Node\Stmt\Class_) {
+        if (!$node instanceof Node\Stmt\Class_){
             return null;
         }
 
         $nodes = [];
-        foreach ($this->definition->dependencies as $dependency) {
+        foreach ($this->definition->dependencies as $dependency){
             $nodes[] = $this->buildProperty($dependency);
         }
 
@@ -67,8 +67,8 @@ 
      */
     private function definePlacementID(Node\Stmt\Class_ $node): int
     {
-        foreach ($node->stmts as $index => $child) {
-            if ($child instanceof Node\Stmt\ClassMethod || $child instanceof Node\Stmt\Property) {
+        foreach ($node->stmts as $index => $child){
+            if ($child instanceof Node\Stmt\ClassMethod || $child instanceof Node\Stmt\Property){
                 return $index;
             }
         }
@@ -85,11 +85,11 @@ 
         $b = new Property($dependency->property);
         $b->makePrivate();
 
-        if ($this->useTypedProperty()) {
+        if ($this->useTypedProperty()){
             $b->setType($this->getPropertyType($dependency));
         }
 
-        if ($this->renderDoc()) {
+        if ($this->renderDoc()){
             $b->setDocComment(new Doc(sprintf('/** @var %s */', $this->getPropertyType($dependency))));
         }
 
@@ -112,8 +112,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;
             }
         }

Braces +16 added lines, -8 removed lines

@@ -46,12 +46,14 @@ 
      */
     public function leaveNode(Node $node)
     {
-        if (!$node instanceof Node\Stmt\Class_) {
+        if (!$node instanceof Node\Stmt\Class_)
+        {
             return null;
         }
 
         $nodes = [];
-        foreach ($this->definition->dependencies as $dependency) {
+        foreach ($this->definition->dependencies as $dependency)
+        {
             $nodes[] = $this->buildProperty($dependency);
         }
 
@@ -67,8 +69,10 @@ 
      */
     private function definePlacementID(Node\Stmt\Class_ $node): int
     {
-        foreach ($node->stmts as $index => $child) {
-            if ($child instanceof Node\Stmt\ClassMethod || $child instanceof Node\Stmt\Property) {
+        foreach ($node->stmts as $index => $child)
+        {
+            if ($child instanceof Node\Stmt\ClassMethod || $child instanceof Node\Stmt\Property)
+            {
                 return $index;
             }
         }
@@ -85,11 +89,13 @@ 
         $b = new Property($dependency->property);
         $b->makePrivate();
 
-        if ($this->useTypedProperty()) {
+        if ($this->useTypedProperty())
+        {
             $b->setType($this->getPropertyType($dependency));
         }
 
-        if ($this->renderDoc()) {
+        if ($this->renderDoc())
+        {
             $b->setDocComment(new Doc(sprintf('/** @var %s */', $this->getPropertyType($dependency))));
         }
 
@@ -112,8 +118,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;
             }
         }