[Beeframework-svn] SF.net SVN: beeframework:[221] trunk/framework/Bee/Persistence/Doctrine2/ DaoBase.php

[<m_p...@us...>]

Revision: 221
          http://sourceforge.net/p/beeframework/code/221
Author:   m_plomer
Date:     2014-09-18 04:16:17 +0000 (Thu, 18 Sep 2014)
Log Message:
-----------
 - minor fixes in DaoBase

Modified Paths:
--------------
    trunk/framework/Bee/Persistence/Doctrine2/DaoBase.php

Modified: trunk/framework/Bee/Persistence/Doctrine2/DaoBase.php
===================================================================
--- trunk/framework/Bee/Persistence/Doctrine2/DaoBase.php	2014-09-18 02:01:49 UTC (rev 220)
+++ trunk/framework/Bee/Persistence/Doctrine2/DaoBase.php	2014-09-18 04:16:17 UTC (rev 221)
@@ -37,7 +37,7 @@
 	 * @param null $hydrationMode
 	 * @return array
 	 */
-    public function executeListQuery(QueryBuilder $queryBuilder, IRestrictionHolder $restrictionHolder = null, IOrderAndLimitHolder $orderAndLimitHolder = null, array $defaultOrderMapping, $hydrationMode = null) {
+    public function executeListQuery(QueryBuilder $queryBuilder, IRestrictionHolder $restrictionHolder = null, IOrderAndLimitHolder $orderAndLimitHolder = null, array $defaultOrderMapping = null, $hydrationMode = null) {
         $this->applyFilterRestrictions($queryBuilder, $restrictionHolder);
         $this->applyOrderAndLimit($queryBuilder, $orderAndLimitHolder, $defaultOrderMapping);
         return $this->getQueryFromBuilder($queryBuilder)->execute(null, $hydrationMode);
@@ -97,7 +97,10 @@
 	 * @param IOrderAndLimitHolder $orderAndLimitHolder
 	 * @param array $defaultOrderMapping
 	 */
-    protected final function applyOrderAndLimit(QueryBuilder &$queryBuilder, IOrderAndLimitHolder $orderAndLimitHolder = null, array $defaultOrderMapping = array()) {
+    protected final function applyOrderAndLimit(QueryBuilder &$queryBuilder, IOrderAndLimitHolder $orderAndLimitHolder = null, array $defaultOrderMapping = null) {
+		if(is_null($defaultOrderMapping)) {
+			$defaultOrderMapping = array();
+		}
         if (is_null($orderAndLimitHolder)) {
             $orderMapping = $defaultOrderMapping;
         } else {

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.