Fix some issue with 0 values and sorting of the args

doctrine · Jan 27, 2018 · f7c4643 · f7c4643
1 parent 6718d89
commit f7c4643
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/lib/Doctrine/ORM/Internal/Hydration/AbstractHydrator.php b/lib/Doctrine/ORM/Internal/Hydration/AbstractHydrator.php
@@ -309,6 +309,7 @@ protected function gatherRowData(array $data, array &$id, array &$nonemptyCompon
             foreach ($rowData['newObjects'] as $objIndex => $newObject) {
                 $class  = $newObject['class'];
                 $args   = $newObject['args'];
+                ksort($args);
                 $obj    = $class->newInstanceArgs($args);
 
                 $rowData['newObjects'][$objIndex]['obj'] = $obj;

diff --git a/lib/Doctrine/ORM/Query/SqlWalker.php b/lib/Doctrine/ORM/Query/SqlWalker.php
@@ -1648,7 +1648,7 @@ public function walkNewObject($newObjectExpression, $newObjectResultAlias = null
                 'argIndex'  => $argIndex,
             ];
 
-            if ($objOwner) {
+            if ($objOwner !== null) {
                 $this->rsm->addNewObjectAsArgument($objIndex, $objOwner, $objOwnerIdx);
             }
         }