From 8c3ba7dbf098ea5662d8e734fea215e874631e8a Mon Sep 17 00:00:00 2001 From: guilhermeblanco Date: Thu, 14 Jan 2010 16:14:41 +0000 Subject: [PATCH] [2.0][DDC-249] Fixed issue that documentation refers QueryBuilder::select() supports array, but it was only restricted to strings. --- lib/Doctrine/ORM/QueryBuilder.php | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/lib/Doctrine/ORM/QueryBuilder.php b/lib/Doctrine/ORM/QueryBuilder.php index 86a69bc7b..7765af686 100644 --- a/lib/Doctrine/ORM/QueryBuilder.php +++ b/lib/Doctrine/ORM/QueryBuilder.php @@ -401,12 +401,13 @@ class QueryBuilder public function select($select = null) { $this->_type = self::SELECT; - $selects = func_get_args(); - - if (empty($selects)) { + + if (empty($select)) { return $this; } + $selects = is_array($select) ? $select : func_get_args(); + return $this->add('select', new Expr\Select($selects), false); } @@ -426,11 +427,12 @@ class QueryBuilder public function addSelect($select = null) { $this->_type = self::SELECT; - $selects = func_get_args(); - - if (empty($selects)) { - return $this; + + if (empty($select)) { + return $this; } + + $selects = is_array($select) ? $select : func_get_args(); return $this->add('select', new Expr\Select($selects), true); }