aimeos / aimeos-slim

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::create( $context, 'log' );
+		$logger = \Aimeos\MAdmin::create($context, 'log');
 
-		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/Base/I18n.php

Spacing +11 added lines, -11 removed lines

@@ -29,7 +29,7 @@ 
 	 *
 	 * @param ContainerInterface $container Dependency container
 	 */
-	public function __construct( ContainerInterface $container )
+	public function __construct(ContainerInterface $container)
 	{
 		$this->container = $container;
 	}
@@ -41,23 +41,23 @@ 
 	 * @param array $languageIds List of two letter ISO language IDs
 	 * @return \Aimeos\MW\Translation\Iface[] List of translation objects
 	 */
-	public function get( array $languageIds )
+	public function get(array $languageIds)
 	{
-		$config = $this->container->get( 'aimeos.config' )->get();
-		$i18nPaths = $this->container->get( 'aimeos' )->getI18nPaths();
+		$config = $this->container->get('aimeos.config')->get();
+		$i18nPaths = $this->container->get('aimeos')->getI18nPaths();
 
-		foreach( $languageIds as $langid )
+		foreach ($languageIds as $langid)
 		{
-			if( !isset( $this->i18n[$langid] ) )
+			if (!isset($this->i18n[$langid]))
 			{
-				$i18n = new \Aimeos\MW\Translation\Gettext( $i18nPaths, $langid );
+				$i18n = new \Aimeos\MW\Translation\Gettext($i18nPaths, $langid);
 
-				if( function_exists( 'apcu_store' ) === true && $config->get( 'apc_enabled', false ) == true ) {
-					$i18n = new \Aimeos\MW\Translation\Decorator\APC( $i18n, $config->get( 'apc_prefix', 'slim:' ) );
+				if (function_exists('apcu_store') === true && $config->get('apc_enabled', false) == true) {
+					$i18n = new \Aimeos\MW\Translation\Decorator\APC($i18n, $config->get('apc_prefix', 'slim:'));
 				}
 
-				if( ( $cfg = $config->get( 'i18n/' . $langid, array() ) ) !== array() ) {
-					$i18n = new \Aimeos\MW\Translation\Decorator\Memory( $i18n, $cfg );
+				if (($cfg = $config->get('i18n/'.$langid, array())) !== array()) {
+					$i18n = new \Aimeos\MW\Translation\Decorator\Memory($i18n, $cfg);
 				}
 
 				$this->i18n[$langid] = $i18n;

src/Base/Locale.php

Spacing +13 added lines, -13 removed lines

@@ -29,7 +29,7 @@ 
 	 *
 	 * @param ContainerInterface $container Dependency container
 	 */
-	public function __construct( ContainerInterface $container )
+	public function __construct(ContainerInterface $container)
 	{
 		$this->container = $container;
 	}
@@ -42,18 +42,18 @@ 
 	 * @param array $attributes Associative list of URL parameter
 	 * @return \Aimeos\MShop\Locale\Item\Iface Locale item object
 	 */
-	public function get( \Aimeos\MShop\Context\Item\Iface $context, array $attributes )
+	public function get(\Aimeos\MShop\Context\Item\Iface $context, array $attributes)
 	{
-		if( $this->locale === null )
+		if ($this->locale === null)
 		{
-			$disableSites = $this->container->get( 'aimeos.config' )->get( 'disableSites', true );
+			$disableSites = $this->container->get('aimeos.config')->get('disableSites', true);
 
-			$site = ( isset( $attributes['site'] ) ? $attributes['site'] : 'default' );
-			$lang = ( isset( $attributes['locale'] ) ? $attributes['locale'] : '' );
-			$currency = ( isset( $attributes['currency'] ) ? $attributes['currency'] : '' );
+			$site = (isset($attributes['site']) ? $attributes['site'] : 'default');
+			$lang = (isset($attributes['locale']) ? $attributes['locale'] : '');
+			$currency = (isset($attributes['currency']) ? $attributes['currency'] : '');
 
-			$localeManager = \Aimeos\MShop::create( $context, 'locale' );
-			$this->locale = $localeManager->bootstrap( $site, $lang, $currency, $disableSites );
+			$localeManager = \Aimeos\MShop::create($context, 'locale');
+			$this->locale = $localeManager->bootstrap($site, $lang, $currency, $disableSites);
 		}
 
 		return $this->locale;
@@ -67,13 +67,13 @@ 
 	 * @param string $site Unique site code
 	 * @return \Aimeos\MShop\Locale\Item\Iface Locale item object
 	 */
-	public function getBackend( \Aimeos\MShop\Context\Item\Iface $context, $site )
+	public function getBackend(\Aimeos\MShop\Context\Item\Iface $context, $site)
 	{
-		$localeManager = \Aimeos\MShop::create( $context, 'locale' );
+		$localeManager = \Aimeos\MShop::create($context, 'locale');
 
 		try {
-			$localeItem = $localeManager->bootstrap( $site, '', '', false, null, true );
-		} catch( \Aimeos\MShop\Exception $e ) {
+			$localeItem = $localeManager->bootstrap($site, '', '', false, null, true);
+		} catch (\Aimeos\MShop\Exception $e) {
 			$localeItem = $localeManager->createItem();
 		}
 

src/Base/Shop.php

Spacing +12 added lines, -12 removed lines

@@ -30,7 +30,7 @@ 
 	 *
 	 * @param ContainerInterface $container Dependency container
 	 */
-	public function __construct( ContainerInterface $container )
+	public function __construct(ContainerInterface $container)
 	{
 		$this->container = $container;
 	}
@@ -45,24 +45,24 @@ 
 	 * @param array Associative list of URI attributes
 	 * @return array Associative list with body and header output separated by client name
 	 */
-	public function get( $pageName, ServerRequestInterface $request, ResponseInterface $response, array $attr )
+	public function get($pageName, ServerRequestInterface $request, ResponseInterface $response, array $attr)
 	{
-		$tmplPaths = $this->container->get( 'aimeos' )->getCustomPaths( 'client/html/templates' );
-		$context = $this->container->get( 'aimeos.context' )->get( true, $attr );
+		$tmplPaths = $this->container->get('aimeos')->getCustomPaths('client/html/templates');
+		$context = $this->container->get('aimeos.context')->get(true, $attr);
 		$langid = $context->getLocale()->getLanguageId();
 
-		$view = $this->container->get( 'aimeos.view' )->create( $context, $request, $response, $attr, $tmplPaths, $langid );
-		$context->setView( $view );
+		$view = $this->container->get('aimeos.view')->create($context, $request, $response, $attr, $tmplPaths, $langid);
+		$context->setView($view);
 
-		$pagesConfig = $this->container->get( 'aimeos.config' )->get()->get( 'page', array() );
-		$result = array( 'aibody' => array(), 'aiheader' => array() );
+		$pagesConfig = $this->container->get('aimeos.config')->get()->get('page', array());
+		$result = array('aibody' => array(), 'aiheader' => array());
 
-		if( isset( $pagesConfig[$pageName] ) )
+		if (isset($pagesConfig[$pageName]))
 		{
-			foreach( (array) $pagesConfig[$pageName] as $clientName )
+			foreach ((array) $pagesConfig[$pageName] as $clientName)
 			{
-				$client = \Aimeos\Client\Html::create( $context, $clientName );
-				$client->setView( clone $view );
+				$client = \Aimeos\Client\Html::create($context, $clientName);
+				$client->setView(clone $view);
 				$client->process();
 
 				$result['aibody'][$clientName] = $client->getBody();

src/aimeos-routes.php

Spacing +119 added lines, -119 removed lines

@@ -1,189 +1,189 @@
 <?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/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:[a-z\/]+}[/{id}]', 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:[a-z\/]+}[/{id}]', 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:[a-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:[a-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:[a-z\/]+}[/{id}]', 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:[a-z\/]+}[/{id}]', 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:[a-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:[a-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:[a-z\/]+}[/{id}]', function( $request, $response, $args ) {
-		return \Aimeos\Slim\Controller\Jqadm::getAction( $this, $request, $response, $args );
-	})->setName( 'aimeos_shop_jqadm_get' );
+	$this->map(['GET'], '/get/{resource:[a-z\/]+}[/{id}]', function($request, $response, $args) {
+		return \Aimeos\Slim\Controller\Jqadm::getAction($this, $request, $response, $args);
+	})->setName('aimeos_shop_jqadm_get');
 
-	$this->map(['POST'], '/save/{resource:[a-z\/]+}[/{id}]', function( $request, $response, $args ) {
-		return \Aimeos\Slim\Controller\Jqadm::saveAction( $this, $request, $response, $args );
-	})->setName( 'aimeos_shop_jqadm_save' );
+	$this->map(['POST'], '/save/{resource:[a-z\/]+}[/{id}]', 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:[a-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:[a-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:[a-z\/]+}[/{id}]', function( $request, $response, $args ) {
-		return \Aimeos\Slim\Controller\Jsonadm::deleteAction( $this, $request, $response, $args );
-	})->setName( 'aimeos_shop_jsonadm_delete' );
+	$this->map(['DELETE'], '/{resource:[a-z\/]+}[/{id}]', function($request, $response, $args) {
+		return \Aimeos\Slim\Controller\Jsonadm::deleteAction($this, $request, $response, $args);
+	})->setName('aimeos_shop_jsonadm_delete');
 
-	$this->map(['GET'], '/{resource:[a-z\/]+}[/{id}]', function( $request, $response, $args ) {
-		return \Aimeos\Slim\Controller\Jsonadm::getAction( $this, $request, $response, $args );
-	})->setName( 'aimeos_shop_jsonadm_get' );
+	$this->map(['GET'], '/{resource:[a-z\/]+}[/{id}]', function($request, $response, $args) {
+		return \Aimeos\Slim\Controller\Jsonadm::getAction($this, $request, $response, $args);
+	})->setName('aimeos_shop_jsonadm_get');
 
-	$this->map(['PATCH'], '/{resource:[a-z\/]+}[/{id}]', function( $request, $response, $args ) {
-		return \Aimeos\Slim\Controller\Jsonadm::patchAction( $this, $request, $response, $args );
-	})->setName( 'aimeos_shop_jsonadm_patch' );
+	$this->map(['PATCH'], '/{resource:[a-z\/]+}[/{id}]', function($request, $response, $args) {
+		return \Aimeos\Slim\Controller\Jsonadm::patchAction($this, $request, $response, $args);
+	})->setName('aimeos_shop_jsonadm_patch');
 
-	$this->map(['POST'], '/{resource:[a-z\/]+}[/{id}]', function( $request, $response, $args ) {
-		return \Aimeos\Slim\Controller\Jsonadm::postAction( $this, $request, $response, $args );
-	})->setName( 'aimeos_shop_jsonadm_post' );
+	$this->map(['POST'], '/{resource:[a-z\/]+}[/{id}]', function($request, $response, $args) {
+		return \Aimeos\Slim\Controller\Jsonadm::postAction($this, $request, $response, $args);
+	})->setName('aimeos_shop_jsonadm_post');
 
-	$this->map(['PUT'], '/{resource:[a-z\/]+}[/{id}]', function( $request, $response, $args ) {
-		return \Aimeos\Slim\Controller\Jsonadm::putAction( $this, $request, $response, $args );
-	})->setName( 'aimeos_shop_jsonadm_put' );
+	$this->map(['PUT'], '/{resource:[a-z\/]+}[/{id}]', 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_name}]]', 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_name}]]', 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_name}]]', 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_name}]]', 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'], '/d/{d_name}/{d_prodid}[/{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'], '/d/{d_name}/{d_prodid}[/{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'], '/d/pin[/{pin_action}/{pin_id}[/{d_name}]]', function( $request, $response, $args ) {
-		return \Aimeos\Slim\Controller\Catalog::detailAction( $this, $request, $response, $args );
-	})->setName( 'aimeos_shop_session_pinned' );
+	$this->map(['GET', 'POST'], '/d/pin[/{pin_action}/{pin_id}[/{d_name}]]', function($request, $response, $args) {
+		return \Aimeos\Slim\Controller\Catalog::detailAction($this, $request, $response, $args);
+	})->setName('aimeos_shop_session_pinned');
 
-	$this->map(['GET', 'POST'], '/list', function( $request, $response, $args ) {
-		return \Aimeos\Slim\Controller\Catalog::listAction( $this, $request, $response, $args );
-	})->setName( 'aimeos_shop_list' );
+	$this->map(['GET', 'POST'], '/list', 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'], '/c/{f_name}/{f_catid}', function( $request, $response, $args ) {
-		return \Aimeos\Slim\Controller\Catalog::treeAction( $this, $request, $response, $args );
-	})->setName( 'aimeos_shop_tree' );
+	$this->map(['GET', 'POST'], '/c/{f_name}/{f_catid}', function($request, $response, $args) {
+		return \Aimeos\Slim\Controller\Catalog::treeAction($this, $request, $response, $args);
+	})->setName('aimeos_shop_tree');
 
-	$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/Catalog.php

Spacing +23 added lines, -23 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( 'shop' )->get( 'catalog-count', $request, $response, $args );
-		$response = $container->get( 'view' )->render( $response, 'Catalog/count.html.twig', $contents );
+		$contents = $container->get('shop')->get('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( 'shop' )->get( 'catalog-detail', $request, $response, $args );
-		return $container->get( 'view' )->render( $response, 'Catalog/detail.html.twig', $contents );
+		$contents = $container->get('shop')->get('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( 'shop' )->get( 'catalog-list', $request, $response, $args );
-		return $container->get( 'view' )->render( $response, 'Catalog/list.html.twig', $contents );
+		$contents = $container->get('shop')->get('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( 'shop' )->get( 'catalog-stock', $request, $response, $args );
-		$response = $container->get( 'view' )->render( $response, 'Catalog/stock.html.twig', $contents );
+		$contents = $container->get('shop')->get('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,12 +101,12 @@ 
 	 * @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( 'shop' )->get( 'catalog-suggest', $request, $response, $args );
-		$response = $container->get( 'view' )->render( $response, 'Catalog/suggest.html.twig', $contents );
+		$contents = $container->get('shop')->get('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');
 	}
 
 
@@ -119,9 +119,9 @@ 
 	 * @param array $args Associative list of route parameters
 	 * @return ResponseInterface $response Modified response object with generated output
 	 */
-	public static function treeAction( ContainerInterface $container, ServerRequestInterface $request, ResponseInterface $response, array $args )
+	public static function treeAction(ContainerInterface $container, ServerRequestInterface $request, ResponseInterface $response, array $args)
 	{
-		$contents = $container->get( 'shop' )->get( 'catalog-tree', $request, $response, $args );
-		return $container->get( 'view' )->render( $response, 'Catalog/tree.html.twig', $contents );
+		$contents = $container->get('shop')->get('catalog-tree', $request, $response, $args);
+		return $container->get('view')->render($response, 'Catalog/tree.html.twig', $contents);
 	}
 }
\ No newline at end of file

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::createAdmin( $container, $request, $response, $args );
+		$cntl = self::createAdmin($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::createAdmin( $container, $request, $response, $args );
+		$cntl = self::createAdmin($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::createAdmin( $container, $request, $response, $args );
+		$cntl = self::createAdmin($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::createAdmin( $container, $request, $response, $args );
+		$cntl = self::createAdmin($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::createAdmin( $container, $request, $response, $args );
+		$cntl = self::createAdmin($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::createAdmin( $container, $request, $response, $args );
+		$cntl = self::createAdmin($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::createAdmin( $container, $request, $response, $args );
+		$cntl = self::createAdmin($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 createAdmin( ContainerInterface $container, ServerRequestInterface $request, ResponseInterface $response, array $args )
+	protected static function createAdmin(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::create( $context, $aimeos, $resource );
+		return \Aimeos\Admin\JQAdm::create($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/Account.php

Spacing +9 added lines, -9 removed lines

@@ -31,10 +31,10 @@ 
 	 * @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( 'shop' )->get( 'account-index', $request, $response, $args );
-		return $container->get( 'view' )->render( $response, 'Account/index.html.twig', $contents );
+		$contents = $container->get('shop')->get('account-index', $request, $response, $args);
+		return $container->get('view')->render($response, 'Account/index.html.twig', $contents);
 	}
 
 
@@ -47,16 +47,16 @@ 
 	 * @param array $args Associative list of route parameters
 	 * @return ResponseInterface $response Modified response object with generated output
 	 */
-	public static function downloadAction( ContainerInterface $container, ServerRequestInterface $request, ResponseInterface $response, array $args )
+	public static function downloadAction(ContainerInterface $container, ServerRequestInterface $request, ResponseInterface $response, array $args)
 	{
-		$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, array(), $langid );
-		$context->setView( $view );
+		$view = $container->get('aimeos.view')->create($context, $request, $response, $args, array(), $langid);
+		$context->setView($view);
 
-		$client = \Aimeos\Client\Html::create( $context, 'account/download' );
-		$client->setView( $view );
+		$client = \Aimeos\Client\Html::create($context, 'account/download');
+		$client->setView($view);
 		$client->process();
 
 		return $view->response();

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::create( $context, $resource . '/' . $related );
+		return \Aimeos\Client\JsonApi::create($context, $resource.'/'.$related);
 	}
 }