[Beeframework-svn] SF.net SVN: beeframework:[214] trunk/framework/Bee

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

Revision: 214
          http://sourceforge.net/p/beeframework/code/214
Author:   m_plomer
Date:     2014-09-12 14:51:58 +0000 (Fri, 12 Sep 2014)
Log Message:
-----------
 - finished incomplete refactoring of IOrderAndLimitHolder / IRestrictionHolder into namespace

Modified Paths:
--------------
    trunk/framework/Bee/MVC/Controller/Multiaction/HandlerMethodInvocator/AnnotationBasedInvocator.php
    trunk/framework/Bee/Persistence/Doctrine/DaoBase.php
    trunk/framework/Bee/Persistence/Doctrine2/DaoBase.php

Modified: trunk/framework/Bee/MVC/Controller/Multiaction/HandlerMethodInvocator/AnnotationBasedInvocator.php
===================================================================
--- trunk/framework/Bee/MVC/Controller/Multiaction/HandlerMethodInvocator/AnnotationBasedInvocator.php	2014-09-11 01:39:50 UTC (rev 213)
+++ trunk/framework/Bee/MVC/Controller/Multiaction/HandlerMethodInvocator/AnnotationBasedInvocator.php	2014-09-12 14:51:58 UTC (rev 214)
@@ -68,9 +68,10 @@
 				$this->defaultMethodInvocation = new MethodInvocation($methodMeta);
 			}
 
-			if (Bee_Framework::getProductionMode()) {
-				Bee_Cache_Manager::store($cacheKey, $this->defaultMethodInvocation);
-			}
+			// todo: fix production mode method caching
+//			if (Bee_Framework::getProductionMode()) {
+//				Bee_Cache_Manager::store($cacheKey, $this->defaultMethodInvocation);
+//			}
 		}
 		return $this->defaultMethodInvocation;
 	}

Modified: trunk/framework/Bee/Persistence/Doctrine/DaoBase.php
===================================================================
--- trunk/framework/Bee/Persistence/Doctrine/DaoBase.php	2014-09-11 01:39:50 UTC (rev 213)
+++ trunk/framework/Bee/Persistence/Doctrine/DaoBase.php	2014-09-12 14:51:58 UTC (rev 214)
@@ -15,6 +15,9 @@
  * limitations under the License.
  */
 
+use Bee\Persistence\IOrderAndLimitHolder;
+use Bee\Persistence\IRestrictionHolder;
+
 class Bee_Persistence_Doctrine_DaoBase {
 	
 	/**
@@ -61,13 +64,13 @@
     /**
      * @param Doctrine_Query $query
      * @param array $params
-     * @param Bee_Persistence_IRestrictionHolder $restrictionHolder
-     * @param Bee_Persistence_IOrderAndLimitHolder $orderAndLimitHolder
+     * @param IRestrictionHolder $restrictionHolder
+     * @param IOrderAndLimitHolder $orderAndLimitHolder
      * @param array $defaultOrderMapping
      *
      * @return array
      */
-    public function executeListQuery(Doctrine_Query $query, array $params=array(), Bee_Persistence_IRestrictionHolder $restrictionHolder = null, Bee_Persistence_IOrderAndLimitHolder $orderAndLimitHolder = null, array $defaultOrderMapping) {
+    public function executeListQuery(Doctrine_Query $query, array $params=array(), IRestrictionHolder $restrictionHolder = null, IOrderAndLimitHolder $orderAndLimitHolder = null, array $defaultOrderMapping) {
         $this->applyFilterRestrictions($query, $params, $restrictionHolder);
         $this->applyOrderAndLimit($query, $params, $orderAndLimitHolder, $defaultOrderMapping);
         $result = $query->execute($params);
@@ -77,9 +80,9 @@
     /**
      * @param Doctrine_Query $query
      * @param array $params
-     * @param Bee_Persistence_IRestrictionHolder $restrictionHolder
+     * @param IRestrictionHolder $restrictionHolder
      */
-    protected final function applyFilterRestrictions(Doctrine_Query &$query, array &$params, Bee_Persistence_IRestrictionHolder $restrictionHolder = null) {
+    protected final function applyFilterRestrictions(Doctrine_Query &$query, array &$params, IRestrictionHolder $restrictionHolder = null) {
         if (is_null($restrictionHolder)) {
             return;
         }
@@ -130,10 +133,10 @@
 	/**
 	 * @param Doctrine_Query $query
 	 * @param array $params
-	 * @param Bee_Persistence_IOrderAndLimitHolder $orderAndLimitHolder
+	 * @param IOrderAndLimitHolder $orderAndLimitHolder
 	 * @param array $defaultOrderMapping
 	 */
-    protected final function applyOrderAndLimit(Doctrine_Query &$query, array &$params, Bee_Persistence_IOrderAndLimitHolder $orderAndLimitHolder = null, array $defaultOrderMapping = array()) {
+    protected final function applyOrderAndLimit(Doctrine_Query &$query, array &$params, IOrderAndLimitHolder $orderAndLimitHolder = null, array $defaultOrderMapping = array()) {
         if (is_null($orderAndLimitHolder)) {
             $orderMapping = $defaultOrderMapping;
         } else {

Modified: trunk/framework/Bee/Persistence/Doctrine2/DaoBase.php
===================================================================
--- trunk/framework/Bee/Persistence/Doctrine2/DaoBase.php	2014-09-11 01:39:50 UTC (rev 213)
+++ trunk/framework/Bee/Persistence/Doctrine2/DaoBase.php	2014-09-12 14:51:58 UTC (rev 214)
@@ -15,8 +15,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-use Bee_Persistence_IOrderAndLimitHolder;
-use Bee_Persistence_IRestrictionHolder;
+use Bee\Persistence\IOrderAndLimitHolder;
+use Bee\Persistence\IRestrictionHolder;
 use Bee_Utils_Strings;
 use Doctrine\ORM\Query;
 use Doctrine\ORM\QueryBuilder;
@@ -31,13 +31,13 @@
 
 	/**
 	 * @param QueryBuilder $queryBuilder
-	 * @param Bee_Persistence_IRestrictionHolder $restrictionHolder
-	 * @param Bee_Persistence_IOrderAndLimitHolder $orderAndLimitHolder
+	 * @param IRestrictionHolder $restrictionHolder
+	 * @param IOrderAndLimitHolder $orderAndLimitHolder
 	 * @param array $defaultOrderMapping
 	 * @param null $hydrationMode
 	 * @return array
 	 */
-    public function executeListQuery(QueryBuilder $queryBuilder, Bee_Persistence_IRestrictionHolder $restrictionHolder = null, Bee_Persistence_IOrderAndLimitHolder $orderAndLimitHolder = null, array $defaultOrderMapping, $hydrationMode = null) {
+    public function executeListQuery(QueryBuilder $queryBuilder, IRestrictionHolder $restrictionHolder = null, IOrderAndLimitHolder $orderAndLimitHolder = null, array $defaultOrderMapping, $hydrationMode = null) {
         $this->applyFilterRestrictions($queryBuilder, $restrictionHolder);
         $this->applyOrderAndLimit($queryBuilder, $orderAndLimitHolder, $defaultOrderMapping);
         return $this->getQueryFromBuilder($queryBuilder)->execute(null, $hydrationMode);
@@ -53,10 +53,10 @@
 
 	/**
 	 * @param QueryBuilder $queryBuilder
-	 * @param Bee_Persistence_IRestrictionHolder $restrictionHolder
+	 * @param IRestrictionHolder $restrictionHolder
 	 * @internal param QueryBuilder $query
 	 */
-    protected final function applyFilterRestrictions(QueryBuilder &$queryBuilder, Bee_Persistence_IRestrictionHolder $restrictionHolder = null) {
+    protected final function applyFilterRestrictions(QueryBuilder &$queryBuilder, IRestrictionHolder $restrictionHolder = null) {
         if (is_null($restrictionHolder)) {
             return;
         }
@@ -94,10 +94,10 @@
 
 	/**
 	 * @param QueryBuilder $queryBuilder
-	 * @param Bee_Persistence_IOrderAndLimitHolder $orderAndLimitHolder
+	 * @param IOrderAndLimitHolder $orderAndLimitHolder
 	 * @param array $defaultOrderMapping
 	 */
-    protected final function applyOrderAndLimit(QueryBuilder &$queryBuilder, Bee_Persistence_IOrderAndLimitHolder $orderAndLimitHolder = null, array $defaultOrderMapping = array()) {
+    protected final function applyOrderAndLimit(QueryBuilder &$queryBuilder, IOrderAndLimitHolder $orderAndLimitHolder = null, array $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.