From 347d1625bcbd42325df31cf92953648446786f90 Mon Sep 17 00:00:00 2001 From: ReenExe Date: Sat, 2 Jul 2016 22:33:23 +0300 Subject: [PATCH] merge conditions --- lib/Doctrine/ORM/UnitOfWork.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/Doctrine/ORM/UnitOfWork.php b/lib/Doctrine/ORM/UnitOfWork.php index b2c1c6f4b..dfc8d9ce0 100644 --- a/lib/Doctrine/ORM/UnitOfWork.php +++ b/lib/Doctrine/ORM/UnitOfWork.php @@ -1155,9 +1155,9 @@ class UnitOfWork implements PropertyChangedListener } $joinColumns = reset($assoc['joinColumns']); - $isNullable = isset($joinColumns['nullable']) ? $joinColumns['nullable'] : false; + $weight = (int)empty($joinColumns['nullable']); - $calc->addDependency($targetClass->name, $class->name, $isNullable ? 0 : 1); + $calc->addDependency($targetClass->name, $class->name, $weight); // If the target class has mapped subclasses, these share the same dependency. if ( ! $targetClass->subClasses) {