aimeos / ai-controller-jobs

controller/common/src/Controller/Common/Product/Import/Csv/Processor/Done.php

Spacing +3 added lines, -3 removed lines

@@ -27,8 +27,8 @@ 
 	 * @param array $mapping Associative list of field position in CSV as key and domain item key as value
 	 * @param \Aimeos\Controller\Common\Product\Import\Csv\Processor\Iface $processor Decorated processor
 	 */
-	public function __construct( \Aimeos\MShop\Context\Item\Iface $context, array $mapping,
-		\Aimeos\Controller\Common\Product\Import\Csv\Processor\Iface $processor = null )
+	public function __construct(\Aimeos\MShop\Context\Item\Iface $context, array $mapping,
+		\Aimeos\Controller\Common\Product\Import\Csv\Processor\Iface $processor = null)
 	{
 	}
 
@@ -40,7 +40,7 @@ 
 	 * @param array $data List of CSV fields with position as key and data as value
 	 * @return array List of data which hasn't been imported
 	 */
-	public function process( \Aimeos\MShop\Product\Item\Iface $item, array $data )
+	public function process(\Aimeos\MShop\Product\Item\Iface $item, array $data)
 	{
 		return $data;
 	}

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

Spacing +56 added lines, -56 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,36 +53,36 @@ 
 	 * @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();
 
-		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);
 
-		\Aimeos\MW\Common\Base::checkClass( '\\Aimeos\\Controller\\Common\\Product\\Import\\Csv\\Cache\\Iface', $object );
+		\Aimeos\MW\Common\Base::checkClass('\\Aimeos\\Controller\\Common\\Product\\Import\\Csv\\Cache\\Iface', $object);
 
 		return $object;
 	}
@@ -94,12 +94,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;
@@ -114,15 +114,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();
 		}
 
@@ -221,21 +221,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]);
 			}
 		}
 
@@ -249,37 +249,37 @@ 
 	 * @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();
-		$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);
 
-			\Aimeos\MW\Common\Base::checkClass( '\\Aimeos\\Controller\\Common\\Product\\Import\\Csv\\Processor\\Iface', $object );
+			\Aimeos\MW\Common\Base::checkClass('\\Aimeos\\Controller\\Common\\Product\\Import\\Csv\\Processor\\Iface', $object);
 		}
 
 		return $object;
@@ -293,17 +293,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;
@@ -318,23 +318,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];

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

Spacing +27 added lines, -27 removed lines

@@ -26,17 +26,17 @@ 
 	 * @param array $codes List of coupon codes
 	 * @return array Associative list of coupon codes as key and coupon code items as value
 	 */
-	protected function getCouponCodeItems( array $codes )
+	protected function getCouponCodeItems(array $codes)
 	{
 		$result = [];
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'coupon/code' );
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'coupon/code');
 
 		$search = $manager->createSearch();
-		$search->setConditions( $search->compare( '==', 'coupon.code.code', $codes ) );
-		$search->setSlice( 0, count( $codes ) );
+		$search->setConditions($search->compare('==', 'coupon.code.code', $codes));
+		$search->setSlice(0, count($codes));
 
-		foreach( $manager->searchItems( $search ) as $item ) {
-			$result[ $item->getCode() ] = $item;
+		foreach ($manager->searchItems($search) as $item) {
+			$result[$item->getCode()] = $item;
 		}
 
 		return $result;
@@ -51,15 +51,15 @@ 
 	 * @param integer $codePos Column position which contains the unique coupon code (starting from 0)
 	 * @return array List of arrays with coupon 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();
 		}
 
@@ -98,21 +98,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]);
 			}
 		}
 
@@ -126,37 +126,37 @@ 
 	 * @param array $mappings Associative list of processor types as keys and index/data mappings as values
 	 * @return \Aimeos\Controller\Common\Coupon\Import\Csv\Processor\Iface Processor object
 	 */
-	protected function getProcessors( array $mappings )
+	protected function getProcessors(array $mappings)
 	{
 		$context = $this->getContext();
 		$config = $context->getConfig();
-		$object = new \Aimeos\Controller\Common\Coupon\Import\Csv\Processor\Done( $context, [] );
+		$object = new \Aimeos\Controller\Common\Coupon\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\\Coupon\\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/coupon/import/csv/processor/' . $type . '/name', 'Standard' );
+			$name = $config->get('controller/common/coupon/import/csv/processor/' . $type . '/name', 'Standard');
 
-			if( ctype_alnum( $name ) === false )
+			if (ctype_alnum($name) === false)
 			{
 				$classname = is_string($name) ? '\\Aimeos\\Controller\\Common\\Coupon\\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\\Coupon\\Import\\Csv\\Processor\\' . ucfirst( $type ) . '\\' . $name;
+			$classname = '\\Aimeos\\Controller\\Common\\Coupon\\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);
 
-			\Aimeos\MW\Common\Base::checkClass( '\\Aimeos\\Controller\\Common\\Coupon\\Import\\Csv\\Processor\\Iface', $object );
+			\Aimeos\MW\Common\Base::checkClass('\\Aimeos\\Controller\\Common\\Coupon\\Import\\Csv\\Processor\\Iface', $object);
 		}
 
 		return $object;

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

Spacing +50 added lines, -50 removed lines

@@ -30,14 +30,14 @@ 
 	 * @param array $data Associative list of catalog 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,36 +53,36 @@ 
 	 * @param string|null Name of the cache implementation
 	 * @return \Aimeos\Controller\Common\Catalog\Import\Csv\Cache\Iface Cache object
 	 */
-	protected function getCache( $type, $name = null )
+	protected function getCache($type, $name = null)
 	{
 		$context = $this->getContext();
 		$config = $context->getConfig();
 
-		if( ctype_alnum( $type ) === false )
+		if (ctype_alnum($type) === false)
 		{
 			$classname = is_string($name) ? '\\Aimeos\\Controller\\Common\\Catalog\\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/catalog/import/csv/cache/' . $type . '/name', 'Standard' );
+		if ($name === null) {
+			$name = $config->get('controller/common/catalog/import/csv/cache/' . $type . '/name', 'Standard');
 		}
 
-		if( ctype_alnum( $name ) === false )
+		if (ctype_alnum($name) === false)
 		{
 			$classname = is_string($name) ? '\\Aimeos\\Controller\\Common\\Catalog\\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\\Catalog\\Import\\Csv\\Cache\\' . ucfirst( $type ) . '\\' . $name;
+		$classname = '\\Aimeos\\Controller\\Common\\Catalog\\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);
 
-		\Aimeos\MW\Common\Base::checkClass( '\\Aimeos\\Controller\\Common\\Catalog\\Import\\Csv\\Cache\\Iface', $object );
+		\Aimeos\MW\Common\Base::checkClass('\\Aimeos\\Controller\\Common\\Catalog\\Import\\Csv\\Cache\\Iface', $object);
 
 		return $object;
 	}
@@ -94,12 +94,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;
@@ -114,15 +114,15 @@ 
 	 * @param integer $codePos Column position which contains the unique catalog code (starting from 0)
 	 * @return array List of arrays with catalog 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();
 		}
 
@@ -178,21 +178,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]);
 			}
 		}
 
@@ -206,37 +206,37 @@ 
 	 * @param array $mappings Associative list of processor types as keys and index/data mappings as values
 	 * @return \Aimeos\Controller\Common\Catalog\Import\Csv\Processor\Iface Processor object
 	 */
-	protected function getProcessors( array $mappings )
+	protected function getProcessors(array $mappings)
 	{
 		$context = $this->getContext();
 		$config = $context->getConfig();
-		$object = new \Aimeos\Controller\Common\Catalog\Import\Csv\Processor\Done( $context, [] );
+		$object = new \Aimeos\Controller\Common\Catalog\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\\Catalog\\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/catalog/import/csv/processor/' . $type . '/name', 'Standard' );
+			$name = $config->get('controller/common/catalog/import/csv/processor/' . $type . '/name', 'Standard');
 
-			if( ctype_alnum( $name ) === false )
+			if (ctype_alnum($name) === false)
 			{
 				$classname = is_string($name) ? '\\Aimeos\\Controller\\Common\\Catalog\\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\\Catalog\\Import\\Csv\\Processor\\' . ucfirst( $type ) . '\\' . $name;
+			$classname = '\\Aimeos\\Controller\\Common\\Catalog\\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);
 
-			\Aimeos\MW\Common\Base::checkClass( '\\Aimeos\\Controller\\Common\\Catalog\\Import\\Csv\\Processor\\Iface', $object );
+			\Aimeos\MW\Common\Base::checkClass('\\Aimeos\\Controller\\Common\\Catalog\\Import\\Csv\\Processor\\Iface', $object);
 		}
 
 		return $object;
@@ -251,23 +251,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];

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

Spacing +56 added lines, -56 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,36 +53,36 @@ 
 	 * @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();
 
-		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);
 
-		\Aimeos\MW\Common\Base::checkClass( '\\Aimeos\\Controller\\Common\\Product\\Import\\Csv\\Cache\\Iface', $object );
+		\Aimeos\MW\Common\Base::checkClass('\\Aimeos\\Controller\\Common\\Product\\Import\\Csv\\Cache\\Iface', $object);
 
 		return $object;
 	}
@@ -94,12 +94,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;
@@ -114,15 +114,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();
 		}
 
@@ -221,21 +221,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]);
 			}
 		}
 
@@ -249,37 +249,37 @@ 
 	 * @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();
-		$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);
 
-			\Aimeos\MW\Common\Base::checkClass( '\\Aimeos\\Controller\\Common\\Product\\Import\\Csv\\Processor\\Iface', $object );
+			\Aimeos\MW\Common\Base::checkClass('\\Aimeos\\Controller\\Common\\Product\\Import\\Csv\\Processor\\Iface', $object);
 		}
 
 		return $object;
@@ -293,17 +293,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;
@@ -318,23 +318,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];

controller/jobs/src/Controller/Jobs/Subscription/Process/End/Standard.php

Spacing +21 added lines, -21 removed lines

@@ -28,7 +28,7 @@ 
 	 */
 	public function getName()
 	{
-		return $this->getContext()->getI18n()->dt( 'controller/jobs', 'Subscription process end' );
+		return $this->getContext()->getI18n()->dt('controller/jobs', 'Subscription process end');
 	}
 
 
@@ -39,7 +39,7 @@ 
 	 */
 	public function getDescription()
 	{
-		return $this->getContext()->getI18n()->dt( 'controller/jobs', 'Terminates expired subscriptions' );
+		return $this->getContext()->getI18n()->dt('controller/jobs', 'Terminates expired subscriptions');
 	}
 
 
@@ -65,51 +65,51 @@ 
 		 * @since 2018.04
 		 * @category Developer
 		 */
-		$names = (array) $config->get( 'controller/common/subscription/process/processors', [] );
+		$names = (array) $config->get('controller/common/subscription/process/processors', []);
 
-		$processors = $this->getProcessors( $names );
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'subscription' );
+		$processors = $this->getProcessors($names);
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'subscription');
 
-		$search = $manager->createSearch( true );
+		$search = $manager->createSearch(true);
 		$expr = [
-			$search->compare( '<', 'subscription.dateend', date( 'Y-m-d' ) ),
+			$search->compare('<', 'subscription.dateend', date('Y-m-d')),
 			$search->getConditions(),
 		];
-		$search->setConditions( $search->combine( '&&', $expr ) );
-		$search->setSortations( [$search->sort( '+', 'subscription.id' )] );
+		$search->setConditions($search->combine('&&', $expr));
+		$search->setSortations([$search->sort('+', 'subscription.id')]);
 
 		$start = 0;
 
 		do
 		{
-			$search->setSlice( $start, 100 );
-			$items = $manager->searchItems( $search );
+			$search->setSlice($start, 100);
+			$items = $manager->searchItems($search);
 
-			foreach( $items as $item )
+			foreach ($items as $item)
 			{
 				try
 				{
-					foreach( $processors as $processor ) {
-						$processor->end( $item );
+					foreach ($processors as $processor) {
+						$processor->end($item);
 					}
 
-					if( ( $reason = $item->getReason() ) === null ) {
+					if (($reason = $item->getReason()) === null) {
 						$reason = \Aimeos\MShop\Subscription\Item\Iface::REASON_END;
 					}
 
-					$manager->saveItem( $item->setReason( $reason )->setStatus( 0 ) );
+					$manager->saveItem($item->setReason($reason)->setStatus(0));
 				}
-				catch( \Exception $e )
+				catch (\Exception $e)
 				{
 					$msg = 'Unable to process subscription with ID "%1$S": %2$s';
-					$logger->log( sprintf( $msg, $item->getId(), $e->getMessage() ) );
-					$logger->log( $e->getTraceAsString() );
+					$logger->log(sprintf($msg, $item->getId(), $e->getMessage()));
+					$logger->log($e->getTraceAsString());
 				}
 			}
 
-			$count = count( $items );
+			$count = count($items);
 			$start += $count;
 		}
-		while( $count === $search->getSliceSize() );
+		while ($count === $search->getSliceSize());
 	}
 }

Braces +1 added lines, -2 removed lines

@@ -98,8 +98,7 @@
 					}
 
 					$manager->saveItem( $item->setReason( $reason )->setStatus( 0 ) );
-				}
-				catch( \Exception $e )
+				} catch( \Exception $e )
 				{
 					$msg = 'Unable to process subscription with ID "%1$S": %2$s';
 					$logger->log( sprintf( $msg, $item->getId(), $e->getMessage() ) );

controller/jobs/tests/Controller/Jobs/Order/Service/Delivery/StandardTest.php

Spacing +62 added lines, -62 removed lines

@@ -20,7 +20,7 @@ 
 		$context = \TestHelperJobs::getContext();
 		$aimeos = \TestHelperJobs::getAimeos();
 
-		$this->object = new \Aimeos\Controller\Jobs\Order\Service\Delivery\Standard( $context, $aimeos );
+		$this->object = new \Aimeos\Controller\Jobs\Order\Service\Delivery\Standard($context, $aimeos);
 	}
 
 
@@ -32,14 +32,14 @@ 
 
 	public function testGetName()
 	{
-		$this->assertEquals( 'Process order delivery services', $this->object->getName() );
+		$this->assertEquals('Process order delivery services', $this->object->getName());
 	}
 
 
 	public function testGetDescription()
 	{
 		$text = 'Sends paid orders to the ERP system or logistic partner';
-		$this->assertEquals( $text, $this->object->getDescription() );
+		$this->assertEquals($text, $this->object->getDescription());
 	}
 
 
@@ -50,47 +50,47 @@ 
 
 
 		$name = 'ControllerJobsServiceDeliveryProcessDefaultRun';
-		$context->getConfig()->set( 'mshop/service/manager/name', $name );
-		$context->getConfig()->set( 'mshop/order/manager/name', $name );
+		$context->getConfig()->set('mshop/service/manager/name', $name);
+		$context->getConfig()->set('mshop/order/manager/name', $name);
 
 
-		$serviceManagerStub = $this->getMockBuilder( '\\Aimeos\\MShop\\Service\\Manager\\Standard' )
-			->setMethods( array( 'getProvider', 'searchItems' ) )
-			->setConstructorArgs( array( $context ) )
+		$serviceManagerStub = $this->getMockBuilder('\\Aimeos\\MShop\\Service\\Manager\\Standard')
+			->setMethods(array('getProvider', 'searchItems'))
+			->setConstructorArgs(array($context))
 			->getMock();
 
-		$orderManagerStub = $this->getMockBuilder( '\\Aimeos\\MShop\\Order\\Manager\\Standard' )
-			->setMethods( array( 'saveItems', 'searchItems' ) )
-			->setConstructorArgs( array( $context ) )
+		$orderManagerStub = $this->getMockBuilder('\\Aimeos\\MShop\\Order\\Manager\\Standard')
+			->setMethods(array('saveItems', 'searchItems'))
+			->setConstructorArgs(array($context))
 			->getMock();
 
-		\Aimeos\MShop\Service\Manager\Factory::injectManager( '\\Aimeos\\MShop\\Service\\Manager\\' . $name, $serviceManagerStub );
-		\Aimeos\MShop\Order\Manager\Factory::injectManager( '\\Aimeos\\MShop\\Order\\Manager\\' . $name, $orderManagerStub );
+		\Aimeos\MShop\Service\Manager\Factory::injectManager('\\Aimeos\\MShop\\Service\\Manager\\' . $name, $serviceManagerStub);
+		\Aimeos\MShop\Order\Manager\Factory::injectManager('\\Aimeos\\MShop\\Order\\Manager\\' . $name, $orderManagerStub);
 
 
 		$serviceItem = $serviceManagerStub->createItem();
 		$orderItem = $orderManagerStub->createItem();
 
-		$serviceProviderStub = $this->getMockBuilder( '\\Aimeos\\MShop\\Service\\Provider\\Delivery\\Manual' )
-			->setConstructorArgs( array( $context, $serviceItem ) )
+		$serviceProviderStub = $this->getMockBuilder('\\Aimeos\\MShop\\Service\\Provider\\Delivery\\Manual')
+			->setConstructorArgs(array($context, $serviceItem))
 			->getMock();
 
 
-		$serviceManagerStub->expects( $this->once() )->method( 'searchItems' )
-			->will( $this->onConsecutiveCalls( array( $serviceItem ), [] ) );
+		$serviceManagerStub->expects($this->once())->method('searchItems')
+			->will($this->onConsecutiveCalls(array($serviceItem), []));
 
-		$serviceManagerStub->expects( $this->once() )->method( 'getProvider' )
-			->will( $this->returnValue( $serviceProviderStub ) );
+		$serviceManagerStub->expects($this->once())->method('getProvider')
+			->will($this->returnValue($serviceProviderStub));
 
-		$orderManagerStub->expects( $this->once() )->method( 'searchItems' )
-			->will( $this->onConsecutiveCalls( array( $orderItem ), [] ) );
+		$orderManagerStub->expects($this->once())->method('searchItems')
+			->will($this->onConsecutiveCalls(array($orderItem), []));
 
-		$serviceProviderStub->expects( $this->once() )->method( 'processBatch' );
+		$serviceProviderStub->expects($this->once())->method('processBatch');
 
-		$orderManagerStub->expects( $this->once() )->method( 'saveItems' );
+		$orderManagerStub->expects($this->once())->method('saveItems');
 
 
-		$object = new \Aimeos\Controller\Jobs\Order\Service\Delivery\Standard( $context, $aimeos );
+		$object = new \Aimeos\Controller\Jobs\Order\Service\Delivery\Standard($context, $aimeos);
 		$object->run();
 	}
 
@@ -102,48 +102,48 @@ 
 
 
 		$name = 'ControllerJobsServiceDeliveryProcessDefaultRun';
-		$context->getConfig()->set( 'mshop/service/manager/name', $name );
-		$context->getConfig()->set( 'mshop/order/manager/name', $name );
+		$context->getConfig()->set('mshop/service/manager/name', $name);
+		$context->getConfig()->set('mshop/order/manager/name', $name);
 
 
-		$orderManagerStub = $this->getMockBuilder( '\\Aimeos\\MShop\\Order\\Manager\\Standard' )
-			->setMethods( array( 'saveItems', 'searchItems' ) )
-			->setConstructorArgs( array( $context ) )
+		$orderManagerStub = $this->getMockBuilder('\\Aimeos\\MShop\\Order\\Manager\\Standard')
+			->setMethods(array('saveItems', 'searchItems'))
+			->setConstructorArgs(array($context))
 			->getMock();
 
-		$serviceManagerStub = $this->getMockBuilder( '\\Aimeos\\MShop\\Service\\Manager\\Standard' )
-			->setMethods( array( 'getProvider', 'searchItems' ) )
-			->setConstructorArgs( array( $context ) )
+		$serviceManagerStub = $this->getMockBuilder('\\Aimeos\\MShop\\Service\\Manager\\Standard')
+			->setMethods(array('getProvider', 'searchItems'))
+			->setConstructorArgs(array($context))
 			->getMock();
 
-		\Aimeos\MShop\Service\Manager\Factory::injectManager( '\\Aimeos\\MShop\\Service\\Manager\\' . $name, $serviceManagerStub );
-		\Aimeos\MShop\Order\Manager\Factory::injectManager( '\\Aimeos\\MShop\\Order\\Manager\\' . $name, $orderManagerStub );
+		\Aimeos\MShop\Service\Manager\Factory::injectManager('\\Aimeos\\MShop\\Service\\Manager\\' . $name, $serviceManagerStub);
+		\Aimeos\MShop\Order\Manager\Factory::injectManager('\\Aimeos\\MShop\\Order\\Manager\\' . $name, $orderManagerStub);
 
 
 		$serviceItem = $serviceManagerStub->createItem();
 		$orderItem = $orderManagerStub->createItem();
 
-		$serviceProviderStub = $this->getMockBuilder( '\\Aimeos\\MShop\\Service\\Provider\\Delivery\\Manual' )
-			->setConstructorArgs( array( $context, $serviceItem ) )
+		$serviceProviderStub = $this->getMockBuilder('\\Aimeos\\MShop\\Service\\Provider\\Delivery\\Manual')
+			->setConstructorArgs(array($context, $serviceItem))
 			->getMock();
 
 
-		$serviceManagerStub->expects( $this->once() )->method( 'searchItems' )
-			->will( $this->onConsecutiveCalls( array( $serviceItem ), [] ) );
+		$serviceManagerStub->expects($this->once())->method('searchItems')
+			->will($this->onConsecutiveCalls(array($serviceItem), []));
 
-		$serviceManagerStub->expects( $this->once() )->method( 'getProvider' )
-			->will( $this->returnValue( $serviceProviderStub ) );
+		$serviceManagerStub->expects($this->once())->method('getProvider')
+			->will($this->returnValue($serviceProviderStub));
 
-		$orderManagerStub->expects( $this->once() )->method( 'searchItems' )
-			->will( $this->onConsecutiveCalls( array( $orderItem ), [] ) );
+		$orderManagerStub->expects($this->once())->method('searchItems')
+			->will($this->onConsecutiveCalls(array($orderItem), []));
 
-		$serviceProviderStub->expects( $this->once() )->method( 'processBatch' )
-			->will( $this->throwException( new \Aimeos\MShop\Service\Exception( 'test order service delivery: process' ) ) );
+		$serviceProviderStub->expects($this->once())->method('processBatch')
+			->will($this->throwException(new \Aimeos\MShop\Service\Exception('test order service delivery: process')));
 
-		$orderManagerStub->expects( $this->never() )->method( 'saveItems' );
+		$orderManagerStub->expects($this->never())->method('saveItems');
 
 
-		$object = new \Aimeos\Controller\Jobs\Order\Service\Delivery\Standard( $context, $aimeos );
+		$object = new \Aimeos\Controller\Jobs\Order\Service\Delivery\Standard($context, $aimeos);
 		$object->run();
 	}
 
@@ -155,36 +155,36 @@ 
 
 
 		$name = 'ControllerJobsServiceDeliveryProcessDefaultRun';
-		$context->getConfig()->set( 'mshop/service/manager/name', $name );
-		$context->getConfig()->set( 'mshop/order/manager/name', $name );
+		$context->getConfig()->set('mshop/service/manager/name', $name);
+		$context->getConfig()->set('mshop/order/manager/name', $name);
 
 
-		$orderManagerStub = $this->getMockBuilder( '\\Aimeos\\MShop\\Order\\Manager\\Standard' )
-			->setMethods( array( 'saveItem', 'searchItems' ) )
-			->setConstructorArgs( array( $context ) )
+		$orderManagerStub = $this->getMockBuilder('\\Aimeos\\MShop\\Order\\Manager\\Standard')
+			->setMethods(array('saveItem', 'searchItems'))
+			->setConstructorArgs(array($context))
 			->getMock();
 
-		$serviceManagerStub = $this->getMockBuilder( '\\Aimeos\\MShop\\Service\\Manager\\Standard' )
-			->setMethods( array( 'getProvider', 'searchItems' ) )
-			->setConstructorArgs( array( $context ) )
+		$serviceManagerStub = $this->getMockBuilder('\\Aimeos\\MShop\\Service\\Manager\\Standard')
+			->setMethods(array('getProvider', 'searchItems'))
+			->setConstructorArgs(array($context))
 			->getMock();
 
-		\Aimeos\MShop\Service\Manager\Factory::injectManager( '\\Aimeos\\MShop\\Service\\Manager\\' . $name, $serviceManagerStub );
-		\Aimeos\MShop\Order\Manager\Factory::injectManager( '\\Aimeos\\MShop\\Order\\Manager\\' . $name, $orderManagerStub );
+		\Aimeos\MShop\Service\Manager\Factory::injectManager('\\Aimeos\\MShop\\Service\\Manager\\' . $name, $serviceManagerStub);
+		\Aimeos\MShop\Order\Manager\Factory::injectManager('\\Aimeos\\MShop\\Order\\Manager\\' . $name, $orderManagerStub);
 
 
 		$serviceItem = $serviceManagerStub->createItem();
 
-		$serviceManagerStub->expects( $this->once() )->method( 'searchItems' )
-			->will( $this->onConsecutiveCalls( array( $serviceItem ), [] ) );
+		$serviceManagerStub->expects($this->once())->method('searchItems')
+			->will($this->onConsecutiveCalls(array($serviceItem), []));
 
-		$serviceManagerStub->expects( $this->once() )->method( 'getProvider' )
-			->will( $this->throwException( new \Aimeos\MShop\Service\Exception( 'test sorder service delivery: getProvider' ) ) );
+		$serviceManagerStub->expects($this->once())->method('getProvider')
+			->will($this->throwException(new \Aimeos\MShop\Service\Exception('test sorder service delivery: getProvider')));
 
-		$orderManagerStub->expects( $this->never() )->method( 'searchItems' );
+		$orderManagerStub->expects($this->never())->method('searchItems');
 
 
-		$object = new \Aimeos\Controller\Jobs\Order\Service\Delivery\Standard( $context, $aimeos );
+		$object = new \Aimeos\Controller\Jobs\Order\Service\Delivery\Standard($context, $aimeos);
 		$object->run();
 	}
 }

controller/jobs/src/Controller/Jobs/Subscription/Process/Renew/Standard.php

Spacing +73 added lines, -73 removed lines

@@ -28,7 +28,7 @@ 
 	 */
 	public function getName()
 	{
-		return $this->getContext()->getI18n()->dt( 'controller/jobs', 'Subscription process renew' );
+		return $this->getContext()->getI18n()->dt('controller/jobs', 'Subscription process renew');
 	}
 
 
@@ -39,7 +39,7 @@ 
 	 */
 	public function getDescription()
 	{
-		return $this->getContext()->getI18n()->dt( 'controller/jobs', 'Renews subscriptions at next date' );
+		return $this->getContext()->getI18n()->dt('controller/jobs', 'Renews subscriptions at next date');
 	}
 
 
@@ -54,73 +54,73 @@ 
 		$config = $context->getConfig();
 		$logger = $context->getLogger();
 
-		$names = (array) $config->get( 'controller/common/subscription/process/processors', [] );
+		$names = (array) $config->get('controller/common/subscription/process/processors', []);
 
-		$date = date( 'Y-m-d' );
-		$processors = $this->getProcessors( $names );
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'subscription' );
+		$date = date('Y-m-d');
+		$processors = $this->getProcessors($names);
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'subscription');
 
-		$search = $manager->createSearch( true );
+		$search = $manager->createSearch(true);
 		$expr = [
-			$search->compare( '<=', 'subscription.datenext', $date ),
-			$search->combine( '||', [
-				$search->compare( '==', 'subscription.dateend', null ),
-				$search->compare( '>', 'subscription.dateend', $date ),
-			] ),
+			$search->compare('<=', 'subscription.datenext', $date),
+			$search->combine('||', [
+				$search->compare('==', 'subscription.dateend', null),
+				$search->compare('>', 'subscription.dateend', $date),
+			]),
 			$search->getConditions(),
 		];
-		$search->setConditions( $search->combine( '&&', $expr ) );
-		$search->setSortations( [$search->sort( '+', 'subscription.id' )] );
+		$search->setConditions($search->combine('&&', $expr));
+		$search->setSortations([$search->sort('+', 'subscription.id')]);
 
 		$start = 0;
 
 		do
 		{
-			$search->setSlice( $start, 100 );
-			$items = $manager->searchItems( $search );
+			$search->setSlice($start, 100);
+			$items = $manager->searchItems($search);
 
-			foreach( $items as $item )
+			foreach ($items as $item)
 			{
 				try
 				{
-					$context = $this->createContext( $item->getOrderBaseId() );
-					$newOrder = $this->createOrderBase( $context, $item );
-					$newInvoice = $this->createOrderInvoice( $context, $newOrder );
+					$context = $this->createContext($item->getOrderBaseId());
+					$newOrder = $this->createOrderBase($context, $item);
+					$newInvoice = $this->createOrderInvoice($context, $newOrder);
 
 					try
 					{
-						$this->createPayment( $context, $newOrder, $newInvoice );
+						$this->createPayment($context, $newOrder, $newInvoice);
 
-						$interval = new \DateInterval( $item->getInterval() );
-						$item->setDateNext( date_create()->add( $interval )->format( 'Y-m-d' ) );
+						$interval = new \DateInterval($item->getInterval());
+						$item->setDateNext(date_create()->add($interval)->format('Y-m-d'));
 					}
-					catch( \Exception $e )
+					catch (\Exception $e)
 					{
-						$item->setReason( \Aimeos\MShop\Subscription\Item\Iface::REASON_PAYMENT );
-						$item->setDateEnd( date_create()->format( 'Y-m-d' ) );
-						$manager->saveItem( $item );
+						$item->setReason(\Aimeos\MShop\Subscription\Item\Iface::REASON_PAYMENT);
+						$item->setDateEnd(date_create()->format('Y-m-d'));
+						$manager->saveItem($item);
 
 						throw $e;
 					}
 
-					$manager->saveItem( $item );
+					$manager->saveItem($item);
 
-					foreach( $processors as $processor ) {
-						$processor->renew( $item, $newInvoice );
+					foreach ($processors as $processor) {
+						$processor->renew($item, $newInvoice);
 					}
 				}
-				catch( \Exception $e )
+				catch (\Exception $e)
 				{
 					$msg = 'Unable to process subscription with ID "%1$s": %2$s';
-					$logger->log( sprintf( $msg, $item->getId(), $e->getMessage() ) );
-					$logger->log( $e->getTraceAsString() );
+					$logger->log(sprintf($msg, $item->getId(), $e->getMessage()));
+					$logger->log($e->getTraceAsString());
 				}
 			}
 
-			$count = count( $items );
+			$count = count($items);
 			$start += $count;
 		}
-		while( $count === $search->getSliceSize() );
+		while ($count === $search->getSliceSize());
 	}
 
 
@@ -130,30 +130,30 @@ 
 	 * @param string $baseId Unique order base ID
 	 * @return \Aimeos\MShop\Context\Item\Iface New context object
 	 */
-	protected function createContext( $baseId )
+	protected function createContext($baseId)
 	{
 		$context = clone $this->getContext();
 
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'order/base' );
-		$baseItem = $manager->getItem( $baseId );
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'order/base');
+		$baseItem = $manager->getItem($baseId);
 
 		$locale = $baseItem->getLocale();
 		$level = \Aimeos\MShop\Locale\Manager\Base::SITE_ALL;
 
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'locale' );
-		$locale = $manager->bootstrap( $baseItem->getSiteCode(), $locale->getLanguageId(), $locale->getCurrencyId(), false, $level );
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'locale');
+		$locale = $manager->bootstrap($baseItem->getSiteCode(), $locale->getLanguageId(), $locale->getCurrencyId(), false, $level);
 
-		$context->setLocale( $locale );
+		$context->setLocale($locale);
 
 		try
 		{
-			$manager = \Aimeos\MShop\Factory::createManager( $context, 'customer' );
-			$customerItem = $manager->getItem( $baseItem->getCustomerId(), ['customer/group'] );
+			$manager = \Aimeos\MShop\Factory::createManager($context, 'customer');
+			$customerItem = $manager->getItem($baseItem->getCustomerId(), ['customer/group']);
 
-			$context->setUserId( $baseItem->getCustomerId() );
-			$context->setGroupIds( $customerItem->getGroups() );
+			$context->setUserId($baseItem->getCustomerId());
+			$context->setGroupIds($customerItem->getGroups());
 		}
-		catch( \Exception $e ) {} // Subscription without account
+		catch (\Exception $e) {} // Subscription without account
 
 		return $context;
 	}
@@ -166,38 +166,38 @@ 
 	 * @param \Aimeos\MShop\Subscription\Item\Iface $subscription Subscription item with order base ID and order product ID
 	 * @return \Aimeos\MShop\Order\Item\Base\Iface Complete order with product, addresses and services saved to the storage
 	 */
-	protected function createOrderBase( \Aimeos\MShop\Context\Item\Iface $context, \Aimeos\MShop\Subscription\Item\Iface $subscription )
+	protected function createOrderBase(\Aimeos\MShop\Context\Item\Iface $context, \Aimeos\MShop\Subscription\Item\Iface $subscription)
 	{
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'order/base' );
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'order/base');
 
-		$basket = $manager->load( $subscription->getOrderBaseId() );
+		$basket = $manager->load($subscription->getOrderBaseId());
 
 		$newBasket = $manager->createItem();
-		$newBasket->setCustomerId( $basket->getCustomerId() );
+		$newBasket->setCustomerId($basket->getCustomerId());
 
-		foreach( $basket->getProducts() as $orderProduct )
+		foreach ($basket->getProducts() as $orderProduct)
 		{
-			if( $orderProduct->getId() === $subscription->getOrderProductId() )
+			if ($orderProduct->getId() === $subscription->getOrderProductId())
 			{
-				foreach( $orderProduct->getAttributeItems() as $attrItem ) {
-					$attrItem->setId( null );
+				foreach ($orderProduct->getAttributeItems() as $attrItem) {
+					$attrItem->setId(null);
 				}
-				$newBasket->addProduct( $orderProduct->setId( null ) );
+				$newBasket->addProduct($orderProduct->setId(null));
 			}
 		}
 
-		foreach( $basket->getAddresses() as $type => $orderAddress ) {
-			$newBasket->setAddress( $orderAddress, $type );
+		foreach ($basket->getAddresses() as $type => $orderAddress) {
+			$newBasket->setAddress($orderAddress, $type);
 		}
 
-		foreach( $basket->getServices() as $type => $orderServices )
+		foreach ($basket->getServices() as $type => $orderServices)
 		{
-			foreach( $orderServices as $orderService ) {
-				$newBasket->addService( $orderService, $type );
+			foreach ($orderServices as $orderService) {
+				$newBasket->addService($orderService, $type);
 			}
 		}
 
-		return $manager->store( $newBasket );
+		return $manager->store($newBasket);
 	}
 
 
@@ -208,15 +208,15 @@ 
 	 * @param \Aimeos\MShop\Order\Item\Base\Iface $basket Complete order with product, addresses and services saved to the storage
 	 * @return \Aimeos\MShop\Order\Item\Iface New invoice item associated to the order saved to the storage
 	 */
-	protected function createOrderInvoice( \Aimeos\MShop\Context\Item\Iface $context, \Aimeos\MShop\Order\Item\Base\Iface $basket )
+	protected function createOrderInvoice(\Aimeos\MShop\Context\Item\Iface $context, \Aimeos\MShop\Order\Item\Base\Iface $basket)
 	{
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'order' );
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'order');
 
 		$item = $manager->createItem();
-		$item->setBaseId( $basket->getId() );
-		$item->setType( 'subscription' );
+		$item->setBaseId($basket->getId());
+		$item->setType('subscription');
 
-		return $manager->saveItem( $item );
+		return $manager->saveItem($item);
 	}
 
 
@@ -227,17 +227,17 @@ 
 	 * @param \Aimeos\MShop\Order\Item\Base\Iface $basket Complete order with product, addresses and services
 	 * @param \Aimeos\MShop\Order\Item\Iface New invoice item associated to the order
 	 */
-	protected function createPayment( \Aimeos\MShop\Context\Item\Iface $context, \Aimeos\MShop\Order\Item\Base\Iface $basket,
-		\Aimeos\MShop\Order\Item\Iface $invoice )
+	protected function createPayment(\Aimeos\MShop\Context\Item\Iface $context, \Aimeos\MShop\Order\Item\Base\Iface $basket,
+		\Aimeos\MShop\Order\Item\Iface $invoice)
 	{
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'service' );
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'service');
 
-		foreach( $basket->getService( \Aimeos\MShop\Order\Item\Base\Service\Base::TYPE_PAYMENT ) as $service )
+		foreach ($basket->getService(\Aimeos\MShop\Order\Item\Base\Service\Base::TYPE_PAYMENT) as $service)
 		{
-			$item = $manager->getItem( $service->getServiceId() );
-			$provider = $manager->getProvider( $item, 'payment' );
+			$item = $manager->getItem($service->getServiceId());
+			$provider = $manager->getProvider($item, 'payment');
 
-			$provider->repay( $invoice );
+			$provider->repay($invoice);
 		}
 	}
 }

Braces +3 added lines, -6 removed lines

@@ -93,8 +93,7 @@ 
 
 						$interval = new \DateInterval( $item->getInterval() );
 						$item->setDateNext( date_create()->add( $interval )->format( 'Y-m-d' ) );
-					}
-					catch( \Exception $e )
+					} catch( \Exception $e )
 					{
 						$item->setReason( \Aimeos\MShop\Subscription\Item\Iface::REASON_PAYMENT );
 						$item->setDateEnd( date_create()->format( 'Y-m-d' ) );
@@ -108,8 +107,7 @@ 
 					foreach( $processors as $processor ) {
 						$processor->renew( $item, $newInvoice );
 					}
-				}
-				catch( \Exception $e )
+				} catch( \Exception $e )
 				{
 					$msg = 'Unable to process subscription with ID "%1$s": %2$s';
 					$logger->log( sprintf( $msg, $item->getId(), $e->getMessage() ) );
@@ -152,8 +150,7 @@ 
 
 			$context->setUserId( $baseItem->getCustomerId() );
 			$context->setGroupIds( $customerItem->getGroups() );
-		}
-		catch( \Exception $e ) {} // Subscription without account
+		} catch( \Exception $e ) {} // Subscription without account
 
 		return $context;
 	}

controller/jobs/src/Controller/Jobs/Order/Service/Delivery/Standard.php

Spacing +30 added lines, -30 removed lines

@@ -29,7 +29,7 @@ 
 	 */
 	public function getName()
 	{
-		return $this->getContext()->getI18n()->dt( 'controller/jobs', 'Process order delivery services' );
+		return $this->getContext()->getI18n()->dt('controller/jobs', 'Process order delivery services');
 	}
 
 
@@ -40,7 +40,7 @@ 
 	 */
 	public function getDescription()
 	{
-		return $this->getContext()->getI18n()->dt( 'controller/jobs', 'Sends paid orders to the ERP system or logistic partner' );
+		return $this->getContext()->getI18n()->dt('controller/jobs', 'Sends paid orders to the ERP system or logistic partner');
 	}
 
 
@@ -69,8 +69,8 @@ 
 		 * @see controller/jobs/order/email/delivery/standard/limit-days
 		 * @see controller/jobs/order/service/delivery/batch-max
 		 */
-		$days = $context->getConfig()->get( 'controller/jobs/order/service/delivery/limit-days', 90 );
-		$date = date( 'Y-m-d 00:00:00', time() - 86400 * $days );
+		$days = $context->getConfig()->get('controller/jobs/order/service/delivery/limit-days', 90);
+		$date = date('Y-m-d 00:00:00', time() - 86400 * $days);
 
 		/** controller/jobs/order/service/delivery/batch-max
 		 * Maximum number of orders processed at once by the delivery service provider
@@ -85,71 +85,71 @@ 
 		 * @category Developer
 		 * @see controller/jobs/order/service/delivery/limit-days
 		 */
-		$maxItems = $context->getConfig()->get( 'controller/jobs/order/service/delivery/batch-max', 100 );
+		$maxItems = $context->getConfig()->get('controller/jobs/order/service/delivery/batch-max', 100);
 
 
-		$serviceManager = \Aimeos\MShop\Service\Manager\Factory::createManager( $context );
+		$serviceManager = \Aimeos\MShop\Service\Manager\Factory::createManager($context);
 		$serviceSearch = $serviceManager->createSearch();
-		$serviceSearch->setConditions( $serviceSearch->compare( '==', 'service.type.code', 'delivery' ) );
+		$serviceSearch->setConditions($serviceSearch->compare('==', 'service.type.code', 'delivery'));
 
-		$orderManager = \Aimeos\MShop\Order\Manager\Factory::createManager( $context );
+		$orderManager = \Aimeos\MShop\Order\Manager\Factory::createManager($context);
 		$orderSearch = $orderManager->createSearch();
 
 		$start = 0;
 
 		do
 		{
-			$serviceItems = $serviceManager->searchItems( $serviceSearch );
+			$serviceItems = $serviceManager->searchItems($serviceSearch);
 
-			foreach( $serviceItems as $serviceItem )
+			foreach ($serviceItems as $serviceItem)
 			{
 				try
 				{
-					$serviceProvider = $serviceManager->getProvider( $serviceItem, $serviceItem->getType() );
+					$serviceProvider = $serviceManager->getProvider($serviceItem, $serviceItem->getType());
 
 					$expr = array(
-						$orderSearch->compare( '>', 'order.datepayment', $date ),
-						$orderSearch->compare( '>', 'order.statuspayment', \Aimeos\MShop\Order\Item\Base::PAY_PENDING ),
-						$orderSearch->compare( '==', 'order.statusdelivery', \Aimeos\MShop\Order\Item\Base::STAT_UNFINISHED ),
-						$orderSearch->compare( '==', 'order.base.service.code', $serviceItem->getCode() ),
-						$orderSearch->compare( '==', 'order.base.service.type', 'delivery' ),
+						$orderSearch->compare('>', 'order.datepayment', $date),
+						$orderSearch->compare('>', 'order.statuspayment', \Aimeos\MShop\Order\Item\Base::PAY_PENDING),
+						$orderSearch->compare('==', 'order.statusdelivery', \Aimeos\MShop\Order\Item\Base::STAT_UNFINISHED),
+						$orderSearch->compare('==', 'order.base.service.code', $serviceItem->getCode()),
+						$orderSearch->compare('==', 'order.base.service.type', 'delivery'),
 					);
-					$orderSearch->setConditions( $orderSearch->combine( '&&', $expr ) );
+					$orderSearch->setConditions($orderSearch->combine('&&', $expr));
 
 					$orderStart = 0;
 
 					do
 					{
-						$orderSearch->setSlice( $orderStart, $maxItems );
-						$orderItems = $orderManager->searchItems( $orderSearch );
+						$orderSearch->setSlice($orderStart, $maxItems);
+						$orderItems = $orderManager->searchItems($orderSearch);
 
 						try
 						{
-							$serviceProvider->processBatch( $orderItems );
-							$orderManager->saveItems( $orderItems );
+							$serviceProvider->processBatch($orderItems);
+							$orderManager->saveItems($orderItems);
 						}
-						catch( \Exception $e )
+						catch (\Exception $e)
 						{
 							$str = 'Error while processing orders: %2$s';
-							$context->getLogger()->log( sprintf( $str, $e->getMessage() ) );
+							$context->getLogger()->log(sprintf($str, $e->getMessage()));
 						}
 
-						$orderCount = count( $orderItems );
+						$orderCount = count($orderItems);
 						$orderStart += $orderCount;
 					}
-					while( $orderCount >= $orderSearch->getSliceSize() );
+					while ($orderCount >= $orderSearch->getSliceSize());
 				}
-				catch( \Exception $e )
+				catch (\Exception $e)
 				{
 					$str = 'Error while processing service with ID "%1$s": %2$s';
-					$context->getLogger()->log( sprintf( $str, $serviceItem->getId(), $e->getMessage() ) );
+					$context->getLogger()->log(sprintf($str, $serviceItem->getId(), $e->getMessage()));
 				}
 			}
 
-			$count = count( $serviceItems );
+			$count = count($serviceItems);
 			$start += $count;
-			$serviceSearch->setSlice( $start );
+			$serviceSearch->setSlice($start);
 		}
-		while( $count >= $serviceSearch->getSliceSize() );
+		while ($count >= $serviceSearch->getSliceSize());
 	}
 }

Braces +2 added lines, -4 removed lines

@@ -127,8 +127,7 @@ 
 						{
 							$serviceProvider->processBatch( $orderItems );
 							$orderManager->saveItems( $orderItems );
-						}
-						catch( \Exception $e )
+						} catch( \Exception $e )
 						{
 							$str = 'Error while processing orders: %2$s';
 							$context->getLogger()->log( sprintf( $str, $e->getMessage() ) );
@@ -138,8 +137,7 @@ 
 						$orderStart += $orderCount;
 					}
 					while( $orderCount >= $orderSearch->getSliceSize() );
-				}
-				catch( \Exception $e )
+				} catch( \Exception $e )
 				{
 					$str = 'Error while processing service with ID "%1$s": %2$s';
 					$context->getLogger()->log( sprintf( $str, $serviceItem->getId(), $e->getMessage() ) );