[CodingStyle] Skip inside return statement on NewlineAfterStatementRe…

…ctor (#958)

* add failing test case

* [CodingStyle] Skip inside other statement on NewlineAfterStatementRector

* phpstan

* eol

* rename fixture

Co-authored-by: Dominik Peters <d.peters@billiger-mietwagen.de>

rules-tests/CodingStyle/Rector/Stmt/NewlineAfterStatementRector/Fixture/skip_inside_return_statement.php.inc

@@ -0,0 +1,16 @@
+<?php
+
+namespace Rector\Tests\CodingStyle\Rector\Stmt\NewlineAfterStatementRector\Fixture;
+
+class SomeClass
+{
+}
+
+final class SomeOtherClassClass
+{
+    public function getSomeClass(): SomeClass
+    {
+        return new class('foobar') extends SomeClass {
+        };
+    }
+}

rules/CodingStyle/Rector/Stmt/NewlineAfterStatementRector.php

@@ -111,6 +111,8 @@ public function getNodeTypes(): array
      */
     public function refactor(Node $node): ?Node
     {
+        $node = $this->resolveCurrentStatement($node);
+
         if (! in_array($node::class, self::STMTS_TO_HAVE_NEXT_NEWLINE, true)) {
             return null;
         }
@@ -159,6 +161,15 @@ public function refactor(Node $node): ?Node
         return $node;
     }
 
+    private function resolveCurrentStatement(Stmt $stmt): Stmt
+    {
+        $currentStatement = $stmt->getAttribute(AttributeKey::CURRENT_STATEMENT);
+
+        return $currentStatement instanceof Stmt
+            ? $currentStatement
+            : $stmt;
+    }
+
     /**
      * @param null|Doc[] $comments
      */