Renamed _aggregate() to aggregateBase()

aimeos · Oct 2, 2015 · 6fa5bf2 · 6fa5bf2
1 parent 9badcf3
commit 6fa5bf2
Show file tree

Hide file tree

Showing 16 changed files with 16 additions and 16 deletions.
diff --git a/lib/mshoplib/src/MShop/Catalog/Manager/Index/Attribute/Default.php b/lib/mshoplib/src/MShop/Catalog/Manager/Index/Attribute/Default.php
@@ -88,7 +88,7 @@ public function __construct( MShop_Context_Item_Interface $context )
 	 */
 	public function aggregate( MW_Common_Criteria_Interface $search, $key )
 	{
-		return $this->_aggregate( $search, $key, 'mshop/catalog/manager/index/default/aggregate' );
+		return $this->aggregateBase( $search, $key, 'mshop/catalog/manager/index/default/aggregate' );
 	}
 
 

diff --git a/lib/mshoplib/src/MShop/Catalog/Manager/Index/Catalog/Default.php b/lib/mshoplib/src/MShop/Catalog/Manager/Index/Catalog/Default.php
@@ -96,7 +96,7 @@ public function __construct( MShop_Context_Item_Interface $context )
 	 */
 	public function aggregate( MW_Common_Criteria_Interface $search, $key )
 	{
-		return $this->_aggregate( $search, $key, 'mshop/catalog/manager/index/default/aggregate' );
+		return $this->aggregateBase( $search, $key, 'mshop/catalog/manager/index/default/aggregate' );
 	}
 
 

diff --git a/lib/mshoplib/src/MShop/Catalog/Manager/Index/Default.php b/lib/mshoplib/src/MShop/Catalog/Manager/Index/Default.php
@@ -70,7 +70,7 @@ public function aggregate( MW_Common_Criteria_Interface $search, $key )
 		 * @see mshop/catalog/manager/index/default/item/optimize
 		 * @see mshop/catalog/manager/index/default/item/search
 		 */
-		return $this->_aggregate( $search, $key, 'mshop/catalog/manager/index/default/aggregate', array( 'product' ) );
+		return $this->aggregateBase( $search, $key, 'mshop/catalog/manager/index/default/aggregate', array( 'product' ) );
 	}
 
 

diff --git a/lib/mshoplib/src/MShop/Catalog/Manager/Index/Price/Default.php b/lib/mshoplib/src/MShop/Catalog/Manager/Index/Price/Default.php
@@ -132,7 +132,7 @@ public function __construct( MShop_Context_Item_Interface $context )
 	 */
 	public function aggregate( MW_Common_Criteria_Interface $search, $key )
 	{
-		return $this->_aggregate( $search, $key, 'mshop/catalog/manager/index/default/aggregate' );
+		return $this->aggregateBase( $search, $key, 'mshop/catalog/manager/index/default/aggregate' );
 	}
 
 

diff --git a/lib/mshoplib/src/MShop/Catalog/Manager/Index/Text/Default.php b/lib/mshoplib/src/MShop/Catalog/Manager/Index/Text/Default.php
@@ -97,7 +97,7 @@ public function __construct( MShop_Context_Item_Interface $context )
 	 */
 	public function aggregate( MW_Common_Criteria_Interface $search, $key )
 	{
-		return $this->_aggregate( $search, $key, 'mshop/catalog/manager/index/default/aggregate' );
+		return $this->aggregateBase( $search, $key, 'mshop/catalog/manager/index/default/aggregate' );
 	}
 
 

diff --git a/lib/mshoplib/src/MShop/Common/Manager/Abstract.php b/lib/mshoplib/src/MShop/Common/Manager/Abstract.php
@@ -106,7 +106,7 @@ public function rollback()
 	 * @param string[] $required List of domain/sub-domain names like "catalog.index" that must be additionally joined
 	 * @return array List of ID values as key and the number of counted products as value
 	 */
-	protected function _aggregate( MW_Common_Criteria_Interface $search, $key, $cfgPath, $required = array() )
+	protected function aggregateBase( MW_Common_Criteria_Interface $search, $key, $cfgPath, $required = array() )
 	{
 		$list = array();
 		$context = $this->_getContext();

diff --git a/lib/mshoplib/src/MShop/Common/Manager/List/Abstract.php b/lib/mshoplib/src/MShop/Common/Manager/List/Abstract.php
@@ -61,7 +61,7 @@ public function __construct( MShop_Context_Item_Interface $context )
 	public function aggregate( MW_Common_Criteria_Interface $search, $key )
 	{
 		$required = array( trim( $this->_prefix, '.' ) );
-		return $this->_aggregate( $search, $key, $this->_configPath . 'aggregate', $required );
+		return $this->aggregateBase( $search, $key, $this->_configPath . 'aggregate', $required );
 	}
 
 

diff --git a/lib/mshoplib/src/MShop/Order/Manager/Base/Address/Default.php b/lib/mshoplib/src/MShop/Order/Manager/Base/Address/Default.php
@@ -280,7 +280,7 @@ public function aggregate( MW_Common_Criteria_Interface $search, $key )
 		 * @see mshop/order/manager/base/address/default/item/count
 		 */
 		$cfgkey = 'mshop/order/manager/base/address/default/aggregate';
-		return $this->_aggregate( $search, $key, $cfgkey, array( 'order.base.address' ) );
+		return $this->aggregateBase( $search, $key, $cfgkey, array( 'order.base.address' ) );
 	}
 
 

diff --git a/lib/mshoplib/src/MShop/Order/Manager/Base/Coupon/Default.php b/lib/mshoplib/src/MShop/Order/Manager/Base/Coupon/Default.php
@@ -147,7 +147,7 @@ public function aggregate( MW_Common_Criteria_Interface $search, $key )
 		 * @see mshop/order/manager/base/coupon/default/item/count
 		 */
 		$cfgkey = 'mshop/order/manager/base/coupon/default/aggregate';
-		return $this->_aggregate( $search, $key, $cfgkey, array( 'order.base.coupon' ) );
+		return $this->aggregateBase( $search, $key, $cfgkey, array( 'order.base.coupon' ) );
 	}
 
 

diff --git a/lib/mshoplib/src/MShop/Order/Manager/Base/Default.php b/lib/mshoplib/src/MShop/Order/Manager/Base/Default.php
@@ -186,7 +186,7 @@ public function aggregate( MW_Common_Criteria_Interface $search, $key )
 		 * @see mshop/order/manager/base/default/item/count
 		 */
 		$cfgkey = 'mshop/order/manager/base/default/aggregate';
-		return $this->_aggregate( $search, $key, $cfgkey, array( 'order.base' ) );
+		return $this->aggregateBase( $search, $key, $cfgkey, array( 'order.base' ) );
 	}
 
 

diff --git a/lib/mshoplib/src/MShop/Order/Manager/Base/Product/Attribute/Default.php b/lib/mshoplib/src/MShop/Order/Manager/Base/Product/Attribute/Default.php
@@ -169,7 +169,7 @@ public function aggregate( MW_Common_Criteria_Interface $search, $key )
 		 * @see mshop/order/manager/base/product/attribute/default/item/count
 		 */
 		$cfgkey = 'mshop/order/manager/base/product/attribute/default/aggregate';
-		return $this->_aggregate( $search, $key, $cfgkey, array( 'order.base.product.attribute' ) );
+		return $this->aggregateBase( $search, $key, $cfgkey, array( 'order.base.product.attribute' ) );
 	}
 
 

diff --git a/lib/mshoplib/src/MShop/Order/Manager/Base/Product/Default.php b/lib/mshoplib/src/MShop/Order/Manager/Base/Product/Default.php
@@ -264,7 +264,7 @@ public function aggregate( MW_Common_Criteria_Interface $search, $key )
 		 * @see mshop/order/manager/base/product/default/item/count
 		 */
 		$cfgkey = 'mshop/order/manager/base/product/default/aggregate';
-		return $this->_aggregate( $search, $key, $cfgkey, array( 'order.base.product' ) );
+		return $this->aggregateBase( $search, $key, $cfgkey, array( 'order.base.product' ) );
 	}
 
 

diff --git a/lib/mshoplib/src/MShop/Order/Manager/Base/Service/Attribute/Default.php b/lib/mshoplib/src/MShop/Order/Manager/Base/Service/Attribute/Default.php
@@ -169,7 +169,7 @@ public function aggregate( MW_Common_Criteria_Interface $search, $key )
 		 * @see mshop/order/manager/base/service/attribute/default/item/count
 		 */
 		$cfgkey = 'mshop/order/manager/base/service/attribute/default/aggregate';
-		return $this->_aggregate( $search, $key, $cfgkey, array( 'order.base.service.attribute' ) );
+		return $this->aggregateBase( $search, $key, $cfgkey, array( 'order.base.service.attribute' ) );
 	}
 
 

diff --git a/lib/mshoplib/src/MShop/Order/Manager/Base/Service/Default.php b/lib/mshoplib/src/MShop/Order/Manager/Base/Service/Default.php
@@ -196,7 +196,7 @@ public function aggregate( MW_Common_Criteria_Interface $search, $key )
 		 * @see mshop/order/manager/base/service/default/item/count
 		 */
 		$cfgkey = 'mshop/order/manager/base/service/default/aggregate';
-		return $this->_aggregate( $search, $key, $cfgkey, array( 'order.base.service' ) );
+		return $this->aggregateBase( $search, $key, $cfgkey, array( 'order.base.service' ) );
 	}
 
 

diff --git a/lib/mshoplib/src/MShop/Order/Manager/Default.php b/lib/mshoplib/src/MShop/Order/Manager/Default.php
@@ -188,7 +188,7 @@ public function aggregate( MW_Common_Criteria_Interface $search, $key )
 		 * @see mshop/order/manager/default/item/count
 		 */
 		$cfgkey = 'mshop/order/manager/default/aggregate';
-		return $this->_aggregate( $search, $key, $cfgkey, array( 'order' ) );
+		return $this->aggregateBase( $search, $key, $cfgkey, array( 'order' ) );
 	}
 
 

diff --git a/lib/mshoplib/src/MShop/Order/Manager/Status/Default.php b/lib/mshoplib/src/MShop/Order/Manager/Status/Default.php
@@ -145,7 +145,7 @@ public function aggregate( MW_Common_Criteria_Interface $search, $key )
 		 * @see mshop/order/manager/status/default/item/count
 		 */
 		$cfgkey = 'mshop/order/manager/status/default/aggregate';
-		return $this->_aggregate( $search, $key, $cfgkey, array( 'order.status' ) );
+		return $this->aggregateBase( $search, $key, $cfgkey, array( 'order.status' ) );
 	}