From 167dfde00f047a99495e1098db114f96d4f892f3 Mon Sep 17 00:00:00 2001
From: Alessandro Lai <alessandro.lai85@gmail.com>
Date: Wed, 21 Jun 2017 10:11:31 +0200
Subject: [PATCH] Apply additional fixes to the SqlWalker to fix tests

---
 lib/Doctrine/ORM/Query/SqlWalker.php | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/lib/Doctrine/ORM/Query/SqlWalker.php b/lib/Doctrine/ORM/Query/SqlWalker.php
index 33ee45d19..78179d367 100644
--- a/lib/Doctrine/ORM/Query/SqlWalker.php
+++ b/lib/Doctrine/ORM/Query/SqlWalker.php
@@ -2290,7 +2290,7 @@ class SqlWalker implements TreeWalker
 
             $metadata = $this->em->getClassMetadata($parameter);
 
-            if ($metadata->getReflectionClass()->isSubclassOf($discrClass->name)) {
+            if (! $metadata->getReflectionClass()->isSubclassOf($discrClass->name)) {
                 throw QueryException::instanceOfUnrelatedClass($parameter, $discrClass->name);
             }
 
@@ -2302,13 +2302,15 @@ class SqlWalker implements TreeWalker
                 $currentMetadata = $this->em->getClassMetadata($class);
                 $currentDiscriminator = $currentMetadata->discriminatorValue;
 
-                if (null !== $currentDiscriminator && ! array_key_exists($currentDiscriminator, $discriminators)) {
+                if (null !== $currentDiscriminator) {
                     $discriminators[$currentDiscriminator] = null;
                 }
             }
         }
 
-        $sqlParameterList = array_map([$this->conn, 'quote'], array_keys($discriminators));
+        foreach (array_keys($discriminators) as $dis) {
+            $sqlParameterList[] = $this->conn->quote($dis);
+        }
 
         return '(' . implode(', ', $sqlParameterList) . ')';
     }