From e2f1ea7f23440dd55388a29341d1d2925e27868f Mon Sep 17 00:00:00 2001 From: jaimz22 Date: Sat, 8 Nov 2014 16:45:58 +0000 Subject: [PATCH] stupid cloud 9 ide broke my code :( sorry --- lib/Doctrine/ORM/Internal/Hydration/ArrayHydrator.php | 3 +-- lib/Doctrine/ORM/Internal/Hydration/ObjectHydrator.php | 1 - 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/lib/Doctrine/ORM/Internal/Hydration/ArrayHydrator.php b/lib/Doctrine/ORM/Internal/Hydration/ArrayHydrator.php index f63337b1c..a79f086ec 100644 --- a/lib/Doctrine/ORM/Internal/Hydration/ArrayHydrator.php +++ b/lib/Doctrine/ORM/Internal/Hydration/ArrayHydrator.php @@ -253,8 +253,7 @@ class ArrayHydrator extends AbstractHydrator $args = $newObject['args']; $obj = $class->newInstanceArgs($args); - // if ($count === 1) { - if (count($args) == $scalarCount || ($scalarCount == 0 && count($rowData['newObjects'])) { + if (count($args) == $scalarCount || ($scalarCount == 0 && count($rowData['newObjects']))) { $result[$resultKey] = $obj; continue; diff --git a/lib/Doctrine/ORM/Internal/Hydration/ObjectHydrator.php b/lib/Doctrine/ORM/Internal/Hydration/ObjectHydrator.php index 5a44e6689..f7b37b38f 100644 --- a/lib/Doctrine/ORM/Internal/Hydration/ObjectHydrator.php +++ b/lib/Doctrine/ORM/Internal/Hydration/ObjectHydrator.php @@ -553,7 +553,6 @@ class ObjectHydrator extends AbstractHydrator $args = $newObject['args']; $obj = $class->newInstanceArgs($args); - // if (count($args) == $scalarCount) { if (count($args) == $scalarCount || ($scalarCount == 0 && count($rowData['newObjects']))) { $result[$resultKey] = $obj;