aimeos / aimeos-slim

src/Controller/Checkout.php

Spacing +12 added lines, -12 removed lines

@@ -31,12 +31,12 @@ 
 	 * @param array $args Associative list of route parameters
 	 * @return ResponseInterface $response Modified response object with generated output
 	 */
-	public static function confirmAction( ContainerInterface $container, ServerRequestInterface $request, ResponseInterface $response, array $args )
+	public static function confirmAction(ContainerInterface $container, ServerRequestInterface $request, ResponseInterface $response, array $args)
 	{
-		$contents = $container->get( 'aimeos_page' )->getSections( 'checkout-confirm', $request, $response, $args );
-		$response = $container->get( 'view' )->render( $response, 'Checkout/confirm.html.twig', $contents );
+		$contents = $container->get('aimeos_page')->getSections('checkout-confirm', $request, $response, $args);
+		$response = $container->get('view')->render($response, 'Checkout/confirm.html.twig', $contents);
 
-		return $response->withHeader( 'Cache-Control', 'no-store' );
+		return $response->withHeader('Cache-Control', 'no-store');
 	}
 
 
@@ -49,12 +49,12 @@ 
 	 * @param array $args Associative list of route parameters
 	 * @return ResponseInterface $response Modified response object with generated output
 	 */
-	public static function indexAction( ContainerInterface $container, ServerRequestInterface $request, ResponseInterface $response, array $args )
+	public static function indexAction(ContainerInterface $container, ServerRequestInterface $request, ResponseInterface $response, array $args)
 	{
-		$contents = $container->get( 'aimeos_page' )->getSections( 'checkout-index', $request, $response, $args );
-		$response = $container->get( 'view' )->render( $response, 'Checkout/index.html.twig', $contents );
+		$contents = $container->get('aimeos_page')->getSections('checkout-index', $request, $response, $args);
+		$response = $container->get('view')->render($response, 'Checkout/index.html.twig', $contents);
 
-		return $response->withHeader( 'Cache-Control', 'no-store' );
+		return $response->withHeader('Cache-Control', 'no-store');
 	}
 
 
@@ -67,11 +67,11 @@ 
 	 * @param array $args Associative list of route parameters
 	 * @return ResponseInterface $response Modified response object with generated output
 	 */
-	public static function updateAction( ContainerInterface $container, ServerRequestInterface $request, ResponseInterface $response, array $args )
+	public static function updateAction(ContainerInterface $container, ServerRequestInterface $request, ResponseInterface $response, array $args)
 	{
-		$contents = $container->get( 'aimeos_page' )->getSections( 'checkout-update', $request, $response, $args );
-		$response = $container->get( 'view' )->render( $response, 'Checkout/update.html.twig', $contents );
+		$contents = $container->get('aimeos_page')->getSections('checkout-update', $request, $response, $args);
+		$response = $container->get('view')->render($response, 'Checkout/update.html.twig', $contents);
 
-		return $response->withHeader( 'Cache-Control', 'no-store' );
+		return $response->withHeader('Cache-Control', 'no-store');
 	}
 }
\ No newline at end of file

src/Bootstrap.php

Spacing +31 added lines, -31 removed lines

@@ -27,7 +27,7 @@ 
 	 * @param \Slim\App $app Slim application
 	 * @param array $settings Multi-dimensional array of configuration settings
 	 */
-	public function __construct( \Slim\App $app, array $settings )
+	public function __construct(\Slim\App $app, array $settings)
 	{
 		$this->app = $app;
 		$this->settings = $settings;
@@ -40,16 +40,16 @@ 
 	 * @param string $path Absolute or relative path to the Aimeos route file
 	 * @return \Aimeos\Slim\Bootstrap Self instance
 	 */
-	public function routes( $path )
+	public function routes($path)
 	{
 		$app = $this->app;
 		$settings = $this->settings;
 
-		$config = function( $key, $default ) use ( $settings )
+		$config = function($key, $default) use ($settings)
 		{
-			foreach( explode( '/', trim( $key, '/' ) ) as $part )
+			foreach (explode('/', trim($key, '/')) as $part)
 			{
-				if( isset( $settings[$part] ) ) {
+				if (isset($settings[$part])) {
 					$settings = $settings[$part];
 				} else {
 					return $default;
@@ -71,52 +71,52 @@ 
 	 * @param string $extdir Absolute or relative path to the Aimeos extension directory
 	 * @return \Aimeos\Slim\Bootstrap Self instance
 	 */
-	public function setup( $extdir = '../ext' )
+	public function setup($extdir = '../ext')
 	{
 		$container = $this->app->getContainer();
 
-		$container['router'] = function( $c ) {
+		$container['router'] = function($c) {
 			return new \Aimeos\Slim\Router();
 		};
 
-		$container['mailer'] = function( $c ) {
-			return new \Swift_Mailer( new \Swift_SendmailTransport() );
+		$container['mailer'] = function($c) {
+			return new \Swift_Mailer(new \Swift_SendmailTransport());
 		};
 
 
-		$default = require __DIR__ . DIRECTORY_SEPARATOR . 'aimeos-default.php';
-		$settings = array_replace_recursive( $default, $this->settings );
+		$default = require __DIR__.DIRECTORY_SEPARATOR.'aimeos-default.php';
+		$settings = array_replace_recursive($default, $this->settings);
 
-		$container['aimeos'] = function( $c ) use ( $extdir ) {
-			return new \Aimeos\Bootstrap( (array) $extdir, false );
+		$container['aimeos'] = function($c) use ($extdir) {
+			return new \Aimeos\Bootstrap((array) $extdir, false);
 		};
 
-		$container['aimeos_config'] = function( $c ) use ( $settings ) {
-			return new \Aimeos\Slim\Base\Config( $c, $settings );
+		$container['aimeos_config'] = function($c) use ($settings) {
+			return new \Aimeos\Slim\Base\Config($c, $settings);
 		};
 
-		$container['aimeos_context'] = function( $c ) {
-			return new \Aimeos\Slim\Base\Context( $c );
+		$container['aimeos_context'] = function($c) {
+			return new \Aimeos\Slim\Base\Context($c);
 		};
 
-		$container['aimeos_i18n'] = function( $c ) {
-			return new \Aimeos\Slim\Base\I18n( $c );
+		$container['aimeos_i18n'] = function($c) {
+			return new \Aimeos\Slim\Base\I18n($c);
 		};
 
-		$container['aimeos_locale'] = function( $c ) {
-			return new \Aimeos\Slim\Base\Locale( $c );
+		$container['aimeos_locale'] = function($c) {
+			return new \Aimeos\Slim\Base\Locale($c);
 		};
 
-		$container['aimeos_page'] = function( $c ) {
-			return new \Aimeos\Slim\Base\Page( $c );
+		$container['aimeos_page'] = function($c) {
+			return new \Aimeos\Slim\Base\Page($c);
 		};
 
-		$container['aimeos_view'] = function( $c ) {
-			return new \Aimeos\Slim\Base\View( $c );
+		$container['aimeos_view'] = function($c) {
+			return new \Aimeos\Slim\Base\View($c);
 		};
 
 		// add client IP address to requests
-		$this->app->add( new \RKA\Middleware\IpAddress( true, [] ) );
+		$this->app->add(new \RKA\Middleware\IpAddress(true, []));
 
 		return $this;
 	}
@@ -129,14 +129,14 @@ 
 	 */
 	public static function getVersion()
 	{
-		$basedir = dirname( dirname( dirname( dirname( __DIR__ ) ) ) ) . DIRECTORY_SEPARATOR;
+		$basedir = dirname(dirname(dirname(dirname(__DIR__)))).DIRECTORY_SEPARATOR;
 
-		if( ( $content = @file_get_contents( $basedir . 'composer.lock' ) ) !== false
-			&& ( $content = json_decode( $content, true ) ) !== null && isset( $content['packages'] )
+		if (($content = @file_get_contents($basedir.'composer.lock')) !== false
+			&& ($content = json_decode($content, true)) !== null && isset($content['packages'])
 		) {
-			foreach( (array) $content['packages'] as $item )
+			foreach ((array) $content['packages'] as $item)
 			{
-				if( $item['name'] === 'aimeos/aimeos-slim' ) {
+				if ($item['name'] === 'aimeos/aimeos-slim') {
 					return $item['version'];
 				}
 			}

src/Controller/Catalog.php

Spacing +20 added lines, -20 removed lines

@@ -31,13 +31,13 @@ 
 	 * @param array $args Associative list of route parameters
 	 * @return ResponseInterface $response Modified response object with generated output
 	 */
-	public static function countAction( ContainerInterface $container, ServerRequestInterface $request, ResponseInterface $response, array $args )
+	public static function countAction(ContainerInterface $container, ServerRequestInterface $request, ResponseInterface $response, array $args)
 	{
-		$contents = $container->get( 'aimeos_page' )->getSections( 'catalog-count', $request, $response, $args );
-		$response = $container->get( 'view' )->render( $response, 'Catalog/count.html.twig', $contents );
+		$contents = $container->get('aimeos_page')->getSections('catalog-count', $request, $response, $args);
+		$response = $container->get('view')->render($response, 'Catalog/count.html.twig', $contents);
 
-		return $response->withHeader( 'Content-Type', 'application/javascript' )
-			->withHeader( 'Cache-Control', 'max-age=300' );
+		return $response->withHeader('Content-Type', 'application/javascript')
+			->withHeader('Cache-Control', 'max-age=300');
 	}
 
 
@@ -50,10 +50,10 @@ 
 	 * @param array $args Associative list of route parameters
 	 * @return ResponseInterface $response Modified response object with generated output
 	 */
-	public static function detailAction( ContainerInterface $container, ServerRequestInterface $request, ResponseInterface $response, array $args )
+	public static function detailAction(ContainerInterface $container, ServerRequestInterface $request, ResponseInterface $response, array $args)
 	{
-		$contents = $container->get( 'aimeos_page' )->getSections( 'catalog-detail', $request, $response, $args );
-		return $container->get( 'view' )->render( $response, 'Catalog/detail.html.twig', $contents );
+		$contents = $container->get('aimeos_page')->getSections('catalog-detail', $request, $response, $args);
+		return $container->get('view')->render($response, 'Catalog/detail.html.twig', $contents);
 	}
 
 
@@ -66,10 +66,10 @@ 
 	 * @param array $args Associative list of route parameters
 	 * @return ResponseInterface $response Modified response object with generated output
 	 */
-	public static function listAction( ContainerInterface $container, ServerRequestInterface $request, ResponseInterface $response, array $args )
+	public static function listAction(ContainerInterface $container, ServerRequestInterface $request, ResponseInterface $response, array $args)
 	{
-		$contents = $container->get( 'aimeos_page' )->getSections( 'catalog-list', $request, $response, $args );
-		return $container->get( 'view' )->render( $response, 'Catalog/list.html.twig', $contents );
+		$contents = $container->get('aimeos_page')->getSections('catalog-list', $request, $response, $args);
+		return $container->get('view')->render($response, 'Catalog/list.html.twig', $contents);
 	}
 
 
@@ -82,13 +82,13 @@ 
 	 * @param array $args Associative list of route parameters
 	 * @return ResponseInterface $response Modified response object with generated output
 	 */
-	public static function stockAction( ContainerInterface $container, ServerRequestInterface $request, ResponseInterface $response, array $args )
+	public static function stockAction(ContainerInterface $container, ServerRequestInterface $request, ResponseInterface $response, array $args)
 	{
-		$contents = $container->get( 'aimeos_page' )->getSections( 'catalog-stock', $request, $response, $args );
-		$response = $container->get( 'view' )->render( $response, 'Catalog/stock.html.twig', $contents );
+		$contents = $container->get('aimeos_page')->getSections('catalog-stock', $request, $response, $args);
+		$response = $container->get('view')->render($response, 'Catalog/stock.html.twig', $contents);
 
-		return $response->withHeader( 'Cache-Control', 'max-age=30' )
-			->withHeader( 'Content-Type', 'application/javascript' );
+		return $response->withHeader('Cache-Control', 'max-age=30')
+			->withHeader('Content-Type', 'application/javascript');
 	}
 
 
@@ -101,11 +101,11 @@ 
 	 * @param array $args Associative list of route parameters
 	 * @return ResponseInterface $response Modified response object with generated output
 	 */
-	public static function suggestAction( ContainerInterface $container, ServerRequestInterface $request, ResponseInterface $response, array $args )
+	public static function suggestAction(ContainerInterface $container, ServerRequestInterface $request, ResponseInterface $response, array $args)
 	{
-		$contents = $container->get( 'aimeos_page' )->getSections( 'catalog-suggest', $request, $response, $args );
-		$response = $container->get( 'view' )->render( $response, 'Catalog/suggest.html.twig', $contents );
+		$contents = $container->get('aimeos_page')->getSections('catalog-suggest', $request, $response, $args);
+		$response = $container->get('view')->render($response, 'Catalog/suggest.html.twig', $contents);
 
-		return $response->withHeader( 'Content-Type', 'application/json' );
+		return $response->withHeader('Content-Type', 'application/json');
 	}
 }
\ No newline at end of file

src/Base/Context.php

Spacing +48 added lines, -48 removed lines

@@ -29,7 +29,7 @@ 
 	 *
 	 * @param ContainerInterface $container Dependency container
 	 */
-	public function __construct( ContainerInterface $container )
+	public function __construct(ContainerInterface $container)
 	{
 		$this->container = $container;
 	}
@@ -43,35 +43,35 @@ 
 	 * @param string $type Configuration type ("frontend" or "backend")
 	 * @return \Aimeos\MShop\Context\Item\Iface Context object
 	 */
-	public function get( $locale = true, array $attributes = array(), $type = 'frontend' )
+	public function get($locale = true, array $attributes = array(), $type = 'frontend')
 	{
-		$config = $this->container->get( 'aimeos_config' )->get( $type );
+		$config = $this->container->get('aimeos_config')->get($type);
 
-		if( $this->context === null )
+		if ($this->context === null)
 		{
 			$context = new \Aimeos\MShop\Context\Item\Standard();
-			$context->setConfig( $config );
-
-			$this->addDataBaseManager( $context );
-			$this->addFilesystemManager( $context );
-			$this->addMessageQueueManager( $context );
-			$this->addLogger( $context );
-			$this->addCache( $context );
-			$this->addMailer( $context);
-			$this->addProcess( $context );
-			$this->addSession( $context );
-			$this->addUser( $context );
+			$context->setConfig($config);
+
+			$this->addDataBaseManager($context);
+			$this->addFilesystemManager($context);
+			$this->addMessageQueueManager($context);
+			$this->addLogger($context);
+			$this->addCache($context);
+			$this->addMailer($context);
+			$this->addProcess($context);
+			$this->addSession($context);
+			$this->addUser($context);
 
 			$this->context = $context;
 		}
 
-		$this->context->setConfig( $config );
+		$this->context->setConfig($config);
 
-		if( $locale === true )
+		if ($locale === true)
 		{
-			$localeItem = $this->container->get( 'aimeos_locale' )->get( $this->context, $attributes );
-			$this->context->setLocale( $localeItem );
-			$this->context->setI18n( $this->container->get( 'aimeos_i18n' )->get( array( $localeItem->getLanguageId() ) ) );
+			$localeItem = $this->container->get('aimeos_locale')->get($this->context, $attributes);
+			$this->context->setLocale($localeItem);
+			$this->context->setI18n($this->container->get('aimeos_i18n')->get(array($localeItem->getLanguageId())));
 		}
 
 		return $this->context;
@@ -84,11 +84,11 @@ 
 	 * @param \Aimeos\MShop\Context\Item\Iface $context Context object including config
 	 * @return \Aimeos\MShop\Context\Item\Iface Modified context object
 	 */
-	protected function addCache( \Aimeos\MShop\Context\Item\Iface $context )
+	protected function addCache(\Aimeos\MShop\Context\Item\Iface $context)
 	{
-		$cache = new \Aimeos\MAdmin\Cache\Proxy\Standard( $context );
+		$cache = new \Aimeos\MAdmin\Cache\Proxy\Standard($context);
 
-		return $context->setCache( $cache );
+		return $context->setCache($cache);
 	}
 
 
@@ -98,11 +98,11 @@ 
 	 * @param \Aimeos\MShop\Context\Item\Iface $context Context object
 	 * @return \Aimeos\MShop\Context\Item\Iface Modified context object
 	 */
-	protected function addDatabaseManager( \Aimeos\MShop\Context\Item\Iface $context )
+	protected function addDatabaseManager(\Aimeos\MShop\Context\Item\Iface $context)
 	{
-		$dbm = new \Aimeos\MW\DB\Manager\DBAL( $context->getConfig() );
+		$dbm = new \Aimeos\MW\DB\Manager\DBAL($context->getConfig());
 
-		return $context->setDatabaseManager( $dbm );
+		return $context->setDatabaseManager($dbm);
 	}
 
 
@@ -112,11 +112,11 @@ 
 	 * @param \Aimeos\MShop\Context\Item\Iface $context Context object
 	 * @return \Aimeos\MShop\Context\Item\Iface Modified context object
 	 */
-	protected function addFilesystemManager( \Aimeos\MShop\Context\Item\Iface $context )
+	protected function addFilesystemManager(\Aimeos\MShop\Context\Item\Iface $context)
 	{
-		$fs = new \Aimeos\MW\Filesystem\Manager\Standard( $context->getConfig() );
+		$fs = new \Aimeos\MW\Filesystem\Manager\Standard($context->getConfig());
 
-		return $context->setFilesystemManager( $fs );
+		return $context->setFilesystemManager($fs);
 	}
 
 
@@ -126,11 +126,11 @@ 
 	 * @param \Aimeos\MShop\Context\Item\Iface $context Context object
 	 * @return \Aimeos\MShop\Context\Item\Iface Modified context object
 	 */
-	protected function addLogger( \Aimeos\MShop\Context\Item\Iface $context )
+	protected function addLogger(\Aimeos\MShop\Context\Item\Iface $context)
 	{
-		$logger = \Aimeos\MAdmin\Log\Manager\Factory::createManager( $context );
+		$logger = \Aimeos\MAdmin\Log\Manager\Factory::createManager($context);
 
-		return $context->setLogger( $logger );
+		return $context->setLogger($logger);
 	}
 
 
@@ -141,11 +141,11 @@ 
 	 * @param \Aimeos\MShop\Context\Item\Iface $context Context object
 	 * @return \Aimeos\MShop\Context\Item\Iface Modified context object
 	 */
-	protected function addMailer( \Aimeos\MShop\Context\Item\Iface $context )
+	protected function addMailer(\Aimeos\MShop\Context\Item\Iface $context)
 	{
-		$mail = new \Aimeos\MW\Mail\Swift( $this->container->get( 'mailer' ) );
+		$mail = new \Aimeos\MW\Mail\Swift($this->container->get('mailer'));
 
-		return $context->setMail( $mail );
+		return $context->setMail($mail);
 	}
 
 
@@ -155,11 +155,11 @@ 
 	 * @param \Aimeos\MShop\Context\Item\Iface $context Context object
 	 * @return \Aimeos\MShop\Context\Item\Iface Modified context object
 	 */
-	protected function addMessageQueueManager( \Aimeos\MShop\Context\Item\Iface $context )
+	protected function addMessageQueueManager(\Aimeos\MShop\Context\Item\Iface $context)
 	{
-		$mq = new \Aimeos\MW\MQueue\Manager\Standard( $context->getConfig() );
+		$mq = new \Aimeos\MW\MQueue\Manager\Standard($context->getConfig());
 
-		return $context->setMessageQueueManager( $mq );
+		return $context->setMessageQueueManager($mq);
 	}
 
 
@@ -169,16 +169,16 @@ 
 	 * @param \Aimeos\MShop\Context\Item\Iface $context Context object
 	 * @return \Aimeos\MShop\Context\Item\Iface Modified context object
 	 */
-	protected function addProcess( \Aimeos\MShop\Context\Item\Iface $context )
+	protected function addProcess(\Aimeos\MShop\Context\Item\Iface $context)
 	{
 		$config = $context->getConfig();
-		$max = $config->get( 'pcntl_max', 4 );
-		$prio = $config->get( 'pcntl_priority', 19 );
+		$max = $config->get('pcntl_max', 4);
+		$prio = $config->get('pcntl_priority', 19);
 
-		$process = new \Aimeos\MW\Process\Pcntl( $max, $prio );
-		$process = new \Aimeos\MW\Process\Decorator\Check( $process );
+		$process = new \Aimeos\MW\Process\Pcntl($max, $prio);
+		$process = new \Aimeos\MW\Process\Decorator\Check($process);
 
-		return $context->setProcess( $process );
+		return $context->setProcess($process);
 	}
 
 
@@ -188,11 +188,11 @@ 
 	 * @param \Aimeos\MShop\Context\Item\Iface $context Context object
 	 * @return \Aimeos\MShop\Context\Item\Iface Modified context object
 	 */
-	protected function addSession( \Aimeos\MShop\Context\Item\Iface $context )
+	protected function addSession(\Aimeos\MShop\Context\Item\Iface $context)
 	{
 		$session = new \Aimeos\MW\Session\PHP();
 
-		return $context->setSession( $session );
+		return $context->setSession($session);
 	}
 
 
@@ -202,10 +202,10 @@ 
 	 * @param \Aimeos\MShop\Context\Item\Iface $context Context object
 	 * @return \Aimeos\MShop\Context\Item\Iface Modified context object
 	 */
-	protected function addUser( \Aimeos\MShop\Context\Item\Iface $context )
+	protected function addUser(\Aimeos\MShop\Context\Item\Iface $context)
 	{
 		$ipaddr = $this->container->request->getAttribute('ip_address');
 
-		return $context->setEditor( $ipaddr );
+		return $context->setEditor($ipaddr);
 	}
 }

src/aimeos-default.php

Spacing +10 added lines, -10 removed lines

@@ -7,16 +7,16 @@
 	'uploaddir' => '/',
 
 	'page' => array(
-		'account-index' => array( 'account/profile','account/history','account/favorite','account/watch','basket/mini','catalog/session' ),
-		'basket-index' => array( 'basket/standard','basket/related' ),
-		'catalog-count' => array( 'catalog/count' ),
-		'catalog-detail' => array( 'basket/mini','catalog/stage','catalog/detail','catalog/session' ),
-		'catalog-list' => array( 'basket/mini','catalog/filter','catalog/stage','catalog/lists' ),
-		'catalog-stock' => array( 'catalog/stock' ),
-		'catalog-suggest' => array( 'catalog/suggest' ),
-		'checkout-confirm' => array( 'checkout/confirm' ),
-		'checkout-index' => array( 'checkout/standard' ),
-		'checkout-update' => array( 'checkout/update'),
+		'account-index' => array('account/profile', 'account/history', 'account/favorite', 'account/watch', 'basket/mini', 'catalog/session'),
+		'basket-index' => array('basket/standard', 'basket/related'),
+		'catalog-count' => array('catalog/count'),
+		'catalog-detail' => array('basket/mini', 'catalog/stage', 'catalog/detail', 'catalog/session'),
+		'catalog-list' => array('basket/mini', 'catalog/filter', 'catalog/stage', 'catalog/lists'),
+		'catalog-stock' => array('catalog/stock'),
+		'catalog-suggest' => array('catalog/suggest'),
+		'checkout-confirm' => array('checkout/confirm'),
+		'checkout-index' => array('checkout/standard'),
+		'checkout-update' => array('checkout/update'),
 	),
 
 	'resource' => array(

src/Command/Jobs.php

Spacing +42 added lines, -42 removed lines

@@ -34,28 +34,28 @@ 
 	 *
 	 * @param array $argv Associative array from $_SERVER['argv']
 	 */
-	public static function run( array $argv )
+	public static function run(array $argv)
 	{
-		array_shift( $argv );
-		$options = self::getOptions( $argv );
+		array_shift($argv);
+		$options = self::getOptions($argv);
 
-		if( ( $jobs = array_shift( $argv ) ) === null ) {
+		if (($jobs = array_shift($argv)) === null) {
 			throw new \Aimeos\Slim\Command\Exception();
 		}
-		$sites = array_shift( $argv );
+		$sites = array_shift($argv);
 
-		$config = self::getConfig( $options );
+		$config = self::getConfig($options);
 
-		$app = new \Slim\App( $config );
-		$aimeos = new \Aimeos\Slim\Bootstrap( $app, $config );
-		$aimeos->setup( ( isset( $options['extdir'] ) ? $options['extdir'] : './ext' ) )
-			->routes( ( isset( $options['routes'] ) ? $options['routes'] : './src/aimeos-routes.php' ) );
+		$app = new \Slim\App($config);
+		$aimeos = new \Aimeos\Slim\Bootstrap($app, $config);
+		$aimeos->setup((isset($options['extdir']) ? $options['extdir'] : './ext'))
+			->routes((isset($options['routes']) ? $options['routes'] : './src/aimeos-routes.php'));
 
 		$container = $app->getContainer();
-		$context = self::getContext( $container );
+		$context = self::getContext($container);
 
-		$siteItems = self::getSiteItems( $context, $sites );
-		self::execute( $container->get( 'aimeos' ), $context, $siteItems, $jobs );
+		$siteItems = self::getSiteItems($context, $sites);
+		self::execute($container->get('aimeos'), $context, $siteItems, $jobs);
 	}
 
 
@@ -65,16 +65,16 @@ 
 	 * @param array $options Associative list of given options
 	 * @return array Multi-dimensional array of configuration settings
 	 */
-	protected static function getConfig( array $options )
+	protected static function getConfig(array $options)
 	{
 		$config = array();
 
-		if( isset( $options['config'] ) )
+		if (isset($options['config']))
 		{
-			foreach( (array) $options['config'] as $path )
+			foreach ((array) $options['config'] as $path)
 			{
-				if( is_file( $path ) ) {
-					$config = array_replace_recursive( $config, require $path );
+				if (is_file($path)) {
+					$config = array_replace_recursive($config, require $path);
 				}
 			}
 		}
@@ -89,25 +89,25 @@ 
 	 * @param \Interop\Container\ContainerInterface $container Dependency injection container
 	 * @return \Aimeos\MShop\Context\Item\Standard Context object
 	 */
-	protected static function getContext( \Interop\Container\ContainerInterface $container )
+	protected static function getContext(\Interop\Container\ContainerInterface $container)
 	{
-		$aimeos = $container->get( 'aimeos' );
-		$context = $container->get( 'aimeos_context' )->get( false, array(), 'command' );
+		$aimeos = $container->get('aimeos');
+		$context = $container->get('aimeos_context')->get(false, array(), 'command');
 
 		$env = \Slim\Http\Environment::mock();
-		$request = \Slim\Http\Request::createFromEnvironment( $env );
+		$request = \Slim\Http\Request::createFromEnvironment($env);
 		$response = new \Slim\Http\Response();
 
-		$tmplPaths = $aimeos->getCustomPaths( 'controller/jobs/templates' );
-		$view = $container->get( 'aimeos_view' )->create( $context, $request, $response, array(), $tmplPaths );
+		$tmplPaths = $aimeos->getCustomPaths('controller/jobs/templates');
+		$view = $container->get('aimeos_view')->create($context, $request, $response, array(), $tmplPaths);
 
-		$langManager = \Aimeos\MShop\Factory::createManager( $context, 'locale/language' );
-		$langids = array_keys( $langManager->searchItems( $langManager->createSearch( true ) ) );
-		$i18n = $container->get( 'aimeos_i18n' )->get( $langids );
+		$langManager = \Aimeos\MShop\Factory::createManager($context, 'locale/language');
+		$langids = array_keys($langManager->searchItems($langManager->createSearch(true)));
+		$i18n = $container->get('aimeos_i18n')->get($langids);
 
-		$context->setEditor( 'aimeos:jobs' );
-		$context->setView( $view );
-		$context->setI18n( $i18n );
+		$context->setEditor('aimeos:jobs');
+		$context->setView($view);
+		$context->setI18n($i18n);
 
 		return $context;
 	}
@@ -120,28 +120,28 @@ 
 	 * @param \Aimeos\MShop\Context\Item\Iface $ctx Context object
 	 * @param array $siteItems List of site items implementing \Aimeos\MShop\Locale\Site\Iface
 	 */
-	protected static function execute( \Aimeos\Bootstrap $aimeos, \Aimeos\MShop\Context\Item\Iface $ctx, array $siteItems, $jobs )
+	protected static function execute(\Aimeos\Bootstrap $aimeos, \Aimeos\MShop\Context\Item\Iface $ctx, array $siteItems, $jobs)
 	{
 		$process = $ctx->getProcess();
-		$localeManager = \Aimeos\MShop\Locale\Manager\Factory::createManager( $ctx );
+		$localeManager = \Aimeos\MShop\Locale\Manager\Factory::createManager($ctx);
 
-		foreach( $siteItems as $siteItem )
+		foreach ($siteItems as $siteItem)
 		{
-			$localeItem = $localeManager->bootstrap( $siteItem->getCode(), 'en', '', false );
-			$localeItem->setLanguageId( null );
-			$localeItem->setCurrencyId( null );
+			$localeItem = $localeManager->bootstrap($siteItem->getCode(), 'en', '', false);
+			$localeItem->setLanguageId(null);
+			$localeItem->setCurrencyId(null);
 
-			$ctx->setLocale( $localeItem );
+			$ctx->setLocale($localeItem);
 
-			printf( "Executing the Aimeos jobs for \"%s\"\n", $siteItem->getCode() );
+			printf("Executing the Aimeos jobs for \"%s\"\n", $siteItem->getCode());
 
-			foreach( (array) explode( ' ', $jobs ) as $jobname )
+			foreach ((array) explode(' ', $jobs) as $jobname)
 			{
-				$fcn = function( $ctx, $aimeos, $jobname ) {
-					\Aimeos\Controller\Jobs\Factory::createController( $ctx, $aimeos, $jobname )->run();
+				$fcn = function($ctx, $aimeos, $jobname) {
+					\Aimeos\Controller\Jobs\Factory::createController($ctx, $aimeos, $jobname)->run();
 				};
 
-				$process->start( $fcn, [$ctx, $aimeos, $jobname], true );
+				$process->start($fcn, [$ctx, $aimeos, $jobname], true);
 			}
 		}
 

src/aimeos-routes.php

Spacing +126 added lines, -126 removed lines

@@ -1,202 +1,202 @@
 <?php
 
 
-$app->group( $config( 'routes/admin', '/admin' ), function() use ( $config ) {
+$app->group($config('routes/admin', '/admin'), function() use ($config) {
 
-	$this->map(['GET', 'POST'], '', function( $request, $response, $args ) use ( $config ) {
-		return $response->withHeader( 'Location', $config( 'routes/jqadm', '/admin/default/jqadm' ) . '/search/dashboard' );
-	})->setName( 'aimeos_shop_admin' );
+	$this->map(['GET', 'POST'], '', function($request, $response, $args) use ($config) {
+		return $response->withHeader('Location', $config('routes/jqadm', '/admin/default/jqadm').'/search/dashboard');
+	})->setName('aimeos_shop_admin');
 
 });
 
 
-$app->group( $config( 'routes/extadm', '/admin/{site}/extadm' ), function() use ( $config ) {
+$app->group($config('routes/extadm', '/admin/{site}/extadm'), function() use ($config) {
 
-	$this->map(['GET'], '/file', function( $request, $response, $args ) {
-		return \Aimeos\Slim\Controller\Extadm::fileAction( $this, $request, $response, $args );
-	})->setName( 'aimeos_shop_extadm_file' );
+	$this->map(['GET'], '/file', function($request, $response, $args) {
+		return \Aimeos\Slim\Controller\Extadm::fileAction($this, $request, $response, $args);
+	})->setName('aimeos_shop_extadm_file');
 
-	$this->map(['POST'], '/do', function( $request, $response, $args ) {
-		return \Aimeos\Slim\Controller\Extadm::doAction( $this, $request, $response, $args );
-	})->setName( 'aimeos_shop_extadm_json' );
+	$this->map(['POST'], '/do', function($request, $response, $args) {
+		return \Aimeos\Slim\Controller\Extadm::doAction($this, $request, $response, $args);
+	})->setName('aimeos_shop_extadm_json');
 
-	$this->map(['GET'], '[/{lang}[/{tab:[0-9]+}]]', function( $request, $response, $args ) {
-		return \Aimeos\Slim\Controller\Extadm::indexAction( $this, $request, $response, $args );
-	})->setName( 'aimeos_shop_extadm' );
+	$this->map(['GET'], '[/{lang}[/{tab:[0-9]+}]]', function($request, $response, $args) {
+		return \Aimeos\Slim\Controller\Extadm::indexAction($this, $request, $response, $args);
+	})->setName('aimeos_shop_extadm');
 
 });
 
 
-$app->group( $config( 'routes/jqadm', '/admin/{site}/jqadm' ), function() use ( $config ) {
+$app->group($config('routes/jqadm', '/admin/{site}/jqadm'), function() use ($config) {
 
-	$this->map(['GET'], '/file/{type}', function( $request, $response, $args ) {
-		return \Aimeos\Slim\Controller\Jqadm::fileAction( $this, $request, $response, $args );
-	})->setName( 'aimeos_shop_jqadm_file' );
+	$this->map(['GET'], '/file/{type}', function($request, $response, $args) {
+		return \Aimeos\Slim\Controller\Jqadm::fileAction($this, $request, $response, $args);
+	})->setName('aimeos_shop_jqadm_file');
 
-	$this->map(['GET', 'POST'], '/copy/{resource:[^0-9A-Z\-\_]+}[/{id:[0-9A-Z\-\_]*}]', function( $request, $response, $args ) {
-		return \Aimeos\Slim\Controller\Jqadm::copyAction( $this, $request, $response, $args );
-	})->setName( 'aimeos_shop_jqadm_copy' );
+	$this->map(['GET', 'POST'], '/copy/{resource:[^0-9A-Z\-\_]+}[/{id:[0-9A-Z\-\_]*}]', function($request, $response, $args) {
+		return \Aimeos\Slim\Controller\Jqadm::copyAction($this, $request, $response, $args);
+	})->setName('aimeos_shop_jqadm_copy');
 
-	$this->map(['GET', 'POST'], '/create/{resource:[^0-9A-Z\-\_]+}', function( $request, $response, $args ) {
-		return \Aimeos\Slim\Controller\Jqadm::createAction( $this, $request, $response, $args );
-	})->setName( 'aimeos_shop_jqadm_create' );
+	$this->map(['GET', 'POST'], '/create/{resource:[^0-9A-Z\-\_]+}', function($request, $response, $args) {
+		return \Aimeos\Slim\Controller\Jqadm::createAction($this, $request, $response, $args);
+	})->setName('aimeos_shop_jqadm_create');
 
-	$this->map(['GET', 'POST'], '/delete/{resource:[^0-9A-Z\-\_]+}[/{id:[0-9A-Z\-\_]*}]', function( $request, $response, $args ) {
-		return \Aimeos\Slim\Controller\Jqadm::deleteAction( $this, $request, $response, $args );
-	})->setName( 'aimeos_shop_jqadm_delete' );
+	$this->map(['GET', 'POST'], '/delete/{resource:[^0-9A-Z\-\_]+}[/{id:[0-9A-Z\-\_]*}]', function($request, $response, $args) {
+		return \Aimeos\Slim\Controller\Jqadm::deleteAction($this, $request, $response, $args);
+	})->setName('aimeos_shop_jqadm_delete');
 
-	$this->map(['GET', 'POST'], '/export/{resource:[^0-9A-Z\-\_]+}', function( $request, $response, $args ) {
-		return \Aimeos\Slim\Controller\Jqadm::exportAction( $this, $request, $response, $args );
-	})->setName( 'aimeos_shop_jqadm_export' );
+	$this->map(['GET', 'POST'], '/export/{resource:[^0-9A-Z\-\_]+}', function($request, $response, $args) {
+		return \Aimeos\Slim\Controller\Jqadm::exportAction($this, $request, $response, $args);
+	})->setName('aimeos_shop_jqadm_export');
 
-	$this->map(['GET'], '/get/{resource:[^0-9A-Z\-\_]+}[/{id:[0-9A-Z\-\_]*}]', function( $request, $response, $args ) {
-		return \Aimeos\Slim\Controller\Jqadm::getAction( $this, $request, $response, $args );
-	})->setName( 'aimeos_shop_jqadm_get' );
+	$this->map(['GET'], '/get/{resource:[^0-9A-Z\-\_]+}[/{id:[0-9A-Z\-\_]*}]', function($request, $response, $args) {
+		return \Aimeos\Slim\Controller\Jqadm::getAction($this, $request, $response, $args);
+	})->setName('aimeos_shop_jqadm_get');
 
-	$this->map(['POST'], '/save/{resource:[^0-9A-Z\-\_]+}[/{id:[0-9A-Z\-\_]*}]', function( $request, $response, $args ) {
-		return \Aimeos\Slim\Controller\Jqadm::saveAction( $this, $request, $response, $args );
-	})->setName( 'aimeos_shop_jqadm_save' );
+	$this->map(['POST'], '/save/{resource:[^0-9A-Z\-\_]+}[/{id:[0-9A-Z\-\_]*}]', function($request, $response, $args) {
+		return \Aimeos\Slim\Controller\Jqadm::saveAction($this, $request, $response, $args);
+	})->setName('aimeos_shop_jqadm_save');
 
-	$this->map(['GET', 'POST'], '/search/{resource:[^0-9A-Z\-\_]+}', function( $request, $response, $args ) {
-		return \Aimeos\Slim\Controller\Jqadm::searchAction( $this, $request, $response, $args );
-	})->setName( 'aimeos_shop_jqadm_search' );
+	$this->map(['GET', 'POST'], '/search/{resource:[^0-9A-Z\-\_]+}', function($request, $response, $args) {
+		return \Aimeos\Slim\Controller\Jqadm::searchAction($this, $request, $response, $args);
+	})->setName('aimeos_shop_jqadm_search');
 
 });
 
 
-$app->group( $config( 'routes/jsonadm', '/admin/{site}/jsonadm' ), function() use ( $config ) {
+$app->group($config('routes/jsonadm', '/admin/{site}/jsonadm'), function() use ($config) {
 
-	$this->map(['DELETE'], '/{resource:[^0-9A-Z\-\_]+}[/{id:[0-9A-Z\-\_]*}]', function( $request, $response, $args ) {
-		return \Aimeos\Slim\Controller\Jsonadm::deleteAction( $this, $request, $response, $args );
-	})->setName( 'aimeos_shop_jsonadm_delete' );
+	$this->map(['DELETE'], '/{resource:[^0-9A-Z\-\_]+}[/{id:[0-9A-Z\-\_]*}]', function($request, $response, $args) {
+		return \Aimeos\Slim\Controller\Jsonadm::deleteAction($this, $request, $response, $args);
+	})->setName('aimeos_shop_jsonadm_delete');
 
-	$this->map(['GET'], '/{resource:[^0-9A-Z\-\_]+}[/{id:[0-9A-Z\-\_]*}]', function( $request, $response, $args ) {
-		return \Aimeos\Slim\Controller\Jsonadm::getAction( $this, $request, $response, $args );
-	})->setName( 'aimeos_shop_jsonadm_get' );
+	$this->map(['GET'], '/{resource:[^0-9A-Z\-\_]+}[/{id:[0-9A-Z\-\_]*}]', function($request, $response, $args) {
+		return \Aimeos\Slim\Controller\Jsonadm::getAction($this, $request, $response, $args);
+	})->setName('aimeos_shop_jsonadm_get');
 
-	$this->map(['PATCH'], '/{resource:[^0-9A-Z\-\_]+}[/{id:[0-9A-Z\-\_]*}]', function( $request, $response, $args ) {
-		return \Aimeos\Slim\Controller\Jsonadm::patchAction( $this, $request, $response, $args );
-	})->setName( 'aimeos_shop_jsonadm_patch' );
+	$this->map(['PATCH'], '/{resource:[^0-9A-Z\-\_]+}[/{id:[0-9A-Z\-\_]*}]', function($request, $response, $args) {
+		return \Aimeos\Slim\Controller\Jsonadm::patchAction($this, $request, $response, $args);
+	})->setName('aimeos_shop_jsonadm_patch');
 
-	$this->map(['POST'], '/{resource:[^0-9A-Z\-\_]+}[/{id:[0-9A-Z\-\_]*}]', function( $request, $response, $args ) {
-		return \Aimeos\Slim\Controller\Jsonadm::postAction( $this, $request, $response, $args );
-	})->setName( 'aimeos_shop_jsonadm_post' );
+	$this->map(['POST'], '/{resource:[^0-9A-Z\-\_]+}[/{id:[0-9A-Z\-\_]*}]', function($request, $response, $args) {
+		return \Aimeos\Slim\Controller\Jsonadm::postAction($this, $request, $response, $args);
+	})->setName('aimeos_shop_jsonadm_post');
 
-	$this->map(['PUT'], '/{resource:[^0-9A-Z\-\_]+}[/{id:[0-9A-Z\-\_]*}]', function( $request, $response, $args ) {
-		return \Aimeos\Slim\Controller\Jsonadm::putAction( $this, $request, $response, $args );
-	})->setName( 'aimeos_shop_jsonadm_put' );
+	$this->map(['PUT'], '/{resource:[^0-9A-Z\-\_]+}[/{id:[0-9A-Z\-\_]*}]', function($request, $response, $args) {
+		return \Aimeos\Slim\Controller\Jsonadm::putAction($this, $request, $response, $args);
+	})->setName('aimeos_shop_jsonadm_put');
 
-	$this->map(['OPTIONS'], '/[{resource}]', function( $request, $response, $args ) {
-		return \Aimeos\Slim\Controller\Jsonadm::optionsAction( $this, $request, $response, $args );
-	})->setName( 'aimeos_shop_jsonadm_options' );
+	$this->map(['OPTIONS'], '/[{resource}]', function($request, $response, $args) {
+		return \Aimeos\Slim\Controller\Jsonadm::optionsAction($this, $request, $response, $args);
+	})->setName('aimeos_shop_jsonadm_options');
 
 });
 
 
-$app->group( $config( 'routes/jsonapi', '/jsonapi' ), function() use ( $config ) {
+$app->group($config('routes/jsonapi', '/jsonapi'), function() use ($config) {
 
-	$this->map(['DELETE'], '/{resource}', function( $request, $response, $args ) {
-		return \Aimeos\Slim\Controller\Jsonapi::deleteAction( $this, $request, $response, $args );
-	})->setName( 'aimeos_shop_jsonapi_delete' );
+	$this->map(['DELETE'], '/{resource}', function($request, $response, $args) {
+		return \Aimeos\Slim\Controller\Jsonapi::deleteAction($this, $request, $response, $args);
+	})->setName('aimeos_shop_jsonapi_delete');
 
-	$this->map(['GET'], '/{resource}', function( $request, $response, $args ) {
-		return \Aimeos\Slim\Controller\Jsonapi::getAction( $this, $request, $response, $args );
-	})->setName( 'aimeos_shop_jsonapi_get' );
+	$this->map(['GET'], '/{resource}', function($request, $response, $args) {
+		return \Aimeos\Slim\Controller\Jsonapi::getAction($this, $request, $response, $args);
+	})->setName('aimeos_shop_jsonapi_get');
 
-	$this->map(['PATCH'], '/{resource}', function( $request, $response, $args ) {
-		return \Aimeos\Slim\Controller\Jsonapi::patchAction( $this, $request, $response, $args );
-	})->setName( 'aimeos_shop_jsonapi_patch' );
+	$this->map(['PATCH'], '/{resource}', function($request, $response, $args) {
+		return \Aimeos\Slim\Controller\Jsonapi::patchAction($this, $request, $response, $args);
+	})->setName('aimeos_shop_jsonapi_patch');
 
-	$this->map(['POST'], '/{resource}', function( $request, $response, $args ) {
-		return \Aimeos\Slim\Controller\Jsonapi::postAction( $this, $request, $response, $args );
-	})->setName( 'aimeos_shop_jsonapi_post' );
+	$this->map(['POST'], '/{resource}', function($request, $response, $args) {
+		return \Aimeos\Slim\Controller\Jsonapi::postAction($this, $request, $response, $args);
+	})->setName('aimeos_shop_jsonapi_post');
 
-	$this->map(['PUT'], '/{resource}', function( $request, $response, $args ) {
-		return \Aimeos\Slim\Controller\Jsonapi::putAction( $this, $request, $response, $args );
-	})->setName( 'aimeos_shop_jsonapi_put' );
+	$this->map(['PUT'], '/{resource}', function($request, $response, $args) {
+		return \Aimeos\Slim\Controller\Jsonapi::putAction($this, $request, $response, $args);
+	})->setName('aimeos_shop_jsonapi_put');
 
-	$this->map(['OPTIONS'], '/[{resource}]', function( $request, $response, $args ) {
-		return \Aimeos\Slim\Controller\Jsonapi::optionsAction( $this, $request, $response, $args );
-	})->setName( 'aimeos_shop_jsonapi_options' );
+	$this->map(['OPTIONS'], '/[{resource}]', function($request, $response, $args) {
+		return \Aimeos\Slim\Controller\Jsonapi::optionsAction($this, $request, $response, $args);
+	})->setName('aimeos_shop_jsonapi_options');
 
 });
 
 
-$app->group( $config( 'routes/account', '' ), function() {
+$app->group($config('routes/account', ''), function() {
 
-	$this->map(['GET', 'POST'], '/myaccount', function( $request, $response, $args ) {
-		return \Aimeos\Slim\Controller\Account::indexAction( $this, $request, $response, $args );
-	})->setName( 'aimeos_shop_account' );
+	$this->map(['GET', 'POST'], '/myaccount', function($request, $response, $args) {
+		return \Aimeos\Slim\Controller\Account::indexAction($this, $request, $response, $args);
+	})->setName('aimeos_shop_account');
 
-	$this->map(['GET', 'POST'], '/myaccount/favorite[/{fav_action}/{fav_id:[0-9]+}[/{d_prodid:[0-9]+}[/{d_name}[/{d_pos:[0-9]+}]]]]', function( $request, $response, $args ) {
-		return \Aimeos\Slim\Controller\Account::indexAction( $this, $request, $response, $args );
-	})->setName( 'aimeos_shop_account_favorite' );
+	$this->map(['GET', 'POST'], '/myaccount/favorite[/{fav_action}/{fav_id:[0-9]+}[/{d_prodid:[0-9]+}[/{d_name}[/{d_pos:[0-9]+}]]]]', function($request, $response, $args) {
+		return \Aimeos\Slim\Controller\Account::indexAction($this, $request, $response, $args);
+	})->setName('aimeos_shop_account_favorite');
 
-	$this->map(['GET', 'POST'], '/myaccount/watch[/{wat_action}/{wat_id:[0-9]+}[/{d_prodid:[0-9]+}[/{d_name}[/{d_pos:[0-9]+}]]]]', function( $request, $response, $args ) {
-		return \Aimeos\Slim\Controller\Account::indexAction( $this, $request, $response, $args );
-	})->setName( 'aimeos_shop_account_watch' );
+	$this->map(['GET', 'POST'], '/myaccount/watch[/{wat_action}/{wat_id:[0-9]+}[/{d_prodid:[0-9]+}[/{d_name}[/{d_pos:[0-9]+}]]]]', function($request, $response, $args) {
+		return \Aimeos\Slim\Controller\Account::indexAction($this, $request, $response, $args);
+	})->setName('aimeos_shop_account_watch');
 
-	$this->map(['GET', 'POST'], '/myaccount/download/{dl_id}', function( $request, $response, $args ) {
-		return \Aimeos\Slim\Controller\Account::downloadAction( $this, $request, $response, $args );
-	})->setName( 'aimeos_shop_account_download' );
+	$this->map(['GET', 'POST'], '/myaccount/download/{dl_id}', function($request, $response, $args) {
+		return \Aimeos\Slim\Controller\Account::downloadAction($this, $request, $response, $args);
+	})->setName('aimeos_shop_account_download');
 
 });
 
 
-$app->group( $config( 'routes/default', '' ), function() {
+$app->group($config('routes/default', ''), function() {
 
-	$this->map(['GET', 'POST'], '/count', function( $request, $response, $args ) {
-		return \Aimeos\Slim\Controller\Catalog::countAction( $this, $request, $response, $args );
-	})->setName( 'aimeos_shop_count' );
+	$this->map(['GET', 'POST'], '/count', function($request, $response, $args) {
+		return \Aimeos\Slim\Controller\Catalog::countAction($this, $request, $response, $args);
+	})->setName('aimeos_shop_count');
 
-	$this->map(['GET', 'POST'], '/detail/{d_prodid:[0-9]+}[/{d_name}[/{d_pos:[0-9]+}]]', function( $request, $response, $args ) {
-		return \Aimeos\Slim\Controller\Catalog::detailAction( $this, $request, $response, $args );
-	})->setName( 'aimeos_shop_detail' );
+	$this->map(['GET', 'POST'], '/detail/{d_prodid:[0-9]+}[/{d_name}[/{d_pos:[0-9]+}]]', function($request, $response, $args) {
+		return \Aimeos\Slim\Controller\Catalog::detailAction($this, $request, $response, $args);
+	})->setName('aimeos_shop_detail');
 
-	$this->map(['GET', 'POST'], '/detail/pin[/{pin_action}/{pin_id:[0-9]+}[/{d_prodid:[0-9]+}[/{d_name}[/{d_pos:[0-9]+}]]]]', function( $request, $response, $args ) {
-		return \Aimeos\Slim\Controller\Catalog::detailAction( $this, $request, $response, $args );
-	})->setName( 'aimeos_shop_session_pinned' );
+	$this->map(['GET', 'POST'], '/detail/pin[/{pin_action}/{pin_id:[0-9]+}[/{d_prodid:[0-9]+}[/{d_name}[/{d_pos:[0-9]+}]]]]', function($request, $response, $args) {
+		return \Aimeos\Slim\Controller\Catalog::detailAction($this, $request, $response, $args);
+	})->setName('aimeos_shop_session_pinned');
 
-	$this->map(['GET', 'POST'], '/list[/{f_catid:[0-9]+}[/{f_name}]]', function( $request, $response, $args ) {
-		return \Aimeos\Slim\Controller\Catalog::listAction( $this, $request, $response, $args );
-	})->setName( 'aimeos_shop_list' );
+	$this->map(['GET', 'POST'], '/list[/{f_catid:[0-9]+}[/{f_name}]]', function($request, $response, $args) {
+		return \Aimeos\Slim\Controller\Catalog::listAction($this, $request, $response, $args);
+	})->setName('aimeos_shop_list');
 
-	$this->map(['GET', 'POST'], '/suggest', function( $request, $response, $args ) {
-		return \Aimeos\Slim\Controller\Catalog::suggestAction( $this, $request, $response, $args );
-	})->setName( 'aimeos_shop_suggest' );
+	$this->map(['GET', 'POST'], '/suggest', function($request, $response, $args) {
+		return \Aimeos\Slim\Controller\Catalog::suggestAction($this, $request, $response, $args);
+	})->setName('aimeos_shop_suggest');
 
-	$this->map(['GET', 'POST'], '/stock', function( $request, $response, $args ) {
-		return \Aimeos\Slim\Controller\Catalog::stockAction( $this, $request, $response, $args );
-	})->setName( 'aimeos_shop_stock' );
+	$this->map(['GET', 'POST'], '/stock', function($request, $response, $args) {
+		return \Aimeos\Slim\Controller\Catalog::stockAction($this, $request, $response, $args);
+	})->setName('aimeos_shop_stock');
 
-	$this->map(['GET', 'POST'], '/basket', function( $request, $response, $args ) {
-		return \Aimeos\Slim\Controller\Basket::indexAction( $this, $request, $response, $args );
-	})->setName( 'aimeos_shop_basket' );
+	$this->map(['GET', 'POST'], '/basket', function($request, $response, $args) {
+		return \Aimeos\Slim\Controller\Basket::indexAction($this, $request, $response, $args);
+	})->setName('aimeos_shop_basket');
 
-	$this->map(['GET', 'POST'], '/checkout[/{c_step}]', function( $request, $response, $args ) {
-		return \Aimeos\Slim\Controller\Checkout::indexAction( $this, $request, $response, $args );
-	})->setName( 'aimeos_shop_checkout' );
+	$this->map(['GET', 'POST'], '/checkout[/{c_step}]', function($request, $response, $args) {
+		return \Aimeos\Slim\Controller\Checkout::indexAction($this, $request, $response, $args);
+	})->setName('aimeos_shop_checkout');
 
-	$this->map(['GET', 'POST'], '/confirm[/{code}]', function( $request, $response, $args ) {
-		return \Aimeos\Slim\Controller\Checkout::confirmAction( $this, $request, $response, $args );
-	})->setName( 'aimeos_shop_confirm' );
+	$this->map(['GET', 'POST'], '/confirm[/{code}]', function($request, $response, $args) {
+		return \Aimeos\Slim\Controller\Checkout::confirmAction($this, $request, $response, $args);
+	})->setName('aimeos_shop_confirm');
 
 });
 
 
-$app->group( $config( 'routes/update', '' ), function() {
+$app->group($config('routes/update', ''), function() {
 
-	$this->map(['GET', 'POST'], '/update', function( $request, $response, $args ) {
-		return \Aimeos\Slim\Controller\Checkout::updateAction( $this, $request, $response, $args );
-	})->setName( 'aimeos_shop_update' );
+	$this->map(['GET', 'POST'], '/update', function($request, $response, $args) {
+		return \Aimeos\Slim\Controller\Checkout::updateAction($this, $request, $response, $args);
+	})->setName('aimeos_shop_update');
 
 });
 
 
-$app->map(['GET', 'POST'], '/terms', function( $request, $response, $args ) {
+$app->map(['GET', 'POST'], '/terms', function($request, $response, $args) {
 	return 'terms';
-})->setName( 'aimeos_shop_terms' );
+})->setName('aimeos_shop_terms');
 
-$app->map(['GET', 'POST'], '/privacy', function( $request, $response, $args ) {
+$app->map(['GET', 'POST'], '/privacy', function($request, $response, $args) {
 	return 'privacy';
-})->setName( 'aimeos_shop_privacy' );
+})->setName('aimeos_shop_privacy');

src/Controller/Jqadm.php

Spacing +58 added lines, -58 removed lines

@@ -32,36 +32,36 @@ 
 	 * @param array $args Associative list of route parameters
 	 * @return ResponseInterface Modified response object with generated output
 	 */
-	public static function fileAction( ContainerInterface $container, ServerRequestInterface $request, ResponseInterface $response, array $args )
+	public static function fileAction(ContainerInterface $container, ServerRequestInterface $request, ResponseInterface $response, array $args)
 	{
 		$contents = '';
 		$files = array();
-		$aimeos = $container->get( 'aimeos' );
-		$type = ( isset( $args['type'] ) ? $args['type'] : 'js' );
+		$aimeos = $container->get('aimeos');
+		$type = (isset($args['type']) ? $args['type'] : 'js');
 
-		foreach( $aimeos->getCustomPaths( 'admin/jqadm' ) as $base => $paths )
+		foreach ($aimeos->getCustomPaths('admin/jqadm') as $base => $paths)
 		{
-			foreach( $paths as $path )
+			foreach ($paths as $path)
 			{
-				$jsbAbsPath = $base . '/' . $path;
-				$jsb2 = new \Aimeos\MW\Jsb2\Standard( $jsbAbsPath, dirname( $jsbAbsPath ) );
-				$files = array_merge( $files, $jsb2->getFiles( $type ) );
+				$jsbAbsPath = $base.'/'.$path;
+				$jsb2 = new \Aimeos\MW\Jsb2\Standard($jsbAbsPath, dirname($jsbAbsPath));
+				$files = array_merge($files, $jsb2->getFiles($type));
 			}
 		}
 
-		foreach( $files as $file )
+		foreach ($files as $file)
 		{
-			if( ( $content = file_get_contents( $file ) ) !== false ) {
+			if (($content = file_get_contents($file)) !== false) {
 				$contents .= $content;
 			}
 		}
 
-		$response->getBody()->write( $contents );
+		$response->getBody()->write($contents);
 
-		if( $type === 'js' ) {
-			$response = $response->withHeader( 'Content-Type', 'application/javascript' );
-		} elseif( $type === 'css' ) {
-			$response = $response->withHeader( 'Content-Type', 'text/css' );
+		if ($type === 'js') {
+			$response = $response->withHeader('Content-Type', 'application/javascript');
+		} elseif ($type === 'css') {
+			$response = $response->withHeader('Content-Type', 'text/css');
 		}
 
 		return $response;
@@ -77,15 +77,15 @@ 
 	 * @param array $args Associative list of route parameters
 	 * @return ResponseInterface Modified response object with generated output
 	 */
-	public static function copyAction( ContainerInterface $container, ServerRequestInterface $request, ResponseInterface $response, array $args )
+	public static function copyAction(ContainerInterface $container, ServerRequestInterface $request, ResponseInterface $response, array $args)
 	{
-		$cntl = self::createClient( $container, $request, $response, $args );
+		$cntl = self::createClient($container, $request, $response, $args);
 
-		if( ( $html = $cntl->copy() ) == '' ) {
+		if (($html = $cntl->copy()) == '') {
 			return $cntl->getView()->response();
 		}
 
-		return self::getHtml( $container, $response, $html );
+		return self::getHtml($container, $response, $html);
 	}
 
 
@@ -98,15 +98,15 @@ 
 	 * @param array $args Associative list of route parameters
 	 * @return ResponseInterface Modified response object with generated output
 	 */
-	public static function createAction( ContainerInterface $container, ServerRequestInterface $request, ResponseInterface $response, array $args )
+	public static function createAction(ContainerInterface $container, ServerRequestInterface $request, ResponseInterface $response, array $args)
 	{
-		$cntl = self::createClient( $container, $request, $response, $args );
+		$cntl = self::createClient($container, $request, $response, $args);
 
-		if( ( $html = $cntl->create() ) == '' ) {
+		if (($html = $cntl->create()) == '') {
 			return $cntl->getView()->response();
 		}
 
-		return self::getHtml( $container, $response, $html );
+		return self::getHtml($container, $response, $html);
 	}
 
 
@@ -119,15 +119,15 @@ 
 	 * @param array $args Associative list of route parameters
 	 * @return ResponseInterface Modified response object with generated output
 	 */
-	public static function deleteAction( ContainerInterface $container, ServerRequestInterface $request, ResponseInterface $response, array $args )
+	public static function deleteAction(ContainerInterface $container, ServerRequestInterface $request, ResponseInterface $response, array $args)
 	{
-		$cntl = self::createClient( $container, $request, $response, $args );
+		$cntl = self::createClient($container, $request, $response, $args);
 
-		if( ( $html = $cntl->delete() ) == '' ) {
+		if (($html = $cntl->delete()) == '') {
 			return $cntl->getView()->response();
 		}
 
-		return self::getHtml( $container, $response, $html );
+		return self::getHtml($container, $response, $html);
 	}
 
 
@@ -140,15 +140,15 @@ 
 	 * @param array $args Associative list of route parameters
 	 * @return ResponseInterface Modified response object with generated output
 	 */
-	public static function exportAction( ContainerInterface $container, ServerRequestInterface $request, ResponseInterface $response, array $args )
+	public static function exportAction(ContainerInterface $container, ServerRequestInterface $request, ResponseInterface $response, array $args)
 	{
-		$cntl = self::createClient( $container, $request, $response, $args );
+		$cntl = self::createClient($container, $request, $response, $args);
 
-		if( ( $html = $cntl->export() ) == '' ) {
+		if (($html = $cntl->export()) == '') {
 			return $cntl->getView()->response();
 		}
 
-		return self::getHtml( $container, $response, $html );
+		return self::getHtml($container, $response, $html);
 	}
 
 
@@ -161,15 +161,15 @@ 
 	 * @param array $args Associative list of route parameters
 	 * @return ResponseInterface Modified response object with generated output
 	 */
-	public static function getAction( ContainerInterface $container, ServerRequestInterface $request, ResponseInterface $response, array $args )
+	public static function getAction(ContainerInterface $container, ServerRequestInterface $request, ResponseInterface $response, array $args)
 	{
-		$cntl = self::createClient( $container, $request, $response, $args );
+		$cntl = self::createClient($container, $request, $response, $args);
 
-		if( ( $html = $cntl->get() ) == '' ) {
+		if (($html = $cntl->get()) == '') {
 			return $cntl->getView()->response();
 		}
 
-		return self::getHtml( $container, $response, $html );
+		return self::getHtml($container, $response, $html);
 	}
 
 
@@ -182,15 +182,15 @@ 
 	 * @param array $args Associative list of route parameters
 	 * @return ResponseInterface Modified response object with generated output
 	 */
-	public static function saveAction( ContainerInterface $container, ServerRequestInterface $request, ResponseInterface $response, array $args )
+	public static function saveAction(ContainerInterface $container, ServerRequestInterface $request, ResponseInterface $response, array $args)
 	{
-		$cntl = self::createClient( $container, $request, $response, $args );
+		$cntl = self::createClient($container, $request, $response, $args);
 
-		if( ( $html = $cntl->save() ) == '' ) {
+		if (($html = $cntl->save()) == '') {
 			return $cntl->getView()->response();
 		}
 
-		return self::getHtml( $container, $response, $html );
+		return self::getHtml($container, $response, $html);
 	}
 
 
@@ -203,15 +203,15 @@ 
 	 * @param array $args Associative list of route parameters
 	 * @return ResponseInterface Modified response object with generated output
 	 */
-	public static function searchAction( ContainerInterface $container, ServerRequestInterface $request, ResponseInterface $response, array $args )
+	public static function searchAction(ContainerInterface $container, ServerRequestInterface $request, ResponseInterface $response, array $args)
 	{
-		$cntl = self::createClient( $container, $request, $response, $args );
+		$cntl = self::createClient($container, $request, $response, $args);
 
-		if( ( $html = $cntl->search() ) == '' ) {
+		if (($html = $cntl->search()) == '') {
 			return $cntl->getView()->response();
 		}
 
-		return self::getHtml( $container, $response, $html );
+		return self::getHtml($container, $response, $html);
 	}
 
 
@@ -224,29 +224,29 @@ 
 	 * @param array $args Associative list of route parameters
 	 * @return \Aimeos\Admin\JQAdm\Iface JQAdm client
 	 */
-	protected static function createClient( ContainerInterface $container, ServerRequestInterface $request, ResponseInterface $response, array $args )
+	protected static function createClient(ContainerInterface $container, ServerRequestInterface $request, ResponseInterface $response, array $args)
 	{
-		$aimeos = $container->get( 'aimeos' );
-		$templatePaths = $aimeos->getCustomPaths( 'admin/jqadm/templates' );
+		$aimeos = $container->get('aimeos');
+		$templatePaths = $aimeos->getCustomPaths('admin/jqadm/templates');
 		$params = $args + (array) $request->getParsedBody() + (array) $request->getQueryParams();
 
-		$resource = ( isset( $params['resource'] ) ? $params['resource'] : null );
-		$site = ( isset( $params['site'] ) ? $params['site'] : 'default' );
-		$lang = ( isset( $params['lang'] ) ? $params['lang'] : 'en' );
+		$resource = (isset($params['resource']) ? $params['resource'] : null);
+		$site = (isset($params['site']) ? $params['site'] : 'default');
+		$lang = (isset($params['lang']) ? $params['lang'] : 'en');
 
-		$context = $container->get( 'aimeos_context' )->get( false, $args, 'backend' );
-		$context->setI18n( $container->get( 'aimeos_i18n' )->get( array( $lang, 'en' ) ) );
-		$context->setLocale( $container->get( 'aimeos_locale' )->getBackend( $context, $site ) );
+		$context = $container->get('aimeos_context')->get(false, $args, 'backend');
+		$context->setI18n($container->get('aimeos_i18n')->get(array($lang, 'en')));
+		$context->setLocale($container->get('aimeos_locale')->getBackend($context, $site));
 
-		$view = $container->get( 'aimeos_view' )->create( $context, $request, $response, $args, $templatePaths, $lang );
+		$view = $container->get('aimeos_view')->create($context, $request, $response, $args, $templatePaths, $lang);
 
 		$view->aimeosType = 'Slim';
 		$view->aimeosVersion = \Aimeos\Slim\Bootstrap::getVersion();
-		$view->aimeosExtensions = implode( ',', $aimeos->getExtensions() );
+		$view->aimeosExtensions = implode(',', $aimeos->getExtensions());
 
-		$context->setView( $view );
+		$context->setView($view);
 
-		return \Aimeos\Admin\JQAdm\Factory::createClient( $context, $aimeos, $resource );
+		return \Aimeos\Admin\JQAdm\Factory::createClient($context, $aimeos, $resource);
 	}
 
 
@@ -258,8 +258,8 @@ 
 	 * @param string $content Content from admin client
 	 * @return ResponseInterface Modified response object with generated output
 	 */
-	protected static function getHtml( ContainerInterface $container, ResponseInterface $response, $content )
+	protected static function getHtml(ContainerInterface $container, ResponseInterface $response, $content)
 	{
-		return $container->get( 'view' )->render( $response, 'Jqadm/index.html.twig', array( 'content' => $content ) );
+		return $container->get('view')->render($response, 'Jqadm/index.html.twig', array('content' => $content));
 	}
 }

src/Controller/Jsonapi.php

Spacing +20 added lines, -20 removed lines

@@ -32,9 +32,9 @@ 
 	 * @param array $args Associative list of route parameters
 	 * @return ResponseInterface $response Modified response object with generated output
 	 */
-	public static function deleteAction( ContainerInterface $container, ServerRequestInterface $request, ResponseInterface $response, array $args )
+	public static function deleteAction(ContainerInterface $container, ServerRequestInterface $request, ResponseInterface $response, array $args)
 	{
-		return self::createClient( $container, $request, $response, $args )->delete( $request, $response );
+		return self::createClient($container, $request, $response, $args)->delete($request, $response);
 	}
 
 
@@ -47,9 +47,9 @@ 
 	 * @param array $args Associative list of route parameters
 	 * @return ResponseInterface $response Modified response object with generated output
 	 */
-	public static function getAction( ContainerInterface $container, ServerRequestInterface $request, ResponseInterface $response, array $args )
+	public static function getAction(ContainerInterface $container, ServerRequestInterface $request, ResponseInterface $response, array $args)
 	{
-		return self::createClient( $container, $request, $response, $args )->get( $request, $response );
+		return self::createClient($container, $request, $response, $args)->get($request, $response);
 	}
 
 
@@ -62,9 +62,9 @@ 
 	 * @param array $args Associative list of route parameters
 	 * @return ResponseInterface $response Modified response object with generated output
 	 */
-	public static function patchAction( ContainerInterface $container, ServerRequestInterface $request, ResponseInterface $response, array $args )
+	public static function patchAction(ContainerInterface $container, ServerRequestInterface $request, ResponseInterface $response, array $args)
 	{
-		return self::createClient( $container, $request, $response, $args )->patch( $request, $response );
+		return self::createClient($container, $request, $response, $args)->patch($request, $response);
 	}
 
 
@@ -77,9 +77,9 @@ 
 	 * @param array $args Associative list of route parameters
 	 * @return ResponseInterface $response Modified response object with generated output
 	 */
-	public static function postAction( ContainerInterface $container, ServerRequestInterface $request, ResponseInterface $response, array $args )
+	public static function postAction(ContainerInterface $container, ServerRequestInterface $request, ResponseInterface $response, array $args)
 	{
-		return self::createClient( $container, $request, $response, $args )->post( $request, $response );
+		return self::createClient($container, $request, $response, $args)->post($request, $response);
 	}
 
 
@@ -92,9 +92,9 @@ 
 	 * @param array $args Associative list of route parameters
 	 * @return ResponseInterface $response Modified response object with generated output
 	 */
-	public static function putAction( ContainerInterface $container, ServerRequestInterface $request, ResponseInterface $response, array $args )
+	public static function putAction(ContainerInterface $container, ServerRequestInterface $request, ResponseInterface $response, array $args)
 	{
-		return self::createClient( $container, $request, $response, $args )->put( $request, $response );
+		return self::createClient($container, $request, $response, $args)->put($request, $response);
 	}
 
 
@@ -107,9 +107,9 @@ 
 	 * @param array $args Associative list of route parameters
 	 * @return ResponseInterface $response Modified response object with generated output
 	 */
-	public static function optionsAction( ContainerInterface $container, ServerRequestInterface $request, ResponseInterface $response, array $args )
+	public static function optionsAction(ContainerInterface $container, ServerRequestInterface $request, ResponseInterface $response, array $args)
 	{
-		return self::createClient( $container, $request, $response, $args )->options( $request, $response );
+		return self::createClient($container, $request, $response, $args)->options($request, $response);
 	}
 
 
@@ -122,19 +122,19 @@ 
 	 * @param array $args Associative list of route parameters
 	 * @return \Aimeos\Client\JsonApi\Iface JSON client controller
 	 */
-	protected static function createClient( ContainerInterface $container, ServerRequestInterface $request, ResponseInterface $response, array $args )
+	protected static function createClient(ContainerInterface $container, ServerRequestInterface $request, ResponseInterface $response, array $args)
 	{
 		$params = $request->getQueryParams();
-		$resource = ( isset( $args['resource'] ) ? $args['resource'] : ( isset( $params['resource'] ) ? $params['resource'] : null ) );
-		$related = ( isset( $args['related'] ) ? $args['related'] : ( isset( $params['related'] ) ? $params['related'] : null ) );
-		$tmplPaths = $container->get( 'aimeos' )->getCustomPaths( 'client/jsonapi/templates' );
+		$resource = (isset($args['resource']) ? $args['resource'] : (isset($params['resource']) ? $params['resource'] : null));
+		$related = (isset($args['related']) ? $args['related'] : (isset($params['related']) ? $params['related'] : null));
+		$tmplPaths = $container->get('aimeos')->getCustomPaths('client/jsonapi/templates');
 
-		$context = $container->get( 'aimeos_context' )->get( true, $args );
+		$context = $container->get('aimeos_context')->get(true, $args);
 		$langid = $context->getLocale()->getLanguageId();
 
-		$view = $container->get( 'aimeos_view' )->create( $context, $request, $response, $args, $tmplPaths, $langid );
-		$context->setView( $view );
+		$view = $container->get('aimeos_view')->create($context, $request, $response, $args, $tmplPaths, $langid);
+		$context->setView($view);
 
-		return \Aimeos\Client\JsonApi\Factory::createClient( $context, $resource . '/' . $related );
+		return \Aimeos\Client\JsonApi\Factory::createClient($context, $resource.'/'.$related);
 	}
 }