[cs] add and apply psr2

TomasVotruba · jaapio · commit a872e515bb39 · 2017-11-12T21:23:54.000+01:00
diff --git a/easy-coding-standard.neon b/easy-coding-standard.neon
@@ -1,5 +1,6 @@
 includes:
     - temp/ecs/config/clean-code.neon
+    - temp/ecs/config/psr2-checkers.neon
 
 parameters:
     skip:
diff --git a/src/DocBlock.php b/src/DocBlock.php
@@ -55,8 +55,7 @@ public function __construct(
         Location $location = null,
         $isTemplateStart = false,
         $isTemplateEnd = false
-    )
-    {
+    ) {
         Assert::string($summary);
         Assert::boolean($isTemplateStart);
         Assert::boolean($isTemplateEnd);
diff --git a/src/DocBlock/Description.php b/src/DocBlock/Description.php
@@ -98,6 +98,7 @@ public function render(Formatter $formatter = null)
         foreach ($this->tags as $tag) {
             $tags[] = '{' . $formatter->format($tag) . '}';
         }
+
         return vsprintf($this->bodyTemplate, $tags);
     }
 
diff --git a/src/DocBlock/DescriptionFactory.php b/src/DocBlock/DescriptionFactory.php
@@ -188,5 +188,4 @@ private function removeSuperfluousStartingWhitespace($contents)
 
         return implode("\n", $lines);
     }
-
 }
diff --git a/src/DocBlock/Serializer.php b/src/DocBlock/Serializer.php
@@ -121,6 +121,7 @@ private function getSummaryAndDescriptionTextBlock(DocBlock $docblock, $wrapLeng
             $text = wordwrap($text, $wrapLength);
             return $text;
         }
+
         return $text;
     }
 
@@ -138,6 +139,7 @@ private function addTagBlock(DocBlock $docblock, $wrapLength, $indent, $comment)
             if ($wrapLength !== null) {
                 $tagText = wordwrap($tagText, $wrapLength);
             }
+
             $tagText = str_replace("\n", "\n{$indent} * ", $tagText);
 
             $comment .= "{$indent} * {$tagText}\n";
diff --git a/src/DocBlock/StandardTagFactory.php b/src/DocBlock/StandardTagFactory.php
@@ -196,8 +196,7 @@ private function createTag($body, $name, TypeContext $context)
         $arguments        = $this->getArgumentsForParametersFromWiring(
             $this->fetchParametersForHandlerFactoryMethod($handlerClassName),
             $this->getServiceLocatorWithDynamicParameters($context, $name, $body)
-        )
-        ;
+        );
 
         return call_user_func_array([$handlerClassName, 'create'], $arguments);
     }
diff --git a/src/DocBlock/Tags/Covers.php b/src/DocBlock/Tags/Covers.php
@@ -49,8 +49,7 @@ public static function create(
         DescriptionFactory $descriptionFactory = null,
         FqsenResolver $resolver = null,
         TypeContext $context = null
-    )
-    {
+    ) {
         Assert::string($body);
         Assert::notEmpty($body);
 
diff --git a/src/DocBlock/Tags/Method.php b/src/DocBlock/Tags/Method.php
@@ -135,7 +135,7 @@ public static function create(
 
         if (is_string($arguments) && strlen($arguments) > 0) {
             $arguments = explode(',', $arguments);
-            foreach($arguments as &$argument) {
+            foreach ($arguments as &$argument) {
                 $argument = explode(' ', self::stripRestArg(trim($argument)), 2);
                 if ($argument[0][0] === '$') {
                     $argumentName = substr($argument[0], 1);
@@ -214,9 +214,11 @@ private function filterArguments($arguments)
             if (is_string($argument)) {
                 $argument = [ 'name' => $argument ];
             }
+
             if (! isset($argument['type'])) {
                 $argument['type'] = new Void_();
             }
+
             $keys = array_keys($argument);
             sort($keys);
             if ($keys !== [ 'name', 'type' ]) {
diff --git a/src/DocBlock/Tags/Reference/Reference.php b/src/DocBlock/Tags/Reference/Reference.php
@@ -17,5 +17,5 @@
  */
 interface Reference
 {
-   public function __toString();
+    public function __toString();
 }
diff --git a/src/DocBlock/Tags/Return_.php b/src/DocBlock/Tags/Return_.php
@@ -43,8 +43,7 @@ public static function create(
         TypeResolver $typeResolver = null,
         DescriptionFactory $descriptionFactory = null,
         TypeContext $context = null
-    )
-    {
+    ) {
         Assert::string($body);
         Assert::allNotNull([$typeResolver, $descriptionFactory]);
 
diff --git a/src/DocBlock/Tags/Source.php b/src/DocBlock/Tags/Source.php
@@ -59,6 +59,7 @@ public static function create($body, DescriptionFactory $descriptionFactory = nu
             if (isset($matches[2]) && $matches[2] !== '') {
                 $lineCount = (int)$matches[2];
             }
+
             $description = $matches[3];
         }
 
diff --git a/src/DocBlockFactory.php b/src/DocBlockFactory.php
@@ -93,7 +93,7 @@ public function create($docblock, Types\Context $context = null, Location $locat
         return new DocBlock(
             $summary,
             $description ? $this->descriptionFactory->create($description, $context) : null,
-            array_filter($this->parseTagBlock($tags, $context), function($tag) {
+            array_filter($this->parseTagBlock($tags, $context), function ($tag) {
                 return $tag instanceof Tag;
             }),
             $context,
diff --git a/tests/integration/InterpretingDocBlocksTest.php b/tests/integration/InterpretingDocBlocksTest.php
@@ -78,7 +78,8 @@ public function testDescriptionsCanEscapeAtSignsAndClosingBraces()
          */
 
         include(__DIR__ . '/../../examples/playing-with-descriptions/02-escaping.php');
-        $this->assertSame(<<<'DESCRIPTION'
+        $this->assertSame(
+            <<<'DESCRIPTION'
 You can escape the @-sign by surrounding it with braces, for example: @. And escape a closing brace within an
 inline tag by adding an opening brace in front of it like this: }.
 
@@ -91,7 +92,6 @@ public function testDescriptionsCanEscapeAtSignsAndClosingBraces()
 DESCRIPTION
             ,
             $foundDescription
-        )
-        ;
+        );
     }
 }
diff --git a/tests/integration/ReconstitutingADocBlockTest.php b/tests/integration/ReconstitutingADocBlockTest.php
@@ -12,7 +12,6 @@
 
 namespace phpDocumentor\Reflection;
 
-
 /**
  * @coversNothing
  */
diff --git a/tests/unit/DocBlock/DescriptionFactoryTest.php b/tests/unit/DocBlock/DescriptionFactoryTest.php
@@ -73,8 +73,7 @@ public function testDescriptionCanParseAStringWithInlineTag()
         $tagFactory->shouldReceive('create')
             ->once()
             ->with('@link http://phpdoc.org/ description', $context)
-            ->andReturn(new Link('http://phpdoc.org/', new Description('description')))
-        ;
+            ->andReturn(new Link('http://phpdoc.org/', new Description('description')));
 
         $factory     = new DescriptionFactory($tagFactory);
         $description = $factory->create($contents, $context);
@@ -99,8 +98,7 @@ public function testDescriptionCanParseAStringStartingWithInlineTag()
         $tagFactory->shouldReceive('create')
             ->once()
             ->with('@link http://phpdoc.org/ This', $context)
-            ->andReturn(new Link('http://phpdoc.org/', new Description('This')))
-        ;
+            ->andReturn(new Link('http://phpdoc.org/', new Description('This')));
 
         $factory     = new DescriptionFactory($tagFactory);
         $description = $factory->create($contents, $context);
diff --git a/tests/unit/DocBlock/StandardTagFactoryTest.php b/tests/unit/DocBlock/StandardTagFactoryTest.php
@@ -50,8 +50,7 @@ public function testCreatingAGenericTag()
             ->shouldReceive('create')
             ->once()
             ->with($expectedDescriptionText, $context)
-            ->andReturn($expectedDescription)
-        ;
+            ->andReturn($expectedDescription);
 
         $tagFactory = new StandardTagFactory(m::mock(FqsenResolver::class));
         $tagFactory->addService($descriptionFactory, DescriptionFactory::class);
@@ -99,8 +98,7 @@ public function testAnEmptyContextIsCreatedIfNoneIsProvided()
             ->shouldReceive('resolve')
             ->with('Tag', m::type(Context::class))
             ->andReturn(new Fqsen($fqsen))
-            ->getMock()
-        ;
+            ->getMock();
         $descriptionFactory = m::mock(DescriptionFactory::class);
         $descriptionFactory->shouldIgnoreMissing();
 
@@ -161,8 +159,7 @@ public function testAddParameterToServiceLocator()
             [FqsenResolver::class => $resolver, 'myParam' => 'myValue'],
             'serviceLocator',
             $tagFactory
-        )
-        ;
+        );
     }
 
     /**
@@ -181,8 +178,7 @@ public function testAddServiceToServiceLocator()
             [FqsenResolver::class => $resolver, PassthroughFormatter::class => $service],
             'serviceLocator',
             $tagFactory
-        )
-        ;
+        );
     }
 
     /**
@@ -202,8 +198,7 @@ public function testInjectConcreteServiceForInterfaceToServiceLocator()
             [FqsenResolver::class => $resolver, $interfaceName => $service],
             'serviceLocator',
             $tagFactory
-        )
-        ;
+        );
     }
 
     /**
@@ -340,8 +335,7 @@ public function testReturntagIsMappedCorrectly()
             ->shouldReceive('create')
             ->once()
             ->with('', $context)
-            ->andReturn(new Description(''))
-        ;
+            ->andReturn(new Description(''));
 
         $typeResolver = new TypeResolver();
 
diff --git a/tests/unit/DocBlock/Tags/MethodTest.php b/tests/unit/DocBlock/Tags/MethodTest.php
@@ -342,7 +342,8 @@ public function testCollectionReturnTypes(
         $expectedType,
         $expectedValueType = null,
         $expectedKeyType = null
-    ) { $resolver           = new TypeResolver();
+    ) {
+        $resolver           = new TypeResolver();
         $descriptionFactory = m::mock(DescriptionFactory::class);
         $descriptionFactory->shouldReceive('create')->with('', null)->andReturn(new Description(''));
 
@@ -540,7 +541,8 @@ public function testCreateWithMixedReturnTypes()
             new Compound([
                 new Array_(new Object_(new Fqsen('\MyClass'))),
                 new Array_(new Integer()),
-            ])
-            , $fixture->getReturnType());
+            ]),
+            $fixture->getReturnType()
+        );
     }
 }
diff --git a/tests/unit/DocBlock/Tags/PropertyReadTest.php b/tests/unit/DocBlock/Tags/PropertyReadTest.php
@@ -140,8 +140,12 @@ public function testFactoryMethod()
         $description = new Description('My Description');
         $descriptionFactory->shouldReceive('create')->with('My Description', $context)->andReturn($description);
 
-        $fixture = PropertyRead::create('string $myProperty My Description', $typeResolver, $descriptionFactory,
-            $context);
+        $fixture = PropertyRead::create(
+            'string $myProperty My Description',
+            $typeResolver,
+            $descriptionFactory,
+            $context
+        );
 
         $this->assertSame('string $myProperty My Description', (string)$fixture);
         $this->assertSame('myProperty', $fixture->getVariableName());
diff --git a/tests/unit/DocBlock/Tags/PropertyWriteTest.php b/tests/unit/DocBlock/Tags/PropertyWriteTest.php
@@ -140,8 +140,12 @@ public function testFactoryMethod()
         $description = new Description('My Description');
         $descriptionFactory->shouldReceive('create')->with('My Description', $context)->andReturn($description);
 
-        $fixture = PropertyWrite::create('string $myProperty My Description', $typeResolver, $descriptionFactory,
-            $context);
+        $fixture = PropertyWrite::create(
+            'string $myProperty My Description',
+            $typeResolver,
+            $descriptionFactory,
+            $context
+        );
 
         $this->assertSame('string $myProperty My Description', (string)$fixture);
         $this->assertSame('myProperty', $fixture->getVariableName());
diff --git a/tests/unit/DocBlock/Tags/UsesTest.php b/tests/unit/DocBlock/Tags/UsesTest.php
@@ -125,8 +125,7 @@ public function testFactoryMethod()
         $description = new Description('My Description');
 
         $descriptionFactory
-            ->shouldReceive('create')->with('My Description', $context)->andReturn($description)
-        ;
+            ->shouldReceive('create')->with('My Description', $context)->andReturn($description);
         $resolver->shouldReceive('resolve')->with('DateTime', $context)->andReturn($fqsen);
 
         $fixture = Uses::create('DateTime My Description', $resolver, $descriptionFactory, $context);

Original file line number	Diff line number	Diff line change
`@@ -98,6 +98,7 @@ public function render(Formatter $formatter = null)`
`98`	`98`	`foreach ($this->tags as $tag) {`
`99`	`99`	`$tags[] = '{' . $formatter->format($tag) . '}';`
`100`	`100`	`}`
	`101`	`+`
`101`	`102`	`return vsprintf($this->bodyTemplate, $tags);`
`102`	`103`	`}`
`103`	`104`
Original file line number	Diff line number	Diff line change
`@@ -188,5 +188,4 @@ private function removeSuperfluousStartingWhitespace($contents)`
`188`	`188`
`189`	`189`	`return implode("\n", $lines);`
`190`	`190`	`}`
`191`		`-`
`192`	`191`	`}`
Original file line number	Diff line number	Diff line change
`@@ -121,6 +121,7 @@ private function getSummaryAndDescriptionTextBlock(DocBlock $docblock, $wrapLeng`
`121`	`121`	`$text = wordwrap($text, $wrapLength);`
`122`	`122`	`return $text;`
`123`	`123`	`}`
	`124`	`+`
`124`	`125`	`return $text;`
`125`	`126`	`}`
`126`	`127`
`@@ -138,6 +139,7 @@ private function addTagBlock(DocBlock $docblock, $wrapLength, $indent, $comment)`
`138`	`139`	`if ($wrapLength !== null) {`
`139`	`140`	`$tagText = wordwrap($tagText, $wrapLength);`
`140`	`141`	`}`
	`142`	`+`
`141`	`143`	`$tagText = str_replace("\n", "\n{$indent} * ", $tagText);`
`142`	`144`
`143`	`145`	`$comment .= "{$indent} * {$tagText}\n";`
Original file line number	Diff line number	Diff line change
`@@ -196,8 +196,7 @@ private function createTag($body, $name, TypeContext $context)`
`196`	`196`	`$arguments = $this->getArgumentsForParametersFromWiring(`
`197`	`197`	`$this->fetchParametersForHandlerFactoryMethod($handlerClassName),`
`198`	`198`	`$this->getServiceLocatorWithDynamicParameters($context, $name, $body)`
`199`		`- )`
`200`		`- ;`
	`199`	`+ );`
`201`	`200`
`202`	`201`	`return call_user_func_array([$handlerClassName, 'create'], $arguments);`
`203`	`202`	`}`
Original file line number	Diff line number	Diff line change
`@@ -17,5 +17,5 @@`
`17`	`17`	`*/`
`18`	`18`	`interface Reference`
`19`	`19`	`{`
`20`		`- public function __toString();`
	`20`	`+ public function __toString();`
`21`	`21`	`}`