aimeos / aimeos-slim

src/Command/Cache.php

Spacing +30 added lines, -30 removed lines

@@ -34,19 +34,19 @@ 
 	 *
 	 * @param array $argv Associative array from $_SERVER['argv']
 	 */
-	public static function run( array $argv )
+	public static function run(array $argv)
 	{
-		array_shift( $argv );
-		$options = self::getOptions( $argv );
-		$sites = array_shift( $argv );
+		array_shift($argv);
+		$options = self::getOptions($argv);
+		$sites = array_shift($argv);
 
-		$extdirs = ( isset( $options['extdir'] ) ? (array) $options['extdir'] : array() );
-		$aimeos = new \Aimeos\Bootstrap( $extdirs );
+		$extdirs = (isset($options['extdir']) ? (array) $options['extdir'] : array());
+		$aimeos = new \Aimeos\Bootstrap($extdirs);
 
-		$ctx = self::getContext( $aimeos->getConfigPaths(), $options );
-		$siteItems = self::getSiteItems( $ctx, $sites );
+		$ctx = self::getContext($aimeos->getConfigPaths(), $options);
+		$siteItems = self::getSiteItems($ctx, $sites);
 
-		self::clear( $ctx, $siteItems );
+		self::clear($ctx, $siteItems);
 	}
 
 
@@ -57,32 +57,32 @@ 
 	 * @param array $options Associative list of configuration options as key/value pairs
 	 * @return \Aimeos\MShop\Context\Item\Iface Context object
 	 */
-	protected static function getContext( array $confPaths, array $options )
+	protected static function getContext(array $confPaths, array $options)
 	{
 		$config = array();
 		$ctx = new \Aimeos\MShop\Context\Item\Standard();
 
-		if( isset( $options['config'] ) )
+		if (isset($options['config']))
 		{
-			foreach( (array) $options['config'] as $path )
+			foreach ((array) $options['config'] as $path)
 			{
-				if( is_file( $path ) ) {
-					$config = array_replace_recursive( $config, require $path );
+				if (is_file($path)) {
+					$config = array_replace_recursive($config, require $path);
 				} else {
 					$confPaths[] = $path;
 				}
 			}
 		}
 
-		$conf = new \Aimeos\MW\Config\PHPArray( $config, $confPaths );
-		$conf = new \Aimeos\MW\Config\Decorator\Memory( $conf );
-		$ctx->setConfig( $conf );
+		$conf = new \Aimeos\MW\Config\PHPArray($config, $confPaths);
+		$conf = new \Aimeos\MW\Config\Decorator\Memory($conf);
+		$ctx->setConfig($conf);
 
-		$dbm = new \Aimeos\MW\DB\Manager\PDO( $conf );
-		$ctx->setDatabaseManager( $dbm );
+		$dbm = new \Aimeos\MW\DB\Manager\PDO($conf);
+		$ctx->setDatabaseManager($dbm);
 
-		$logger = new \Aimeos\MW\Logger\Errorlog( \Aimeos\MW\Logger\Base::INFO );
-		$ctx->setLogger( $logger );
+		$logger = new \Aimeos\MW\Logger\Errorlog(\Aimeos\MW\Logger\Base::INFO);
+		$ctx->setLogger($logger);
 
 		return $ctx;
 	}
@@ -94,23 +94,23 @@ 
 	 * @param \Aimeos\MShop\Context\Item\Iface $ctx Context object
 	 * @param array $siteItems List of site items implementing \Aimeos\MShop\Locale\Site\Iface
 	 */
-	protected static function clear( \Aimeos\MShop\Context\Item\Iface $ctx, array $siteItems )
+	protected static function clear(\Aimeos\MShop\Context\Item\Iface $ctx, array $siteItems)
 	{
-		$localeManager = \Aimeos\MShop\Factory::createManager( $ctx, 'locale' );
+		$localeManager = \Aimeos\MShop\Factory::createManager($ctx, 'locale');
 
-		foreach( $siteItems as $siteItem )
+		foreach ($siteItems as $siteItem)
 		{
-			$localeItem = $localeManager->bootstrap( $siteItem->getCode(), '', '', false );
+			$localeItem = $localeManager->bootstrap($siteItem->getCode(), '', '', false);
 
 			$lcontext = clone $ctx;
-			$lcontext->setLocale( $localeItem );
+			$lcontext->setLocale($localeItem);
 
-			$cache = new \Aimeos\MAdmin\Cache\Proxy\Standard( $lcontext );
-			$lcontext->setCache( $cache );
+			$cache = new \Aimeos\MAdmin\Cache\Proxy\Standard($lcontext);
+			$lcontext->setCache($cache);
 
-			printf( "Clearing the Aimeos cache for site \"%1\$s\"\n", $siteItem->getCode() );
+			printf("Clearing the Aimeos cache for site \"%1\$s\"\n", $siteItem->getCode());
 
-			\Aimeos\MAdmin\Cache\Manager\Factory::createManager( $lcontext )->getCache()->flush();
+			\Aimeos\MAdmin\Cache\Manager\Factory::createManager($lcontext)->getCache()->flush();
 		}
 	}
 }
\ No newline at end of file

src/Command/Jobs.php

Spacing +37 added lines, -37 removed lines

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

src/Command/Base.php

Spacing +16 added lines, -16 removed lines

@@ -24,31 +24,31 @@ 
 	 * @param array &$params List of parameters
 	 * @return array Associative list of option name and value(s)
 	 */
-	protected static function getOptions( array &$params )
+	protected static function getOptions(array &$params)
 	{
 		$options = array();
 
-		foreach( $params as $key => $option )
+		foreach ($params as $key => $option)
 		{
-			if( $option === '--help' ) {
+			if ($option === '--help') {
 				throw new Exception();
 			}
 
-			if( strncmp( $option, '--', 2 ) === 0 && ( $pos = strpos( $option, '=', 2 ) ) !== false )
+			if (strncmp($option, '--', 2) === 0 && ($pos = strpos($option, '=', 2)) !== false)
 			{
-				$name = substr( $option, 2, $pos - 2 );
+				$name = substr($option, 2, $pos - 2);
 
-				if( isset( $options[$name] ) )
+				if (isset($options[$name]))
 				{
 					$options[$name] = (array) $options[$name];
-					$options[$name][] = substr( $option, $pos + 1 );
+					$options[$name][] = substr($option, $pos + 1);
 				}
 				else
 				{
-					$options[$name] = substr( $option, $pos + 1 );
+					$options[$name] = substr($option, $pos + 1);
 				}
 
-				unset( $params[$key] );
+				unset($params[$key]);
 			}
 		}
 
@@ -62,19 +62,19 @@ 
 	 * @param \Aimeos\MShop\Context\Item\Iface $ctx Context object
 	 * @param string|null $sites List of site codes separated by a space
 	 */
-	protected static function getSiteItems( \Aimeos\MShop\Context\Item\Iface $ctx, $sites )
+	protected static function getSiteItems(\Aimeos\MShop\Context\Item\Iface $ctx, $sites)
 	{
-		$manager = \Aimeos\MShop\Factory::createManager( $ctx, 'locale/site' );
+		$manager = \Aimeos\MShop\Factory::createManager($ctx, 'locale/site');
 		$search = $manager->createSearch();
 
-		if( is_scalar( $sites ) && $sites != '' ) {
-			$sites = explode( ' ', $sites );
+		if (is_scalar($sites) && $sites != '') {
+			$sites = explode(' ', $sites);
 		}
 
-		if( !empty( $sites ) ) {
-			$search->setConditions( $search->compare( '==', 'locale.site.code', $sites ) );
+		if (!empty($sites)) {
+			$search->setConditions($search->compare('==', 'locale.site.code', $sites));
 		}
 
-		return $manager->searchItems( $search );
+		return $manager->searchItems($search);
 	}
 }
\ No newline at end of file

Braces +1 added lines, -2 removed lines

@@ -42,8 +42,7 @@
 				{
 					$options[$name] = (array) $options[$name];
 					$options[$name][] = substr( $option, $pos + 1 );
-				}
-				else
+				} else
 				{
 					$options[$name] = substr( $option, $pos + 1 );
 				}

cache.php

Braces +3 added lines, -6 removed lines

@@ -19,14 +19,12 @@ 
 	require 'vendor' . DIRECTORY_SEPARATOR . 'autoload.php';
 
 	\Aimeos\Slim\Command\Cache::run( $_SERVER['argv'] );
-}
-catch( \Aimeos\Slim\Command\Exception $e )
+} catch( \Aimeos\Slim\Command\Exception $e )
 {
 	echo $e->getMessage() . "\n";
 	echo \Aimeos\Slim\Command\Cache::usage();
 	exit( 1 );
-}
-catch( \Throwable $t )
+} catch( \Throwable $t )
 {
 	echo "\n\nCaught PHP error";
 	echo "\n\nMessage:\n";
@@ -35,8 +33,7 @@ 
 	echo $t->getTraceAsString();
 	echo "\n\n";
 	exit( 1 );
-}
-catch( \Exception $e )
+} catch( \Exception $e )
 {
 	echo "\n\nCaught exception";
 	echo "\n\nMessage:\n";

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);
 }

jobs.php

Braces +3 added lines, -6 removed lines

@@ -19,14 +19,12 @@ 
 	require 'vendor' . DIRECTORY_SEPARATOR . 'autoload.php';
 
 	\Aimeos\Slim\Command\Cache::run( $_SERVER['argv'] );
-}
-catch( \Aimeos\Slim\Command\Exception $e )
+} catch( \Aimeos\Slim\Command\Exception $e )
 {
 	echo $e->getMessage() . "\n";
 	echo \Aimeos\Slim\Command\Cache::usage();
 	exit( 1 );
-}
-catch( \Throwable $t )
+} catch( \Throwable $t )
 {
 	echo "\n\nCaught PHP error";
 	echo "\n\nMessage:\n";
@@ -35,8 +33,7 @@ 
 	echo $t->getTraceAsString();
 	echo "\n\n";
 	exit( 1 );
-}
-catch( \Exception $e )
+} catch( \Exception $e )
 {
 	echo "\n\nCaught exception";
 	echo "\n\nMessage:\n";

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);
 }

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;

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'];
 				}
 			}