From d961028b1443799a580bdc60437445a49c31b863 Mon Sep 17 00:00:00 2001 From: "Fabio B. Silva" Date: Tue, 11 Jun 2013 14:23:50 -0400 Subject: [PATCH] small optimization --- .../ORM/Internal/Hydration/SimpleObjectHydrator.php | 9 ++------- .../Doctrine/Tests/ORM/Functional/Ticket/DDC2494Test.php | 2 +- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/lib/Doctrine/ORM/Internal/Hydration/SimpleObjectHydrator.php b/lib/Doctrine/ORM/Internal/Hydration/SimpleObjectHydrator.php index 85f3a0fad..412ad41e2 100644 --- a/lib/Doctrine/ORM/Internal/Hydration/SimpleObjectHydrator.php +++ b/lib/Doctrine/ORM/Internal/Hydration/SimpleObjectHydrator.php @@ -178,14 +178,9 @@ class SimpleObjectHydrator extends AbstractHydrator } if (isset($this->_rsm->metaMappings[$column])) { - $name = $this->_rsm->metaMappings[$column]; - $type = isset($this->_rsm->typeMappings[$column]) - ? $this->_rsm->typeMappings[$column] - : null; - return array( - 'name' => $name, - 'type' => $type + 'name' => $this->_rsm->metaMappings[$column], + 'type' => (isset($this->_rsm->typeMappings[$column]) ? $this->_rsm->typeMappings[$column] : null) ); } diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2494Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2494Test.php index 4c27fb777..1b2ca881e 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2494Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2494Test.php @@ -208,4 +208,4 @@ class DDC2494TinyIntType extends Type { return 'ddc2494_tinyint'; } -} \ No newline at end of file +}