From e5a95bf363e33d72d2370df4aae358af9219254a Mon Sep 17 00:00:00 2001
From: guilhermeblanco <guilhermeblanco@625475ce-881a-0410-a577-b389adb331d8>
Date: Mon, 17 Aug 2009 23:30:41 +0000
Subject: [PATCH] [2.0] More documentation and fixes to QueryBuilder and Expr
 classes.

---
 lib/Doctrine/ORM/Query/Expr.php      |  5 -----
 lib/Doctrine/ORM/Query/Expr/Base.php |  2 +-
 lib/Doctrine/ORM/QueryBuilder.php    | 14 +++-----------
 3 files changed, 4 insertions(+), 17 deletions(-)

diff --git a/lib/Doctrine/ORM/Query/Expr.php b/lib/Doctrine/ORM/Query/Expr.php
index 963963f61..ca94ecb51 100644
--- a/lib/Doctrine/ORM/Query/Expr.php
+++ b/lib/Doctrine/ORM/Query/Expr.php
@@ -53,11 +53,6 @@ class Expr
         return new Expr\From($from, $alias);
     }
     
-    public static function join($joinType, $join, $alias = null, $conditionType = null, $condition = null)
-    {
-        return new Expr\Join($joinType, $join, $alias, $conditionType, $condition);
-    }
-    
     public static function leftJoin($join, $alias = null, $conditionType = null, $condition = null)
     {
         return new Expr\Join(Expr\Join::LEFT_JOIN, $join, $alias, $conditionType, $condition);
diff --git a/lib/Doctrine/ORM/Query/Expr/Base.php b/lib/Doctrine/ORM/Query/Expr/Base.php
index 9fe217236..7fd563ac0 100644
--- a/lib/Doctrine/ORM/Query/Expr/Base.php
+++ b/lib/Doctrine/ORM/Query/Expr/Base.php
@@ -42,7 +42,7 @@ abstract class Base
 
     public function __construct($args = array())
     {
-        foreach ($args as $arg) {
+        foreach ((array) $args as $arg) {
             $this->add($arg);
         }
     }
diff --git a/lib/Doctrine/ORM/QueryBuilder.php b/lib/Doctrine/ORM/QueryBuilder.php
index a9c7018da..b7520cc0e 100644
--- a/lib/Doctrine/ORM/QueryBuilder.php
+++ b/lib/Doctrine/ORM/QueryBuilder.php
@@ -259,19 +259,11 @@ class QueryBuilder
     
     public function innerJoin($join, $alias = null, $conditionType = null, $condition = null)
     {
-        /*$join = 'INNER JOIN ' . $parentAlias . '.' . $join . ' '
-        . $alias . (isset($condition) ? ' ' . $condition : null);
-
-        return $this->add('from', $join, true);*/
         return $this->add('from', Expr::innerJoin($join, $alias, $conditionType, $condition), true);
     }
 
     public function leftJoin($join, $alias = null, $conditionType = null, $condition = null)
     {
-        /*$join = 'LEFT JOIN ' . $parentAlias . '.' . $join . ' '
-        . $alias . (isset($condition) ? ' ' . $condition : null);
-
-        return $this->add('from', $join, true);*/
         return $this->add('from', Expr::leftJoin($join, $alias, $conditionType, $condition), true);
     }
 
@@ -310,7 +302,7 @@ class QueryBuilder
         return $this->add('where', Expr::in($expr, $params), true);
     }
 
-    public function orWhereIn($expr, $params = array(), $not = false)
+    public function orWhereIn($expr, $params = array())
     {
         if (count($this->_getDqlQueryPart('where')) > 0) {
             $this->add('where', 'OR', true);
@@ -370,12 +362,12 @@ class QueryBuilder
         return $this->add('having', Expr::having($having), true);
     }
 
-    public function orderBy($sort, $order)
+    public function orderBy($sort, $order = null)
     {
         return $this->add('orderBy', Expr::orderBy($sort, $order), false);
     }
 
-    public function addOrderBy($sort, $order)
+    public function addOrderBy($sort, $order = null)
     {
         return $this->add('orderBy', Expr::orderBy($sort, $order), true);
     }