aimeos / ai-controller-jobs

controller/jobs/src/Controller/Jobs/Product/Export/Standard.php

Spacing +42 added lines, -42 removed lines

@@ -28,7 +28,7 @@ 
 	 */
 	public function getName()
 	{
-		return $this->getContext()->getI18n()->dt( 'controller/jobs', 'Product export' );
+		return $this->getContext()->getI18n()->dt('controller/jobs', 'Product export');
 	}
 
 
@@ -39,7 +39,7 @@ 
 	 */
 	public function getDescription()
 	{
-		return $this->getContext()->getI18n()->dt( 'controller/jobs', 'Exports all available products' );
+		return $this->getContext()->getI18n()->dt('controller/jobs', 'Exports all available products');
 	}
 
 
@@ -51,7 +51,7 @@ 
 	public function run()
 	{
 		$container = $this->createContainer();
-		$this->export( $container );
+		$this->export($container);
 		$container->close();
 	}
 
@@ -62,7 +62,7 @@ 
 	 * @param \Aimeos\MW\Container\Content\Iface $content File content object
 	 * @param \Aimeos\MShop\Product\Item\Iface[] $items List of product items
 	 */
-	protected function addItems( \Aimeos\MW\Container\Content\Iface $content, array $items )
+	protected function addItems(\Aimeos\MW\Container\Content\Iface $content, array $items)
 	{
 		$config = $this->getContext()->getConfig();
 
@@ -95,7 +95,7 @@ 
 
 		$view->exportItems = $items;
 
-		$content->add( $view->render( $view->config( $tplconf, $default ) ) );
+		$content->add($view->render($view->config($tplconf, $default)));
 	}
 
 
@@ -124,7 +124,7 @@ 
 		 * @see controller/jobs/product/export/max-items
 		 * @see controller/jobs/product/export/max-query
 		 */
-		$location = $config->get( 'controller/jobs/product/export/location', sys_get_temp_dir() );
+		$location = $config->get('controller/jobs/product/export/location', sys_get_temp_dir());
 
 		/** controller/jobs/product/export/standard/container/type
 		 * List of file container options for the export files
@@ -141,7 +141,7 @@ 
 		 * @see controller/jobs/product/export/max-items
 		 * @see controller/jobs/product/export/max-query
 		*/
-		$container = $config->get( 'controller/jobs/product/export/standard/container/type', 'Directory' );
+		$container = $config->get('controller/jobs/product/export/standard/container/type', 'Directory');
 
 		/** controller/jobs/product/export/standard/container/content
 		 * List of file container options for the export files
@@ -158,7 +158,7 @@ 
 		 * @see controller/jobs/product/export/max-items
 		 * @see controller/jobs/product/export/max-query
 		 */
-		$content = $config->get( 'controller/jobs/product/export/standard/container/content', 'Binary' );
+		$content = $config->get('controller/jobs/product/export/standard/container/content', 'Binary');
 
 		/** controller/jobs/product/export/standard/container/options
 		 * List of file container options for the export files
@@ -175,9 +175,9 @@ 
 		 * @see controller/jobs/product/export/max-items
 		 * @see controller/jobs/product/export/max-query
 		 */
-		$options = $config->get( 'controller/jobs/product/export/standard/container/options', array() );
+		$options = $config->get('controller/jobs/product/export/standard/container/options', array());
 
-		return \Aimeos\MW\Container\Factory::getContainer( $location, $container, $content, $options );
+		return \Aimeos\MW\Container\Factory::getContainer($location, $container, $content, $options);
 	}
 
 
@@ -188,7 +188,7 @@ 
 	 * @param integer $filenum New file number
 	 * @return \Aimeos\MW\Container\Content\Iface New content object
 	 */
-	protected function createContent( \Aimeos\MW\Container\Iface $container, $filenum )
+	protected function createContent(\Aimeos\MW\Container\Iface $container, $filenum)
 	{
 		$config = $this->getContext()->getConfig();
 
@@ -219,9 +219,9 @@ 
 
 		$view = $this->getContext()->getView();
 
-		$content = $container->create( $this->getFilename( $filenum ) );
-		$content->add( $view->render( $view->config( $tplconf, $default ) ) );
-		$container->add( $content );
+		$content = $container->create($this->getFilename($filenum));
+		$content->add($view->render($view->config($tplconf, $default)));
+		$container->add($content);
 
 		return $content;
 	}
@@ -232,7 +232,7 @@ 
 	 *
 	 * @param \Aimeos\MW\Container\Content\Iface $content
 	 */
-	protected function closeContent( \Aimeos\MW\Container\Content\Iface $content )
+	protected function closeContent(\Aimeos\MW\Container\Content\Iface $content)
 	{
 		$config = $this->getContext()->getConfig();
 
@@ -263,7 +263,7 @@ 
 
 		$view = $this->getContext()->getView();
 
-		$content->add( $view->render( $view->config( $tplconf, $default ) ) );
+		$content->add($view->render($view->config($tplconf, $default)));
 	}
 
 
@@ -273,45 +273,45 @@ 
 	 * @param \Aimeos\MW\Container\Iface $container Container object
 	 * @return array List of content (file) names
 	 */
-	protected function export( \Aimeos\MW\Container\Iface $container )
+	protected function export(\Aimeos\MW\Container\Iface $container)
 	{
-		$default = array( 'attribute', 'media', 'price', 'product', 'text' );
+		$default = array('attribute', 'media', 'price', 'product', 'text');
 
-		$domains = $this->getConfig( 'domains', $default );
-		$maxItems = $this->getConfig( 'max-items', 10000 );
-		$maxQuery = $this->getConfig( 'max-query', 1000 );
+		$domains = $this->getConfig('domains', $default);
+		$maxItems = $this->getConfig('max-items', 10000);
+		$maxQuery = $this->getConfig('max-query', 1000);
 
 		$start = 0; $filenum = 1;
 		$names = array();
 
-		$productManager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'product' );
+		$productManager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'product');
 
-		$search = $productManager->createSearch( true );
-		$search->setSortations( array( $search->sort( '+', 'product.id' ) ) );
-		$search->setSlice( 0, $maxQuery );
+		$search = $productManager->createSearch(true);
+		$search->setSortations(array($search->sort('+', 'product.id')));
+		$search->setSlice(0, $maxQuery);
 
-		$content = $this->createContent( $container, $filenum );
+		$content = $this->createContent($container, $filenum);
 		$names[] = $content->getResource();
 
 		do
 		{
-			$items = $productManager->searchItems( $search, $domains );
-			$this->addItems( $content, $items );
+			$items = $productManager->searchItems($search, $domains);
+			$this->addItems($content, $items);
 
-			$count = count( $items );
+			$count = count($items);
 			$start += $count;
-			$search->setSlice( $start, $maxQuery );
+			$search->setSlice($start, $maxQuery);
 
-			if( $start + $maxQuery > $maxItems * $filenum )
+			if ($start + $maxQuery > $maxItems * $filenum)
 			{
-				$this->closeContent( $content );
-				$content = $this->createContent( $container, ++$filenum );
+				$this->closeContent($content);
+				$content = $this->createContent($container, ++$filenum);
 				$names[] = $content->getResource();
 			}
 		}
-		while( $count >= $search->getSliceSize() );
+		while ($count >= $search->getSliceSize());
 
-		$this->closeContent( $content );
+		$this->closeContent($content);
 
 		return $names;
 	}
@@ -324,11 +324,11 @@ 
 	 * @param mixed $default Default value if name is unknown
 	 * @return mixed Configuration value
 	 */
-	protected function getConfig( $name, $default = null )
+	protected function getConfig($name, $default = null)
 	{
 		$config = $this->getContext()->getConfig();
 
-		switch( $name )
+		switch ($name)
 		{
 			case 'domain':
 				/** controller/jobs/product/export/domains
@@ -350,7 +350,7 @@ 
 				 * @see controller/jobs/product/export/max-items
 				 * @see controller/jobs/product/export/max-query
 				 */
-				return $config->get( 'controller/jobs/product/export/domains', $default );
+				return $config->get('controller/jobs/product/export/domains', $default);
 
 			case 'max-items':
 				/** controller/jobs/product/export/max-items
@@ -372,7 +372,7 @@ 
 				 * @see controller/jobs/product/export/max-query
 				 * @see controller/jobs/product/export/domains
 				 */
-				return $config->get( 'controller/jobs/product/export/max-items', $default );
+				return $config->get('controller/jobs/product/export/max-items', $default);
 
 			case 'max-query':
 				/** controller/jobs/product/export/max-query
@@ -394,7 +394,7 @@ 
 				 * @see controller/jobs/product/export/max-items
 				 * @see controller/jobs/product/export/domains
 				 */
-				return $config->get( 'controller/jobs/product/export/max-query', $default );
+				return $config->get('controller/jobs/product/export/max-query', $default);
 		}
 
 		return $default;
@@ -407,8 +407,8 @@ 
 	 * @param integer $number Current file number
 	 * @return string New file name
 	 */
-	protected function getFilename( $number )
+	protected function getFilename($number)
 	{
-		return sprintf( 'aimeos-products-%d.xml', $number );
+		return sprintf('aimeos-products-%d.xml', $number);
 	}
 }

controller/jobs/src/Controller/Jobs/Product/Bought/Factory.php

Spacing +8 added lines, -8 removed lines

@@ -30,7 +30,7 @@ 
 	 * @param string|null $name Name of the controller or "Standard" if null
 	 * @return \Aimeos\Controller\Jobs\Iface New controller object
 	 */
-	public static function createController( \Aimeos\MShop\Context\Item\Iface $context, \Aimeos\Bootstrap $aimeos, $name = null )
+	public static function createController(\Aimeos\MShop\Context\Item\Iface $context, \Aimeos\Bootstrap $aimeos, $name = null)
 	{
 		/** controller/jobs/product/bought/name
 		 * Class name of the used product suggestions scheduler controller implementation
@@ -65,20 +65,20 @@ 
 		 * @since 2014.03
 		 * @category Developer
 		 */
-		if( $name === null ) {
-			$name = $context->getConfig()->get( 'controller/jobs/product/bought/name', 'Standard' );
+		if ($name === null) {
+			$name = $context->getConfig()->get('controller/jobs/product/bought/name', 'Standard');
 		}
 
-		if( ctype_alnum( $name ) === false )
+		if (ctype_alnum($name) === false)
 		{
-			$classname = is_string( $name ) ? '\\Aimeos\\Controller\\Jobs\\Product\\Bought\\' . $name : '<not a string>';
-			throw new \Aimeos\Controller\Jobs\Exception( sprintf( 'Invalid characters in class name "%1$s"', $classname ) );
+			$classname = is_string($name) ? '\\Aimeos\\Controller\\Jobs\\Product\\Bought\\' . $name : '<not a string>';
+			throw new \Aimeos\Controller\Jobs\Exception(sprintf('Invalid characters in class name "%1$s"', $classname));
 		}
 
 		$iface = '\\Aimeos\\Controller\\Jobs\\Iface';
 		$classname = '\\Aimeos\\Controller\\Jobs\\Product\\Bought\\' . $name;
 
-		$controller = self::createControllerBase( $context, $aimeos, $classname, $iface );
+		$controller = self::createControllerBase($context, $aimeos, $classname, $iface);
 
 		/** controller/jobs/product/bought/decorators/excludes
 		 * Excludes decorators added by the "common" option from the product bought job controller
@@ -155,6 +155,6 @@ 
 		 * @see controller/jobs/product/bought/decorators/excludes
 		 * @see controller/jobs/product/bought/decorators/global
 		 */
-		return self::addControllerDecorators( $context, $aimeos, $controller, 'product/bought' );
+		return self::addControllerDecorators($context, $aimeos, $controller, 'product/bought');
 	}
 }
\ No newline at end of file

controller/jobs/src/Controller/Jobs/Product/Bought/Standard.php

Spacing +64 added lines, -64 removed lines

@@ -29,7 +29,7 @@ 
 	 */
 	public function getName()
 	{
-		return $this->getContext()->getI18n()->dt( 'controller/jobs', 'Products bought together' );
+		return $this->getContext()->getI18n()->dt('controller/jobs', 'Products bought together');
 	}
 
 
@@ -40,7 +40,7 @@ 
 	 */
 	public function getDescription()
 	{
-		return $this->getContext()->getI18n()->dt( 'controller/jobs', 'Creates bought together product suggestions' );
+		return $this->getContext()->getI18n()->dt('controller/jobs', 'Creates bought together product suggestions');
 	}
 
 
@@ -72,7 +72,7 @@ 
 		 * @see controller/jobs/product/bought/min-confidence
 		 * @see controller/jobs/product/bought/limit-days
 		 */
-		$maxItems = $config->get( 'controller/jobs/product/bought/max-items', 5 );
+		$maxItems = $config->get('controller/jobs/product/bought/max-items', 5);
 
 		/** controller/jobs/product/bought/min-support
 		 * Minimum support value to sort out all irrelevant combinations
@@ -101,7 +101,7 @@ 
 		 * @see controller/jobs/product/bought/min-confidence
 		 * @see controller/jobs/product/bought/limit-days
 		 */
-		$minSupport = $config->get( 'controller/jobs/product/bought/min-support', 0.02 );
+		$minSupport = $config->get('controller/jobs/product/bought/min-support', 0.02);
 
 		/** controller/jobs/product/bought/min-confidence
 		 * Minimum confidence value for high quality suggestions
@@ -126,7 +126,7 @@ 
 		 * @see controller/jobs/product/bought/min-support
 		 * @see controller/jobs/product/bought/limit-days
 		 */
-		$minConfidence = $config->get( 'controller/jobs/product/bought/min-confidence', 0.66 );
+		$minConfidence = $config->get('controller/jobs/product/bought/min-confidence', 0.66);
 
 		/** controller/jobs/product/bought/limit-days
 		 * Only use orders placed in the past within the configured number of days for calculating bought together products
@@ -150,45 +150,45 @@ 
 		 * @see controller/jobs/product/bought/min-support
 		 * @see controller/jobs/product/bought/min-confidence
 		 */
-		$days = $config->get( 'controller/jobs/product/bought/limit-days', 180 );
-		$date = date( 'Y-m-d H:i:s', time() - $days * 86400 );
+		$days = $config->get('controller/jobs/product/bought/limit-days', 180);
+		$date = date('Y-m-d H:i:s', time() - $days * 86400);
 
 
-		$typeItem = $this->getTypeItem( 'product/lists/type', 'product', 'bought-together' );
+		$typeItem = $this->getTypeItem('product/lists/type', 'product', 'bought-together');
 
-		$baseManager = \Aimeos\MShop\Factory::createManager( $context, 'order/base' );
+		$baseManager = \Aimeos\MShop\Factory::createManager($context, 'order/base');
 		$search = $baseManager->createSearch();
-		$search->setConditions( $search->compare( '>', 'order.base.ctime', $date ) );
-		$search->setSlice( 0, 0 );
+		$search->setConditions($search->compare('>', 'order.base.ctime', $date));
+		$search->setSlice(0, 0);
 		$totalOrders = 0;
-		$baseManager->searchItems( $search, array(), $totalOrders );
+		$baseManager->searchItems($search, array(), $totalOrders);
 
-		$baseProductManager = \Aimeos\MShop\Factory::createManager( $context, 'order/base/product' );
+		$baseProductManager = \Aimeos\MShop\Factory::createManager($context, 'order/base/product');
 		$search = $baseProductManager->createSearch();
-		$search->setConditions( $search->compare( '>', 'order.base.product.ctime', $date ) );
+		$search->setConditions($search->compare('>', 'order.base.product.ctime', $date));
 		$start = 0;
 
 		do
 		{
-			$totalCounts = $baseProductManager->aggregate( $search, 'order.base.product.productid' );
-			$prodIds = array_keys( $totalCounts );
+			$totalCounts = $baseProductManager->aggregate($search, 'order.base.product.productid');
+			$prodIds = array_keys($totalCounts);
 
-			foreach( $totalCounts as $id => $count )
+			foreach ($totalCounts as $id => $count)
 			{
-				$this->removeListItems( $id, $typeItem->getId() );
+				$this->removeListItems($id, $typeItem->getId());
 
-				if( $count / $totalOrders > $minSupport )
+				if ($count / $totalOrders > $minSupport)
 				{
-					$productIds = $this->getSuggestions( $id, $prodIds, $count, $totalOrders, $maxItems, $minSupport, $minConfidence, $date );
-					$this->addListItems( $id, $typeItem->getId(), $productIds );
+					$productIds = $this->getSuggestions($id, $prodIds, $count, $totalOrders, $maxItems, $minSupport, $minConfidence, $date);
+					$this->addListItems($id, $typeItem->getId(), $productIds);
 				}
 			}
 
-			$count = count( $totalCounts );
+			$count = count($totalCounts);
 			$start += $count;
-			$search->setSlice( $start );
+			$search->setSlice($start);
 		}
-		while( $count >= $search->getSliceSize() );
+		while ($count >= $search->getSliceSize());
 	}
 
 
@@ -205,59 +205,59 @@ 
 	 * @param string $date Date in YYYY-MM-DD HH:mm:ss format after which orders should be used for calculations
 	 * @return array List of suggested product IDs as key and their confidence as value
 	 */
-	protected function getSuggestions( $id, $prodIds, $count, $total, $maxItems, $minSupport, $minConfidence, $date )
+	protected function getSuggestions($id, $prodIds, $count, $total, $maxItems, $minSupport, $minConfidence, $date)
 	{
 		$refIds = array();
 		$context = $this->getContext();
 
-		$catalogListManager = \Aimeos\MShop\Factory::createManager( $context, 'catalog/lists' );
-		$baseProductManager = \Aimeos\MShop\Factory::createManager( $context, 'order/base/product' );
+		$catalogListManager = \Aimeos\MShop\Factory::createManager($context, 'catalog/lists');
+		$baseProductManager = \Aimeos\MShop\Factory::createManager($context, 'order/base/product');
 
 
 		$search = $baseProductManager->createSearch();
-		$func = $search->createFunction( 'order.base.product.count', array( (string) $id ) );
+		$func = $search->createFunction('order.base.product.count', array((string) $id));
 		$expr = array(
-			$search->compare( '==', 'order.base.product.productid', $prodIds ),
-			$search->compare( '>', 'order.base.product.ctime', $date ),
-			$search->compare( '==', $func, 1 ),
+			$search->compare('==', 'order.base.product.productid', $prodIds),
+			$search->compare('>', 'order.base.product.ctime', $date),
+			$search->compare('==', $func, 1),
 		);
-		$search->setConditions( $search->combine( '&&', $expr ) );
+		$search->setConditions($search->combine('&&', $expr));
 
-		$relativeCounts = $baseProductManager->aggregate( $search, 'order.base.product.productid' );
+		$relativeCounts = $baseProductManager->aggregate($search, 'order.base.product.productid');
 
 
 		$search = $catalogListManager->createSearch();
 		$expr = array(
-			$search->compare( '==', 'catalog.lists.refid', array_keys( $relativeCounts ) ),
-			$search->compare( '==', 'catalog.lists.domain', 'product' ),
+			$search->compare('==', 'catalog.lists.refid', array_keys($relativeCounts)),
+			$search->compare('==', 'catalog.lists.domain', 'product'),
 		);
-		$search->setConditions( $search->combine( '&&', $expr ) );
+		$search->setConditions($search->combine('&&', $expr));
 
-		foreach( $catalogListManager->searchItems( $search ) as $listItem ) {
+		foreach ($catalogListManager->searchItems($search) as $listItem) {
 			$refIds[$listItem->getRefId()] = true;
 		}
 
 
-		unset( $relativeCounts[$id] );
+		unset($relativeCounts[$id]);
 		$supportA = $count / $total;
 		$products = array();
 
-		foreach( $relativeCounts as $prodId => $relCnt )
+		foreach ($relativeCounts as $prodId => $relCnt)
 		{
-			if( !isset( $refIds[$prodId] ) ) {
+			if (!isset($refIds[$prodId])) {
 				continue;
 			}
 
 			$supportAB = $relCnt / $total;
 
-			if( $supportAB > $minSupport && ( $conf = ( $supportAB / $supportA ) ) > $minConfidence ) {
+			if ($supportAB > $minSupport && ($conf = ($supportAB / $supportA)) > $minConfidence) {
 				$products[$prodId] = $conf;
 			}
 		}
 
-		arsort( $products );
+		arsort($products);
 
-		return array_keys( array_slice( $products, 0, $maxItems, true ) );
+		return array_keys(array_slice($products, 0, $maxItems, true));
 	}
 
 
@@ -268,26 +268,26 @@ 
 	 * @param integer $typeId Unique ID of the list type used for the referenced products
 	 * @param array $productIds List of position as key and product ID as value
 	 */
-	protected function addListItems( $productId, $typeId, array $productIds )
+	protected function addListItems($productId, $typeId, array $productIds)
 	{
-		if( empty( $productIds ) ) {
+		if (empty($productIds)) {
 			return;
 		}
 
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'product/lists' );
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'product/lists');
 		$item = $manager->createItem();
 
-		foreach( $productIds as $pos => $refid )
+		foreach ($productIds as $pos => $refid)
 		{
-			$item->setId( null );
-			$item->setParentId( $productId );
-			$item->setDomain( 'product' );
-			$item->setTypeId( $typeId );
-			$item->setPosition( $pos );
-			$item->setRefId( $refid );
-			$item->setStatus( 1 );
-
-			$manager->saveItem( $item );
+			$item->setId(null);
+			$item->setParentId($productId);
+			$item->setDomain('product');
+			$item->setTypeId($typeId);
+			$item->setPosition($pos);
+			$item->setRefId($refid);
+			$item->setStatus(1);
+
+			$manager->saveItem($item);
 		}
 	}
 
@@ -298,20 +298,20 @@ 
 	 * @param string $productId Unique ID of the product the references should be removed from
 	 * @param integer $typeId Unique ID of the list type the referenced products should be removed from
 	 */
-	protected function removeListItems( $productId, $typeId )
+	protected function removeListItems($productId, $typeId)
 	{
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'product/lists' );
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'product/lists');
 
 		$search = $manager->createSearch();
 		$expr = array(
-			$search->compare( '==', 'product.lists.parentid', $productId ),
-			$search->compare( '==', 'product.lists.domain', 'product' ),
-			$search->compare( '==', 'product.lists.typeid', $typeId ),
+			$search->compare('==', 'product.lists.parentid', $productId),
+			$search->compare('==', 'product.lists.domain', 'product'),
+			$search->compare('==', 'product.lists.typeid', $typeId),
 		);
-		$search->setConditions( $search->combine( '&&', $expr ) );
+		$search->setConditions($search->combine('&&', $expr));
 
-		$listItems = $manager->searchItems( $search );
+		$listItems = $manager->searchItems($search);
 
-		$manager->deleteItems( array_keys( $listItems ) );
+		$manager->deleteItems(array_keys($listItems));
 	}
 }

controller/jobs/src/Controller/Jobs/Product/Import/Csv/Factory.php

Spacing +6 added lines, -6 removed lines

@@ -29,7 +29,7 @@ 
 	 * @param string|null $name Name of the controller or "Standard" if null
 	 * @return \Aimeos\Controller\Jobs\Iface New controller object
 	 */
-	public static function createController( \Aimeos\MShop\Context\Item\Iface $context, \Aimeos\Bootstrap $aimeos, $name = null )
+	public static function createController(\Aimeos\MShop\Context\Item\Iface $context, \Aimeos\Bootstrap $aimeos, $name = null)
 	{
 		/** controller/jobs/product/import/csv/name
 		 * Class name of the used product suggestions scheduler controller implementation
@@ -64,20 +64,20 @@ 
 		 * @since 2015.01
 		 * @category Developer
 		 */
-		if ( $name === null ) {
+		if ($name === null) {
 			$name = $context->getConfig()->get('controller/jobs/product/import/csv/name', 'Standard');
 		}
 
-		if ( ctype_alnum($name) === false )
+		if (ctype_alnum($name) === false)
 		{
 			$classname = is_string($name) ? '\\Aimeos\\Controller\\Jobs\\Product\\Import\\Csv\\' . $name : '<not a string>';
-			throw new \Aimeos\Controller\Jobs\Exception( sprintf( 'Invalid characters in class name "%1$s"', $classname ) );
+			throw new \Aimeos\Controller\Jobs\Exception(sprintf('Invalid characters in class name "%1$s"', $classname));
 		}
 
 		$iface = '\\Aimeos\\Controller\\Jobs\\Iface';
 		$classname = '\\Aimeos\\Controller\\Jobs\\Product\\Import\\Csv\\' . $name;
 
-		$controller = self::createControllerBase( $context, $aimeos, $classname, $iface );
+		$controller = self::createControllerBase($context, $aimeos, $classname, $iface);
 
 		/** controller/jobs/product/import/csv/decorators/excludes
 		 * Excludes decorators added by the "common" option from the product import CSV job controller
@@ -154,6 +154,6 @@ 
 		 * @see controller/jobs/product/import/csv/decorators/excludes
 		 * @see controller/jobs/product/import/csv/decorators/global
 		 */
-		return self::addControllerDecorators( $context, $aimeos, $controller, 'product/import/csv' );
+		return self::addControllerDecorators($context, $aimeos, $controller, 'product/import/csv');
 	}
 }
\ No newline at end of file

controller/jobs/src/Controller/Jobs/Product/Import/Csv/Standard.php

Spacing +68 added lines, -68 removed lines

@@ -28,7 +28,7 @@ 
 	 */
 	public function getName()
 	{
-		return $this->getContext()->getI18n()->dt( 'controller/jobs', 'Product import CSV' );
+		return $this->getContext()->getI18n()->dt('controller/jobs', 'Product import CSV');
 	}
 
 
@@ -39,7 +39,7 @@ 
 	 */
 	public function getDescription()
 	{
-		return $this->getContext()->getI18n()->dt( 'controller/jobs', 'Imports new and updates existing products from CSV files' );
+		return $this->getContext()->getI18n()->dt('controller/jobs', 'Imports new and updates existing products from CSV files');
 	}
 
 
@@ -54,7 +54,7 @@ 
 		$context = $this->getContext();
 		$config = $context->getConfig();
 		$logger = $context->getLogger();
-		$domains = array( 'attribute', 'media', 'price', 'product', 'text' );
+		$domains = array('attribute', 'media', 'price', 'product', 'text');
 		$mappings = $this->getDefaultMapping();
 
 
@@ -74,7 +74,7 @@ 
 		 * @see controller/common/product/import/csv/converter
 		 * @see controller/common/product/import/csv/max-size
 		 */
-		$domains = $config->get( 'controller/common/product/import/csv/domains', $domains );
+		$domains = $config->get('controller/common/product/import/csv/domains', $domains);
 
 		/** controller/jobs/product/import/csv/domains
 		 * List of item domain names that should be retrieved along with the product items
@@ -94,7 +94,7 @@ 
 		 * @see controller/jobs/product/import/csv/backup
 		 * @see controller/common/product/import/csv/max-size
 		 */
-		$domains = $config->get( 'controller/jobs/product/import/csv/domains', $domains );
+		$domains = $config->get('controller/jobs/product/import/csv/domains', $domains);
 
 
 		/** controller/common/product/import/csv/mapping
@@ -122,7 +122,7 @@ 
 		 * @see controller/common/product/import/csv/converter
 		 * @see controller/common/product/import/csv/max-size
 		 */
-		$mappings = $config->get( 'controller/common/product/import/csv/mapping', $mappings );
+		$mappings = $config->get('controller/common/product/import/csv/mapping', $mappings);
 
 		/** controller/jobs/product/import/csv/mapping
 		 * List of mappings between the position in the CSV file and item keys
@@ -142,7 +142,7 @@ 
 		 * @see controller/jobs/product/import/csv/backup
 		 * @see controller/common/product/import/csv/max-size
 		 */
-		$mappings = $config->get( 'controller/jobs/product/import/csv/mapping', $mappings );
+		$mappings = $config->get('controller/jobs/product/import/csv/mapping', $mappings);
 
 
 		/** controller/common/product/import/csv/converter
@@ -184,7 +184,7 @@ 
 		 * @see controller/common/product/import/csv/mapping
 		 * @see controller/common/product/import/csv/max-size
 		 */
-		$converters = $config->get( 'controller/common/product/import/csv/converter', array() );
+		$converters = $config->get('controller/common/product/import/csv/converter', array());
 
 		/** controller/jobs/product/import/csv/converter
 		 * List of converter names for the values at the position in the CSV file
@@ -204,7 +204,7 @@ 
 		 * @see controller/jobs/product/import/csv/backup
 		 * @see controller/common/product/import/csv/max-size
 		 */
-		$converters = $config->get( 'controller/jobs/product/import/csv/converter', $converters );
+		$converters = $config->get('controller/jobs/product/import/csv/converter', $converters);
 
 
 		/** controller/common/product/import/csv/max-size
@@ -224,7 +224,7 @@ 
 		 * @see controller/common/product/import/csv/mapping
 		 * @see controller/common/product/import/csv/converter
 		 */
-		$maxcnt = (int) $config->get( 'controller/common/product/import/csv/max-size', 1000 );
+		$maxcnt = (int) $config->get('controller/common/product/import/csv/max-size', 1000);
 
 
 		/** controller/jobs/product/import/csv/skip-lines
@@ -246,7 +246,7 @@ 
 		 * @see controller/jobs/product/import/csv/backup
 		 * @see controller/common/product/import/csv/max-size
 		 */
-		$skiplines = (int) $config->get( 'controller/jobs/product/import/csv/skip-lines', 0 );
+		$skiplines = (int) $config->get('controller/jobs/product/import/csv/skip-lines', 0);
 
 
 		/** controller/jobs/product/import/csv/strict
@@ -270,7 +270,7 @@ 
 		 * @see controller/jobs/product/import/csv/backup
 		 * @see controller/common/product/import/csv/max-size
 		 */
-		$strict = (bool) $config->get( 'controller/jobs/product/import/csv/strict', true );
+		$strict = (bool) $config->get('controller/jobs/product/import/csv/strict', true);
 
 
 		/** controller/jobs/product/import/csv/backup
@@ -303,74 +303,74 @@ 
 		 * @see controller/jobs/product/import/csv/strict
 		 * @see controller/common/product/import/csv/max-size
 		 */
-		$backup = $config->get( 'controller/jobs/product/import/csv/backup' );
+		$backup = $config->get('controller/jobs/product/import/csv/backup');
 
 
-		if( !isset( $mappings['item'] ) || !is_array( $mappings['item'] ) )
+		if (!isset($mappings['item']) || !is_array($mappings['item']))
 		{
-			$msg = sprintf( 'Required mapping key "%1$s" is missing or contains no array', 'item' );
-			throw new \Aimeos\Controller\Jobs\Exception( $msg );
+			$msg = sprintf('Required mapping key "%1$s" is missing or contains no array', 'item');
+			throw new \Aimeos\Controller\Jobs\Exception($msg);
 		}
 
 		try
 		{
 			$procMappings = $mappings;
-			unset( $procMappings['item'] );
+			unset($procMappings['item']);
 
-			$codePos = $this->getCodePosition( $mappings['item'] );
-			$convlist = $this->getConverterList( $converters );
-			$processor = $this->getProcessors( $procMappings );
+			$codePos = $this->getCodePosition($mappings['item']);
+			$convlist = $this->getConverterList($converters);
+			$processor = $this->getProcessors($procMappings);
 			$container = $this->getContainer();
 			$path = $container->getName();
 
-			$msg = sprintf( 'Started product import from "%1$s" (%2$s)', $path, __CLASS__ );
-			$logger->log( $msg, \Aimeos\MW\Logger\Base::NOTICE );
+			$msg = sprintf('Started product import from "%1$s" (%2$s)', $path, __CLASS__);
+			$logger->log($msg, \Aimeos\MW\Logger\Base::NOTICE);
 
-			foreach( $container as $content )
+			foreach ($container as $content)
 			{
 				$name = $content->getName();
 
-				for( $i = 0; $i < $skiplines; $i++ ) {
+				for ($i = 0; $i < $skiplines; $i++) {
 					$content->next();
 				}
 
-				while( ( $data = $this->getData( $content, $maxcnt, $codePos ) ) !== array() )
+				while (($data = $this->getData($content, $maxcnt, $codePos)) !== array())
 				{
-					$data = $this->convertData( $convlist, $data );
-					$products = $this->getProducts( array_keys( $data ), $domains );
-					$errcnt = $this->import( $products, $data, $mappings['item'], $processor, $strict );
-					$chunkcnt = count( $data );
+					$data = $this->convertData($convlist, $data);
+					$products = $this->getProducts(array_keys($data), $domains);
+					$errcnt = $this->import($products, $data, $mappings['item'], $processor, $strict);
+					$chunkcnt = count($data);
 
 					$msg = 'Imported product lines from "%1$s": %2$d/%3$d (%4$s)';
-					$logger->log( sprintf( $msg, $name, $chunkcnt - $errcnt, $chunkcnt, __CLASS__ ), \Aimeos\MW\Logger\Base::NOTICE );
+					$logger->log(sprintf($msg, $name, $chunkcnt - $errcnt, $chunkcnt, __CLASS__), \Aimeos\MW\Logger\Base::NOTICE);
 
 					$errors += $errcnt;
 					$total += $chunkcnt;
-					unset( $products, $data );
+					unset($products, $data);
 				}
 			}
 
 			$container->close();
 		}
-		catch( \Exception $e )
+		catch (\Exception $e)
 		{
-			$logger->log( 'Product import error: ' . $e->getMessage() );
-			$logger->log( $e->getTraceAsString() );
+			$logger->log('Product import error: ' . $e->getMessage());
+			$logger->log($e->getTraceAsString());
 
-			throw new \Aimeos\Controller\Jobs\Exception( $e->getMessage() );
+			throw new \Aimeos\Controller\Jobs\Exception($e->getMessage());
 		}
 
 		$msg = 'Finished product import from "%1$s": %2$d successful, %3$s errors, %4$s total (%5$s)';
-		$logger->log( sprintf( $msg, $path, $total - $errors, $errors, $total, __CLASS__ ), \Aimeos\MW\Logger\Base::NOTICE );
+		$logger->log(sprintf($msg, $path, $total - $errors, $errors, $total, __CLASS__), \Aimeos\MW\Logger\Base::NOTICE);
 
-		if( $errors > 0 )
+		if ($errors > 0)
 		{
-			$msg = sprintf( 'Invalid product lines in "%1$s": %2$d/%3$d', $path, $errors, $total );
-			throw new \Aimeos\Controller\Jobs\Exception( $msg );
+			$msg = sprintf('Invalid product lines in "%1$s": %2$d/%3$d', $path, $errors, $total);
+			throw new \Aimeos\Controller\Jobs\Exception($msg);
 		}
 
-		if( !empty( $backup ) && @rename( $path, strftime( $backup ) ) === false ) {
-			throw new \Aimeos\Controller\Jobs\Exception( sprintf( 'Unable to move imported file' ) );
+		if (!empty($backup) && @rename($path, strftime($backup)) === false) {
+			throw new \Aimeos\Controller\Jobs\Exception(sprintf('Unable to move imported file'));
 		}
 	}
 
@@ -382,16 +382,16 @@ 
 	 * @return integer Position of the "product.code" column
 	 * @throws \Aimeos\Controller\Jobs\Exception If no mapping for "product.code" is found
 	 */
-	protected function getCodePosition( array $mapping )
+	protected function getCodePosition(array $mapping)
 	{
-		foreach( $mapping as $pos => $key )
+		foreach ($mapping as $pos => $key)
 		{
-			if( $key === 'product.code' ) {
+			if ($key === 'product.code') {
 				return $pos;
 			}
 		}
 
-		throw new \Aimeos\Controller\Jobs\Exception( sprintf( 'No "product.code" column in CSV mapping found' ) );
+		throw new \Aimeos\Controller\Jobs\Exception(sprintf('No "product.code" column in CSV mapping found'));
 	}
 
 
@@ -426,7 +426,7 @@ 
 		 * @see controller/jobs/product/import/csv/container/content
 		 * @see controller/jobs/product/import/csv/container/options
 		*/
-		$location = $config->get( 'controller/jobs/product/import/csv/location', '.' );
+		$location = $config->get('controller/jobs/product/import/csv/location', '.');
 
 		/** controller/jobs/product/import/csv/container/type
 		 * Nave of the container type to read the data from
@@ -449,7 +449,7 @@ 
 		 * @see controller/jobs/product/import/csv/container/content
 		 * @see controller/jobs/product/import/csv/container/options
 		*/
-		$container = $config->get( 'controller/jobs/product/import/csv/container/type', 'Directory' );
+		$container = $config->get('controller/jobs/product/import/csv/container/type', 'Directory');
 
 		/** controller/jobs/product/import/csv/container/content
 		 * Name of the content type inside the container to read the data from
@@ -470,7 +470,7 @@ 
 		 * @see controller/jobs/product/import/csv/container/type
 		 * @see controller/jobs/product/import/csv/container/options
 		*/
-		$content = $config->get( 'controller/jobs/product/import/csv/container/content', 'CSV' );
+		$content = $config->get('controller/jobs/product/import/csv/container/content', 'CSV');
 
 		/** controller/jobs/product/import/csv/container/options
 		 * List of file container options for the product import files
@@ -488,9 +488,9 @@ 
 		 * @see controller/jobs/product/import/csv/container/content
 		 * @see controller/jobs/product/import/csv/container/type
 		*/
-		$options = $config->get( 'controller/jobs/product/import/csv/container/options', array() );
+		$options = $config->get('controller/jobs/product/import/csv/container/options', array());
 
-		return \Aimeos\MW\Container\Factory::getContainer( $location, $container, $content, $options );
+		return \Aimeos\MW\Container\Factory::getContainer($location, $container, $content, $options);
 	}
 
 
@@ -505,14 +505,14 @@ 
 	 * @return integer Number of products that couldn't be imported
 	 * @throws \Aimeos\Controller\Jobs\Exception
 	 */
-	protected function import( array $products, array $data, array $mapping,
-		\Aimeos\Controller\Common\Product\Import\Csv\Processor\Iface $processor, $strict )
+	protected function import(array $products, array $data, array $mapping,
+		\Aimeos\Controller\Common\Product\Import\Csv\Processor\Iface $processor, $strict)
 	{
 		$errors = 0;
 		$context = $this->getContext();
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'product' );
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'product');
 
-		foreach( $data as $code => $list )
+		foreach ($data as $code => $list)
 		{
 			$remaining = array();
 
@@ -520,36 +520,36 @@ 
 
 			try
 			{
-				if( isset( $products[$code] ) ) {
+				if (isset($products[$code])) {
 					$product = $products[$code];
 				} else {
 					$product = $manager->createItem();
 				}
 
-				$map = $this->getMappedData( $mapping, $list );
+				$map = $this->getMappedData($mapping, $list);
 
-				$typecode = ( isset( $map['product.type'] ) ? $map['product.type'] : 'default' );
-				$map['product.typeid'] = $this->getTypeId( 'product/type', 'product', $typecode );
+				$typecode = (isset($map['product.type']) ? $map['product.type'] : 'default');
+				$map['product.typeid'] = $this->getTypeId('product/type', 'product', $typecode);
 
-				$product->fromArray( $this->addItemDefaults( $map ) );
-				$manager->saveItem( $product );
+				$product->fromArray($this->addItemDefaults($map));
+				$manager->saveItem($product);
 
-				$remaining = $processor->process( $product, $list );
+				$remaining = $processor->process($product, $list);
 
 				$manager->commit();
 			}
-			catch( \Exception $e )
+			catch (\Exception $e)
 			{
 				$manager->rollback();
 
-				$msg = sprintf( 'Unable to import product with code "%1$s": %2$s', $code, $e->getMessage() );
-				$context->getLogger()->log( $msg );
+				$msg = sprintf('Unable to import product with code "%1$s": %2$s', $code, $e->getMessage());
+				$context->getLogger()->log($msg);
 
 				$errors++;
 			}
 
-			if( $strict && !empty( $remaining ) ) {
-				$context->getLogger()->log( 'Not imported: ' . print_r( $remaining, true ) );
+			if ($strict && !empty($remaining)) {
+				$context->getLogger()->log('Not imported: ' . print_r($remaining, true));
 			}
 		}
 
@@ -563,9 +563,9 @@ 
 	 * @param array $list Associative list of domain item keys and their values, e.g. "product.status" => 1
 	 * @return array Given associative list enriched by default values if they were not already set
 	 */
-	protected function addItemDefaults( array $list )
+	protected function addItemDefaults(array $list)
 	{
-		if( !isset( $list['product.status'] ) ) {
+		if (!isset($list['product.status'])) {
 			$list['product.status'] = 1;
 		}
 

controller/jobs/tests/bootstrap.php

Spacing +7 added lines, -7 removed lines

@@ -11,22 +11,22 @@
  * Set error reporting to maximum
  */
 error_reporting( -1 );
-ini_set( 'display_errors', '1' );
+ini_set('display_errors', '1');
 
-date_default_timezone_set( 'UTC' );
+date_default_timezone_set('UTC');
 
 /**
  * Set locale settings to reasonable defaults
  */
-setlocale( LC_ALL, 'en_US.UTF-8' );
-setlocale( LC_NUMERIC, 'POSIX' );
-setlocale( LC_CTYPE, 'en_US.UTF-8' );
-setlocale( LC_TIME, 'POSIX' );
+setlocale(LC_ALL, 'en_US.UTF-8');
+setlocale(LC_NUMERIC, 'POSIX');
+setlocale(LC_CTYPE, 'en_US.UTF-8');
+setlocale(LC_TIME, 'POSIX');
 
 /*
  * Set include path for tests
  */
-define( 'PATH_TESTS', __DIR__ );
+define('PATH_TESTS', __DIR__);
 
 require_once 'TestHelperJobs.php';
 \TestHelperJobs::bootstrap();

controller/jobs/tests/Perf/Product/Import/Csv/StandardTest.php

Spacing +76 added lines, -76 removed lines

@@ -17,31 +17,31 @@ 
 		$this->context = \TestHelperJobs::getContext('unitperf');
 
 		$config = $this->context->getConfig();
-		$config->set( 'controller/jobs/product/import/csv/location', 'tmp/product-import.zip' );
-		$config->set( 'controller/jobs/product/import/csv/container/type', 'Zip' );
-		$config->set( 'controller/jobs/product/import/csv/container/content', 'CSV' );
-		$config->set( 'controller/jobs/product/import/csv/mapping', $this->getMapping() );
+		$config->set('controller/jobs/product/import/csv/location', 'tmp/product-import.zip');
+		$config->set('controller/jobs/product/import/csv/container/type', 'Zip');
+		$config->set('controller/jobs/product/import/csv/container/content', 'CSV');
+		$config->set('controller/jobs/product/import/csv/mapping', $this->getMapping());
 
-		$container = \Aimeos\MW\Container\Factory::getContainer( 'tmp/product-import.zip', 'Zip', 'CSV', array() );
+		$container = \Aimeos\MW\Container\Factory::getContainer('tmp/product-import.zip', 'Zip', 'CSV', array());
 
-		$content = $container->create( 'product.csv' );
+		$content = $container->create('product.csv');
 
-		for( $i = 0; $i < 1000; $i++ )
+		for ($i = 0; $i < 1000; $i++)
 		{
 			$data = array();
 
-			$data = $this->addProduct( $data, $i );
-			$data = $this->addText( $data, $i );
-			$data = $this->addMedia( $data, $i );
-			$data = $this->addPrice( $data, $i );
-			$data = $this->addAttribute( $data, $i );
-			$data = $this->addProductRef( $data, $i );
-			$data = $this->addProperty( $data, $i );
+			$data = $this->addProduct($data, $i);
+			$data = $this->addText($data, $i);
+			$data = $this->addMedia($data, $i);
+			$data = $this->addPrice($data, $i);
+			$data = $this->addAttribute($data, $i);
+			$data = $this->addProductRef($data, $i);
+			$data = $this->addProperty($data, $i);
 
-			$content->add( $data );
+			$content->add($data);
 		}
 
-		$container->add( $content );
+		$container->add($content);
 
 		$container->close();
 	}
@@ -55,25 +55,25 @@ 
 		$this->cleanupPrice();
 		$this->cleanupProduct();
 
-		unlink( 'tmp/product-import.zip' );
+		unlink('tmp/product-import.zip');
 	}
 
 
 	public function testImport()
 	{
 		$aimeos = \TestHelperJobs::getAimeos();
-		$cntl = \Aimeos\Controller\Jobs\Product\Import\Csv\Factory::createController( $this->context, $aimeos, 'Standard' );
+		$cntl = \Aimeos\Controller\Jobs\Product\Import\Csv\Factory::createController($this->context, $aimeos, 'Standard');
 
-		$start = microtime( true );
+		$start = microtime(true);
 
 		$cntl->run();
 
-		$stop = microtime( true );
-		echo "\n    product import CSV: " . ( ( $stop - $start ) ) . " sec\n";
+		$stop = microtime(true);
+		echo "\n    product import CSV: " . (($stop - $start)) . " sec\n";
 	}
 
 
-	protected function addAttribute( array $data, $cnt )
+	protected function addAttribute(array $data, $cnt)
 	{
 		$data[] = 'length'; // type
 		$data[] = 'import-' . ($cnt % 30); // code
@@ -86,7 +86,7 @@ 
 	}
 
 
-	protected function addMedia( array $data, $cnt )
+	protected function addMedia(array $data, $cnt)
 	{
 		$data[] = "/path/to/image-$cnt.jpg"; // url
 
@@ -94,7 +94,7 @@ 
 	}
 
 
-	protected function addPrice( array $data, $cnt )
+	protected function addPrice(array $data, $cnt)
 	{
 		$data[] = 1; // quantity
 		$data[] = 'import-' . $cnt; // label
@@ -105,7 +105,7 @@ 
 	}
 
 
-	protected function addProduct( array $data, $cnt )
+	protected function addProduct(array $data, $cnt)
 	{
 		$data[] = 'import-' . $cnt; // code
 		$data[] = 'import-' . $cnt; // label
@@ -116,7 +116,7 @@ 
 	}
 
 
-	protected function addProductRef( array $data, $cnt )
+	protected function addProductRef(array $data, $cnt)
 	{
 		$data[] = 'import-' . ($cnt % 100); // code
 		$data[] = 'suggestion'; // type
@@ -125,7 +125,7 @@ 
 	}
 
 
-	protected function addProperty( array $data, $cnt )
+	protected function addProperty(array $data, $cnt)
 	{
 		$data[] = 'package-weight'; // type
 		$data[] = '0.5'; // value
@@ -134,7 +134,7 @@ 
 	}
 
 
-	protected function addText( array $data, $cnt )
+	protected function addText(array $data, $cnt)
 	{
 		$data[] = 'name'; // type
 		$data[] = 'import-name-' . $cnt; //content
@@ -149,132 +149,132 @@ 
 
 	protected function cleanupAttribute()
 	{
-		$manager = \Aimeos\MShop\Attribute\Manager\Factory::createManager( $this->context );
+		$manager = \Aimeos\MShop\Attribute\Manager\Factory::createManager($this->context);
 
 		$search = $manager->createSearch();
 		$expr = array(
-			$search->compare( '==', 'attribute.domain', 'product' ),
-			$search->compare( '==', 'attribute.label', 'import-%' ),
+			$search->compare('==', 'attribute.domain', 'product'),
+			$search->compare('==', 'attribute.label', 'import-%'),
 		);
-		$search->setConditions( $search->combine( '&&', $expr ) );
-		$search->setSortations( array( $search->sort( '+', 'attribute.id' ) ) );
+		$search->setConditions($search->combine('&&', $expr));
+		$search->setSortations(array($search->sort('+', 'attribute.id')));
 
 		$start = 0;
 
 		do
 		{
-			$result = $manager->searchItems( $search );
-			$manager->deleteItems( array_keys( $result ) );
+			$result = $manager->searchItems($search);
+			$manager->deleteItems(array_keys($result));
 
-			$count = count( $result );
+			$count = count($result);
 			$start += $count;
-			$search->setSlice( $start );
+			$search->setSlice($start);
 		}
-		while( $count == $search->getSliceSize() );
+		while ($count == $search->getSliceSize());
 	}
 
 
 	protected function cleanupMedia()
 	{
-		$manager = \Aimeos\MShop\Media\Manager\Factory::createManager( $this->context );
+		$manager = \Aimeos\MShop\Media\Manager\Factory::createManager($this->context);
 
 		$search = $manager->createSearch();
 		$expr = array(
-			$search->compare( '==', 'media.domain', 'product' ),
-			$search->compare( '==', 'media.label', 'import-%' ),
+			$search->compare('==', 'media.domain', 'product'),
+			$search->compare('==', 'media.label', 'import-%'),
 		);
-		$search->setConditions( $search->combine( '&&', $expr ) );
-		$search->setSortations( array( $search->sort( '+', 'media.id' ) ) );
+		$search->setConditions($search->combine('&&', $expr));
+		$search->setSortations(array($search->sort('+', 'media.id')));
 
 		$start = 0;
 
 		do
 		{
-			$result = $manager->searchItems( $search );
-			$manager->deleteItems( array_keys( $result ) );
+			$result = $manager->searchItems($search);
+			$manager->deleteItems(array_keys($result));
 
-			$count = count( $result );
+			$count = count($result);
 			$start += $count;
-			$search->setSlice( $start );
+			$search->setSlice($start);
 		}
-		while( $count == $search->getSliceSize() );
+		while ($count == $search->getSliceSize());
 	}
 
 
 	protected function cleanupPrice()
 	{
-		$manager = \Aimeos\MShop\Price\Manager\Factory::createManager( $this->context );
+		$manager = \Aimeos\MShop\Price\Manager\Factory::createManager($this->context);
 
 		$search = $manager->createSearch();
 		$expr = array(
-				$search->compare( '==', 'price.domain', 'product' ),
-				$search->compare( '==', 'price.label', 'import-%' ),
+				$search->compare('==', 'price.domain', 'product'),
+				$search->compare('==', 'price.label', 'import-%'),
 		);
-		$search->setConditions( $search->combine( '&&', $expr ) );
-		$search->setSortations( array( $search->sort( '+', 'price.id' ) ) );
+		$search->setConditions($search->combine('&&', $expr));
+		$search->setSortations(array($search->sort('+', 'price.id')));
 
 		$start = 0;
 
 		do
 		{
-			$result = $manager->searchItems( $search );
-			$manager->deleteItems( array_keys( $result ) );
+			$result = $manager->searchItems($search);
+			$manager->deleteItems(array_keys($result));
 
-			$count = count( $result );
+			$count = count($result);
 			$start += $count;
-			$search->setSlice( $start );
+			$search->setSlice($start);
 		}
-		while( $count == $search->getSliceSize() );
+		while ($count == $search->getSliceSize());
 	}
 
 
 	protected function cleanupProduct()
 	{
-		$manager = \Aimeos\MShop\Product\Manager\Factory::createManager( $this->context );
+		$manager = \Aimeos\MShop\Product\Manager\Factory::createManager($this->context);
 
 		$search = $manager->createSearch();
-		$search->setConditions( $search->compare( '==', 'product.code', 'import-%' ) );
-		$search->setSortations( array( $search->sort( '+', 'product.id' ) ) );
+		$search->setConditions($search->compare('==', 'product.code', 'import-%'));
+		$search->setSortations(array($search->sort('+', 'product.id')));
 
 		$start = 0;
 
 		do
 		{
-			$result = $manager->searchItems( $search );
-			$manager->deleteItems( array_keys( $result ) );
+			$result = $manager->searchItems($search);
+			$manager->deleteItems(array_keys($result));
 
-			$count = count( $result );
+			$count = count($result);
 			$start += $count;
-			$search->setSlice( $start );
+			$search->setSlice($start);
 		}
-		while( $count == $search->getSliceSize() );
+		while ($count == $search->getSliceSize());
 	}
 
 
 	protected function cleanupText()
 	{
-		$manager = \Aimeos\MShop\Text\Manager\Factory::createManager( $this->context );
+		$manager = \Aimeos\MShop\Text\Manager\Factory::createManager($this->context);
 
 		$search = $manager->createSearch();
 		$expr = array(
-			$search->compare( '==', 'text.domain', 'product' ),
-			$search->compare( '==', 'text.label', 'import-%' ),
+			$search->compare('==', 'text.domain', 'product'),
+			$search->compare('==', 'text.label', 'import-%'),
 		);
-		$search->setConditions( $search->combine( '&&', $expr ) );
-		$search->setSortations( array( $search->sort( '+', 'text.id' ) ) );
+		$search->setConditions($search->combine('&&', $expr));
+		$search->setSortations(array($search->sort('+', 'text.id')));
 
 		$start = 0;
 
 		do
 		{
-			$result = $manager->searchItems( $search );
-			$manager->deleteItems( array_keys( $result ) );
+			$result = $manager->searchItems($search);
+			$manager->deleteItems(array_keys($result));
 
-			$count = count( $result );
+			$count = count($result);
 			$start += $count;
-			$search->setSlice( $start );
+			$search->setSlice($start);
 		}
-		while( $count == $search->getSliceSize() );
+		while ($count == $search->getSliceSize());
 	}
 
 

controller/jobs/tests/config/controller.php

Spacing +2 added lines, -2 removed lines

@@ -4,11 +4,11 @@
 	'jobs' => array(
 		'product' => array(
 			'export' => array(
-				'location' => dirname( __DIR__ ) . DIRECTORY_SEPARATOR . 'tmp',
+				'location' => dirname(__DIR__) . DIRECTORY_SEPARATOR . 'tmp',
 				'max-items' => 15,
 				'max-query' => 5,
 				'sitemap' => array(
-					'location' => dirname( __DIR__ ) . DIRECTORY_SEPARATOR . 'tmp',
+					'location' => dirname(__DIR__) . DIRECTORY_SEPARATOR . 'tmp',
 					'max-items' => 15,
 					'max-query' => 5,
 				),

controller/jobs/tests/Controller/Jobs/Order/Cleanup/Unpaid/FactoryTest.php

Spacing +8 added lines, -8 removed lines

@@ -16,8 +16,8 @@ 
 		$context = \TestHelperJobs::getContext();
 		$aimeos = \TestHelperJobs::getAimeos();
 
-		$obj = \Aimeos\Controller\Jobs\Order\Cleanup\Unpaid\Factory::createController( $context, $aimeos );
-		$this->assertInstanceOf( '\\Aimeos\\Controller\\Jobs\\Iface', $obj );
+		$obj = \Aimeos\Controller\Jobs\Order\Cleanup\Unpaid\Factory::createController($context, $aimeos);
+		$this->assertInstanceOf('\\Aimeos\\Controller\\Jobs\\Iface', $obj);
 	}
 
 
@@ -26,8 +26,8 @@ 
 		$context = \TestHelperJobs::getContext();
 		$aimeos = \TestHelperJobs::getAimeos();
 
-		$this->setExpectedException( '\\Aimeos\\Controller\\Jobs\\Exception' );
-		\Aimeos\Controller\Jobs\Order\Cleanup\Unpaid\Factory::createController( $context, $aimeos, 'Wrong$$$Name' );
+		$this->setExpectedException('\\Aimeos\\Controller\\Jobs\\Exception');
+		\Aimeos\Controller\Jobs\Order\Cleanup\Unpaid\Factory::createController($context, $aimeos, 'Wrong$$$Name');
 	}
 
 
@@ -36,8 +36,8 @@ 
 		$context = \TestHelperJobs::getContext();
 		$aimeos = \TestHelperJobs::getAimeos();
 
-		$this->setExpectedException( '\\Aimeos\\Controller\\Jobs\\Exception' );
-		\Aimeos\Controller\Jobs\Order\Cleanup\Unpaid\Factory::createController( $context, $aimeos, 'WrongClass' );
+		$this->setExpectedException('\\Aimeos\\Controller\\Jobs\\Exception');
+		\Aimeos\Controller\Jobs\Order\Cleanup\Unpaid\Factory::createController($context, $aimeos, 'WrongClass');
 	}
 
 
@@ -46,8 +46,8 @@ 
 		$context = \TestHelperJobs::getContext();
 		$aimeos = \TestHelperJobs::getAimeos();
 
-		$this->setExpectedException( '\\Aimeos\\Controller\\Jobs\\Exception' );
-		\Aimeos\Controller\Jobs\Order\Cleanup\Unpaid\Factory::createController( $context, $aimeos, 'Factory' );
+		$this->setExpectedException('\\Aimeos\\Controller\\Jobs\\Exception');
+		\Aimeos\Controller\Jobs\Order\Cleanup\Unpaid\Factory::createController($context, $aimeos, 'Factory');
 	}
 
 }