[CodingStyle] Add NewlineAfterStatementRector (#787)

Co-authored-by: GitHub Action <action@github.com>
rectorphp · Aug 30, 2021 · a81fd4e · a81fd4e
1 parent 13bf954
commit a81fd4e
Show file tree

Hide file tree

Showing 158 changed files with 608 additions and 5 deletions.
diff --git a/config/set/coding-style.php b/config/set/coding-style.php
@@ -25,6 +25,7 @@
 use Rector\CodingStyle\Rector\Plus\UseIncrementAssignRector;
 use Rector\CodingStyle\Rector\PostInc\PostIncDecToPreIncDecRector;
 use Rector\CodingStyle\Rector\Property\AddFalseDefaultToBoolPropertyRector;
+use Rector\CodingStyle\Rector\Stmt\NewlineAfterStatementRector;
 use Rector\CodingStyle\Rector\String_\SplitStringClassConstantToClassConstFetchRector;
 use Rector\CodingStyle\Rector\String_\SymplifyQuoteEscapeRector;
 use Rector\CodingStyle\Rector\Switch_\BinarySwitchToIfElseRector;
@@ -76,4 +77,5 @@
     $services->set(RemoveDoubleUnderscoreInMethodNameRector::class);
     $services->set(PostIncDecToPreIncDecRector::class);
     $services->set(UnSpreadOperatorRector::class);
+    $services->set(NewlineAfterStatementRector::class);
 };
diff --git a/packages/BetterPhpDocParser/PhpDocParser/StaticDoctrineAnnotationParser/PlainValueParser.php b/packages/BetterPhpDocParser/PhpDocParser/StaticDoctrineAnnotationParser/PlainValueParser.php
@@ -135,12 +135,15 @@ private function matchConstantValue(string $currentTokenValue): ConstExprNode |
         if (strtolower($currentTokenValue) === 'true') {
             return new ConstExprTrueNode();
         }
+
         if (! is_numeric($currentTokenValue)) {
             return null;
         }
+
         if ((string) (int) $currentTokenValue !== $currentTokenValue) {
             return null;
         }
+
         return new ConstExprIntegerNode($currentTokenValue);
     }
 }
diff --git a/packages/BetterPhpDocParser/ValueObject/Type/SpacingAwareCallableTypeNode.php b/packages/BetterPhpDocParser/ValueObject/Type/SpacingAwareCallableTypeNode.php
@@ -55,12 +55,15 @@ private function normalizeParameterType(string $parameterTypeString, string $ret
         if ($parameterTypeString !== '') {
             return '(' . $parameterTypeString . ')';
         }
+
         if ($returnTypeAsString === 'mixed') {
             return $parameterTypeString;
         }
+
         if ($returnTypeAsString === '') {
             return $parameterTypeString;
         }
+
         return '()';
     }
 
@@ -69,9 +72,11 @@ private function normalizeReturnType(string $parameterTypeString, string $return
         if ($returnTypeAsString !== 'mixed') {
             return ':' . $returnTypeAsString;
         }
+
         if ($parameterTypeString !== '') {
             return ':' . $returnTypeAsString;
         }
+
         return '';
     }
 }
diff --git a/packages/ChangesReporting/Collector/AffectedFilesCollector.php b/packages/ChangesReporting/Collector/AffectedFilesCollector.php
@@ -24,6 +24,7 @@ public function getNext(): ?File
         if ($this->affectedFiles !== []) {
             return current($this->affectedFiles);
         }
+
         return null;
     }
 

diff --git a/packages/FamilyTree/Reflection/FamilyRelationsAnalyzer.php b/packages/FamilyTree/Reflection/FamilyRelationsAnalyzer.php
@@ -105,9 +105,11 @@ public function getPossibleUnionPropertyType(
             if ($ancestor->isSubclassOf('PHPUnit\Framework\TestCase')) {
                 continue;
             }
+
             if ($nodes === null) {
                 continue;
             }
+
             if (! $this->isPropertyWritten($nodes, $propertyName, $kindPropertyFetch)) {
                 continue;
             }

diff --git a/packages/FileFormatter/Formatter/XmlFileFormatter.php b/packages/FileFormatter/Formatter/XmlFileFormatter.php
@@ -126,9 +126,11 @@ private function runPost(string $part): void
         if ($this->isOpeningTag($part)) {
             ++$this->depth;
         }
+
         if ($this->isClosingCdataTag($part)) {
             $this->preserveWhitespace = false;
         }
+
         if ($this->isOpeningCdataTag($part)) {
             $this->preserveWhitespace = true;
         }

diff --git a/packages/NodeNameResolver/NodeNameResolver.php b/packages/NodeNameResolver/NodeNameResolver.php
@@ -57,9 +57,11 @@ public function isName(Node | array $node, string $name): bool
         if ($node instanceof MethodCall) {
             return false;
         }
+
         if ($node instanceof StaticCall) {
             return false;
         }
+
         $nodes = is_array($node) ? $node : [$node];
 
         foreach ($nodes as $node) {
@@ -80,6 +82,7 @@ public function isCaseSensitiveName(Node $node, string $name): bool
         if ($node instanceof MethodCall) {
             return false;
         }
+
         if ($node instanceof StaticCall) {
             return false;
         }

diff --git a/packages/NodeNameResolver/NodeNameResolver/ClassConstFetchNameResolver.php b/packages/NodeNameResolver/NodeNameResolver/ClassConstFetchNameResolver.php
@@ -38,6 +38,7 @@ public function resolve(Node $node): ?string
         if ($class === null) {
             return null;
         }
+
         if ($name === null) {
             return null;
         }

diff --git a/packages/NodeNestingScope/ScopeNestingComparator.php b/packages/NodeNestingScope/ScopeNestingComparator.php
@@ -61,12 +61,15 @@ public function isNodeConditionallyScoped(Expr $expr): bool
         if ($this->isInBothIfElseBranch($foundParent, $expr)) {
             return false;
         }
+
         if (! $foundParent instanceof Else_) {
             return ! $foundParent instanceof FunctionLike;
         }
+
         if (! $this->nodeComparator->areNodesEqual($expr, $this->doubleIfBranchExprs)) {
             return ! $foundParent instanceof FunctionLike;
         }
+
         return false;
     }
 

diff --git a/packages/NodeRemoval/BreakingRemovalGuard.php b/packages/NodeRemoval/BreakingRemovalGuard.php
@@ -44,12 +44,15 @@ public function isLegalNodeRemoval(Node $node): bool
         if ($parent instanceof BooleanNot) {
             $parent = $parent->getAttribute(AttributeKey::PARENT_NODE);
         }
+
         if ($parent instanceof Assign) {
             return false;
         }
+
         if ($this->isIfCondition($node)) {
             return false;
         }
+
         return ! $this->isWhileCondition($node);
     }
 

diff --git a/packages/NodeTypeResolver/NodeTypeCorrector/PregMatchTypeCorrector.php b/packages/NodeTypeResolver/NodeTypeCorrector/PregMatchTypeCorrector.php
@@ -87,6 +87,7 @@ private function getVariableUsages(Variable $variable): array
             if (! $node instanceof Variable) {
                 return false;
             }
+
             return $node->name === $variable->name;
         });
     }

diff --git a/packages/NodeTypeResolver/NodeTypeResolver.php b/packages/NodeTypeResolver/NodeTypeResolver.php
@@ -498,6 +498,7 @@ private function resolveObjectType(ObjectType $resolvedObjectType, ObjectType $r
         if (! $this->isObjectTypeOfObjectType($renamedObjectType, $requiredObjectType)) {
             return $this->isObjectTypeOfObjectType($resolvedObjectType, $requiredObjectType);
         }
+
         return true;
     }
 }
diff --git a/packages/NodeTypeResolver/NodeTypeResolver/VariableTypeResolver.php b/packages/NodeTypeResolver/NodeTypeResolver/VariableTypeResolver.php
@@ -115,6 +115,7 @@ private function resolveFromParentNodes(Variable $variable): ?Scope
 
             return $parentNodeScope;
         }
+
         return null;
     }
 }
diff --git a/packages/NodeTypeResolver/TypeAnalyzer/ArrayTypeAnalyzer.php b/packages/NodeTypeResolver/TypeAnalyzer/ArrayTypeAnalyzer.php
@@ -72,12 +72,15 @@ private function isIntersectionArrayType(Type $nodeType): bool
             if ($intersectionNodeType instanceof ArrayType) {
                 continue;
             }
+
             if ($intersectionNodeType instanceof HasOffsetType) {
                 continue;
             }
+
             if ($intersectionNodeType instanceof NonEmptyArrayType) {
                 continue;
             }
+
             return false;
         }
 
@@ -98,6 +101,7 @@ private function isPropertyFetchWithArrayDefault(Node $node): bool
         if ($classLike instanceof Interface_) {
             return false;
         }
+
         if ($classLike === null) {
             return false;
         }
@@ -119,9 +123,11 @@ private function isPropertyFetchWithArrayDefault(Node $node): bool
         } else {
             $propertyOwnerStaticType = $this->nodeTypeResolver->resolve($node->class);
         }
+
         if ($propertyOwnerStaticType instanceof ThisType) {
             return false;
         }
+
         return $propertyOwnerStaticType instanceof TypeWithClassName;
     }
 }
diff --git a/packages/NodeTypeResolver/TypeComparator/TypeComparator.php b/packages/NodeTypeResolver/TypeComparator/TypeComparator.php
@@ -102,12 +102,15 @@ private function areAliasedObjectMatchingFqnObject(Type $firstType, Type $second
         if ($firstType instanceof AliasedObjectType && $secondType instanceof ObjectType && $firstType->getFullyQualifiedClass() === $secondType->getClassName()) {
             return true;
         }
+
         if (! $secondType instanceof AliasedObjectType) {
             return false;
         }
+
         if (! $firstType instanceof ObjectType) {
             return false;
         }
+
         return $secondType->getFullyQualifiedClass() === $firstType->getClassName();
     }
 
@@ -119,6 +122,7 @@ private function areArrayTypeWithSingleObjectChildToParent(Type $firstType, Type
         if (! $firstType instanceof ArrayType) {
             return false;
         }
+
         if (! $secondType instanceof ArrayType) {
             return false;
         }

diff --git a/packages/PHPStanStaticTypeMapper/TypeAnalyzer/UnionTypeAnalyzer.php b/packages/PHPStanStaticTypeMapper/TypeAnalyzer/UnionTypeAnalyzer.php
@@ -106,15 +106,19 @@ public function isScalar(UnionType $unionType): bool
             if ($type instanceof StringType && ! $type instanceof ConstantStringType) {
                 continue;
             }
+
             if ($type instanceof FloatType) {
                 continue;
             }
+
             if ($type instanceof IntegerType) {
                 continue;
             }
+
             if ($type instanceof BooleanType) {
                 continue;
             }
+
             return false;
         }
 

diff --git a/packages/PHPStanStaticTypeMapper/TypeMapper/UnionTypeMapper.php b/packages/PHPStanStaticTypeMapper/TypeMapper/UnionTypeMapper.php
@@ -142,9 +142,11 @@ private function shouldSkipIterable(UnionType $unionType): bool
         if (! $unionTypeAnalysis instanceof UnionTypeAnalysis) {
             return false;
         }
+
         if (! $unionTypeAnalysis->hasIterable()) {
             return false;
         }
+
         return $unionTypeAnalysis->hasArray();
     }
 

diff --git a/packages/PostRector/Rector/NodeRemovingPostRector.php b/packages/PostRector/Rector/NodeRemovingPostRector.php
@@ -124,6 +124,7 @@ private function isChainMethodCallNodeToBeRemoved(
         if (! $mainMethodCall->var instanceof MethodCall) {
             return false;
         }
+
         if ($toBeRemovedMethodCall !== $mainMethodCall->var) {
             return false;
         }

diff --git a/packages/PostRector/Rector/PropertyAddingPostRector.php b/packages/PostRector/Rector/PropertyAddingPostRector.php
@@ -38,9 +38,11 @@ public function enterNode(Node $node): ?Node
         if (! $node instanceof Class_) {
             return null;
         }
+
         if ($this->classAnalyzer->isAnonymousClass($node)) {
             return null;
         }
+
         $this->addConstants($node);
         $this->addProperties($node);
         $this->addPropertiesWithoutConstructor($node);

diff --git a/packages/Testing/PHPUnit/Behavior/MultipleFilesChangedTrait.php b/packages/Testing/PHPUnit/Behavior/MultipleFilesChangedTrait.php
@@ -32,6 +32,7 @@ protected function doTestFileInfoWithAdditionalChanges(
         if (trim($expectedContent)) {
             $fixtureContent .= $separator . $expectedContent;
         }
+
         FileSystem::write($fixturePath, $fixtureContent);
         $newFileInfo = new SmartFileInfo($fixturePath);
         $this->doTestFileInfo($newFileInfo, $allowMatches);
@@ -55,6 +56,7 @@ private function prepareAdditionalChangedFiles(array $additionalFileChanges): ar
             if ($path === null) {
                 throw new ShouldNotHappenException('Path for additional change must be set');
             }
+
             $fullPath = $this->getFixtureTempDirectory() . '/' . $path;
 
             $input = isset($additionalFileChange[1]) ? trim($additionalFileChange[1]) : null;
@@ -65,6 +67,7 @@ private function prepareAdditionalChangedFiles(array $additionalFileChanges): ar
 
             $expectedFileChanges[$fullPath] = isset($additionalFileChange[2]) ? trim($additionalFileChange[2]) : '';
         }
+
         return $expectedFileChanges;
     }
 

diff --git a/rules-tests/CodingStyle/Rector/Stmt/NewlineAfterStatementRector/Fixture/no_new_line.php.inc b/rules-tests/CodingStyle/Rector/Stmt/NewlineAfterStatementRector/Fixture/no_new_line.php.inc
@@ -0,0 +1,57 @@
+<?php
+
+namespace Rector\Tests\CodingStyle\Rector\Stmt\NewlineAfterStatementRector\Fixture;
+
+class NoNewLine
+{
+    private $property;
+    private $property2;
+    private const VIEW = 'view';
+    private const ADD = 'add';
+    public function run(array $data)
+    {
+        if (rand(0, 1)) {
+
+        }
+        echo 'test';
+
+        foreach ($data as $key => $value) {
+            # code...
+        }
+        return true;
+    }
+}
+
+?>
+-----
+<?php
+
+namespace Rector\Tests\CodingStyle\Rector\Stmt\NewlineAfterStatementRector\Fixture;
+
+class NoNewLine
+{
+    private $property;
+
+    private $property2;
+
+    private const VIEW = 'view';
+
+    private const ADD = 'add';
+
+    public function run(array $data)
+    {
+        if (rand(0, 1)) {
+
+        }
+
+        echo 'test';
+
+        foreach ($data as $key => $value) {
+            # code...
+        }
+
+        return true;
+    }
+}
+
+?>
diff --git a/.../CodingStyle/Rector/Stmt/NewlineAfterStatementRector/Fixture/no_new_line_function.php.inc b/.../CodingStyle/Rector/Stmt/NewlineAfterStatementRector/Fixture/no_new_line_function.php.inc
@@ -0,0 +1,26 @@
+<?php
+
+namespace Rector\Tests\CodingStyle\Rector\Stmt\NewlineAfterStatementRector\Fixture;
+
+function run()
+{
+}
+function run2()
+{
+}
+
+?>
+-----
+<?php
+
+namespace Rector\Tests\CodingStyle\Rector\Stmt\NewlineAfterStatementRector\Fixture;
+
+function run()
+{
+}
+
+function run2()
+{
+}
+
+?>