aimeos / ai-client-html

controller/jobs/src/Controller/Jobs/Order/Email/Payment/Factory.php

Spacing +9 added lines, -9 removed lines

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

controller/jobs/src/Controller/Jobs/Order/Email/Payment/Standard.php

Spacing +38 added lines, -38 removed lines

@@ -29,7 +29,7 @@ 
 	 */
 	public function getName()
 	{
-		return $this->getContext()->getI18n()->dt( 'controller/jobs', 'Order payment related e-mails' );
+		return $this->getContext()->getI18n()->dt('controller/jobs', 'Order payment related e-mails');
 	}
 
 
@@ -40,7 +40,7 @@ 
 	 */
 	public function getDescription()
 	{
-		return $this->getContext()->getI18n()->dt( 'controller/jobs', 'Sends order confirmation or payment status update e-mails' );
+		return $this->getContext()->getI18n()->dt('controller/jobs', 'Sends order confirmation or payment status update e-mails');
 	}
 
 
@@ -57,16 +57,16 @@ 
 		$mailer = $context->getMail();
 		$view = $context->getView();
 
-		$templatePaths = $aimeos->getCustomPaths( 'client/html/templates' );
+		$templatePaths = $aimeos->getCustomPaths('client/html/templates');
 
-		$helper = new \Aimeos\MW\View\Helper\Config\Standard( $view, $config );
-		$view->addHelper( 'config', $helper );
+		$helper = new \Aimeos\MW\View\Helper\Config\Standard($view, $config);
+		$view->addHelper('config', $helper);
 
-		$client = \Aimeos\Client\Html\Email\Payment\Factory::createClient( $context, $templatePaths );
+		$client = \Aimeos\Client\Html\Email\Payment\Factory::createClient($context, $templatePaths);
 
-		$orderManager = \Aimeos\MShop\Order\Manager\Factory::createManager( $context );
-		$orderStatusManager = $orderManager->getSubManager( 'status' );
-		$orderBaseManager = $orderManager->getSubManager( 'base' );
+		$orderManager = \Aimeos\MShop\Order\Manager\Factory::createManager($context);
+		$orderStatusManager = $orderManager->getSubManager('status');
+		$orderBaseManager = $orderManager->getSubManager('base');
 
 		/** controller/jobs/order/email/payment/standard/limit-days
 		 * Only send payment e-mails of orders that were created in the past within the configured number of days
@@ -83,8 +83,8 @@ 
 		 * @see controller/jobs/order/email/delivery/standard/limit-days
 		 * @see controller/jobs/service/delivery/process/limit-days
 		 */
-		$limit = $config->get( 'controller/jobs/order/email/payment/standard/limit-days', 30 );
-		$limitDate = date( 'Y-m-d H:i:s', time() - $limit * 86400 );
+		$limit = $config->get('controller/jobs/order/email/payment/standard/limit-days', 30);
+		$limitDate = date('Y-m-d H:i:s', time() - $limit * 86400);
 
 		$default = array(
 			\Aimeos\MShop\Order\Item\Base::PAY_REFUND,
@@ -116,71 +116,71 @@ 
 		 * @see controller/jobs/order/email/delivery/standard/status
 		 * @see controller/jobs/order/email/payment/standard/limit-days
 		 */
-		foreach( (array) $config->get( 'controller/jobs/order/email/payment/standard/status', $default ) as $status )
+		foreach ((array) $config->get('controller/jobs/order/email/payment/standard/status', $default) as $status)
 		{
 			$orderSearch = $orderManager->createSearch();
 
-			$param = array( \Aimeos\MShop\Order\Item\Status\Base::EMAIL_PAYMENT, $status );
-			$orderFunc = $orderSearch->createFunction( 'order.containsStatus', $param );
+			$param = array(\Aimeos\MShop\Order\Item\Status\Base::EMAIL_PAYMENT, $status);
+			$orderFunc = $orderSearch->createFunction('order.containsStatus', $param);
 
 			$expr = array(
-				$orderSearch->compare( '>=', 'order.mtime', $limitDate ),
-				$orderSearch->compare( '==', 'order.statuspayment', $status ),
-				$orderSearch->compare( '==', $orderFunc, 0 ),
+				$orderSearch->compare('>=', 'order.mtime', $limitDate),
+				$orderSearch->compare('==', 'order.statuspayment', $status),
+				$orderSearch->compare('==', $orderFunc, 0),
 			);
-			$orderSearch->setConditions( $orderSearch->combine( '&&', $expr ) );
+			$orderSearch->setConditions($orderSearch->combine('&&', $expr));
 
 			$start = 0;
 
 			do
 			{
-				$items = $orderManager->searchItems( $orderSearch );
+				$items = $orderManager->searchItems($orderSearch);
 
-				foreach( $items as $id => $item )
+				foreach ($items as $id => $item)
 				{
 					try
 					{
-						$orderBaseItem = $orderBaseManager->load( $item->getBaseId() );
+						$orderBaseItem = $orderBaseManager->load($item->getBaseId());
 
-						$addr = $orderBaseItem->getAddress( \Aimeos\MShop\Order\Item\Base\Address\Base::TYPE_PAYMENT );
+						$addr = $orderBaseItem->getAddress(\Aimeos\MShop\Order\Item\Base\Address\Base::TYPE_PAYMENT);
 
 						$view->extAddressItem = $addr;
 						$view->extOrderBaseItem = $orderBaseItem;
 						$view->extOrderItem = $item;
 
-						$helper = new \Aimeos\MW\View\Helper\Translate\Standard( $view, $context->getI18n( $addr->getLanguageId() ) );
-						$view->addHelper( 'translate', $helper );
+						$helper = new \Aimeos\MW\View\Helper\Translate\Standard($view, $context->getI18n($addr->getLanguageId()));
+						$view->addHelper('translate', $helper);
 
 						$message = $mailer->createMessage();
-						$helper = new \Aimeos\MW\View\Helper\Mail\Standard( $view, $message );
-						$view->addHelper( 'mail', $helper );
+						$helper = new \Aimeos\MW\View\Helper\Mail\Standard($view, $message);
+						$view->addHelper('mail', $helper);
 
-						$client->setView( $view );
+						$client->setView($view);
 						$client->getHeader();
 						$client->getBody();
 
-						$mailer->send( $message );
+						$mailer->send($message);
 
 						$statusItem = $orderStatusManager->createItem();
-						$statusItem->setParentId( $id );
-						$statusItem->setType( \Aimeos\MShop\Order\Item\Status\Base::EMAIL_PAYMENT );
-						$statusItem->setValue( $status );
+						$statusItem->setParentId($id);
+						$statusItem->setType(\Aimeos\MShop\Order\Item\Status\Base::EMAIL_PAYMENT);
+						$statusItem->setValue($status);
 
-						$orderStatusManager->saveItem( $statusItem );
+						$orderStatusManager->saveItem($statusItem);
 					}
-					catch( \Exception $e )
+					catch (\Exception $e)
 					{
 						$str = 'Error while trying to send payment e-mail for order ID "%1$s" and status "%2$s": %3$s';
-						$msg = sprintf( $str, $item->getId(), $item->getPaymentStatus(), $e->getMessage() );
-						$context->getLogger()->log( $msg );
+						$msg = sprintf($str, $item->getId(), $item->getPaymentStatus(), $e->getMessage());
+						$context->getLogger()->log($msg);
 					}
 				}
 
-				$count = count( $items );
+				$count = count($items);
 				$start += $count;
-				$orderSearch->setSlice( $start );
+				$orderSearch->setSlice($start);
 			}
-			while( $count >= $orderSearch->getSliceSize() );
+			while ($count >= $orderSearch->getSliceSize());
 		}
 	}
 }

controller/jobs/src/Controller/Jobs/Order/Email/Delivery/Factory.php

Spacing +9 added lines, -9 removed lines

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

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

Spacing +40 added lines, -40 removed lines

@@ -29,7 +29,7 @@ 
 	 */
 	public function getName()
 	{
-		return $this->getContext()->getI18n()->dt( 'controller/jobs', 'Order delivery related e-mails' );
+		return $this->getContext()->getI18n()->dt('controller/jobs', 'Order delivery related e-mails');
 	}
 
 
@@ -40,7 +40,7 @@ 
 	 */
 	public function getDescription()
 	{
-		return $this->getContext()->getI18n()->dt( 'controller/jobs', 'Sends order delivery status update e-mails' );
+		return $this->getContext()->getI18n()->dt('controller/jobs', 'Sends order delivery status update e-mails');
 	}
 
 
@@ -57,16 +57,16 @@ 
 		$mailer = $context->getMail();
 		$view = $context->getView();
 
-		$templatePaths = $aimeos->getCustomPaths( 'client/html/templates' );
+		$templatePaths = $aimeos->getCustomPaths('client/html/templates');
 
-		$helper = new \Aimeos\MW\View\Helper\Config\Standard( $view, $config );
-		$view->addHelper( 'config', $helper );
+		$helper = new \Aimeos\MW\View\Helper\Config\Standard($view, $config);
+		$view->addHelper('config', $helper);
 
-		$client = \Aimeos\Client\Html\Email\Delivery\Factory::createClient( $context, $templatePaths );
+		$client = \Aimeos\Client\Html\Email\Delivery\Factory::createClient($context, $templatePaths);
 
-		$orderManager = \Aimeos\MShop\Order\Manager\Factory::createManager( $context );
-		$orderStatusManager = $orderManager->getSubManager( 'status' );
-		$orderBaseManager = $orderManager->getSubManager( 'base' );
+		$orderManager = \Aimeos\MShop\Order\Manager\Factory::createManager($context);
+		$orderStatusManager = $orderManager->getSubManager('status');
+		$orderBaseManager = $orderManager->getSubManager('base');
 
 		/** controller/jobs/order/email/delivery/standard/limit-days
 		 * Only send delivery e-mails of orders that were created in the past within the configured number of days
@@ -84,8 +84,8 @@ 
 		 * @see controller/jobs/order/email/payment/standard/limit-days
 		 * @see controller/jobs/service/delivery/process/limit-days
 		 */
-		$limit = $config->get( 'controller/jobs/order/email/delivery/standard/limit-days', 90 );
-		$limitDate = date( 'Y-m-d H:i:s', time() - $limit * 86400 );
+		$limit = $config->get('controller/jobs/order/email/delivery/standard/limit-days', 90);
+		$limitDate = date('Y-m-d H:i:s', time() - $limit * 86400);
 
 		$default = array(
 			\Aimeos\MShop\Order\Item\Base::STAT_PROGRESS,
@@ -118,75 +118,75 @@ 
 		 * @see controller/jobs/order/email/payment/standard/status
 		 * @see controller/jobs/order/email/delivery/standard/limit-days
 		 */
-		foreach( (array) $config->get( 'controller/jobs/order/email/delivery/standard/status', $default ) as $status )
+		foreach ((array) $config->get('controller/jobs/order/email/delivery/standard/status', $default) as $status)
 		{
 			$orderSearch = $orderManager->createSearch();
 
-			$param = array( \Aimeos\MShop\Order\Item\Status\Base::EMAIL_DELIVERY, $status );
-			$orderFunc = $orderSearch->createFunction( 'order.containsStatus', $param );
+			$param = array(\Aimeos\MShop\Order\Item\Status\Base::EMAIL_DELIVERY, $status);
+			$orderFunc = $orderSearch->createFunction('order.containsStatus', $param);
 
 			$expr = array(
-				$orderSearch->compare( '>=', 'order.mtime', $limitDate ),
-				$orderSearch->compare( '==', 'order.statusdelivery', $status ),
-				$orderSearch->compare( '==', $orderFunc, 0 ),
+				$orderSearch->compare('>=', 'order.mtime', $limitDate),
+				$orderSearch->compare('==', 'order.statusdelivery', $status),
+				$orderSearch->compare('==', $orderFunc, 0),
 			);
-			$orderSearch->setConditions( $orderSearch->combine( '&&', $expr ) );
+			$orderSearch->setConditions($orderSearch->combine('&&', $expr));
 
 			$start = 0;
 
 			do
 			{
-				$items = $orderManager->searchItems( $orderSearch );
+				$items = $orderManager->searchItems($orderSearch);
 
-				foreach( $items as $id => $item )
+				foreach ($items as $id => $item)
 				{
 					try
 					{
-						$orderBaseItem = $orderBaseManager->load( $item->getBaseId() );
+						$orderBaseItem = $orderBaseManager->load($item->getBaseId());
 
 						try {
-							$addr = $orderBaseItem->getAddress( \Aimeos\MShop\Order\Item\Base\Address\Base::TYPE_DELIVERY );
-						} catch( \Exception $e ) {
-							$addr = $orderBaseItem->getAddress( \Aimeos\MShop\Order\Item\Base\Address\Base::TYPE_PAYMENT );
+							$addr = $orderBaseItem->getAddress(\Aimeos\MShop\Order\Item\Base\Address\Base::TYPE_DELIVERY);
+						} catch (\Exception $e) {
+							$addr = $orderBaseItem->getAddress(\Aimeos\MShop\Order\Item\Base\Address\Base::TYPE_PAYMENT);
 						}
 
 						$view->extAddressItem = $addr;
 						$view->extOrderBaseItem = $orderBaseItem;
 						$view->extOrderItem = $item;
 
-						$helper = new \Aimeos\MW\View\Helper\Translate\Standard( $view, $context->getI18n( $addr->getLanguageId() ) );
-						$view->addHelper( 'translate', $helper );
+						$helper = new \Aimeos\MW\View\Helper\Translate\Standard($view, $context->getI18n($addr->getLanguageId()));
+						$view->addHelper('translate', $helper);
 
 						$message = $mailer->createMessage();
-						$helper = new \Aimeos\MW\View\Helper\Mail\Standard( $view, $message );
-						$view->addHelper( 'mail', $helper );
+						$helper = new \Aimeos\MW\View\Helper\Mail\Standard($view, $message);
+						$view->addHelper('mail', $helper);
 
-						$client->setView( $view );
+						$client->setView($view);
 						$client->getHeader();
 						$client->getBody();
 
-						$mailer->send( $message );
+						$mailer->send($message);
 
 						$statusItem = $orderStatusManager->createItem();
-						$statusItem->setParentId( $id );
-						$statusItem->setType( \Aimeos\MShop\Order\Item\Status\Base::EMAIL_DELIVERY );
-						$statusItem->setValue( $status );
+						$statusItem->setParentId($id);
+						$statusItem->setType(\Aimeos\MShop\Order\Item\Status\Base::EMAIL_DELIVERY);
+						$statusItem->setValue($status);
 
-						$orderStatusManager->saveItem( $statusItem );
+						$orderStatusManager->saveItem($statusItem);
 					}
-					catch( \Exception $e )
+					catch (\Exception $e)
 					{
 						$str = 'Error while trying to send delivery e-mail for order ID "%1$s" and status "%2$s": %3$s';
-						$msg = sprintf( $str, $item->getId(), $item->getDeliveryStatus(), $e->getMessage() );
-						$context->getLogger()->log( $msg );
+						$msg = sprintf($str, $item->getId(), $item->getDeliveryStatus(), $e->getMessage());
+						$context->getLogger()->log($msg);
 					}
 				}
 
-				$count = count( $items );
+				$count = count($items);
 				$start += $count;
-				$orderSearch->setSlice( $start );
+				$orderSearch->setSlice($start);
 			}
-			while( $count >= $orderSearch->getSliceSize() );
+			while ($count >= $orderSearch->getSliceSize());
 		}
 	}
 }

controller/jobs/src/Controller/Jobs/Customer/Email/Account/Factory.php

Spacing +9 added lines, -9 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/customer/email/account/name
 		 * Class name of the used product notification e-mail scheduler controller implementation
@@ -64,20 +64,20 @@ 
 		 * @since 2016.04
 		 * @category Developer
 		 */
-		if( $name === null ) {
-			$name = $context->getConfig()->get( 'controller/jobs/customer/email/account/name', 'Standard' );
+		if ($name === null) {
+			$name = $context->getConfig()->get('controller/jobs/customer/email/account/name', 'Standard');
 		}
 
-		if( ctype_alnum( $name ) === false )
+		if (ctype_alnum($name) === false)
 		{
-			$classname = is_string( $name ) ? '\\Aimeos\\Controller\\Jobs\\Customer\\Email\\Account\\' . $name : '<not a string>';
-			throw new \Aimeos\Controller\Jobs\Exception( sprintf( 'Invalid characters in class name "%1$s"', $classname ) );
+			$classname = is_string($name) ? '\\Aimeos\\Controller\\Jobs\\Customer\\Email\\Account\\'.$name : '<not a string>';
+			throw new \Aimeos\Controller\Jobs\Exception(sprintf('Invalid characters in class name "%1$s"', $classname));
 		}
 
 		$iface = '\\Aimeos\\Controller\\Jobs\\Iface';
-		$classname = '\\Aimeos\\Controller\\Jobs\\Customer\\Email\\Account\\' . $name;
+		$classname = '\\Aimeos\\Controller\\Jobs\\Customer\\Email\\Account\\'.$name;
 
-		$controller = self::createControllerBase( $context, $aimeos, $classname, $iface );
+		$controller = self::createControllerBase($context, $aimeos, $classname, $iface);
 
 		/** controller/jobs/customer/email/account/decorators/excludes
 		 * Excludes decorators added by the "common" option from the customer email account controllers
@@ -153,6 +153,6 @@ 
 		 * @see controller/jobs/customer/email/account/decorators/excludes
 		 * @see controller/jobs/customer/email/account/decorators/global
 		 */
-		return self::addControllerDecorators( $context, $aimeos, $controller, 'customer/email/account' );
+		return self::addControllerDecorators($context, $aimeos, $controller, 'customer/email/account');
 	}
 }
\ No newline at end of file

controller/jobs/src/Controller/Jobs/Customer/Email/Account/Standard.php

Spacing +22 added lines, -22 removed lines

@@ -31,7 +31,7 @@ 
 	 */
 	public function getName()
 	{
-		return $this->getContext()->getI18n()->dt( 'controller/jobs', 'Customer account e-mails' );
+		return $this->getContext()->getI18n()->dt('controller/jobs', 'Customer account e-mails');
 	}
 
 
@@ -42,7 +42,7 @@ 
 	 */
 	public function getDescription()
 	{
-		return $this->getContext()->getI18n()->dt( 'controller/jobs', 'Sends e-mails for new customer accounts' );
+		return $this->getContext()->getI18n()->dt('controller/jobs', 'Sends e-mails for new customer accounts');
 	}
 
 
@@ -54,24 +54,24 @@ 
 	public function run()
 	{
 		$context = $this->getContext();
-		$queue = $context->getMessageQueue( 'mq-email', 'customer/email/account' );
-		$custManager = \Aimeos\MShop\Factory::createManager( $context, 'customer' );
+		$queue = $context->getMessageQueue('mq-email', 'customer/email/account');
+		$custManager = \Aimeos\MShop\Factory::createManager($context, 'customer');
 
-		while( ( $msg = $queue->get() ) !== null )
+		while (($msg = $queue->get()) !== null)
 		{
-			if( ( $list = json_decode( $msg->getBody(), true ) ) !== null )
+			if (($list = json_decode($msg->getBody(), true)) !== null)
 			{
 				$item = $custManager->createItem();
-				$item->fromArray( $list );
+				$item->fromArray($list);
 
-				$this->sendEmail( $context, $item );
+				$this->sendEmail($context, $item);
 			}
 			else
 			{
-				$context->getLogger()->log( sprintf( 'Invalid JSON encode message: %1$s', $msg->getBody() ) );
+				$context->getLogger()->log(sprintf('Invalid JSON encode message: %1$s', $msg->getBody()));
 			}
 
-			$queue->del( $msg );
+			$queue->del($msg);
 		}
 	}
 
@@ -82,12 +82,12 @@ 
 	 * @param \Aimeos\MShop\Context\Item\Iface $context Context item object
 	 * @return \Aimeos\Client\Html\Iface Product notification e-mail client
 	 */
-	protected function getClient( \Aimeos\MShop\Context\Item\Iface $context )
+	protected function getClient(\Aimeos\MShop\Context\Item\Iface $context)
 	{
-		if( !isset( $this->client ) )
+		if (!isset($this->client))
 		{
-			$templatePaths = $this->getAimeos()->getCustomPaths( 'client/html' );
-			$this->client = \Aimeos\Client\Html\Email\Account\Factory::createClient( $context, $templatePaths );
+			$templatePaths = $this->getAimeos()->getCustomPaths('client/html');
+			$this->client = \Aimeos\Client\Html\Email\Account\Factory::createClient($context, $templatePaths);
 		}
 
 		return $this->client;
@@ -100,7 +100,7 @@ 
 	 * @param \Aimeos\MShop\Context\Item\Iface $context Context item object
 	 * @param \Aimeos\MShop\Customer\Item\Iface $item Customer item object
 	 */
-	protected function sendEmail( \Aimeos\MShop\Context\Item\Iface $context, \Aimeos\MShop\Customer\Item\Iface $item )
+	protected function sendEmail(\Aimeos\MShop\Context\Item\Iface $context, \Aimeos\MShop\Customer\Item\Iface $item)
 	{
 		$address = $item->getPaymentAddress();
 
@@ -109,20 +109,20 @@ 
 		$view->extAccountCode = $item->getCode();
 		$view->extAccountPassword = $item->getPassword();
 
-		$helper = new \Aimeos\MW\View\Helper\Translate\Standard( $view, $context->getI18n( $address->getLanguageId() ) );
-		$view->addHelper( 'translate', $helper );
+		$helper = new \Aimeos\MW\View\Helper\Translate\Standard($view, $context->getI18n($address->getLanguageId()));
+		$view->addHelper('translate', $helper);
 
 		$mailer = $context->getMail();
 		$message = $mailer->createMessage();
 
-		$helper = new \Aimeos\MW\View\Helper\Mail\Standard( $view, $message );
-		$view->addHelper( 'mail', $helper );
+		$helper = new \Aimeos\MW\View\Helper\Mail\Standard($view, $message);
+		$view->addHelper('mail', $helper);
 
-		$client = $this->getClient( $context );
-		$client->setView( $view );
+		$client = $this->getClient($context);
+		$client->setView($view);
 		$client->getHeader();
 		$client->getBody();
 
-		$mailer->send( $message );
+		$mailer->send($message);
 	}
 }

controller/jobs/src/Controller/Jobs/Customer/Email/Watch/Factory.php

Spacing +9 added lines, -9 removed lines

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

controller/jobs/src/Controller/Jobs/Customer/Email/Watch/Standard.php

Spacing +98 added lines, -98 removed lines

@@ -33,7 +33,7 @@ 
 	 */
 	public function getName()
 	{
-		return $this->getContext()->getI18n()->dt( 'controller/jobs', 'Product notification e-mails' );
+		return $this->getContext()->getI18n()->dt('controller/jobs', 'Product notification e-mails');
 	}
 
 
@@ -44,7 +44,7 @@ 
 	 */
 	public function getDescription()
 	{
-		return $this->getContext()->getI18n()->dt( 'controller/jobs', 'Sends e-mails for watched products' );
+		return $this->getContext()->getI18n()->dt('controller/jobs', 'Sends e-mails for watched products');
 	}
 
 
@@ -57,48 +57,48 @@ 
 	{
 		$langIds = array();
 		$context = $this->getContext();
-		$typeId = $this->getListTypeItem( 'watch' )->getId();
+		$typeId = $this->getListTypeItem('watch')->getId();
 
-		$localeManager = \Aimeos\MShop\Factory::createManager( $context, 'locale' );
-		$custManager = \Aimeos\MShop\Factory::createManager( $context, 'customer' );
+		$localeManager = \Aimeos\MShop\Factory::createManager($context, 'locale');
+		$custManager = \Aimeos\MShop\Factory::createManager($context, 'customer');
 
-		$localeItems = $localeManager->searchItems( $localeManager->createSearch() );
+		$localeItems = $localeManager->searchItems($localeManager->createSearch());
 
-		foreach( $localeItems as $localeItem )
+		foreach ($localeItems as $localeItem)
 		{
 			$langId = $localeItem->getLanguageId();
 
-			if( isset( $langIds[$langId] ) ) {
+			if (isset($langIds[$langId])) {
 				continue;
 			}
 
 			$langIds[$langId] = true;
 			// fetch language specific text and media items for products
-			$context->getLocale()->setLanguageId( $langId );
+			$context->getLocale()->setLanguageId($langId);
 
-			$search = $custManager->createSearch( true );
+			$search = $custManager->createSearch(true);
 			$expr = array(
-				$search->compare( '==', 'customer.languageid', $langId ),
-				$search->compare( '==', 'customer.lists.typeid', $typeId ),
-				$search->compare( '==', 'customer.lists.domain', 'product' ),
+				$search->compare('==', 'customer.languageid', $langId),
+				$search->compare('==', 'customer.lists.typeid', $typeId),
+				$search->compare('==', 'customer.lists.domain', 'product'),
 				$search->getConditions(),
 			);
-			$search->setConditions( $search->combine( '&&', $expr ) );
-			$search->setSortations( array( $search->sort( '+', 'customer.id' ) ) );
+			$search->setConditions($search->combine('&&', $expr));
+			$search->setSortations(array($search->sort('+', 'customer.id')));
 
 			$start = 0;
 
 			do
 			{
-				$customers = $custManager->searchItems( $search );
+				$customers = $custManager->searchItems($search);
 
-				$this->execute( $context, $customers, $typeId );
+				$this->execute($context, $customers, $typeId);
 
-				$count = count( $customers );
+				$count = count($customers);
 				$start += $count;
-				$search->setSlice( $start );
+				$search->setSlice($start);
 			}
-			while( $count >= $search->getSliceSize() );
+			while ($count >= $search->getSliceSize());
 		}
 	}
 
@@ -110,32 +110,32 @@ 
 	 * @param array $customers List of customer items implementing \Aimeos\MShop\Customer\Item\Iface
 	 * @param string $listTypeId Customer list type ID
 	 */
-	protected function execute( \Aimeos\MShop\Context\Item\Iface $context, array $customers, $listTypeId )
+	protected function execute(\Aimeos\MShop\Context\Item\Iface $context, array $customers, $listTypeId)
 	{
 		$prodIds = $custIds = array();
-		$whItem = $this->getWarehouseItem( 'default' );
-		$listManager = \Aimeos\MShop\Factory::createManager( $context, 'customer/lists' );
-		$listItems = $this->getListItems( $context, array_keys( $customers ), $listTypeId );
+		$whItem = $this->getWarehouseItem('default');
+		$listManager = \Aimeos\MShop\Factory::createManager($context, 'customer/lists');
+		$listItems = $this->getListItems($context, array_keys($customers), $listTypeId);
 
-		foreach( $listItems as $id => $listItem )
+		foreach ($listItems as $id => $listItem)
 		{
 			$refId = $listItem->getRefId();
-			$custIds[ $listItem->getParentId() ][$id] = $refId;
+			$custIds[$listItem->getParentId()][$id] = $refId;
 			$prodIds[$refId] = $refId;
 		}
 
-		$date = date( 'Y-m-d H:i:s' );
-		$products = $this->getProducts( $context, $prodIds, $whItem->getId() );
+		$date = date('Y-m-d H:i:s');
+		$products = $this->getProducts($context, $prodIds, $whItem->getId());
 
-		foreach( $custIds as $custId => $list )
+		foreach ($custIds as $custId => $list)
 		{
 			$custListItems = $listIds = array();
 
-			foreach( $list as $listId => $prodId )
+			foreach ($list as $listId => $prodId)
 			{
 				$listItem = $listItems[$listId];
 
-				if( $listItem->getDateEnd() < $date ) {
+				if ($listItem->getDateEnd() < $date) {
 					$listIds[] = $listId;
 				}
 
@@ -144,22 +144,22 @@ 
 
 			try
 			{
-				$custProducts = $this->getListProducts( $custListItems, $products );
+				$custProducts = $this->getListProducts($custListItems, $products);
 
-				if( !empty( $custProducts ) )
+				if (!empty($custProducts))
 				{
-					$this->sendMail( $context, $customers[$custId]->getPaymentAddress(), $custProducts );
-					$listIds += array_keys( $custProducts );
+					$this->sendMail($context, $customers[$custId]->getPaymentAddress(), $custProducts);
+					$listIds += array_keys($custProducts);
 				}
 			}
-			catch( \Exception $e )
+			catch (\Exception $e)
 			{
 				$str = 'Error while trying to send product notification e-mail for customer ID "%1$s": %2$s';
-				$msg = sprintf( $str, $custId, $e->getMessage() );
-				$context->getLogger()->log( $msg );
+				$msg = sprintf($str, $custId, $e->getMessage());
+				$context->getLogger()->log($msg);
 			}
 
-			$listManager->deleteItems( $listIds );
+			$listManager->deleteItems($listIds);
 		}
 	}
 
@@ -170,12 +170,12 @@ 
 	 * @param \Aimeos\MShop\Context\Item\Iface $context Context item object
 	 * @return \Aimeos\Client\Html\Iface Product notification e-mail client
 	 */
-	protected function getClient( \Aimeos\MShop\Context\Item\Iface $context )
+	protected function getClient(\Aimeos\MShop\Context\Item\Iface $context)
 	{
-		if( !isset( $this->client ) )
+		if (!isset($this->client))
 		{
-			$templatePaths = $this->getAimeos()->getCustomPaths( 'client/html' );
-			$this->client = \Aimeos\Client\Html\Email\Watch\Factory::createClient( $context, $templatePaths );
+			$templatePaths = $this->getAimeos()->getCustomPaths('client/html');
+			$this->client = \Aimeos\Client\Html\Email\Watch\Factory::createClient($context, $templatePaths);
 		}
 
 		return $this->client;
@@ -190,20 +190,20 @@ 
 	 * @param string $listTypeId Customer list type ID
 	 * @return array List of customer list items implementing \Aimeos\MShop\Common\Item\Lists\Iface
 	 */
-	protected function getListItems( \Aimeos\MShop\Context\Item\Iface $context, array $custIds, $listTypeId )
+	protected function getListItems(\Aimeos\MShop\Context\Item\Iface $context, array $custIds, $listTypeId)
 	{
-		$listManager = \Aimeos\MShop\Factory::createManager( $context, 'customer/lists' );
+		$listManager = \Aimeos\MShop\Factory::createManager($context, 'customer/lists');
 
 		$search = $listManager->createSearch();
 		$expr = array(
-			$search->compare( '==', 'customer.lists.parentid', $custIds ),
-			$search->compare( '==', 'customer.lists.typeid', $listTypeId ),
-			$search->compare( '==', 'customer.lists.domain', 'product' ),
+			$search->compare('==', 'customer.lists.parentid', $custIds),
+			$search->compare('==', 'customer.lists.typeid', $listTypeId),
+			$search->compare('==', 'customer.lists.domain', 'product'),
 		);
-		$search->setConditions( $search->combine( '&&', $expr ) );
-		$search->setSlice( 0, 0x7fffffff );
+		$search->setConditions($search->combine('&&', $expr));
+		$search->setSlice(0, 0x7fffffff);
 
-		return $listManager->searchItems( $search );
+		return $listManager->searchItems($search);
 	}
 
 
@@ -214,35 +214,35 @@ 
 	 * @param array $products List of product items implementing \Aimeos\MShop\Product\Item\Iface
 	 * @return array Multi-dimensional associative list of list IDs as key and product / price item maps as values
 	 */
-	protected function getListProducts( array $listItems, array $products )
+	protected function getListProducts(array $listItems, array $products)
 	{
 		$result = array();
-		$priceManager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'price' );
+		$priceManager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'price');
 
-		foreach( $listItems as $id => $listItem )
+		foreach ($listItems as $id => $listItem)
 		{
 			try
 			{
 				$refId = $listItem->getRefId();
 				$config = $listItem->getConfig();
 
-				if( isset( $products[$refId] ) )
+				if (isset($products[$refId]))
 				{
-					$prices = $products[$refId]->getRefItems( 'price', 'default', 'default' );
-					$currencyId = ( isset( $config['currency'] ) ? $config['currency'] : null );
+					$prices = $products[$refId]->getRefItems('price', 'default', 'default');
+					$currencyId = (isset($config['currency']) ? $config['currency'] : null);
 
-					$price = $priceManager->getLowestPrice( $prices, 1, $currencyId );
+					$price = $priceManager->getLowestPrice($prices, 1, $currencyId);
 
-					if( isset( $config['stock'] ) && $config['stock'] == 1 ||
-						isset( $config['price'] ) && $config['price'] == 1 &&
-						isset( $config['pricevalue'] ) && $config['pricevalue'] > $price->getValue()
+					if (isset($config['stock']) && $config['stock'] == 1 ||
+						isset($config['price']) && $config['price'] == 1 &&
+						isset($config['pricevalue']) && $config['pricevalue'] > $price->getValue()
 					) {
 						$result[$id]['item'] = $products[$refId];
 						$result[$id]['price'] = $price;
 					}
 				}
 			}
-			catch( \Exception $e ) { ; } // no price available
+			catch (\Exception $e) {; } // no price available
 		}
 
 		return $result;
@@ -256,27 +256,27 @@ 
 	 * @param array $prodIds List of product IDs
 	 * @param string $whId Unique warehouse ID
 	 */
-	protected function getProducts( \Aimeos\MShop\Context\Item\Iface $context, array $prodIds, $whId )
+	protected function getProducts(\Aimeos\MShop\Context\Item\Iface $context, array $prodIds, $whId)
 	{
-		$productManager = \Aimeos\MShop\Factory::createManager( $context, 'product' );
-		$search = $productManager->createSearch( true );
-		$domains = array( 'text', 'price', 'media' );
+		$productManager = \Aimeos\MShop\Factory::createManager($context, 'product');
+		$search = $productManager->createSearch(true);
+		$domains = array('text', 'price', 'media');
 
 		$stockExpr = array(
-			$search->compare( '==', 'product.stock.stocklevel', null ),
-			$search->compare( '>', 'product.stock.stocklevel', 0 ),
+			$search->compare('==', 'product.stock.stocklevel', null),
+			$search->compare('>', 'product.stock.stocklevel', 0),
 		);
 
 		$expr = array(
-			$search->compare( '==', 'product.id', $prodIds ),
+			$search->compare('==', 'product.id', $prodIds),
 			$search->getConditions(),
-			$search->compare( '==', 'product.stock.warehouseid', $whId ),
-			$search->combine( '||', $stockExpr ),
+			$search->compare('==', 'product.stock.warehouseid', $whId),
+			$search->combine('||', $stockExpr),
 		);
-		$search->setConditions( $search->combine( '&&', $expr ) );
-		$search->setSlice( 0, 0x7fffffff );
+		$search->setConditions($search->combine('&&', $expr));
+		$search->setSlice(0, 0x7fffffff);
 
-		return $productManager->searchItems( $search, $domains );
+		return $productManager->searchItems($search, $domains);
 	}
 
 
@@ -287,16 +287,16 @@ 
 	 * @return \Aimeos\MShop\Common\Item\Type\Iface List type item
 	 * @throws \Aimeos\Controller\Jobs\Exception If the list type item wasn't found
 	 */
-	protected function getListTypeItem( $code )
+	protected function getListTypeItem($code)
 	{
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'customer/lists/type' );
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'customer/lists/type');
 
-		$search = $manager->createSearch( true );
-		$search->setConditions( $search->compare( '==', 'customer.lists.type.code', $code ) );
-		$result = $manager->searchItems( $search );
+		$search = $manager->createSearch(true);
+		$search->setConditions($search->compare('==', 'customer.lists.type.code', $code));
+		$result = $manager->searchItems($search);
 
-		if( ( $item = reset( $result ) ) === false ) {
-			throw new \Aimeos\Controller\Jobs\Exception( sprintf( 'List type for domain "%1$s" and code "%2$s" not found', 'customer', $code ) );
+		if (($item = reset($result)) === false) {
+			throw new \Aimeos\Controller\Jobs\Exception(sprintf('List type for domain "%1$s" and code "%2$s" not found', 'customer', $code));
 		}
 
 		return $item;
@@ -310,21 +310,21 @@ 
 	 * @return \Aimeos\MShop\Product\Item\Stock\Warehouse\Iface Warehouse item
 	 * @throws \Aimeos\Controller\Jobs\Exception If the warehouse item wasn't found
 	 */
-	protected function getWarehouseItem( $code )
+	protected function getWarehouseItem($code)
 	{
-		if( !isset( $this->warehouses ) )
+		if (!isset($this->warehouses))
 		{
-			$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'product/stock/warehouse' );
-			$search = $manager->createSearch( true );
+			$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'product/stock/warehouse');
+			$search = $manager->createSearch(true);
 
 			$this->warehouses = array();
-			foreach( $manager->searchItems( $search ) as $whItem ) {
-				$this->warehouses[ $whItem->getCode() ] = $whItem;
+			foreach ($manager->searchItems($search) as $whItem) {
+				$this->warehouses[$whItem->getCode()] = $whItem;
 			}
 		}
 
-		if( !isset( $this->warehouses[$code] ) ) {
-			throw new \Aimeos\Controller\Jobs\Exception( sprintf( 'No warehouse "%1$s" found', $code ) );
+		if (!isset($this->warehouses[$code])) {
+			throw new \Aimeos\Controller\Jobs\Exception(sprintf('No warehouse "%1$s" found', $code));
 		}
 
 		return $this->warehouses[$code];
@@ -338,27 +338,27 @@ 
 	 * @param \Aimeos\MShop\Common\Item\Address\Iface $address Payment address of the customer
 	 * @param array $products List of products a notification should be sent for
 	 */
-	protected function sendMail( \Aimeos\MShop\Context\Item\Iface $context,
-		\Aimeos\MShop\Common\Item\Address\Iface $address, array $products )
+	protected function sendMail(\Aimeos\MShop\Context\Item\Iface $context,
+		\Aimeos\MShop\Common\Item\Address\Iface $address, array $products)
 	{
 		$view = $context->getView();
 		$view->extProducts = $products;
 		$view->extAddressItem = $address;
 
-		$helper = new \Aimeos\MW\View\Helper\Translate\Standard( $view, $context->getI18n( $address->getLanguageId() ) );
-		$view->addHelper( 'translate', $helper );
+		$helper = new \Aimeos\MW\View\Helper\Translate\Standard($view, $context->getI18n($address->getLanguageId()));
+		$view->addHelper('translate', $helper);
 
 		$mailer = $context->getMail();
 		$message = $mailer->createMessage();
 
-		$helper = new \Aimeos\MW\View\Helper\Mail\Standard( $view, $message );
-		$view->addHelper( 'mail', $helper );
+		$helper = new \Aimeos\MW\View\Helper\Mail\Standard($view, $message);
+		$view->addHelper('mail', $helper);
 
-		$client = $this->getClient( $context );
-		$client->setView( $view );
+		$client = $this->getClient($context);
+		$client->setView($view);
 		$client->getHeader();
 		$client->getBody();
 
-		$mailer->send( $message );
+		$mailer->send($message);
 	}
 }

controller/jobs/tests/bootstrap.php

Spacing +7 added lines, -7 removed lines

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