aimeos / ai-controller-jobs

controller/common/src/Controller/Common/Subscription/Export/Csv/Processor/Product/Standard.php

Spacing +9 added lines, -9 removed lines

@@ -40,24 +40,24 @@ 
 	 * @param \Aimeos\MShop\Order\Item\Base\Iface $order Full order with associated items
 	 * @return array Two dimensional associative list of order data representing the lines in CSV
 	 */
-	public function process( \Aimeos\MShop\Subscription\Item\Iface $subscription, \Aimeos\MShop\Order\Item\Base\Iface $order )
+	public function process(\Aimeos\MShop\Subscription\Item\Iface $subscription, \Aimeos\MShop\Order\Item\Base\Iface $order)
 	{
 		$result = [];
 
-		foreach( $order->getProducts() as $item )
+		foreach ($order->getProducts() as $item)
 		{
-			if( $subscription->getOrderProductId() != $item->getId() ) {
+			if ($subscription->getOrderProductId() != $item->getId()) {
 				continue;
 			}
 
 			$data = [];
 			$list = $item->toArray();
 
-			foreach( $item->getAttributes() as $attrItem )
+			foreach ($item->getAttributes() as $attrItem)
 			{
-				foreach( $attrItem->toArray() as $key => $value )
+				foreach ($attrItem->toArray() as $key => $value)
 				{
-					if( isset( $list[$key] ) ) {
+					if (isset($list[$key])) {
 						$list[$key] .= "\n" . $value;
 					} else {
 						$list[$key] = $value;
@@ -65,16 +65,16 @@ 
 				}
 			}
 
-			foreach( $this->getMapping() as $pos => $key )
+			foreach ($this->getMapping() as $pos => $key)
 			{
-				if( array_key_exists( $key, $list ) ) {
+				if (array_key_exists($key, $list)) {
 					$data[$pos] = $list[$key];
 				} else {
 					$data[$pos] = '';
 				}
 			}
 
-			ksort( $data );
+			ksort($data);
 			$result[] = $data;
 		}
 

controller/common/src/Controller/Common/Subscription/Export/Csv/Processor/Base.php

Spacing +1 added lines, -1 removed lines

@@ -29,7 +29,7 @@
 	 * @param \Aimeos\MShop\Context\Item\Iface $context Context object
 	 * @param array $mapping Associative list of field position in CSV as key and domain item key as value
 	 */
-	public function __construct( \Aimeos\MShop\Context\Item\Iface $context, array $mapping )
+	public function __construct(\Aimeos\MShop\Context\Item\Iface $context, array $mapping)
 	{
 		$this->context = $context;
 		$this->mapping = $mapping;

controller/common/src/Controller/Common/Subscription/Export/Csv/Processor/Iface.php

Spacing +2 added lines, -2 removed lines

@@ -25,7 +25,7 @@ 
 	 * @param \Aimeos\MShop\Context\Item\Iface $context Context object
 	 * @param array $mapping Associative list of field position in CSV as key and domain item key as value
 	 */
-	public function __construct( \Aimeos\MShop\Context\Item\Iface $context, array $mapping );
+	public function __construct(\Aimeos\MShop\Context\Item\Iface $context, array $mapping);
 
 
 	/**
@@ -35,5 +35,5 @@ 
 	 * @param \Aimeos\MShop\Order\Item\Base\Iface $order Full order with associated items
 	 * @return array Two dimensional associative list of order data representing the lines in CSV
 	 */
-	public function process( \Aimeos\MShop\Subscription\Item\Iface $subscription, \Aimeos\MShop\Order\Item\Base\Iface $order );
+	public function process(\Aimeos\MShop\Subscription\Item\Iface $subscription, \Aimeos\MShop\Order\Item\Base\Iface $order);
 }
\ No newline at end of file

controller/common/src/Controller/Common/Subscription/Export/Csv/Processor/Subscription/Standard.php

Spacing +4 added lines, -4 removed lines

@@ -40,21 +40,21 @@
 	 * @param \Aimeos\MShop\Order\Item\Base\Iface $order Full order with associated items
 	 * @return array Two dimensional associative list of subscription data representing the lines in CSV
 	 */
-	public function process( \Aimeos\MShop\Subscription\Item\Iface $subscription, \Aimeos\MShop\Order\Item\Base\Iface $order )
+	public function process(\Aimeos\MShop\Subscription\Item\Iface $subscription, \Aimeos\MShop\Order\Item\Base\Iface $order)
 	{
 		$result = [];
 		$list = $subscription->toArray() + $order->toArray();
 
-		foreach( $this->getMapping() as $pos => $key )
+		foreach ($this->getMapping() as $pos => $key)
 		{
-			if( array_key_exists( $key, $list ) ) {
+			if (array_key_exists($key, $list)) {
 				$result[$pos] = $list[$key];
 			} else {
 				$result[$pos] = '';
 			}
 		}
 
-		ksort( $result );
+		ksort($result);
 
 		return [$result];
 	}

controller/common/tests/Controller/Common/Subscription/Export/Csv/Processor/Address/StandardTest.php

Spacing +61 added lines, -61 removed lines

@@ -38,77 +38,77 @@
 		);
 
 
-		$object = new \Aimeos\Controller\Common\Subscription\Export\Csv\Processor\Address\Standard( $context, $mapping );
-
-		$subscription = $this->getSubscription( $context );
-		$order = \Aimeos\MShop\Factory::createManager( $context, 'order/base' )->load( $subscription->getOrderBaseId() );
-
-		$data = $object->process( $subscription, $order );
-
-
-		$this->assertEquals( 2, count( $data ) );
-
-		$this->assertEquals( 21, count( $data[0] ) );
-		$this->assertEquals( 'payment', $data[0][0] );
-		$this->assertEquals( 'mr', $data[0][1] );
-		$this->assertEquals( '', $data[0][2] );
-		$this->assertEquals( '', $data[0][3] );
-		$this->assertEquals( '', $data[0][4] );
-		$this->assertEquals( 'Our', $data[0][5] );
-		$this->assertEquals( 'Unittest', $data[0][6] );
-		$this->assertEquals( 'Durchschnitt', $data[0][7] );
-		$this->assertEquals( '1', $data[0][8] );
-		$this->assertEquals( '', $data[0][9] );
-		$this->assertEquals( '20146', $data[0][10] );
-		$this->assertEquals( 'Hamburg', $data[0][11] );
-		$this->assertEquals( 'Hamburg', $data[0][12] );
-		$this->assertEquals( 'DE', $data[0][13] );
-		$this->assertEquals( 'de', $data[0][14] );
-		$this->assertEquals( '055544332211', $data[0][15] );
-		$this->assertEquals( '055544332213', $data[0][16] );
-		$this->assertEquals( 'test@example.com', $data[0][17] );
-		$this->assertEquals( 'www.metaways.net', $data[0][18] );
-		$this->assertEquals( '11.000000', $data[0][19] );
-		$this->assertEquals( '52.000000', $data[0][20] );
-
-		$this->assertEquals( 21, count( $data[1] ) );
-		$this->assertEquals( 'delivery', $data[1][0] );
-		$this->assertEquals( 'mr', $data[1][1] );
-		$this->assertEquals( 'Example company', $data[1][2] );
-		$this->assertEquals( 'DE999999999', $data[1][3] );
-		$this->assertEquals( 'Dr.', $data[1][4] );
-		$this->assertEquals( 'Our', $data[1][5] );
-		$this->assertEquals( 'Unittest', $data[1][6] );
-		$this->assertEquals( 'Pickhuben', $data[1][7] );
-		$this->assertEquals( '2-4', $data[1][8] );
-		$this->assertEquals( '', $data[1][9] );
-		$this->assertEquals( '20457', $data[1][10] );
-		$this->assertEquals( 'Hamburg', $data[1][11] );
-		$this->assertEquals( 'Hamburg', $data[1][12] );
-		$this->assertEquals( 'DE', $data[1][13] );
-		$this->assertEquals( 'de', $data[1][14] );
-		$this->assertEquals( '055544332211', $data[1][15] );
-		$this->assertEquals( '055544332212', $data[1][16] );
-		$this->assertEquals( 'test@example.com', $data[1][17] );
-		$this->assertEquals( 'www.example.com', $data[1][18] );
-		$this->assertEquals( '10.000000', $data[1][19] );
-		$this->assertEquals( '50.000000', $data[1][20] );
+		$object = new \Aimeos\Controller\Common\Subscription\Export\Csv\Processor\Address\Standard($context, $mapping);
+
+		$subscription = $this->getSubscription($context);
+		$order = \Aimeos\MShop\Factory::createManager($context, 'order/base')->load($subscription->getOrderBaseId());
+
+		$data = $object->process($subscription, $order);
+
+
+		$this->assertEquals(2, count($data));
+
+		$this->assertEquals(21, count($data[0]));
+		$this->assertEquals('payment', $data[0][0]);
+		$this->assertEquals('mr', $data[0][1]);
+		$this->assertEquals('', $data[0][2]);
+		$this->assertEquals('', $data[0][3]);
+		$this->assertEquals('', $data[0][4]);
+		$this->assertEquals('Our', $data[0][5]);
+		$this->assertEquals('Unittest', $data[0][6]);
+		$this->assertEquals('Durchschnitt', $data[0][7]);
+		$this->assertEquals('1', $data[0][8]);
+		$this->assertEquals('', $data[0][9]);
+		$this->assertEquals('20146', $data[0][10]);
+		$this->assertEquals('Hamburg', $data[0][11]);
+		$this->assertEquals('Hamburg', $data[0][12]);
+		$this->assertEquals('DE', $data[0][13]);
+		$this->assertEquals('de', $data[0][14]);
+		$this->assertEquals('055544332211', $data[0][15]);
+		$this->assertEquals('055544332213', $data[0][16]);
+		$this->assertEquals('test@example.com', $data[0][17]);
+		$this->assertEquals('www.metaways.net', $data[0][18]);
+		$this->assertEquals('11.000000', $data[0][19]);
+		$this->assertEquals('52.000000', $data[0][20]);
+
+		$this->assertEquals(21, count($data[1]));
+		$this->assertEquals('delivery', $data[1][0]);
+		$this->assertEquals('mr', $data[1][1]);
+		$this->assertEquals('Example company', $data[1][2]);
+		$this->assertEquals('DE999999999', $data[1][3]);
+		$this->assertEquals('Dr.', $data[1][4]);
+		$this->assertEquals('Our', $data[1][5]);
+		$this->assertEquals('Unittest', $data[1][6]);
+		$this->assertEquals('Pickhuben', $data[1][7]);
+		$this->assertEquals('2-4', $data[1][8]);
+		$this->assertEquals('', $data[1][9]);
+		$this->assertEquals('20457', $data[1][10]);
+		$this->assertEquals('Hamburg', $data[1][11]);
+		$this->assertEquals('Hamburg', $data[1][12]);
+		$this->assertEquals('DE', $data[1][13]);
+		$this->assertEquals('de', $data[1][14]);
+		$this->assertEquals('055544332211', $data[1][15]);
+		$this->assertEquals('055544332212', $data[1][16]);
+		$this->assertEquals('test@example.com', $data[1][17]);
+		$this->assertEquals('www.example.com', $data[1][18]);
+		$this->assertEquals('10.000000', $data[1][19]);
+		$this->assertEquals('50.000000', $data[1][20]);
 	}
 
 
-	protected function getSubscription( $context )
+	protected function getSubscription($context)
 	{
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'subscription' );
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'subscription');
 
 		$search = $manager->createSearch();
-		$search->setConditions( $search->compare( '==', 'subscription.dateend', '2010-01-01' ) );
+		$search->setConditions($search->compare('==', 'subscription.dateend', '2010-01-01'));
 
-		$items = $manager->searchItems( $search );
+		$items = $manager->searchItems($search);
 
-		if( ( $item = reset( $items ) ) !== false ) {
+		if (($item = reset($items)) !== false) {
 			return $item;
 		}
 
-		throw new \Exception( 'No subscription item found' );
+		throw new \Exception('No subscription item found');
 	}
 }

controller/common/tests/Controller/Common/Subscription/Export/Csv/Processor/Subscription/StandardTest.php

Spacing +15 added lines, -15 removed lines

@@ -20,36 +20,36 @@
 		);
 
 
-		$object = new \Aimeos\Controller\Common\Subscription\Export\Csv\Processor\Subscription\Standard( $context, $mapping );
+		$object = new \Aimeos\Controller\Common\Subscription\Export\Csv\Processor\Subscription\Standard($context, $mapping);
 
-		$subscription = $this->getSubscription( $context );
-		$order = \Aimeos\MShop\Factory::createManager( $context, 'order/base' )->load( $subscription->getOrderBaseId() );
+		$subscription = $this->getSubscription($context);
+		$order = \Aimeos\MShop\Factory::createManager($context, 'order/base')->load($subscription->getOrderBaseId());
 
-		$data = $object->process( $subscription, $order );
+		$data = $object->process($subscription, $order);
 
 
-		$this->assertEquals( 1, count( $data ) );
+		$this->assertEquals(1, count($data));
 
-		$this->assertEquals( 3, count( $data[0] ) );
-		$this->assertEquals( 'P0Y1M0W0D', $data[0][0] );
-		$this->assertEquals( '2000-01-01', $data[0][1] );
-		$this->assertEquals( '2010-01-01', $data[0][2] );
+		$this->assertEquals(3, count($data[0]));
+		$this->assertEquals('P0Y1M0W0D', $data[0][0]);
+		$this->assertEquals('2000-01-01', $data[0][1]);
+		$this->assertEquals('2010-01-01', $data[0][2]);
 	}
 
 
-	protected function getSubscription( $context )
+	protected function getSubscription($context)
 	{
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'subscription' );
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'subscription');
 
 		$search = $manager->createSearch();
-		$search->setConditions( $search->compare( '==', 'subscription.dateend', '2010-01-01' ) );
+		$search->setConditions($search->compare('==', 'subscription.dateend', '2010-01-01'));
 
-		$items = $manager->searchItems( $search );
+		$items = $manager->searchItems($search);
 
-		if( ( $item = reset( $items ) ) !== false ) {
+		if (($item = reset($items)) !== false) {
 			return $item;
 		}
 
-		throw new \Exception( 'No subscription item found' );
+		throw new \Exception('No subscription item found');
 	}
 }

controller/jobs/src/Controller/Jobs/Subscription/Export/Csv/Standard.php

Spacing +60 added lines, -60 removed lines

@@ -28,7 +28,7 @@ 
 	 */
 	public function getName()
 	{
-		return $this->getContext()->getI18n()->dt( 'controller/jobs', 'Subscription export CSV' );
+		return $this->getContext()->getI18n()->dt('controller/jobs', 'Subscription export CSV');
 	}
 
 
@@ -39,7 +39,7 @@ 
 	 */
 	public function getDescription()
 	{
-		return $this->getContext()->getI18n()->dt( 'controller/jobs', 'Exports subscriptions to CSV file' );
+		return $this->getContext()->getI18n()->dt('controller/jobs', 'Exports subscriptions to CSV file');
 	}
 
 
@@ -73,7 +73,7 @@ 
 		 * @category Developer
 		 * @see controller/common/subscription/export/csv/max-size
 		 */
-		$mappings = $config->get( 'controller/common/subscription/export/csv/mapping', $mappings );
+		$mappings = $config->get('controller/common/subscription/export/csv/mapping', $mappings);
 
 		/** controller/jobs/subscription/export/csv/mapping
 		 * List of mappings between the position in the CSV file and item keys
@@ -88,7 +88,7 @@ 
 		 * @category Developer
 		 * @see controller/common/subscription/export/csv/max-size
 		 */
-		$mappings = $config->get( 'controller/jobs/subscription/export/csv/mapping', $mappings );
+		$mappings = $config->get('controller/jobs/subscription/export/csv/mapping', $mappings);
 
 
 		/** controller/common/subscription/export/csv/max-size
@@ -106,29 +106,29 @@ 
 		 * @category Developer
 		 * @see controller/common/subscription/export/csv/mapping
 		 */
-		$maxcnt = (int) $config->get( 'controller/common/subscription/export/csv/max-size', 1000 );
+		$maxcnt = (int) $config->get('controller/common/subscription/export/csv/max-size', 1000);
 
 
-		$processors = $this->getProcessors( $mappings );
-		$mq = $context->getMessageQueueManager()->get( 'mq-admin' )->getQueue( 'subscription-export' );
+		$processors = $this->getProcessors($mappings);
+		$mq = $context->getMessageQueueManager()->get('mq-admin')->getQueue('subscription-export');
 
-		while( ( $msg = $mq->get() ) !== null )
+		while (($msg = $mq->get()) !== null)
 		{
 			try
 			{
-				if( ( $data = json_decode( $msg->getBody(), true ) ) === null ) {
-					throw new \Aimeos\Controller\Jobs\Exception( sprintf( 'Invalid message: %2$s', $msg->getBody() ) );
+				if (($data = json_decode($msg->getBody(), true)) === null) {
+					throw new \Aimeos\Controller\Jobs\Exception(sprintf('Invalid message: %2$s', $msg->getBody()));
 				}
 
-				$this->export( $processors, $data, $maxcnt );
+				$this->export($processors, $data, $maxcnt);
 			}
-			catch( \Exception $e )
+			catch (\Exception $e)
 			{
-				$logger->log( 'Subscription export error: ' . $e->getMessage() );
-				$logger->log( $e->getTraceAsString() );
+				$logger->log('Subscription export error: ' . $e->getMessage());
+				$logger->log($e->getTraceAsString());
 			}
 
-			$mq->del( $msg );
+			$mq->del($msg);
 		}
 	}
 
@@ -139,15 +139,15 @@ 
 	 * @param \Aimeos\MShop\Context\Item\Iface $context Context item
 	 * @param string $path Absolute path to the exported file
 	 */
-	protected function addJob( $context, $path )
+	protected function addJob($context, $path)
 	{
-		$manager = \Aimeos\MAdmin\Factory::createManager( $context, 'job' );
+		$manager = \Aimeos\MAdmin\Factory::createManager($context, 'job');
 
 		$item = $manager->createItem();
-		$item->setResult( ['file' => $path] );
-		$item->setLabel( $path );
+		$item->setResult(['file' => $path]);
+		$item->setLabel($path);
 
-		$manager->saveItem( $item, false );
+		$manager->saveItem($item, false);
 	}
 
 
@@ -177,7 +177,7 @@ 
 		 * @see controller/jobs/subscription/export/csv/container/content
 		 * @see controller/jobs/subscription/export/csv/container/options
 		 */
-		$location = $config->get( 'controller/jobs/subscription/export/csv/location', sys_get_temp_dir() );
+		$location = $config->get('controller/jobs/subscription/export/csv/location', sys_get_temp_dir());
 
 		/** controller/jobs/subscription/export/csv/container/type
 		 * Nave of the container type to read the data from
@@ -200,7 +200,7 @@ 
 		 * @see controller/jobs/subscription/export/csv/container/content
 		 * @see controller/jobs/subscription/export/csv/container/options
 		 */
-		$container = $config->get( 'controller/jobs/subscription/export/csv/container/type', 'Directory' );
+		$container = $config->get('controller/jobs/subscription/export/csv/container/type', 'Directory');
 
 		/** controller/jobs/subscription/export/csv/container/content
 		 * Name of the content type inside the container to read the data from
@@ -221,7 +221,7 @@ 
 		 * @see controller/jobs/subscription/export/csv/container/type
 		 * @see controller/jobs/subscription/export/csv/container/options
 		 */
-		$content = $config->get( 'controller/jobs/subscription/export/csv/container/content', 'CSV' );
+		$content = $config->get('controller/jobs/subscription/export/csv/container/content', 'CSV');
 
 		/** controller/jobs/subscription/export/csv/container/options
 		 * List of file container options for the subscription export files
@@ -239,9 +239,9 @@ 
 		 * @see controller/jobs/subscription/export/csv/container/content
 		 * @see controller/jobs/subscription/export/csv/container/type
 		 */
-		$options = $config->get( 'controller/jobs/subscription/export/csv/container/options', [] );
+		$options = $config->get('controller/jobs/subscription/export/csv/container/options', []);
 
-		return \Aimeos\MW\Container\Factory::getContainer( $location, $container, $content, $options );
+		return \Aimeos\MW\Container\Factory::getContainer($location, $container, $content, $options);
 	}
 
 
@@ -253,56 +253,56 @@ 
 	 * @param integer $maxcnt Maximum number of retrieved subscriptions at once
 	 * @return string Path of the file containing the exported data
 	 */
-	protected function export( array $processors, $msg, $maxcnt )
+	protected function export(array $processors, $msg, $maxcnt)
 	{
-		$lcontext = $this->getLocaleContext( $msg );
+		$lcontext = $this->getLocaleContext($msg);
 		$baseRef = ['order/base/address', 'order/base/product'];
 
-		$manager = \Aimeos\MShop\Factory::createManager( $lcontext, 'subscription' );
-		$baseManager = \Aimeos\MShop\Factory::createManager( $lcontext, 'order/base' );
+		$manager = \Aimeos\MShop\Factory::createManager($lcontext, 'subscription');
+		$baseManager = \Aimeos\MShop\Factory::createManager($lcontext, 'order/base');
 
 		$container = $this->getContainer();
-		$content = $container->create( 'subscription-export_' . date( 'Y-m-d_H-i-s' ) );
-		$search = $this->initCriteria( $manager->createSearch()->setSlice( 0, 0x7fffffff ), $msg );
+		$content = $container->create('subscription-export_' . date('Y-m-d_H-i-s'));
+		$search = $this->initCriteria($manager->createSearch()->setSlice(0, 0x7fffffff), $msg);
 		$start = 0;
 
 		do
 		{
 			$baseIds = [];
-			$search->setSlice( $start, $maxcnt );
-			$items = $manager->searchItems( $search );
+			$search->setSlice($start, $maxcnt);
+			$items = $manager->searchItems($search);
 
-			foreach( $items as $item ) {
+			foreach ($items as $item) {
 				$baseIds[] = $item->getOrderBaseId();
 			}
 
 			$baseSearch = $baseManager->createSearch();
-			$baseSearch->setConditions( $baseSearch->compare( '==', 'order.base.id', $baseIds ) );
-			$baseSearch->setSlice( 0, count( $baseIds ) );
+			$baseSearch->setConditions($baseSearch->compare('==', 'order.base.id', $baseIds));
+			$baseSearch->setSlice(0, count($baseIds));
 
-			$baseItems = $baseManager->searchItems( $baseSearch, $baseRef );
+			$baseItems = $baseManager->searchItems($baseSearch, $baseRef);
 
-			foreach( $items as $id => $item )
+			foreach ($items as $id => $item)
 			{
-				foreach( $processors as $type => $processor )
+				foreach ($processors as $type => $processor)
 				{
-					foreach( $processor->process( $item, $baseItems[$item->getOrderBaseId()] ) as $line ) {
-						$content->add( [0 => $type, 1 => $id] + $line );
+					foreach ($processor->process($item, $baseItems[$item->getOrderBaseId()]) as $line) {
+						$content->add([0 => $type, 1 => $id] + $line);
 					}
 				}
 			}
 
-			$count = count( $items );
+			$count = count($items);
 			$start += $count;
 		}
-		while( $count === $search->getSliceSize() );
+		while ($count === $search->getSliceSize());
 
 		$path = $content->getResource();
-		$container->add( $content );
+		$container->add($content);
 		$container->close();
 
-		$path = $this->moveFile( $lcontext, $path );
-		$this->addJob( $lcontext, $path );
+		$path = $this->moveFile($lcontext, $path);
+		$this->addJob($lcontext, $path);
 	}
 
 
@@ -312,15 +312,15 @@ 
 	 * @param array $msg Message data including a "sitecode" value
 	 * @return \Aimeos\MShop\Context\Item\Iface New context item with updated locale
 	 */
-	protected function getLocaleContext( array $msg )
+	protected function getLocaleContext(array $msg)
 	{
 		$lcontext = clone $this->getContext();
-		$manager = \Aimeos\MShop\Factory::createManager( $lcontext, 'locale' );
+		$manager = \Aimeos\MShop\Factory::createManager($lcontext, 'locale');
 
-		$sitecode = ( isset( $msg['sitecode'] ) ? $msg['sitecode'] : 'default' );
-		$localeItem = $manager->bootstrap( $sitecode, '', '', false, \Aimeos\MShop\Locale\Manager\Base::SITE_ONE );
+		$sitecode = (isset($msg['sitecode']) ? $msg['sitecode'] : 'default');
+		$localeItem = $manager->bootstrap($sitecode, '', '', false, \Aimeos\MShop\Locale\Manager\Base::SITE_ONE);
 
-		return $lcontext->setLocale( $localeItem );
+		return $lcontext->setLocale($localeItem);
 	}
 
 
@@ -331,14 +331,14 @@ 
 	 * @param array $msg Message data
 	 * @return \Aimeos\MW\Criteria\Iface Initialized criteria object
 	 */
-	protected function initCriteria( \Aimeos\MW\Criteria\Iface $criteria, array $msg )
+	protected function initCriteria(\Aimeos\MW\Criteria\Iface $criteria, array $msg)
 	{
-		if( isset( $msg['filter'] ) ) {
-			$criteria->setConditions( $criteria->toConditions( $msg['filter'] ) );
+		if (isset($msg['filter'])) {
+			$criteria->setConditions($criteria->toConditions($msg['filter']));
 		}
 
-		if( isset( $msg['sort'] ) ) {
-			$criteria->setSortations( $criteria->toSortations( $msg['sort'] ) );
+		if (isset($msg['sort'])) {
+			$criteria->setSortations($criteria->toSortations($msg['sort']));
 		}
 
 		return $criteria;
@@ -352,12 +352,12 @@ 
 	 * @param string $path Absolute path to the exported file
 	 * @return string Relative path of the file in the storage
 	 */
-	protected function moveFile( $context, $path )
+	protected function moveFile($context, $path)
 	{
-		$filename = basename( $path );
-		$context->getFileSystemManager()->get( 'fs-admin' )->writef( $filename, $path );
+		$filename = basename($path);
+		$context->getFileSystemManager()->get('fs-admin')->writef($filename, $path);
 
-		unlink( $path );
+		unlink($path);
 		return $filename;
 	}
 }

Braces +1 added lines, -2 removed lines

@@ -121,8 +121,7 @@
 				}
 
 				$this->export( $processors, $data, $maxcnt );
-			}
-			catch( \Exception $e )
+			} catch( \Exception $e )
 			{
 				$logger->log( 'Subscription export error: ' . $e->getMessage() );
 				$logger->log( $e->getTraceAsString() );

controller/jobs/src/Controller/Jobs/Subscription/Export/Csv/Factory.php

Spacing +6 added lines, -6 removed lines

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

controller/jobs/src/Controller/Jobs/Subscription/Export/Csv/Base.php

Spacing +13 added lines, -13 removed lines

@@ -104,39 +104,39 @@
 	 * @param array $mappings Associative list of processor types as keys and index/data mappings as values
 	 * @return \Aimeos\Controller\Common\Subscription\Export\Csv\Processor\Iface Processor object
 	 */
-	protected function getProcessors( array $mappings )
+	protected function getProcessors(array $mappings)
 	{
 		$list = [];
 		$context = $this->getContext();
 		$config = $context->getConfig();
 		$iface = '\\Aimeos\\Controller\\Common\\Subscription\\Export\\Csv\\Processor\\Iface';
 
-		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\\Subscription\\Export\\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/subscription/export/csv/processor/' . $type . '/name', 'Standard' );
+			$name = $config->get('controller/common/subscription/export/csv/processor/' . $type . '/name', 'Standard');
 
-			if( ctype_alnum( $name ) === false )
+			if (ctype_alnum($name) === false)
 			{
 				$classname = is_string($name) ? '\\Aimeos\\Controller\\Common\\Subscription\\Export\\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\\Subscription\\Export\\Csv\\Processor\\' . ucfirst( $type ) . '\\' . $name;
+			$classname = '\\Aimeos\\Controller\\Common\\Subscription\\Export\\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 = new $classname($context, $mapping);
 
-			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));
 			}
 
 			$list[$type] = $object;