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)
 	{
 		/** controller/jobs/product/export/standard/template-items
 		 * Relative path to the XML items template of the product site map job controller.
@@ -94,7 +94,7 @@ 
 
 		$view->exportItems = $items;
 
-		$content->add( $view->render( $context->getConfig()->get( $tplconf, $default ) ) );
+		$content->add($view->render($context->getConfig()->get($tplconf, $default)));
 	}
 
 
@@ -123,7 +123,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
@@ -140,7 +140,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
@@ -157,7 +157,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
@@ -174,9 +174,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', [] );
+		$options = $config->get('controller/jobs/product/export/standard/container/options', []);
 
-		return \Aimeos\MW\Container\Factory::getContainer( $location, $container, $content, $options );
+		return \Aimeos\MW\Container\Factory::getContainer($location, $container, $content, $options);
 	}
 
 
@@ -187,7 +187,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)
 	{
 		/** controller/jobs/product/export/standard/template-header
 		 * Relative path to the XML site map header template of the product site map job controller.
@@ -217,9 +217,9 @@ 
 		$context = $this->getContext();
 		$view = $context->getView();
 
-		$content = $container->create( $this->getFilename( $filenum ) );
-		$content->add( $view->render( $context->getConfig()->get( $tplconf, $default ) ) );
-		$container->add( $content );
+		$content = $container->create($this->getFilename($filenum));
+		$content->add($view->render($context->getConfig()->get($tplconf, $default)));
+		$container->add($content);
 
 		return $content;
 	}
@@ -230,7 +230,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)
 	{
 		/** controller/jobs/product/export/standard/template-footer
 		 * Relative path to the XML site map footer template of the product site map job controller.
@@ -260,7 +260,7 @@ 
 		$context = $this->getContext();
 		$view = $context->getView();
 
-		$content->add( $view->render( $context->getConfig()->get( $tplconf, $default ) ) );
+		$content->add($view->render($context->getConfig()->get($tplconf, $default)));
 	}
 
 
@@ -270,45 +270,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 = [];
 
-		$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;
 	}
@@ -321,11 +321,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
@@ -347,7 +347,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
@@ -369,7 +369,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
@@ -391,7 +391,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;
@@ -404,8 +404,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/Admin/Log/Standard.php

Spacing +26 added lines, -26 removed lines

@@ -29,7 +29,7 @@ 
 	 */
 	public function getName()
 	{
-		return $this->getContext()->getI18n()->dt( 'controller/jobs', 'Log cleanup' );
+		return $this->getContext()->getI18n()->dt('controller/jobs', 'Log cleanup');
 	}
 
 
@@ -40,7 +40,7 @@ 
 	 */
 	public function getDescription()
 	{
-		return $this->getContext()->getI18n()->dt( 'controller/jobs', 'Removes the old log entries from the database and archives them (optional)' );
+		return $this->getContext()->getI18n()->dt('controller/jobs', 'Removes the old log entries from the database and archives them (optional)');
 	}
 
 
@@ -71,8 +71,8 @@ 
 		 * @see controller/jobs/admin/log/standard/container/format
 		 * @see controller/jobs/admin/log/standard/container/options
 		 */
-		$limit = $config->get( 'controller/jobs/admin/log/standard/limit-days', 30 );
-		$limitDate = date( 'Y-m-d H:i:s', time() - $limit * 86400 );
+		$limit = $config->get('controller/jobs/admin/log/standard/limit-days', 30);
+		$limitDate = date('Y-m-d H:i:s', time() - $limit * 86400);
 
 		/** controller/jobs/admin/log/standard/path
 		 * Path to a writable directory where the log archive files should be stored
@@ -101,7 +101,7 @@ 
 		 * @see controller/jobs/admin/log/standard/container/options
 		 * @see controller/jobs/admin/log/standard/limit-days
 		 */
-		if( ( $path = $config->get( 'controller/jobs/admin/log/standard/path', null ) ) !== null )
+		if (($path = $config->get('controller/jobs/admin/log/standard/path', null)) !== null)
 		{
 			/** controller/jobs/admin/log/standard/container/type
 			 * Container file type storing all coupon code files to import
@@ -175,19 +175,19 @@ 
 			 * @see controller/jobs/admin/log/standard/limit-days
 			 */
 
-			$type = $config->get( 'controller/jobs/admin/log/standard/container/type', 'Zip' );
-			$format = $config->get( 'controller/jobs/admin/log/standard/container/format', 'CSV' );
-			$options = $config->get( 'controller/jobs/admin/log/standard/container/options', [] );
+			$type = $config->get('controller/jobs/admin/log/standard/container/type', 'Zip');
+			$format = $config->get('controller/jobs/admin/log/standard/container/format', 'CSV');
+			$options = $config->get('controller/jobs/admin/log/standard/container/options', []);
 
-			$path .= DIRECTORY_SEPARATOR . str_replace( ' ', '_', $limitDate );
-			$container = \Aimeos\MW\Container\Factory::getContainer( $path, $type, $format, $options );
+			$path .= DIRECTORY_SEPARATOR . str_replace(' ', '_', $limitDate);
+			$container = \Aimeos\MW\Container\Factory::getContainer($path, $type, $format, $options);
 		}
 
-		$manager = \Aimeos\MAdmin\Factory::createManager( $context, 'log' );
+		$manager = \Aimeos\MAdmin\Factory::createManager($context, 'log');
 
 		$search = $manager->createSearch();
-		$search->setConditions( $search->compare( '<=', 'log.timestamp', $limitDate ) );
-		$search->setSortations( array( $search->sort( '+', 'log.timestamp' ) ) );
+		$search->setConditions($search->compare('<=', 'log.timestamp', $limitDate));
+		$search->setSortations(array($search->sort('+', 'log.timestamp')));
 
 		$start = 0;
 		$contents = [];
@@ -195,37 +195,37 @@ 
 		do
 		{
 			$ids = [];
-			$items = $manager->searchItems( $search );
+			$items = $manager->searchItems($search);
 
-			foreach( $items as $id => $item )
+			foreach ($items as $id => $item)
 			{
-				if( $container !== null )
+				if ($container !== null)
 				{
 					$facility = $item->getFacility();
 
-					if( !isset( $contents[$facility] ) ) {
-						$contents[$facility] = $container->create( $facility );
+					if (!isset($contents[$facility])) {
+						$contents[$facility] = $container->create($facility);
 					}
 
-					$contents[$facility]->add( $item->toArray() );
+					$contents[$facility]->add($item->toArray());
 				}
 
 				$ids[] = $id;
 			}
 
-			$manager->deleteItems( $ids );
+			$manager->deleteItems($ids);
 
-			$count = count( $items );
+			$count = count($items);
 			$start += $count;
-			$search->setSlice( $start );
+			$search->setSlice($start);
 		}
-		while( $count >= $search->getSliceSize() );
+		while ($count >= $search->getSliceSize());
 
 
-		if( $container !== null && !empty( $contents ) )
+		if ($container !== null && !empty($contents))
 		{
-			foreach( $contents as $content ) {
-				$container->add( $content );
+			foreach ($contents as $content) {
+				$container->add($content);
 			}
 
 			$container->close();

controller/jobs/src/Controller/Jobs/Order/Cleanup/Unpaid/Standard.php

Spacing +17 added lines, -17 removed lines

@@ -29,7 +29,7 @@ 
 	 */
 	public function getName()
 	{
-		return $this->getContext()->getI18n()->dt( 'controller/jobs', 'Removes unpaid orders' );
+		return $this->getContext()->getI18n()->dt('controller/jobs', 'Removes unpaid orders');
 	}
 
 
@@ -40,7 +40,7 @@ 
 	 */
 	public function getDescription()
 	{
-		return $this->getContext()->getI18n()->dt( 'controller/jobs', 'Deletes unpaid orders to keep the database clean' );
+		return $this->getContext()->getI18n()->dt('controller/jobs', 'Deletes unpaid orders to keep the database clean');
 	}
 
 
@@ -52,9 +52,9 @@ 
 	public function run()
 	{
 		$context = $this->getContext();
-		$controller = \Aimeos\Controller\Common\Order\Factory::createController( $context );
-		$baseManager = \Aimeos\MShop\Factory::createManager( $context, 'order/base' );
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'order' );
+		$controller = \Aimeos\Controller\Common\Order\Factory::createController($context);
+		$baseManager = \Aimeos\MShop\Factory::createManager($context, 'order/base');
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'order');
 
 		/** controller/jobs/order/cleanup/unpaid/keep-days
 		 * Removes all orders from the database that are unpaid
@@ -71,35 +71,35 @@ 
 		 * @since 2014.07
 		 * @category User
 		 */
-		$days = $context->getConfig()->get( 'controller/jobs/order/cleanup/unpaid/keep-days', 3 );
-		$limit = date( 'Y-m-d H:i:s', time() - 86400 * $days );
+		$days = $context->getConfig()->get('controller/jobs/order/cleanup/unpaid/keep-days', 3);
+		$limit = date('Y-m-d H:i:s', time() - 86400 * $days);
 
 		$search = $manager->createSearch();
 		$expr = array(
-			$search->compare( '<', 'order.mtime', $limit ),
-			$search->compare( '<', 'order.statuspayment', \Aimeos\MShop\Order\Item\Base::PAY_REFUND ),
+			$search->compare('<', 'order.mtime', $limit),
+			$search->compare('<', 'order.statuspayment', \Aimeos\MShop\Order\Item\Base::PAY_REFUND),
 		);
-		$search->setConditions( $search->combine( '&&', $expr ) );
+		$search->setConditions($search->combine('&&', $expr));
 
 		$start = 0;
 
 		do
 		{
 			$baseIds = [];
-			$items = $manager->searchItems( $search );
+			$items = $manager->searchItems($search);
 
-			foreach( $items as $item )
+			foreach ($items as $item)
 			{
-				$controller->unblock( $item );
+				$controller->unblock($item);
 				$baseIds[] = $item->getBaseId();
 			}
 
-			$baseManager->deleteItems( $baseIds );
+			$baseManager->deleteItems($baseIds);
 
-			$count = count( $items );
+			$count = count($items);
 			$start += $count;
-			$search->setSlice( $start );
+			$search->setSlice($start);
 		}
-		while( $count >= $search->getSliceSize() );
+		while ($count >= $search->getSliceSize());
 	}
 }

controller/jobs/src/Controller/Jobs/Order/Cleanup/Unfinished/Standard.php

Spacing +17 added lines, -17 removed lines

@@ -29,7 +29,7 @@ 
 	 */
 	public function getName()
 	{
-		return $this->getContext()->getI18n()->dt( 'controller/jobs', 'Removes unfinished orders' );
+		return $this->getContext()->getI18n()->dt('controller/jobs', 'Removes unfinished orders');
 	}
 
 
@@ -40,7 +40,7 @@ 
 	 */
 	public function getDescription()
 	{
-		return $this->getContext()->getI18n()->dt( 'controller/jobs', 'Deletes unfinished orders an makes their products and coupon codes available again' );
+		return $this->getContext()->getI18n()->dt('controller/jobs', 'Deletes unfinished orders an makes their products and coupon codes available again');
 	}
 
 
@@ -52,9 +52,9 @@ 
 	public function run()
 	{
 		$context = $this->getContext();
-		$controller = \Aimeos\Controller\Common\Order\Factory::createController( $context );
-		$baseManager = \Aimeos\MShop\Factory::createManager( $context, 'order/base' );
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'order' );
+		$controller = \Aimeos\Controller\Common\Order\Factory::createController($context);
+		$baseManager = \Aimeos\MShop\Factory::createManager($context, 'order/base');
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'order');
 
 		/** controller/jobs/order/cleanup/unfinished/keep-hours
 		 * Release the ordered products after the configured time if no payment was confirmed
@@ -74,35 +74,35 @@ 
 		 * @since 2014.07
 		 * @category User
 		 */
-		$hours = $context->getConfig()->get( 'controller/jobs/order/cleanup/unfinished/keep-hours', 24 );
-		$limit = date( 'Y-m-d H:i:s', time() - 3600 * $hours );
+		$hours = $context->getConfig()->get('controller/jobs/order/cleanup/unfinished/keep-hours', 24);
+		$limit = date('Y-m-d H:i:s', time() - 3600 * $hours);
 
 		$search = $manager->createSearch();
 		$expr = array(
-			$search->compare( '<', 'order.mtime', $limit ),
-			$search->compare( '==', 'order.statuspayment', \Aimeos\MShop\Order\Item\Base::PAY_UNFINISHED ),
+			$search->compare('<', 'order.mtime', $limit),
+			$search->compare('==', 'order.statuspayment', \Aimeos\MShop\Order\Item\Base::PAY_UNFINISHED),
 		);
-		$search->setConditions( $search->combine( '&&', $expr ) );
+		$search->setConditions($search->combine('&&', $expr));
 
 		$start = 0;
 
 		do
 		{
 			$baseIds = [];
-			$items = $manager->searchItems( $search );
+			$items = $manager->searchItems($search);
 
-			foreach( $items as $item )
+			foreach ($items as $item)
 			{
-				$controller->unblock( $item );
+				$controller->unblock($item);
 				$baseIds[] = $item->getBaseId();
 			}
 
-			$baseManager->deleteItems( $baseIds );
+			$baseManager->deleteItems($baseIds);
 
-			$count = count( $items );
+			$count = count($items);
 			$start += $count;
-			$search->setSlice( $start );
+			$search->setSlice($start);
 		}
-		while( $count >= $search->getSliceSize() );
+		while ($count >= $search->getSliceSize());
 	}
 }

controller/common/tests/TestHelperCntl.php

Spacing +23 added lines, -23 removed lines

@@ -15,14 +15,14 @@ 
 	public static function bootstrap()
 	{
 		self::getAimeos();
-		\Aimeos\MShop\Factory::setCache( false );
+		\Aimeos\MShop\Factory::setCache(false);
 	}
 
 
-	public static function getContext( $site = 'unittest' )
+	public static function getContext($site = 'unittest')
 	{
-		if( !isset( self::$context[$site] ) ) {
-			self::$context[$site] = self::createContext( $site );
+		if (!isset(self::$context[$site])) {
+			self::$context[$site] = self::createContext($site);
 		}
 
 		return clone self::$context[$site];
@@ -31,13 +31,13 @@ 
 
 	public static function getAimeos()
 	{
-		if( !isset( self::$aimeos ) )
+		if (!isset(self::$aimeos))
 		{
 			require_once 'Bootstrap.php';
-			spl_autoload_register( 'Aimeos\\Bootstrap::autoload' );
+			spl_autoload_register('Aimeos\\Bootstrap::autoload');
 
-			$extdir = dirname( dirname( dirname( dirname( dirname( __FILE__ ) ) ) ) );
-			self::$aimeos = new \Aimeos\Bootstrap( array( $extdir ), true );
+			$extdir = dirname(dirname(dirname(dirname(dirname(__FILE__)))));
+			self::$aimeos = new \Aimeos\Bootstrap(array($extdir), true);
 		}
 
 		return self::$aimeos;
@@ -47,40 +47,40 @@ 
 	/**
 	 * @param string $site
 	 */
-	private static function createContext( $site )
+	private static function createContext($site)
 	{
 		$ctx = new \Aimeos\MShop\Context\Item\Standard();
 		$aimeos = self::getAimeos();
 
 
-		$paths = $aimeos->getConfigPaths( 'mysql' );
+		$paths = $aimeos->getConfigPaths('mysql');
 		$paths[] = __DIR__ . DIRECTORY_SEPARATOR . 'config';
 		$file = __DIR__ . DIRECTORY_SEPARATOR . 'confdoc.ser';
 
-		$conf = new \Aimeos\MW\Config\PHPArray( [], $paths );
-		$conf = new \Aimeos\MW\Config\Decorator\Memory( $conf );
-		$conf = new \Aimeos\MW\Config\Decorator\Documentor( $conf, $file );
-		$ctx->setConfig( $conf );
+		$conf = new \Aimeos\MW\Config\PHPArray([], $paths);
+		$conf = new \Aimeos\MW\Config\Decorator\Memory($conf);
+		$conf = new \Aimeos\MW\Config\Decorator\Documentor($conf, $file);
+		$ctx->setConfig($conf);
 
 
-		$dbm = new \Aimeos\MW\DB\Manager\PDO( $conf );
-		$ctx->setDatabaseManager( $dbm );
+		$dbm = new \Aimeos\MW\DB\Manager\PDO($conf);
+		$ctx->setDatabaseManager($dbm);
 
 
-		$logger = new \Aimeos\MW\Logger\File( 'unittest.log', \Aimeos\MW\Logger\Base::DEBUG );
-		$ctx->setLogger( $logger );
+		$logger = new \Aimeos\MW\Logger\File('unittest.log', \Aimeos\MW\Logger\Base::DEBUG);
+		$ctx->setLogger($logger);
 
 
 		$session = new \Aimeos\MW\Session\None();
-		$ctx->setSession( $session );
+		$ctx->setSession($session);
 
 
-		$localeManager = \Aimeos\MShop\Locale\Manager\Factory::createManager( $ctx );
-		$locale = $localeManager->bootstrap( $site, '', '', false );
-		$ctx->setLocale( $locale );
+		$localeManager = \Aimeos\MShop\Locale\Manager\Factory::createManager($ctx);
+		$locale = $localeManager->bootstrap($site, '', '', false);
+		$ctx->setLocale($locale);
 
 
-		$ctx->setEditor( 'core:controller/common' );
+		$ctx->setEditor('core:controller/common');
 
 		return $ctx;
 	}

controller/common/tests/Controller/Common/Product/Import/Csv/Processor/DoneTest.php

Spacing +6 added lines, -6 removed lines

@@ -21,10 +21,10 @@ 
 	 */
 	protected function setUp()
 	{
-		\Aimeos\MShop\Factory::setCache( true );
+		\Aimeos\MShop\Factory::setCache(true);
 
 		$this->context = \TestHelperCntl::getContext();
-		$this->object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Done( $this->context, [] );
+		$this->object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Done($this->context, []);
 	}
 
 
@@ -36,7 +36,7 @@ 
 	 */
 	protected function tearDown()
 	{
-		\Aimeos\MShop\Factory::setCache( false );
+		\Aimeos\MShop\Factory::setCache(false);
 		\Aimeos\MShop\Factory::clear();
 
 		$this->object = null;
@@ -45,10 +45,10 @@ 
 
 	public function testProcess()
 	{
-		$product = \Aimeos\MShop\Factory::createManager( $this->context, 'product' )->createItem();
+		$product = \Aimeos\MShop\Factory::createManager($this->context, 'product')->createItem();
 
-		$result = $this->object->process( $product, array( 'test' ) );
+		$result = $this->object->process($product, array('test'));
 
-		$this->assertEquals( array( 'test' ), $result );
+		$this->assertEquals(array('test'), $result);
 	}
 }
\ No newline at end of file

controller/common/tests/Controller/Common/Product/Import/Csv/BaseTest.php

Spacing +29 added lines, -29 removed lines

@@ -14,92 +14,92 @@ 
 
 	protected function setUp()
 	{
-		\Aimeos\MShop\Factory::setCache( true );
+		\Aimeos\MShop\Factory::setCache(true);
 
 		$context = \TestHelperCntl::getContext();
 		$aimeos = \TestHelperCntl::getAimeos();
 
-		$this->object = new TestAbstract( $context, $aimeos );
+		$this->object = new TestAbstract($context, $aimeos);
 	}
 
 
 	protected function tearDown()
 	{
-		\Aimeos\MShop\Factory::setCache( false );
+		\Aimeos\MShop\Factory::setCache(false);
 		\Aimeos\MShop\Factory::clear();
 	}
 
 
 	public function testGetCache()
 	{
-		$cache = $this->object->getCachePublic( 'attribute' );
+		$cache = $this->object->getCachePublic('attribute');
 
-		$this->assertInstanceOf( '\\Aimeos\\Controller\\Common\\Product\\Import\\Csv\\Cache\\Iface', $cache );
+		$this->assertInstanceOf('\\Aimeos\\Controller\\Common\\Product\\Import\\Csv\\Cache\\Iface', $cache);
 	}
 
 
 	public function testGetCacheInvalidType()
 	{
-		$this->setExpectedException( '\\Aimeos\\Controller\\Jobs\\Exception' );
-		$this->object->getCachePublic( '$' );
+		$this->setExpectedException('\\Aimeos\\Controller\\Jobs\\Exception');
+		$this->object->getCachePublic('$');
 	}
 
 
 	public function testGetCacheInvalidClass()
 	{
-		$this->setExpectedException( '\\Aimeos\\Controller\\Jobs\\Exception' );
-		$this->object->getCachePublic( 'unknown' );
+		$this->setExpectedException('\\Aimeos\\Controller\\Jobs\\Exception');
+		$this->object->getCachePublic('unknown');
 	}
 
 
 	public function testGetCacheInvalidInterface()
 	{
-		$this->setExpectedException( '\\Aimeos\\Controller\\Jobs\\Exception' );
-		$this->object->getCachePublic( 'attribute', 'unknown' );
+		$this->setExpectedException('\\Aimeos\\Controller\\Jobs\\Exception');
+		$this->object->getCachePublic('attribute', 'unknown');
 	}
 
 
 	public function testGetProcessors()
 	{
-		$processor = $this->object->getProcessorsPublic( array( 'attribute' => [] ) );
+		$processor = $this->object->getProcessorsPublic(array('attribute' => []));
 
-		$this->assertInstanceOf( '\\Aimeos\\Controller\\Common\\Product\\Import\\Csv\\Processor\\Iface', $processor );
+		$this->assertInstanceOf('\\Aimeos\\Controller\\Common\\Product\\Import\\Csv\\Processor\\Iface', $processor);
 	}
 
 
 	public function testGetProcessorsInvalidType()
 	{
-		$this->setExpectedException( '\\Aimeos\\Controller\\Jobs\\Exception' );
-		$this->object->getProcessorsPublic( array( '$' => [] ) );
+		$this->setExpectedException('\\Aimeos\\Controller\\Jobs\\Exception');
+		$this->object->getProcessorsPublic(array('$' => []));
 	}
 
 
 	public function testGetProcessorsInvalidClass()
 	{
-		$this->setExpectedException( '\\Aimeos\\Controller\\Jobs\\Exception' );
-		$this->object->getProcessorsPublic( array( 'unknown' => [] ) );
+		$this->setExpectedException('\\Aimeos\\Controller\\Jobs\\Exception');
+		$this->object->getProcessorsPublic(array('unknown' => []));
 	}
 
 
 	public function testGetProcessorsInvalidInterface()
 	{
-		$this->setExpectedException( '\\Aimeos\\Controller\\Jobs\\Exception' );
-		$this->object->getProcessorsPublic( array( 'unknown' => [] ) );
+		$this->setExpectedException('\\Aimeos\\Controller\\Jobs\\Exception');
+		$this->object->getProcessorsPublic(array('unknown' => []));
 	}
 
 
 	public function testGetTypeId()
 	{
-		$typeid = $this->object->getTypeIdPublic( 'attribute/type', 'product', 'color' );
+		$typeid = $this->object->getTypeIdPublic('attribute/type', 'product', 'color');
 
-		$this->assertNotEquals( null, $typeid );
+		$this->assertNotEquals(null, $typeid);
 	}
 
 
 	public function testGetTypeIdUnknown()
 	{
-		$this->setExpectedException( '\\Aimeos\\Controller\\Jobs\\Exception' );
-		$this->object->getTypeIdPublic( 'attribute/type', 'product', 'unknown' );
+		$this->setExpectedException('\\Aimeos\\Controller\\Jobs\\Exception');
+		$this->object->getTypeIdPublic('attribute/type', 'product', 'unknown');
 	}
 }
 
@@ -107,21 +107,21 @@ 
 class TestAbstract
 	extends \Aimeos\Controller\Common\Product\Import\Csv\Base
 {
-	public function getCachePublic( $type, $name = null )
+	public function getCachePublic($type, $name = null)
 	{
-		return $this->getCache( $type, $name );
+		return $this->getCache($type, $name);
 	}
 
 
-	public function getProcessorsPublic( array $mappings )
+	public function getProcessorsPublic(array $mappings)
 	{
-		return $this->getProcessors( $mappings );
+		return $this->getProcessors($mappings);
 	}
 
 
-	public function getTypeIdPublic( $path, $domain, $code )
+	public function getTypeIdPublic($path, $domain, $code)
 	{
-		return $this->getTypeId( $path, $domain, $code );
+		return $this->getTypeId($path, $domain, $code);
 	}
 }
 

controller/common/src/Controller/Common/Product/Import/Csv/Cache/Attribute/Standard.php

Spacing +17 added lines, -17 removed lines

@@ -40,15 +40,15 @@ 
 	 *
 	 * @param \Aimeos\MShop\Context\Item\Iface $context Context object
 	 */
-	public function __construct( \Aimeos\MShop\Context\Item\Iface $context )
+	public function __construct(\Aimeos\MShop\Context\Item\Iface $context)
 	{
-		parent::__construct( $context );
+		parent::__construct($context);
 
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'attribute' );
-		$result = $manager->searchItems( $manager->createSearch() );
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'attribute');
+		$result = $manager->searchItems($manager->createSearch());
 
-		foreach( $result as $id => $item ) {
-			$this->attributes[ $item->getCode() ][ $item->getType() ] = $item;
+		foreach ($result as $id => $item) {
+			$this->attributes[$item->getCode()][$item->getType()] = $item;
 		}
 	}
 
@@ -60,24 +60,24 @@ 
 	 * @param string|null $type Attribute type
 	 * @return \Aimeos\MShop\Attribute\Item\Iface|null Attribute object or null if not found
 	 */
-	public function get( $code, $type = null )
+	public function get($code, $type = null)
 	{
-		if( isset( $this->attributes[$code] ) && isset( $this->attributes[$code][$type] ) ) {
+		if (isset($this->attributes[$code]) && isset($this->attributes[$code][$type])) {
 			return $this->attributes[$code][$type];
 		}
 
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'attribute' );
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'attribute');
 
 		$search = $manager->createSearch();
 		$expr = array(
-			$search->compare( '==', 'attribute.code', $code ),
-			$search->compare( '==', 'attribute.type.code', $type ),
+			$search->compare('==', 'attribute.code', $code),
+			$search->compare('==', 'attribute.type.code', $type),
 		);
-		$search->setConditions( $search->combine( '&&', $expr ) );
+		$search->setConditions($search->combine('&&', $expr));
 
-		$result = $manager->searchItems( $search );
+		$result = $manager->searchItems($search);
 
-		if( ( $item = reset( $result ) ) !== false )
+		if (($item = reset($result)) !== false)
 		{
 			$this->attributes[$code][$type] = $item;
 			return $item;
@@ -90,14 +90,14 @@ 
 	 *
 	 * @param \Aimeos\MShop\Common\Item\Iface $item Attribute object
 	 */
-	public function set( \Aimeos\MShop\Common\Item\Iface $item )
+	public function set(\Aimeos\MShop\Common\Item\Iface $item)
 	{
 		$code = $item->getCode();
 
-		if( !isset( $this->attributes[$code] ) || !is_array( $this->attributes[$code] ) ) {
+		if (!isset($this->attributes[$code]) || !is_array($this->attributes[$code])) {
 			$this->attributes[$code] = [];
 		}
 
-		$this->attributes[$code][ $item->getType() ] = $item;
+		$this->attributes[$code][$item->getType()] = $item;
 	}
 }
\ No newline at end of file

controller/common/src/Controller/Common/Product/Import/Csv/Base.php

Spacing +58 added lines, -58 removed lines

@@ -30,14 +30,14 @@ 
 	 * @param array $data Associative list of product codes and lists of CSV field indexes and their data
 	 * @return array Associative list of CSV field indexes and their converted data
 	 */
-	protected function convertData( array $convlist, array $data )
+	protected function convertData(array $convlist, array $data)
 	{
-		foreach( $convlist as $idx => $converter )
+		foreach ($convlist as $idx => $converter)
 		{
-			foreach( $data as $code => $list )
+			foreach ($data as $code => $list)
 			{
-				if( isset( $list[$idx] ) ) {
-					$data[$code][$idx] = $converter->translate( $list[$idx] );
+				if (isset($list[$idx])) {
+					$data[$code][$idx] = $converter->translate($list[$idx]);
 				}
 			}
 		}
@@ -53,38 +53,38 @@ 
 	 * @param string|null Name of the cache implementation
 	 * @return \Aimeos\Controller\Common\Product\Import\Csv\Cache\Iface Cache object
 	 */
-	protected function getCache( $type, $name = null )
+	protected function getCache($type, $name = null)
 	{
 		$context = $this->getContext();
 		$config = $context->getConfig();
 		$iface = '\\Aimeos\\Controller\\Common\\Product\\Import\\Csv\\Cache\\Iface';
 
-		if( ctype_alnum( $type ) === false )
+		if (ctype_alnum($type) === false)
 		{
 			$classname = is_string($name) ? '\\Aimeos\\Controller\\Common\\Product\\Import\\Csv\\Cache\\' . $type : '<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));
 		}
 
-		if( $name === null ) {
-			$name = $config->get( 'controller/common/product/import/csv/cache/' . $type . '/name', 'Standard' );
+		if ($name === null) {
+			$name = $config->get('controller/common/product/import/csv/cache/' . $type . '/name', 'Standard');
 		}
 
-		if( ctype_alnum( $name ) === false )
+		if (ctype_alnum($name) === false)
 		{
 			$classname = is_string($name) ? '\\Aimeos\\Controller\\Common\\Product\\Import\\Csv\\Cache\\' . $type . '\\' . $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));
 		}
 
-		$classname = '\\Aimeos\\Controller\\Common\\Product\\Import\\Csv\\Cache\\' . ucfirst( $type ) . '\\' . $name;
+		$classname = '\\Aimeos\\Controller\\Common\\Product\\Import\\Csv\\Cache\\' . ucfirst($type) . '\\' . $name;
 
-		if( class_exists( $classname ) === false ) {
-			throw new \Aimeos\Controller\Jobs\Exception( sprintf( 'Class "%1$s" not found', $classname ) );
+		if (class_exists($classname) === false) {
+			throw new \Aimeos\Controller\Jobs\Exception(sprintf('Class "%1$s" not found', $classname));
 		}
 
-		$object = new $classname( $context );
+		$object = new $classname($context);
 
-		if( !( $object instanceof $iface ) ) {
-			throw new \Aimeos\Controller\Jobs\Exception( sprintf( 'Class "%1$s" does not implement interface "%2$s"', $classname, $iface ) );
+		if (!($object instanceof $iface)) {
+			throw new \Aimeos\Controller\Jobs\Exception(sprintf('Class "%1$s" does not implement interface "%2$s"', $classname, $iface));
 		}
 
 		return $object;
@@ -97,12 +97,12 @@ 
 	 * @param array $convmap List of converter names for the values at the position in the CSV file
 	 * @return array Associative list of positions and converter objects
 	 */
-	protected function getConverterList( array $convmap )
+	protected function getConverterList(array $convmap)
 	{
 		$convlist = [];
 
-		foreach( $convmap as $idx => $name ) {
-			$convlist[$idx] = \Aimeos\MW\Convert\Factory::createConverter( $name );
+		foreach ($convmap as $idx => $name) {
+			$convlist[$idx] = \Aimeos\MW\Convert\Factory::createConverter($name);
 		}
 
 		return $convlist;
@@ -117,15 +117,15 @@ 
 	 * @param integer $codePos Column position which contains the unique product code (starting from 0)
 	 * @return array List of arrays with product codes as keys and list of values from the CSV file
 	 */
-	protected function getData( \Aimeos\MW\Container\Content\Iface $content, $maxcnt, $codePos )
+	protected function getData(\Aimeos\MW\Container\Content\Iface $content, $maxcnt, $codePos)
 	{
 		$count = 0;
 		$data = [];
 
-		while( $content->valid() && $count++ < $maxcnt )
+		while ($content->valid() && $count++ < $maxcnt)
 		{
 			$row = $content->current();
-			$data[ $row[$codePos] ] = $row;
+			$data[$row[$codePos]] = $row;
 			$content->next();
 		}
 
@@ -222,21 +222,21 @@ 
 	 * @param array $mapping List of domain item keys with the CSV field position as key
 	 * @return array List of associative arrays containing the chunked properties
 	 */
-	protected function getMappedChunk( array &$data, array $mapping )
+	protected function getMappedChunk(array &$data, array $mapping)
 	{
 		$idx = 0;
 		$map = [];
 
-		foreach( $mapping as $pos => $key )
+		foreach ($mapping as $pos => $key)
 		{
-			if( isset( $map[$idx][$key] ) ) {
+			if (isset($map[$idx][$key])) {
 				$idx++;
 			}
 
-			if( isset( $data[$pos] ) )
+			if (isset($data[$pos]))
 			{
 				$map[$idx][$key] = $data[$pos];
-				unset( $data[$pos] );
+				unset($data[$pos]);
 			}
 		}
 
@@ -250,39 +250,39 @@ 
 	 * @param array $mappings Associative list of processor types as keys and index/data mappings as values
 	 * @return \Aimeos\Controller\Common\Product\Import\Csv\Processor\Iface Processor object
 	 */
-	protected function getProcessors( array $mappings )
+	protected function getProcessors(array $mappings)
 	{
 		$context = $this->getContext();
 		$config = $context->getConfig();
 		$iface = '\\Aimeos\\Controller\\Common\\Product\\Import\\Csv\\Processor\\Iface';
-		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Done( $context, [] );
+		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Done($context, []);
 
-		foreach( $mappings as $type => $mapping )
+		foreach ($mappings as $type => $mapping)
 		{
-			if( ctype_alnum( $type ) === false )
+			if (ctype_alnum($type) === false)
 			{
 				$classname = is_string($type) ? '\\Aimeos\\Controller\\Common\\Product\\Import\\Csv\\Processor\\' . $type : '<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));
 			}
 
-			$name = $config->get( 'controller/common/product/import/csv/processor/' . $type . '/name', 'Standard' );
+			$name = $config->get('controller/common/product/import/csv/processor/' . $type . '/name', 'Standard');
 
-			if( ctype_alnum( $name ) === false )
+			if (ctype_alnum($name) === false)
 			{
 				$classname = is_string($name) ? '\\Aimeos\\Controller\\Common\\Product\\Import\\Csv\\Processor\\' . $type . '\\' . $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));
 			}
 
-			$classname = '\\Aimeos\\Controller\\Common\\Product\\Import\\Csv\\Processor\\' . ucfirst( $type ) . '\\' . $name;
+			$classname = '\\Aimeos\\Controller\\Common\\Product\\Import\\Csv\\Processor\\' . ucfirst($type) . '\\' . $name;
 
-			if( class_exists( $classname ) === false ) {
-				throw new \Aimeos\Controller\Jobs\Exception( sprintf( 'Class "%1$s" not found', $classname ) );
+			if (class_exists($classname) === false) {
+				throw new \Aimeos\Controller\Jobs\Exception(sprintf('Class "%1$s" not found', $classname));
 			}
 
-			$object = new $classname( $context, $mapping, $object );
+			$object = new $classname($context, $mapping, $object);
 
-			if( !( $object instanceof $iface ) ) {
-				throw new \Aimeos\Controller\Jobs\Exception( sprintf( 'Class "%1$s" does not implement interface "%2$s"', $classname, $iface ) );
+			if (!($object instanceof $iface)) {
+				throw new \Aimeos\Controller\Jobs\Exception(sprintf('Class "%1$s" does not implement interface "%2$s"', $classname, $iface));
 			}
 		}
 
@@ -297,17 +297,17 @@ 
 	 * @param array $domains List of domains whose items should be fetched too
 	 * @return array Associative list of product codes as key and product items as value
 	 */
-	protected function getProducts( array $codes, array $domains )
+	protected function getProducts(array $codes, array $domains)
 	{
 		$result = [];
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'product' );
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'product');
 
 		$search = $manager->createSearch();
-		$search->setConditions( $search->compare( '==', 'product.code', $codes ) );
-		$search->setSlice( 0, count( $codes ) );
+		$search->setConditions($search->compare('==', 'product.code', $codes));
+		$search->setSlice(0, count($codes));
 
-		foreach( $manager->searchItems( $search, $domains ) as $item ) {
-			$result[ $item->getCode() ] = $item;
+		foreach ($manager->searchItems($search, $domains) as $item) {
+			$result[$item->getCode()] = $item;
 		}
 
 		return $result;
@@ -322,23 +322,23 @@ 
 	 * @param string $code Unique code of the type item
 	 * @return string Unique ID of the type item
 	 */
-	protected function getTypeId( $path, $domain, $code )
+	protected function getTypeId($path, $domain, $code)
 	{
-		if( !isset( self::$types[$path][$domain] ) )
+		if (!isset(self::$types[$path][$domain]))
 		{
-			$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), $path );
-			$key = str_replace( '/', '.', $path );
+			$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), $path);
+			$key = str_replace('/', '.', $path);
 
 			$search = $manager->createSearch();
-			$search->setConditions( $search->compare( '==', $key . '.domain', $domain ) );
+			$search->setConditions($search->compare('==', $key . '.domain', $domain));
 
-			foreach( $manager->searchItems( $search ) as $id => $item ) {
-				self::$types[$path][$domain][ $item->getCode() ] = $id;
+			foreach ($manager->searchItems($search) as $id => $item) {
+				self::$types[$path][$domain][$item->getCode()] = $id;
 			}
 		}
 
-		if( !isset( self::$types[$path][$domain][$code] ) ) {
-			throw new \Aimeos\Controller\Jobs\Exception( sprintf( 'No type item for "%1$s/%2$s" in "%3$s" found', $domain, $code, $path ) );
+		if (!isset(self::$types[$path][$domain][$code])) {
+			throw new \Aimeos\Controller\Jobs\Exception(sprintf('No type item for "%1$s/%2$s" in "%3$s" found', $domain, $code, $path));
 		}
 
 		return self::$types[$path][$domain][$code];