[2.0] Intermediate checkin.

lib/Doctrine/ORM/AbstractQuery.php

@@ -64,7 +64,7 @@ abstract class AbstractQuery
     /**
      * @var array $_enumParams Array containing the keys of the parameters that should be enumerated.
      */
-    protected $_enumParams = array();
+    //protected $_enumParams = array();
 
     /**
      * The user-specified ResultSetMapping to use.
@@ -141,20 +141,20 @@ abstract class AbstractQuery
      *
      * @param array $enumParams Enum parameters.
      */
-    protected function _setEnumParams($enumParams = array())
+    /*protected function _setEnumParams($enumParams = array())
     {
         $this->_enumParams = $enumParams;
-    }
+    }*/
 
     /**
      * Get all enumerated parameters
      *
      * @return array All enumerated parameters
      */
-    public function getEnumParams()
+    /*public function getEnumParams()
     {
         return $this->_enumParams;
-    }
+    }*/
 
     /**
      * Convert ENUM parameters to their integer equivalents
@@ -162,7 +162,7 @@ abstract class AbstractQuery
      * @param $params Parameters to be converted
      * @return array Converted parameters array
      */
-    public function convertEnums($params)
+    /*public function convertEnums($params)
     {
         foreach ($this->_enumParams as $key => $values) {
             if (isset($params[$key]) && ! empty($values)) {
@@ -171,7 +171,7 @@ abstract class AbstractQuery
         }
 
         return $params;
-    }
+    }*/
 
     /**
      * Get all defined parameters
@@ -507,11 +507,7 @@ abstract class AbstractQuery
      */
     protected function _prepareParams(array $params)
     {
-        // Convert boolean params
-        $params = $this->_em->getConnection()->getDatabasePlatform()->convertBooleans($params);
-
-        // Convert enum params
-        return $this->convertEnums($params);
+        return $this->_em->getConnection()->getDatabasePlatform()->convertBooleans($params);
     }
 
     /**

lib/Doctrine/ORM/Query/ParserResult.php

@@ -27,6 +27,7 @@ namespace Doctrine\ORM\Query;
  *
  * @author      Guilherme Blanco <guilhermeblanco@hotmail.com>
  * @author      Janne Vanhala <jpvanhal@cc.hut.fi>
+ * @author		Roman Borschel <roman@code-factory.org>
  * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  * @link        http://www.doctrine-project.org
  * @since       2.0
@@ -34,9 +35,13 @@ namespace Doctrine\ORM\Query;
  */
 class ParserResult
 {
-	protected $_sqlExecutor;
-    protected $_resultSetMapping;
-
+	private $_sqlExecutor;
+    private $_resultSetMapping;
+	
+    /**
+     * Initializes a new instance of the <tt>ParserResult</tt> class.
+     * The new instance is initialized with an empty <tt>ResultSetMapping</tt>.
+     */
     public function __construct()
     {
         $this->_resultSetMapping = new ResultSetMapping;
@@ -64,7 +69,9 @@ class ParserResult
     }
 
     /**
-     * @nodoc
+     * Sets the SQL executor that should be used for this ParserResult.
+     * 
+     * @param AbstractExecutor $executor
      */
     public function setSqlExecutor(\Doctrine\ORM\Query\Exec\AbstractExecutor $executor)
     {
@@ -72,7 +79,9 @@ class ParserResult
     }
 
     /**
-     * @nodoc
+     * Gets the SQL executor used by this ParserResult.
+     * 
+     * @return AbstractExecutor
      */
     public function getSqlExecutor()
     {