From b108a2af52da928f5d55b30606eb1096f023b7b9 Mon Sep 17 00:00:00 2001
From: ReenExe <ipourri@gmail.com>
Date: Sun, 3 Jul 2016 00:01:07 +0300
Subject: [PATCH] merge conditions

---
 lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php b/lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php
index 3fc70c26c..b3a545b69 100644
--- a/lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php
+++ b/lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php
@@ -1583,7 +1583,7 @@ class ClassMetadataInfo implements ClassMetadata
         }
 
         if ($mapping['isOwningSide']) {
-            if ( ! isset($mapping['joinColumns']) || ! $mapping['joinColumns']) {
+            if (empty($mapping['joinColumns'])) {
                 // Apply default join column
                 $mapping['joinColumns'] = array(
                     array(