Revert "Merge branch 'fix/#6499-#6533-fix-commit-order-calculation-co…

…nsider-all-join-column-fields'" This reverts commit 2a58645, reversing changes made to 6d428c9.
doctrine · Aug 11, 2017 · a0c0d3b · a0c0d3b
1 parent 2a58645
commit a0c0d3b
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 101 deletions.
diff --git a/lib/Doctrine/ORM/UnitOfWork.php b/lib/Doctrine/ORM/UnitOfWork.php
@@ -1154,11 +1154,7 @@ private function getCommitOrder(array $entityChangeSet = null)
 
                 $joinColumns = reset($assoc['joinColumns']);
 
-                $calc->addDependency(
-                    $targetClass->name,
-                    $class->name,
-                    (int) (($joinColumns['nullable'] ?? true) === false)
-                );
+                $calc->addDependency($targetClass->name, $class->name, (int)empty($joinColumns['nullable']));
 
                 // If the target class has mapped subclasses, these share the same dependency.
                 if ( ! $targetClass->subClasses) {

diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC6499Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC6499Test.php