From 09e949f76ec96141bba69e0c15c3a03a8e3ba5e1 Mon Sep 17 00:00:00 2001
From: Tomas Votruba <tomas.vot@gmail.com>
Date: Fri, 9 Nov 2018 23:27:07 +0100
Subject: [PATCH] make use of matchFirstAndSecondConditionNode Node type

---
 .../src/Rector/Foreach_/ForeachToInArrayRector.php       | 4 +---
 .../src/Rector/Identical/SimplifyConditionsRector.php    | 4 +---
 .../Correct/correct3.php.inc                             | 2 +-
 .../SimplifyEmptyArrayCheckRector/Wrong/wrong3.php.inc   | 2 +-
 packages/Php/src/DualCheckToAble.php                     | 9 ++-------
 5 files changed, 6 insertions(+), 15 deletions(-)

diff --git a/packages/CodeQuality/src/Rector/Foreach_/ForeachToInArrayRector.php b/packages/CodeQuality/src/Rector/Foreach_/ForeachToInArrayRector.php
index 2e0abce3526..65a9230bf69 100644
--- a/packages/CodeQuality/src/Rector/Foreach_/ForeachToInArrayRector.php
+++ b/packages/CodeQuality/src/Rector/Foreach_/ForeachToInArrayRector.php
@@ -94,9 +94,7 @@ CODE_SAMPLE
 
         $matchedNodes = $this->binaryOpMaintainer->matchFirstAndSecondConditionNode(
             $ifCondition,
-            function (Node $node) {
-                return $node instanceof Variable;
-            },
+            Variable::class,
             function (Node $node, Node $otherNode) use ($foreachValueNode) {
                 return $this->areNodesEqual($otherNode, $foreachValueNode);
             }
diff --git a/packages/CodeQuality/src/Rector/Identical/SimplifyConditionsRector.php b/packages/CodeQuality/src/Rector/Identical/SimplifyConditionsRector.php
index b8aab4d2691..57efdffa4eb 100644
--- a/packages/CodeQuality/src/Rector/Identical/SimplifyConditionsRector.php
+++ b/packages/CodeQuality/src/Rector/Identical/SimplifyConditionsRector.php
@@ -80,9 +80,7 @@ final class SimplifyConditionsRector extends AbstractRector
             function (Node $node) {
                 return $node instanceof Identical || $node  instanceof NotIdentical;
             },
-            function (Node $node) {
-                return $node;
-            }
+            Node::class
         );
 
         if ($matchedNodes === null) {
diff --git a/packages/CodeQuality/tests/Rector/FuncCall/SimplifyEmptyArrayCheckRector/Correct/correct3.php.inc b/packages/CodeQuality/tests/Rector/FuncCall/SimplifyEmptyArrayCheckRector/Correct/correct3.php.inc
index 9883941551e..78bb3a8e589 100644
--- a/packages/CodeQuality/tests/Rector/FuncCall/SimplifyEmptyArrayCheckRector/Correct/correct3.php.inc
+++ b/packages/CodeQuality/tests/Rector/FuncCall/SimplifyEmptyArrayCheckRector/Correct/correct3.php.inc
@@ -22,4 +22,4 @@ class SomeClass
 }
 
 $objects = [];
-echo is_array($objects) && is_array($objects);
+is_array($objects) && is_array($objects);
diff --git a/packages/CodeQuality/tests/Rector/FuncCall/SimplifyEmptyArrayCheckRector/Wrong/wrong3.php.inc b/packages/CodeQuality/tests/Rector/FuncCall/SimplifyEmptyArrayCheckRector/Wrong/wrong3.php.inc
index 9883941551e..78bb3a8e589 100644
--- a/packages/CodeQuality/tests/Rector/FuncCall/SimplifyEmptyArrayCheckRector/Wrong/wrong3.php.inc
+++ b/packages/CodeQuality/tests/Rector/FuncCall/SimplifyEmptyArrayCheckRector/Wrong/wrong3.php.inc
@@ -22,4 +22,4 @@ class SomeClass
 }
 
 $objects = [];
-echo is_array($objects) && is_array($objects);
+is_array($objects) && is_array($objects);
diff --git a/packages/Php/src/DualCheckToAble.php b/packages/Php/src/DualCheckToAble.php
index 9d12b9b5353..f9618bda9cd 100644
--- a/packages/Php/src/DualCheckToAble.php
+++ b/packages/Php/src/DualCheckToAble.php
@@ -2,7 +2,6 @@
 
 namespace Rector\Php;
 
-use PhpParser\Node;
 use PhpParser\Node\Arg;
 use PhpParser\Node\Expr\BinaryOp\BooleanOr;
 use PhpParser\Node\Expr\FuncCall;
@@ -34,12 +33,8 @@ final class DualCheckToAble
     {
         $matchedNodes = $this->binaryOpMaintainer->matchFirstAndSecondConditionNode(
             $booleanOrNode,
-            function (Node $node) {
-                return $node instanceof Instanceof_;
-            },
-            function (Node $node) {
-                return $node instanceof FuncCall;
-            }
+            Instanceof_::class,
+            FuncCall::class
         );
 
         if ($matchedNodes === null) {