aimeos / aimeos-slim

src/Base/View.php

Spacing +32 added lines, -32 removed lines

@@ -30,7 +30,7 @@ 
 	 *
 	 * @param ContainerInterface $container Dependency container
 	 */
-	public function __construct( ContainerInterface $container )
+	public function __construct(ContainerInterface $container)
 	{
 		$this->container = $container;
 	}
@@ -46,54 +46,54 @@ 
 	 * @param string|null $locale Code of the current language or null for no translation
 	 * @return \Aimeos\MW\View\Iface View object
 	 */
-	public function create( ServerRequestInterface $request, ResponseInterface $response, array $attr, array $templatePaths, $locale = null )
+	public function create(ServerRequestInterface $request, ResponseInterface $response, array $attr, array $templatePaths, $locale = null)
 	{
 		$params = $fixed = array();
-		$config = $this->container->get( 'aimeos_config' );
+		$config = $this->container->get('aimeos_config');
 
-		if( $locale !== null )
+		if ($locale !== null)
 		{
 			$params = $attr + (array) $request->getParsedBody() + (array) $request->getQueryParams();
-			$fixed = $this->getFixedParams( $attr );
+			$fixed = $this->getFixedParams($attr);
 
-			$i18n = $this->container->get( 'aimeos_i18n' )->get( array( $locale ) );
+			$i18n = $this->container->get('aimeos_i18n')->get(array($locale));
 			$translation = $i18n[$locale];
 		}
 		else
 		{
-			$translation = new \Aimeos\MW\Translation\None( 'en' );
+			$translation = new \Aimeos\MW\Translation\None('en');
 		}
 
 
-		$view = new \Aimeos\MW\View\Standard( $templatePaths );
+		$view = new \Aimeos\MW\View\Standard($templatePaths);
 
-		$helper = new \Aimeos\MW\View\Helper\Translate\Standard( $view, $translation );
-		$view->addHelper( 'translate', $helper );
+		$helper = new \Aimeos\MW\View\Helper\Translate\Standard($view, $translation);
+		$view->addHelper('translate', $helper);
 
-		$helper = new \Aimeos\MW\View\Helper\Url\Slim( $view, $this->container->get( 'router' ), $fixed );
-		$view->addHelper( 'url', $helper );
+		$helper = new \Aimeos\MW\View\Helper\Url\Slim($view, $this->container->get('router'), $fixed);
+		$view->addHelper('url', $helper);
 
-		$helper = new \Aimeos\MW\View\Helper\Param\Standard( $view, $params );
-		$view->addHelper( 'param', $helper );
+		$helper = new \Aimeos\MW\View\Helper\Param\Standard($view, $params);
+		$view->addHelper('param', $helper);
 
-		$config = new \Aimeos\MW\Config\Decorator\Protect( clone $config, array( 'admin', 'client' ) );
-		$helper = new \Aimeos\MW\View\Helper\Config\Standard( $view, $config );
-		$view->addHelper( 'config', $helper );
+		$config = new \Aimeos\MW\Config\Decorator\Protect(clone $config, array('admin', 'client'));
+		$helper = new \Aimeos\MW\View\Helper\Config\Standard($view, $config);
+		$view->addHelper('config', $helper);
 
-		$sepDec = $config->get( 'client/html/common/format/seperatorDecimal', '.' );
-		$sep1000 = $config->get( 'client/html/common/format/seperator1000', ' ' );
-		$helper = new \Aimeos\MW\View\Helper\Number\Standard( $view, $sepDec, $sep1000 );
-		$view->addHelper( 'number', $helper );
+		$sepDec = $config->get('client/html/common/format/seperatorDecimal', '.');
+		$sep1000 = $config->get('client/html/common/format/seperator1000', ' ');
+		$helper = new \Aimeos\MW\View\Helper\Number\Standard($view, $sepDec, $sep1000);
+		$view->addHelper('number', $helper);
 
-		$helper = new \Aimeos\MW\View\Helper\Request\Slim( $view, $request );
-		$view->addHelper( 'request', $helper );
+		$helper = new \Aimeos\MW\View\Helper\Request\Slim($view, $request);
+		$view->addHelper('request', $helper);
 
-		$helper = new \Aimeos\MW\View\Helper\Response\Slim( $view, $response );
-		$view->addHelper( 'response', $helper );
+		$helper = new \Aimeos\MW\View\Helper\Response\Slim($view, $response);
+		$view->addHelper('response', $helper);
 
-		$csrf = $request->getAttribute( 'csrf_name' );
-		$helper = new \Aimeos\MW\View\Helper\Csrf\Standard( $view, $csrf, $request->getAttribute( 'csrf_value ') );
-		$view->addHelper( 'csrf', $helper );
+		$csrf = $request->getAttribute('csrf_name');
+		$helper = new \Aimeos\MW\View\Helper\Csrf\Standard($view, $csrf, $request->getAttribute('csrf_value '));
+		$view->addHelper('csrf', $helper);
 
 		return $view;
 	}
@@ -105,19 +105,19 @@ 
 	 * @param array $attributes Associative list of route attributes
 	 * @return array Associative list of parameters with "site", "locale" and "currency" if available
 	 */
-	protected function getFixedParams( array $attributes )
+	protected function getFixedParams(array $attributes)
 	{
 		$fixed = array();
 
-		if( isset( $attributes['site'] ) ) {
+		if (isset($attributes['site'])) {
 			$fixed['site'] = $attributes['site'];
 		}
 
-		if( isset( $attributes['locale'] ) ) {
+		if (isset($attributes['locale'])) {
 			$fixed['locale'] = $attributes['locale'];
 		}
 
-		if( isset( $attributes['currency'] ) ) {
+		if (isset($attributes['currency'])) {
 			$fixed['currency'] = $attributes['currency'];
 		}
 

src/aimeos-default.php

Spacing +11 added lines, -11 removed lines

@@ -6,16 +6,16 @@ 
 	'uploaddir' => '/',
 
 	'page' => array(
-		'account-index' => array( '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/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'),
 	),
 
 	'routes' => array(
@@ -34,7 +34,7 @@ 
 			'database' => 'slim',
 			'username' => 'root',
 			'password' => '',
-			'stmt' => array( "SET NAMES 'utf8'", "SET SESSION sql_mode='ANSI'" ),
+			'stmt' => array("SET NAMES 'utf8'", "SET SESSION sql_mode='ANSI'"),
 			'opt-persistent' => 0,
 			'limit' => 2,
 		),

src/Base/Context.php

Spacing +30 added lines, -30 removed lines

@@ -30,7 +30,7 @@ 
 	 *
 	 * @param ContainerInterface $container Dependency container
 	 */
-	public function __construct( ContainerInterface $container )
+	public function __construct(ContainerInterface $container)
 	{
 		$this->container = $container;
 	}
@@ -43,48 +43,48 @@ 
 	 * @param array Associative list of URL parameter
 	 * @return \Aimeos\MShop\Context\Item\Iface Context object
 	 */
-	public function get( $locale = true, array $attributes = array() )
+	public function get($locale = true, array $attributes = array())
 	{
-		if( self::$context === null )
+		if (self::$context === null)
 		{
 			$context = new \Aimeos\MShop\Context\Item\Standard();
 
-			$config = $this->container->get( 'aimeos_config' );
-			$context->setConfig( $config );
+			$config = $this->container->get('aimeos_config');
+			$context->setConfig($config);
 
-			$dbm = new \Aimeos\MW\DB\Manager\PDO( $config );
-			$context->setDatabaseManager( $dbm );
+			$dbm = new \Aimeos\MW\DB\Manager\PDO($config);
+			$context->setDatabaseManager($dbm);
 
-			$fs = new \Aimeos\MW\Filesystem\Manager\Standard( $config );
-			$context->setFilesystemManager( $fs );
+			$fs = new \Aimeos\MW\Filesystem\Manager\Standard($config);
+			$context->setFilesystemManager($fs);
 
-			$mq = new \Aimeos\MW\MQueue\Manager\Standard( $config );
-			$context->setMessageQueueManager( $mq );
+			$mq = new \Aimeos\MW\MQueue\Manager\Standard($config);
+			$context->setMessageQueueManager($mq);
 
-			$mail = new \Aimeos\MW\Mail\Swift( $this->container->get( 'mailer' ) );
-			$context->setMail( $mail );
+			$mail = new \Aimeos\MW\Mail\Swift($this->container->get('mailer'));
+			$context->setMail($mail);
 
-			$logger = \Aimeos\MAdmin\Log\Manager\Factory::createManager( $context );
-			$context->setLogger( $logger );
+			$logger = \Aimeos\MAdmin\Log\Manager\Factory::createManager($context);
+			$context->setLogger($logger);
 
-			$cache = new \Aimeos\MAdmin\Cache\Proxy\Standard( $context );
-			$context->setCache( $cache );
+			$cache = new \Aimeos\MAdmin\Cache\Proxy\Standard($context);
+			$context->setCache($cache);
 
 			$session = new \Aimeos\MW\Session\PHP();
-			$context->setSession( $session );
+			$context->setSession($session);
 
 			self::$context = $context;
 		}
 
 		$context = self::$context;
 
-		if( $locale === true )
+		if ($locale === true)
 		{
-			$localeItem = $this->getLocale( $context, $attributes );
+			$localeItem = $this->getLocale($context, $attributes);
 			$langid = $localeItem->getLanguageId();
 
-			$context->setLocale( $localeItem );
-			$context->setI18n( $this->container->get( 'aimeos_i18n' )->get( array( $langid ) ) );
+			$context->setLocale($localeItem);
+			$context->setI18n($this->container->get('aimeos_i18n')->get(array($langid)));
 		}
 
 		return $context;
@@ -98,18 +98,18 @@ 
 	 * @param array Associative list of URL parameter
 	 * @return \Aimeos\MShop\Locale\Item\Iface Locale item object
 	 */
-	protected function getLocale( \Aimeos\MShop\Context\Item\Iface $context, array $attr )
+	protected function getLocale(\Aimeos\MShop\Context\Item\Iface $context, array $attr)
 	{
-		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( $attr['site'] ) ? $attr['site'] : 'default' );
-			$lang = ( isset( $attr['locale'] ) ? $attr['locale'] : '' );
-			$currency = ( isset( $attr['currency'] ) ? $attr['currency'] : '' );
+			$site = (isset($attr['site']) ? $attr['site'] : 'default');
+			$lang = (isset($attr['locale']) ? $attr['locale'] : '');
+			$currency = (isset($attr['currency']) ? $attr['currency'] : '');
 
-			$localeManager = \Aimeos\MShop\Locale\Manager\Factory::createManager( $context );
-			$this->locale = $localeManager->bootstrap( $site, $lang, $currency, $disableSites );
+			$localeManager = \Aimeos\MShop\Locale\Manager\Factory::createManager($context);
+			$this->locale = $localeManager->bootstrap($site, $lang, $currency, $disableSites);
 		}
 
 		return $this->locale;

jobs.php

Spacing +13 added lines, -13 removed lines

@@ -6,28 +6,28 @@ 
  */
 
 
-if( php_sapi_name() != 'cli' ) {
-	exit( 'Setup can only be started via command line for security reasons' );
+if (php_sapi_name() != 'cli') {
+	exit('Setup can only be started via command line for security reasons');
 }
 
-ini_set( 'display_errors', 1 );
-date_default_timezone_set( 'UTC' );
+ini_set('display_errors', 1);
+date_default_timezone_set('UTC');
 
 
 
 try
 {
-	require 'vendor' . DIRECTORY_SEPARATOR . 'autoload.php';
+	require 'vendor'.DIRECTORY_SEPARATOR.'autoload.php';
 
-	\Aimeos\Slim\Command\Jobs::run( $_SERVER['argv'] );
+	\Aimeos\Slim\Command\Jobs::run($_SERVER['argv']);
 }
-catch( \Aimeos\Slim\Command\Exception $e )
+catch (\Aimeos\Slim\Command\Exception $e)
 {
-	echo $e->getMessage() . "\n";
+	echo $e->getMessage()."\n";
 	echo \Aimeos\Slim\Command\Jobs::usage();
-	exit( 1 );
+	exit(1);
 }
-catch( \Throwable $t )
+catch (\Throwable $t)
 {
 	echo "\n\nCaught PHP error while processing setup";
 	echo "\n\nMessage:\n";
@@ -35,9 +35,9 @@ 
 	echo "\n\nStack trace:\n";
 	echo $t->getTraceAsString();
 	echo "\n\n";
-	exit( 1 );
+	exit(1);
 }
-catch( \Exception $e )
+catch (\Exception $e)
 {
 	echo "\n\nCaught exception while processing setup";
 	echo "\n\nMessage:\n";
@@ -45,5 +45,5 @@ 
 	echo "\n\nStack trace:\n";
 	echo $e->getTraceAsString();
 	echo "\n\n";
-	exit( 1 );
+	exit(1);
 }

cache.php

Spacing +13 added lines, -13 removed lines

@@ -6,27 +6,27 @@ 
  */
 
 
-if( php_sapi_name() != 'cli' ) {
-	exit( 'Setup can only be started via command line for security reasons' );
+if (php_sapi_name() != 'cli') {
+	exit('Setup can only be started via command line for security reasons');
 }
 
-ini_set( 'display_errors', 1 );
-date_default_timezone_set( 'UTC' );
+ini_set('display_errors', 1);
+date_default_timezone_set('UTC');
 
 
 try
 {
-	require 'vendor' . DIRECTORY_SEPARATOR . 'autoload.php';
+	require 'vendor'.DIRECTORY_SEPARATOR.'autoload.php';
 
-	\Aimeos\Slim\Command\Cache::run( $_SERVER['argv'] );
+	\Aimeos\Slim\Command\Cache::run($_SERVER['argv']);
 }
-catch( \Aimeos\Slim\Command\Exception $e )
+catch (\Aimeos\Slim\Command\Exception $e)
 {
-	echo $e->getMessage() . "\n";
+	echo $e->getMessage()."\n";
 	echo \Aimeos\Slim\Command\Cache::usage();
-	exit( 1 );
+	exit(1);
 }
-catch( \Throwable $t )
+catch (\Throwable $t)
 {
 	echo "\n\nCaught PHP error";
 	echo "\n\nMessage:\n";
@@ -34,9 +34,9 @@ 
 	echo "\n\nStack trace:\n";
 	echo $t->getTraceAsString();
 	echo "\n\n";
-	exit( 1 );
+	exit(1);
 }
-catch( \Exception $e )
+catch (\Exception $e)
 {
 	echo "\n\nCaught exception";
 	echo "\n\nMessage:\n";
@@ -44,5 +44,5 @@ 
 	echo "\n\nStack trace:\n";
 	echo $e->getTraceAsString();
 	echo "\n\n";
-	exit( 1 );
+	exit(1);
 }

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' );
-		$i18nPaths = $this->container->get( 'aimeos' )->getI18nPaths();
+		$config = $this->container->get('aimeos_config');
+		$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( 'apc_store' ) === true && $config->get( 'apc_enabled', false ) == true ) {
-					$i18n = new \Aimeos\MW\Translation\Decorator\APC( $i18n, $config->get( 'apc_prefix', 'slim:' ) );
+				if (function_exists('apc_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/Bootstrap.php

Spacing +29 added lines, -29 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,48 +71,48 @@ 
 	 * @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['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_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_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);
 		};
 
 
-		$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_config'] = function( $c ) use ( $settings ) {
+		$container['aimeos_config'] = function($c) use ($settings) {
 
-			$config = new \Aimeos\MW\Config\PHPArray( $settings, $c['aimeos']->getConfigPaths() );
+			$config = new \Aimeos\MW\Config\PHPArray($settings, $c['aimeos']->getConfigPaths());
 
-			if( function_exists( 'apc_store' ) === true && $config->get( 'apc_enabled', false ) == true ) {
-				$config = new \Aimeos\MW\Config\Decorator\APC( $config, $config->get( 'apc_prefix', 'slim:' ) );
+			if (function_exists('apc_store') === true && $config->get('apc_enabled', false) == true) {
+				$config = new \Aimeos\MW\Config\Decorator\APC($config, $config->get('apc_prefix', 'slim:'));
 			}
 
 			return $config;
 		};
 
 
-		$container['mailer'] = function( $c ) {
-			return \Swift_Mailer::newInstance( \Swift_SendmailTransport::newInstance() );
+		$container['mailer'] = function($c) {
+			return \Swift_Mailer::newInstance(\Swift_SendmailTransport::newInstance());
 		};
 
 		return $this;
@@ -126,14 +126,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/Extadm.php

Spacing +73 added lines, -73 removed lines

@@ -32,62 +32,62 @@ 
 	 * @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)
 	{
-		$site = ( isset( $args['site'] ) ? $args['site'] : 'default' );
-		$lang = ( isset( $args['lang'] ) ? $args['lang'] : 'en' );
-		$tab = ( isset( $args['tab'] ) ? $args['tab'] : 0 );
+		$site = (isset($args['site']) ? $args['site'] : 'default');
+		$lang = (isset($args['lang']) ? $args['lang'] : 'en');
+		$tab = (isset($args['tab']) ? $args['tab'] : 0);
 
-		$aimeos = $container->get( 'aimeos' );
-		$cntlPaths = $aimeos->getCustomPaths( 'controller/extjs' );
+		$aimeos = $container->get('aimeos');
+		$cntlPaths = $aimeos->getCustomPaths('controller/extjs');
 
-		$context = $container->get( 'aimeos_context' )->get( false, $args );
-		$context = self::setLocale( $context, $site, $lang );
+		$context = $container->get('aimeos_context')->get(false, $args);
+		$context = self::setLocale($context, $site, $lang);
 
-		$controller = new \Aimeos\Controller\ExtJS\JsonRpc( $context, $cntlPaths );
+		$controller = new \Aimeos\Controller\ExtJS\JsonRpc($context, $cntlPaths);
 		$cssFiles = array();
 
-		foreach( $aimeos->getCustomPaths( 'admin/extjs' ) as $base => $paths )
+		foreach ($aimeos->getCustomPaths('admin/extjs') as $base => $paths)
 		{
-			foreach( $paths as $path )
+			foreach ($paths as $path)
 			{
-				$jsbAbsPath = $base . '/' . $path;
+				$jsbAbsPath = $base.'/'.$path;
 
-				if( !is_file( $jsbAbsPath ) ) {
-					throw new \Exception( sprintf( 'JSB2 file "%1$s" not found', $jsbAbsPath ) );
+				if (!is_file($jsbAbsPath)) {
+					throw new \Exception(sprintf('JSB2 file "%1$s" not found', $jsbAbsPath));
 				}
 
-				$jsb2 = new \Aimeos\MW\Jsb2\Standard( $jsbAbsPath, dirname( $path ) );
-				$cssFiles = array_merge( $cssFiles, $jsb2->getUrls( 'css' ) );
+				$jsb2 = new \Aimeos\MW\Jsb2\Standard($jsbAbsPath, dirname($path));
+				$cssFiles = array_merge($cssFiles, $jsb2->getUrls('css'));
 			}
 		}
 
-		$csrfname = $request->getAttribute( 'csrf_name' );
-		$csrfvalue = $request->getAttribute( 'csrf_value' );
+		$csrfname = $request->getAttribute('csrf_name');
+		$csrfvalue = $request->getAttribute('csrf_value');
 
-		$router = $container->get( 'router' );
-		$jqadmUrl = $router->pathFor( 'aimeos_shop_jqadm_search', array( 'site' => $site, 'resource' => 'product' ) );
-		$jsonUrl = $router->pathFor( 'aimeos_shop_extadm_json', array( 'site' => $site, $csrfname => $csrfvalue ) );
-		$adminUrl = $router->pathFor( 'aimeos_shop_extadm', array( 'site' => '<site>', 'lang' => '<lang>', 'tab' => '<tab>' ) );
+		$router = $container->get('router');
+		$jqadmUrl = $router->pathFor('aimeos_shop_jqadm_search', array('site' => $site, 'resource' => 'product'));
+		$jsonUrl = $router->pathFor('aimeos_shop_extadm_json', array('site' => $site, $csrfname => $csrfvalue));
+		$adminUrl = $router->pathFor('aimeos_shop_extadm', array('site' => '<site>', 'lang' => '<lang>', 'tab' => '<tab>'));
 
 		$vars = array(
 			'lang' => $lang,
 			'cssFiles' => $cssFiles,
-			'languages' => self::getJsonLanguages( $aimeos ),
-			'config' => self::getJsonClientConfig( $context ),
-			'site' => self::getJsonSiteItem( $context, $site ),
-			'i18nContent' => self::getJsonClientI18n( $aimeos->getI18nPaths(), $lang ),
-			'uploaddir' => $context->getConfig()->get( 'uploaddir', '/.' ),
+			'languages' => self::getJsonLanguages($aimeos),
+			'config' => self::getJsonClientConfig($context),
+			'site' => self::getJsonSiteItem($context, $site),
+			'i18nContent' => self::getJsonClientI18n($aimeos->getI18nPaths(), $lang),
+			'uploaddir' => $context->getConfig()->get('uploaddir', '/.'),
 			'searchSchemas' => $controller->getJsonSearchSchemas(),
 			'itemSchemas' => $controller->getJsonItemSchemas(),
-			'smd' => $controller->getJsonSmd( $jsonUrl ),
+			'smd' => $controller->getJsonSmd($jsonUrl),
 			'urlTemplate' => $adminUrl,
 			'jqadmurl' => $jqadmUrl,
 			'activeTab' => $tab,
 			'version' => \Aimeos\Slim\Bootstrap::getVersion(),
 		);
 
-		return $container->get( 'view' )->render( $response, 'Extadm/index.html.twig', $vars );
+		return $container->get('view')->render($response, 'Extadm/index.html.twig', $vars);
 	}
 
 
@@ -100,22 +100,22 @@ 
 	 * @param array $args Associative list of route parameters
 	 * @return ResponseInterface $response Modified response object with generated output
 	 */
-	public static function doAction( ContainerInterface $container, ServerRequestInterface $request, ResponseInterface $response, array $args )
+	public static function doAction(ContainerInterface $container, ServerRequestInterface $request, ResponseInterface $response, array $args)
 	{
-		$cntlPaths = $container->get( 'aimeos' )->getCustomPaths( 'controller/extjs' );
+		$cntlPaths = $container->get('aimeos')->getCustomPaths('controller/extjs');
 
-		$context = $container->get( 'aimeos_context' )->get( false, $args );
-		$context->setView( $container->get( 'aimeos_view' )->create( $request, $response, $args, array() ) );
-		$context = self::setLocale( $context );
+		$context = $container->get('aimeos_context')->get(false, $args);
+		$context->setView($container->get('aimeos_view')->create($request, $response, $args, array()));
+		$context = self::setLocale($context);
 
 		$params = $request->getQueryParams();
-		if( ( $post = $request->getParsedBody() ) !== null ) {
-			$params = array_merge( $params, (array) $post );
+		if (($post = $request->getParsedBody()) !== null) {
+			$params = array_merge($params, (array) $post);
 		}
 
-		$controller = new \Aimeos\Controller\ExtJS\JsonRpc( $context, $cntlPaths );
-		$output = $controller->process( $params, (string) $request->getBody() );
-		$response->getBody()->write( $output );
+		$controller = new \Aimeos\Controller\ExtJS\JsonRpc($context, $cntlPaths);
+		$output = $controller->process($params, (string) $request->getBody());
+		$response->getBody()->write($output);
 
 		return $response;
 	}
@@ -130,30 +130,30 @@ 
 	 * @param array $args Associative list of route parameters
 	 * @return ResponseInterface $response 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 = '';
 		$jsFiles = array();
-		$aimeos = $container->get( 'aimeos' );
+		$aimeos = $container->get('aimeos');
 
-		foreach( $aimeos->getCustomPaths( 'admin/extjs' ) as $base => $paths )
+		foreach ($aimeos->getCustomPaths('admin/extjs') as $base => $paths)
 		{
-			foreach( $paths as $path )
+			foreach ($paths as $path)
 			{
-				$jsbAbsPath = $base . '/' . $path;
-				$jsb2 = new \Aimeos\MW\Jsb2\Standard( $jsbAbsPath, dirname( $jsbAbsPath ) );
-				$jsFiles = array_merge( $jsFiles, $jsb2->getFiles( 'js' ) );
+				$jsbAbsPath = $base.'/'.$path;
+				$jsb2 = new \Aimeos\MW\Jsb2\Standard($jsbAbsPath, dirname($jsbAbsPath));
+				$jsFiles = array_merge($jsFiles, $jsb2->getFiles('js'));
 			}
 		}
 
-		foreach( $jsFiles as $file )
+		foreach ($jsFiles as $file)
 		{
-			if( ( $content = file_get_contents( $file ) ) !== false ) {
+			if (($content = file_get_contents($file)) !== false) {
 				$contents .= $content;
 			}
 		}
 
-		return $response->withHeader( 'Content-Type', 'application/javascript' )->getBody()->write( $contents );
+		return $response->withHeader('Content-Type', 'application/javascript')->getBody()->write($contents);
 	}
 
 
@@ -163,15 +163,15 @@ 
 	 * @param \Aimeos\Bootstrap $aimeos Aimeos object
 	 * @return array List of language IDs with labels
 	 */
-	protected static function getJsonLanguages( \Aimeos\Bootstrap $aimeos )
+	protected static function getJsonLanguages(\Aimeos\Bootstrap $aimeos)
 	{
 		$result = array();
 
-		foreach( $aimeos->getI18nList( 'admin' ) as $id ) {
-			$result[] = array( 'id' => $id, 'label' => $id );
+		foreach ($aimeos->getI18nList('admin') as $id) {
+			$result[] = array('id' => $id, 'label' => $id);
 		}
 
-		return json_encode( $result );
+		return json_encode($result);
 	}
 
 
@@ -181,10 +181,10 @@ 
 	 * @param \Aimeos\MShop\Context\Item\Iface $context Context item object
 	 * @return string JSON encoded configuration object
 	 */
-	protected static function getJsonClientConfig( \Aimeos\MShop\Context\Item\Iface $context )
+	protected static function getJsonClientConfig(\Aimeos\MShop\Context\Item\Iface $context)
 	{
-		$config = $context->getConfig()->get( 'admin/extjs', array() );
-		return json_encode( array( 'admin' => array( 'extjs' => $config ) ), JSON_FORCE_OBJECT );
+		$config = $context->getConfig()->get('admin/extjs', array());
+		return json_encode(array('admin' => array('extjs' => $config)), JSON_FORCE_OBJECT);
 	}
 
 
@@ -195,16 +195,16 @@ 
 	 * @param string $lang ISO language code like "en" or "en_GB"
 	 * @return string JSON encoded translation object
 	 */
-	protected static function getJsonClientI18n( array $i18nPaths, $lang )
+	protected static function getJsonClientI18n(array $i18nPaths, $lang)
 	{
-		$i18n = new \Aimeos\MW\Translation\Gettext( $i18nPaths, $lang );
+		$i18n = new \Aimeos\MW\Translation\Gettext($i18nPaths, $lang);
 
 		$content = array(
-			'admin' => $i18n->getAll( 'admin' ),
-			'admin/ext' => $i18n->getAll( 'admin/ext' ),
+			'admin' => $i18n->getAll('admin'),
+			'admin/ext' => $i18n->getAll('admin/ext'),
 		);
 
-		return json_encode( $content, JSON_FORCE_OBJECT );
+		return json_encode($content, JSON_FORCE_OBJECT);
 	}
 
 
@@ -216,19 +216,19 @@ 
 	 * @return string JSON encoded site item object
 	 * @throws Exception If no site item was found for the code
 	 */
-	protected static function getJsonSiteItem( \Aimeos\MShop\Context\Item\Iface $context, $site )
+	protected static function getJsonSiteItem(\Aimeos\MShop\Context\Item\Iface $context, $site)
 	{
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'locale/site' );
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'locale/site');
 
 		$criteria = $manager->createSearch();
-		$criteria->setConditions( $criteria->compare( '==', 'locale.site.code', $site ) );
-		$items = $manager->searchItems( $criteria );
+		$criteria->setConditions($criteria->compare('==', 'locale.site.code', $site));
+		$items = $manager->searchItems($criteria);
 
-		if( ( $item = reset( $items ) ) === false ) {
-			throw new \Exception( sprintf( 'No site found for code "%1$s"', $site ) );
+		if (($item = reset($items)) === false) {
+			throw new \Exception(sprintf('No site found for code "%1$s"', $site));
 		}
 
-		return json_encode( $item->toArray() );
+		return json_encode($item->toArray());
 	}
 
 
@@ -240,17 +240,17 @@ 
 	 * @param string $locale ISO language code, e.g. "en" or "en_GB"
 	 * @return \Aimeos\MShop\Context\Item\Iface Modified context object
 	 */
-	protected static function setLocale( \Aimeos\MShop\Context\Item\Iface $context, $sitecode = 'default', $locale = null )
+	protected static function setLocale(\Aimeos\MShop\Context\Item\Iface $context, $sitecode = 'default', $locale = null)
 	{
-		$localeManager = \Aimeos\MShop\Factory::createManager( $context, 'locale' );
+		$localeManager = \Aimeos\MShop\Factory::createManager($context, 'locale');
 
 		try {
-			$localeItem = $localeManager->bootstrap( $sitecode, $locale, '', false );
-		} catch( \Aimeos\MShop\Locale\Exception $e ) {
+			$localeItem = $localeManager->bootstrap($sitecode, $locale, '', false);
+		} catch (\Aimeos\MShop\Locale\Exception $e) {
 			$localeItem = $localeManager->createItem();
 		}
 
-		$context->setLocale( $localeItem );
+		$context->setLocale($localeItem);
 
 		return $context;
 	}

src/Controller/Jqadm.php

Spacing +54 added lines, -54 removed lines

@@ -32,36 +32,36 @@ 
 	 * @param array $args Associative list of route parameters
 	 * @return ResponseInterface $response 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,10 +77,10 @@ 
 	 * @param array $args Associative list of route parameters
 	 * @return ResponseInterface $response 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 );
-		return self::getHtml( $container, $response, $cntl->copy() );
+		$cntl = self::createClient($container, $request, $response, $args);
+		return self::getHtml($container, $response, $cntl->copy());
 	}
 
 
@@ -93,10 +93,10 @@ 
 	 * @param array $args Associative list of route parameters
 	 * @return ResponseInterface $response 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 );
-		return self::getHtml( $container, $response, $cntl->create() );
+		$cntl = self::createClient($container, $request, $response, $args);
+		return self::getHtml($container, $response, $cntl->create());
 	}
 
 
@@ -109,10 +109,10 @@ 
 	 * @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)
 	{
-		$cntl = self::createClient( $container, $request, $response, $args );
-		return self::getHtml( $container, $response, $cntl->delete() . $cntl->search() );
+		$cntl = self::createClient($container, $request, $response, $args);
+		return self::getHtml($container, $response, $cntl->delete().$cntl->search());
 	}
 
 
@@ -125,10 +125,10 @@ 
 	 * @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)
 	{
-		$cntl = self::createClient( $container, $request, $response, $args );
-		return self::getHtml( $container, $response, $cntl->get() );
+		$cntl = self::createClient($container, $request, $response, $args);
+		return self::getHtml($container, $response, $cntl->get());
 	}
 
 
@@ -141,10 +141,10 @@ 
 	 * @param array $args Associative list of route parameters
 	 * @return ResponseInterface $response 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 );
-		return self::getHtml( $container, $response, ( $cntl->save() ? : $cntl->search() ) );
+		$cntl = self::createClient($container, $request, $response, $args);
+		return self::getHtml($container, $response, ($cntl->save() ?: $cntl->search()));
 	}
 
 
@@ -157,10 +157,10 @@ 
 	 * @param array $args Associative list of route parameters
 	 * @return ResponseInterface $response 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 );
-		return self::getHtml( $container, $response, $cntl->search() );
+		$cntl = self::createClient($container, $request, $response, $args);
+		return self::getHtml($container, $response, $cntl->search());
 	}
 
 
@@ -173,21 +173,21 @@ 
 	 * @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)
 	{
-		$resource = ( isset( $args['resource'] ) ? $args['resource'] : null );
-		$site = ( isset( $args['site'] ) ? $args['site'] : 'default' );
-		$lang = ( isset( $args['lang'] ) ? $args['lang'] : 'en' );
+		$resource = (isset($args['resource']) ? $args['resource'] : null);
+		$site = (isset($args['site']) ? $args['site'] : 'default');
+		$lang = (isset($args['lang']) ? $args['lang'] : 'en');
 
-		$templatePaths = $container->get( 'aimeos' )->getCustomPaths( 'admin/jqadm/templates' );
+		$templatePaths = $container->get('aimeos')->getCustomPaths('admin/jqadm/templates');
 
-		$context = $container->get( 'aimeos_context' )->get( false, $args );
-		$context = self::setLocale( $container->get( 'aimeos_i18n' ), $context, $site, $lang );
+		$context = $container->get('aimeos_context')->get(false, $args);
+		$context = self::setLocale($container->get('aimeos_i18n'), $context, $site, $lang);
 
-		$view = $container->get( 'aimeos_view' )->create( $request, $response, $args, $templatePaths, $lang );
-		$context->setView( $view );
+		$view = $container->get('aimeos_view')->create($request, $response, $args, $templatePaths, $lang);
+		$context->setView($view);
 
-		return \Aimeos\Admin\JQAdm\Factory::createClient( $context, $templatePaths, $resource );
+		return \Aimeos\Admin\JQAdm\Factory::createClient($context, $templatePaths, $resource);
 	}
 
 
@@ -199,12 +199,12 @@ 
 	 * @param string $content Content from admin client
 	 * @return \Illuminate\Contracts\View\View View for rendering the output
 	 */
-	protected static function getHtml( ContainerInterface $container, ResponseInterface $response, $content )
+	protected static function getHtml(ContainerInterface $container, ResponseInterface $response, $content)
 	{
 		$version = \Aimeos\Slim\Bootstrap::getVersion();
-		$content = str_replace( array( '{type}', '{version}' ), array( 'Slim', $version ), $content );
+		$content = str_replace(array('{type}', '{version}'), array('Slim', $version), $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));
 	}
 
 
@@ -217,23 +217,23 @@ 
 	 * @param string $lang ISO language code, e.g. "en" or "en_GB"
 	 * @return \Aimeos\MShop\Context\Item\Iface Modified context object
 	 */
-	protected static function setLocale( \Aimeos\Slim\Base\I18n $i18n, \Aimeos\MShop\Context\Item\Iface $context, $site, $lang )
+	protected static function setLocale(\Aimeos\Slim\Base\I18n $i18n, \Aimeos\MShop\Context\Item\Iface $context, $site, $lang)
 	{
-		$localeManager = \Aimeos\MShop\Factory::createManager( $context, 'locale' );
+		$localeManager = \Aimeos\MShop\Factory::createManager($context, 'locale');
 
 		try
 		{
-			$localeItem = $localeManager->bootstrap( $site, '', '', false );
-			$localeItem->setLanguageId( null );
-			$localeItem->setCurrencyId( null );
+			$localeItem = $localeManager->bootstrap($site, '', '', false);
+			$localeItem->setLanguageId(null);
+			$localeItem->setCurrencyId(null);
 		}
-		catch( \Aimeos\MShop\Locale\Exception $e )
+		catch (\Aimeos\MShop\Locale\Exception $e)
 		{
 			$localeItem = $localeManager->createItem();
 		}
 
-		$context->setLocale( $localeItem );
-		$context->setI18n( $i18n->get( array( $lang, 'en' ) ) );
+		$context->setLocale($localeItem);
+		$context->setI18n($i18n->get(array($lang, 'en')));
 
 		return $context;
 	}