From a970b0d7bb9a07d1a94d1e6fa6bed44e495b7565 Mon Sep 17 00:00:00 2001
From: Sullivan SENECHAL <soullivaneuh@gmail.com>
Date: Mon, 3 Dec 2018 15:39:31 +0100
Subject: [PATCH 1/2] Apply Rector process

---
 src/PhpParser/Node/Commander/NodeAddingCommander.php     | 5 ++---
 src/PhpParser/Node/Commander/NodeRemovingCommander.php   | 5 ++---
 src/PhpParser/Node/Commander/PropertyAddingCommander.php | 7 ++-----
 src/PhpParser/NodeTraverser/CallableNodeTraverser.php    | 5 ++---
 4 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/src/PhpParser/Node/Commander/NodeAddingCommander.php b/src/PhpParser/Node/Commander/NodeAddingCommander.php
index 9d103bc05f9a..27816cb115c3 100644
--- a/src/PhpParser/Node/Commander/NodeAddingCommander.php
+++ b/src/PhpParser/Node/Commander/NodeAddingCommander.php
@@ -93,12 +93,12 @@ private function wrapToExpression(Node $node): Stmt
 
     private function createNodeVisitor(): NodeVisitor
     {
-        return new class($this->nodesToAdd) extends NodeVisitorAbstract {
+        return new class($this->nodesToAdd) extends NodeVisitorAbstract
+        {
             /**
              * @var Stmt[][]
              */
             private $nodesToAdd = [];
-
             /**
              * @param Stmt[][] $nodesToAdd
              */
@@ -106,7 +106,6 @@ public function __construct(array $nodesToAdd)
             {
                 $this->nodesToAdd = $nodesToAdd;
             }
-
             /**
              * @return Node[]|Node|null
              */
diff --git a/src/PhpParser/Node/Commander/NodeRemovingCommander.php b/src/PhpParser/Node/Commander/NodeRemovingCommander.php
index 0b18bc8ea342..4094da2ca302 100644
--- a/src/PhpParser/Node/Commander/NodeRemovingCommander.php
+++ b/src/PhpParser/Node/Commander/NodeRemovingCommander.php
@@ -51,12 +51,12 @@ public function isActive(): bool
 
     private function createNodeVisitor(): NodeVisitor
     {
-        return new class($this->nodesToRemove) extends NodeVisitorAbstract {
+        return new class($this->nodesToRemove) extends NodeVisitorAbstract
+        {
             /**
              * @var Stmt[]
              */
             private $nodesToRemove = [];
-
             /**
              * @param Stmt[] $nodesToRemove
              */
@@ -64,7 +64,6 @@ public function __construct(array $nodesToRemove)
             {
                 $this->nodesToRemove = $nodesToRemove;
             }
-
             /**
              * @return int|Node|Node[]|null
              */
diff --git a/src/PhpParser/Node/Commander/PropertyAddingCommander.php b/src/PhpParser/Node/Commander/PropertyAddingCommander.php
index 327544797a71..0a58d09df63f 100644
--- a/src/PhpParser/Node/Commander/PropertyAddingCommander.php
+++ b/src/PhpParser/Node/Commander/PropertyAddingCommander.php
@@ -58,17 +58,16 @@ public function isActive(): bool
 
     private function createNodeVisitor(): NodeVisitor
     {
-        return new class($this->classMaintainer, $this->propertiesByClass) extends NodeVisitorAbstract {
+        return new class($this->classMaintainer, $this->propertiesByClass) extends NodeVisitorAbstract
+        {
             /**
              * @var ClassMaintainer
              */
             private $classMaintainer;
-
             /**
              * @var VariableInfo[][]
              */
             private $propertiesByClass = [];
-
             /**
              * @param VariableInfo[][] $propertiesByClass
              */
@@ -77,7 +76,6 @@ public function __construct(ClassMaintainer $classMaintainer, array $propertiesB
                 $this->classMaintainer = $classMaintainer;
                 $this->propertiesByClass = $propertiesByClass;
             }
-
             public function enterNode(Node $node): ?Node
             {
                 if (! $node instanceof Class_ || $node->isAnonymous()) {
@@ -86,7 +84,6 @@ public function enterNode(Node $node): ?Node
 
                 return $this->processClassNode($node);
             }
-
             private function processClassNode(Class_ $classNode): Class_
             {
                 $variableInfos = $this->propertiesByClass[spl_object_hash($classNode)] ?? [];
diff --git a/src/PhpParser/NodeTraverser/CallableNodeTraverser.php b/src/PhpParser/NodeTraverser/CallableNodeTraverser.php
index 5bee7577e759..46edcd9a44ee 100644
--- a/src/PhpParser/NodeTraverser/CallableNodeTraverser.php
+++ b/src/PhpParser/NodeTraverser/CallableNodeTraverser.php
@@ -23,17 +23,16 @@ public function traverseNodesWithCallable(array $nodes, callable $callable): arr
 
     private function createNodeVisitor(callable $callable): NodeVisitor
     {
-        return new class($callable) extends NodeVisitorAbstract {
+        return new class($callable) extends NodeVisitorAbstract
+        {
             /**
              * @var callable
              */
             private $callable;
-
             public function __construct(callable $callable)
             {
                 $this->callable = $callable;
             }
-
             /**
              * @return int|Node|null
              */

From 4762edde29208151e1620bc64d4d25e512bff591 Mon Sep 17 00:00:00 2001
From: Sullivan SENECHAL <soullivaneuh@gmail.com>
Date: Mon, 3 Dec 2018 14:53:38 +0100
Subject: [PATCH 2/2] Return error code on diff with dry-run option

---
 src/Console/Command/ProcessCommand.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/Console/Command/ProcessCommand.php b/src/Console/Command/ProcessCommand.php
index d97acb1609a9..0f840e5c0e85 100644
--- a/src/Console/Command/ProcessCommand.php
+++ b/src/Console/Command/ProcessCommand.php
@@ -208,6 +208,10 @@ protected function execute(InputInterface $input, OutputInterface $output): int
 
         $this->symfonyStyle->success('Rector is done!');
 
+        if ($this->parameterProvider->provideParameter(Option::OPTION_DRY_RUN) && count($this->fileDiffs)) {
+            return Shell::CODE_ERROR;
+        }
+
         return Shell::CODE_SUCCESS;
     }