From 4d931010d0b6beaa88c5f9cbec81ae4ce81025e0 Mon Sep 17 00:00:00 2001
From: TomasVotruba <tomas.vot@gmail.com>
Date: Tue, 8 Aug 2017 01:18:55 +0200
Subject: [PATCH] fix cs

---
 src/Rector/AbstractRector.php                 |  2 +-
 .../Contrib/Nette/FormCallbackRector.php      | 27 +++++++++++--------
 .../RemoveConfiguratorConstantsRector.php     |  2 +-
 src/Testing/Application/FileReconstructor.php | 10 +------
 .../NetteObjectToSmartTraitRector/Test.php    |  2 +-
 5 files changed, 20 insertions(+), 23 deletions(-)

diff --git a/src/Rector/AbstractRector.php b/src/Rector/AbstractRector.php
index 48ca7a5870e..920ab3a0582 100644
--- a/src/Rector/AbstractRector.php
+++ b/src/Rector/AbstractRector.php
@@ -11,7 +11,7 @@ use Rector\Contract\Rector\RectorInterface;
 abstract class AbstractRector extends NodeVisitorAbstract implements DeprecationInterface, RectorInterface
 {
     /**
-     * @return int|null|Node
+     * @return null|int|Node
      */
     public function enterNode(Node $node)
     {
diff --git a/src/Rector/Contrib/Nette/FormCallbackRector.php b/src/Rector/Contrib/Nette/FormCallbackRector.php
index 59caddee382..f530b9912ca 100644
--- a/src/Rector/Contrib/Nette/FormCallbackRector.php
+++ b/src/Rector/Contrib/Nette/FormCallbackRector.php
@@ -33,7 +33,7 @@ final class FormCallbackRector extends NodeVisitorAbstract implements Deprecatio
     }
 
     /**
-     * @return int|null|Node
+     * @return null|int|Node
      */
     public function enterNode(Node $node)
     {
@@ -42,16 +42,7 @@ final class FormCallbackRector extends NodeVisitorAbstract implements Deprecatio
                 return null;
             }
 
-            return new Array_([
-                new ArrayItem($node->var),
-                new ArrayItem(
-                    new String_(
-                        (string) $node->name
-                    )
-                )
-            ], [
-                'kind' => Array_::KIND_SHORT
-            ]);
+            return $this->createShortArray($node);
         }
 
         $this->previousNode = $node;
@@ -80,4 +71,18 @@ final class FormCallbackRector extends NodeVisitorAbstract implements Deprecatio
 
         return true;
     }
+
+    private function createShortArray(Node $node): Array_
+    {
+        return new Array_([
+            new ArrayItem($node->var),
+            new ArrayItem(
+                new String_(
+                    (string) $node->name
+                )
+            )
+        ], [
+            'kind' => Array_::KIND_SHORT
+        ]);
+    }
 }
diff --git a/src/Rector/Contrib/Nette/RemoveConfiguratorConstantsRector.php b/src/Rector/Contrib/Nette/RemoveConfiguratorConstantsRector.php
index a2c2eb26bde..801bd4e38f9 100644
--- a/src/Rector/Contrib/Nette/RemoveConfiguratorConstantsRector.php
+++ b/src/Rector/Contrib/Nette/RemoveConfiguratorConstantsRector.php
@@ -4,9 +4,9 @@ namespace Rector\Rector\Contrib\Nette;
 
 use PhpParser\Node;
 use PhpParser\Node\Expr\ClassConstFetch;
+use PhpParser\Node\Scalar\String_;
 use Rector\Deprecation\SetNames;
 use Rector\Rector\AbstractRector;
-use PhpParser\Node\Scalar\String_;
 
 final class RemoveConfiguratorConstantsRector extends AbstractRector
 {
diff --git a/src/Testing/Application/FileReconstructor.php b/src/Testing/Application/FileReconstructor.php
index 92e1ad699d5..c4597646564 100644
--- a/src/Testing/Application/FileReconstructor.php
+++ b/src/Testing/Application/FileReconstructor.php
@@ -5,7 +5,6 @@ namespace Rector\Testing\Application;
 use PhpParser\Lexer;
 use PhpParser\NodeTraverser;
 use PhpParser\Parser;
-use Rector\NodeTraverser\StateHolder;
 use Rector\Printer\FormatPerservingPrinter;
 use SplFileInfo;
 
@@ -31,23 +30,16 @@ final class FileReconstructor
      */
     private $nodeTraverser;
 
-    /**
-     * @var StateHolder
-     */
-    private $stateHolder;
-
     public function __construct(
         Parser $parser,
         FormatPerservingPrinter $codeStyledPrinter,
         Lexer $lexer,
-        NodeTraverser $nodeTraverser,
-        StateHolder $stateHolder
+        NodeTraverser $nodeTraverser
     ) {
         $this->parser = $parser;
         $this->codeStyledPrinter = $codeStyledPrinter;
         $this->lexer = $lexer;
         $this->nodeTraverser = $nodeTraverser;
-        $this->stateHolder = $stateHolder;
     }
 
     // ref: https://github.com/nikic/PHP-Parser/issues/344#issuecomment-298162516
diff --git a/tests/Rector/Contrib/Nette/NetteObjectToSmartTraitRector/Test.php b/tests/Rector/Contrib/Nette/NetteObjectToSmartTraitRector/Test.php
index 5106cc5f85d..3f9cb5e3e3b 100644
--- a/tests/Rector/Contrib/Nette/NetteObjectToSmartTraitRector/Test.php
+++ b/tests/Rector/Contrib/Nette/NetteObjectToSmartTraitRector/Test.php
@@ -12,7 +12,7 @@ final class Test extends AbstractReconstructorTestCase
             __DIR__ . '/wrong/wrong.php.inc',
             __DIR__ . '/correct/correct.php.inc'
         );
-//        $this->doTestFileMatchesExpectedContent(
+        //        $this->doTestFileMatchesExpectedContent(
 //            __DIR__ . '/wrong/wrong2.php.inc',
 //            __DIR__ . '/correct/correct2.php.inc'
 //        );