aimeos / aimeos-slim

src/Bootstrap.php

Spacing +31 added lines, -31 removed lines

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

src/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::create( $ctx, 'locale/site' );
+		$manager = \Aimeos\MShop::create($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

src/Command/Jobs.php

Spacing +42 added lines, -42 removed lines

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

src/Command/Cache.php

Spacing +32 added lines, -32 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,38 +57,38 @@ 
 	 * @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 );
+		$conf = new \Aimeos\MW\Config\PHPArray($config, $confPaths);
+		$conf = new \Aimeos\MW\Config\Decorator\Memory($conf);
 
-		if( ( $cfg = $conf->get( 'command' ) ) !== null ) {
-			$conf = new \Aimeos\MW\Config\Decorator\Memory( $conf, $cfg );
+		if (($cfg = $conf->get('command')) !== null) {
+			$conf = new \Aimeos\MW\Config\Decorator\Memory($conf, $cfg);
 		}
 
-		$ctx->setConfig( $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;
 	}
@@ -100,23 +100,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::create( $ctx, 'locale' );
+		$localeManager = \Aimeos\MShop::create($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::create( $lcontext, 'cache' )->getCache()->clear();
+			\Aimeos\MAdmin::create($lcontext, 'cache')->getCache()->clear();
 		}
 	}
 }
\ No newline at end of file

src/aimeos-default.php

Spacing +11 added lines, -11 removed lines

@@ -7,17 +7,17 @@
 	'uploaddir' => '/',
 
 	'page' => array(
-		'account-index' => array( 'account/profile','account/subscription','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/lists' ),
-		'catalog-stock' => array( 'catalog/stock' ),
-		'catalog-suggest' => array( 'catalog/suggest' ),
-		'catalog-tree' => array( 'basket/mini','catalog/filter','catalog/stage','catalog/lists' ),
-		'checkout-confirm' => array( 'checkout/confirm' ),
-		'checkout-index' => array( 'checkout/standard' ),
-		'checkout-update' => array( 'checkout/update'),
+		'account-index' => array('account/profile', 'account/subscription', '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/lists'),
+		'catalog-stock' => array('catalog/stock'),
+		'catalog-suggest' => array('catalog/suggest'),
+		'catalog-tree' => array('basket/mini', 'catalog/filter', 'catalog/stage', 'catalog/lists'),
+		'checkout-confirm' => array('checkout/confirm'),
+		'checkout-index' => array('checkout/standard'),
+		'checkout-update' => array('checkout/update'),
 	),
 
 	'resource' => array(

src/Base/View.php

Spacing +70 added lines, -70 removed lines

@@ -30,7 +30,7 @@ 
 	 *
 	 * @param ContainerInterface $container Dependency container
 	 */
-	public function __construct( ContainerInterface $container )
+	public function __construct(ContainerInterface $container)
 	{
 		$this->container = $container;
 	}
@@ -47,38 +47,38 @@ 
 	 * @param string|null $locale Code of the current language or null for no translation
 	 * @return \Aimeos\MW\View\Iface View object
 	 */
-	public function create( \Aimeos\MShop\Context\Item\Iface $context, ServerRequestInterface $request,
-		ResponseInterface $response, array $attributes, array $templatePaths, $locale = null )
+	public function create(\Aimeos\MShop\Context\Item\Iface $context, ServerRequestInterface $request,
+		ResponseInterface $response, array $attributes, array $templatePaths, $locale = null)
 	{
 		$iface = 'Slim\Views\Twig';
 		$params = $attributes + (array) $request->getParsedBody() + (array) $request->getQueryParams();
 
-		if( isset( $this->container['view'] ) && $this->container['view'] instanceof $iface )
+		if (isset($this->container['view']) && $this->container['view'] instanceof $iface)
 		{
 			$twig = $this->container['view']->getEnvironment();
-			$engines = array( '.html.twig' => new \Aimeos\MW\View\Engine\Twig( $twig ) );
+			$engines = array('.html.twig' => new \Aimeos\MW\View\Engine\Twig($twig));
 
-			$view = new \Aimeos\MW\View\Standard( $templatePaths, $engines );
-			$this->initTwig( $view, $twig );
+			$view = new \Aimeos\MW\View\Standard($templatePaths, $engines);
+			$this->initTwig($view, $twig);
 		}
 		else
 		{
-			$view = new \Aimeos\MW\View\Standard( $templatePaths );
+			$view = new \Aimeos\MW\View\Standard($templatePaths);
 		}
 
 		$config = $context->getConfig();
 		$session = $context->getSession();
 
-		$this->addAccess( $view );
-		$this->addConfig( $view, $config );
-		$this->addCsrf( $view, $request );
-		$this->addNumber( $view, $config );
-		$this->addParam( $view, $params );
-		$this->addRequest( $view, $request );
-		$this->addResponse( $view, $response );
-		$this->addSession( $view, $session );
-		$this->addTranslate( $view, $locale );
-		$this->addUrl( $view, $attributes );
+		$this->addAccess($view);
+		$this->addConfig($view, $config);
+		$this->addCsrf($view, $request);
+		$this->addNumber($view, $config);
+		$this->addParam($view, $params);
+		$this->addRequest($view, $request);
+		$this->addResponse($view, $response);
+		$this->addSession($view, $session);
+		$this->addTranslate($view, $locale);
+		$this->addUrl($view, $attributes);
 
 		return $view;
 	}
@@ -90,10 +90,10 @@ 
 	 * @param \Aimeos\MW\View\Iface $view View object
 	 * @return \Aimeos\MW\View\Iface Modified view object
 	 */
-	protected function addAccess( \Aimeos\MW\View\Iface $view )
+	protected function addAccess(\Aimeos\MW\View\Iface $view)
 	{
-		$helper = new \Aimeos\MW\View\Helper\Access\All( $view );
-		$view->addHelper( 'access', $helper );
+		$helper = new \Aimeos\MW\View\Helper\Access\All($view);
+		$view->addHelper('access', $helper);
 
 		return $view;
 	}
@@ -106,11 +106,11 @@ 
 	 * @param \Aimeos\MW\Config\Iface $config Configuration object
 	 * @return \Aimeos\MW\View\Iface Modified view object
 	 */
-	protected function addConfig( \Aimeos\MW\View\Iface $view, \Aimeos\MW\Config\Iface $config )
+	protected function addConfig(\Aimeos\MW\View\Iface $view, \Aimeos\MW\Config\Iface $config)
 	{
-		$config = new \Aimeos\MW\Config\Decorator\Protect( clone $config, ['admin', 'client', 'resource/fs/baseurl'] );
-		$helper = new \Aimeos\MW\View\Helper\Config\Standard( $view, $config );
-		$view->addHelper( 'config', $helper );
+		$config = new \Aimeos\MW\Config\Decorator\Protect(clone $config, ['admin', 'client', 'resource/fs/baseurl']);
+		$helper = new \Aimeos\MW\View\Helper\Config\Standard($view, $config);
+		$view->addHelper('config', $helper);
 
 		return $view;
 	}
@@ -123,13 +123,13 @@ 
 	 * @param ServerRequestInterface $request Request object
 	 * @return \Aimeos\MW\View\Iface Modified view object
 	 */
-	protected function addCsrf( \Aimeos\MW\View\Iface $view, ServerRequestInterface $request )
+	protected function addCsrf(\Aimeos\MW\View\Iface $view, ServerRequestInterface $request)
 	{
-		$name = $request->getAttribute( 'csrf_name' );
-		$value = $request->getAttribute( 'csrf_value' );
+		$name = $request->getAttribute('csrf_name');
+		$value = $request->getAttribute('csrf_value');
 
-		$helper = new \Aimeos\MW\View\Helper\Csrf\Standard( $view, $name, $value );
-		$view->addHelper( 'csrf', $helper );
+		$helper = new \Aimeos\MW\View\Helper\Csrf\Standard($view, $name, $value);
+		$view->addHelper('csrf', $helper);
 
 		return $view;
 	}
@@ -142,14 +142,14 @@ 
 	 * @param \Aimeos\MW\Config\Iface $config Configuration object
 	 * @return \Aimeos\MW\View\Iface Modified view object
 	 */
-	protected function addNumber( \Aimeos\MW\View\Iface $view, \Aimeos\MW\Config\Iface $config )
+	protected function addNumber(\Aimeos\MW\View\Iface $view, \Aimeos\MW\Config\Iface $config)
 	{
-		$sepDec = $config->get( 'client/html/common/format/separatorDecimal', '.' );
-		$sep1000 = $config->get( 'client/html/common/format/separator1000', ' ' );
-		$decimals = $config->get( 'client/html/common/format/decimals', 2 );
+		$sepDec = $config->get('client/html/common/format/separatorDecimal', '.');
+		$sep1000 = $config->get('client/html/common/format/separator1000', ' ');
+		$decimals = $config->get('client/html/common/format/decimals', 2);
 
-		$helper = new \Aimeos\MW\View\Helper\Number\Standard( $view, $sepDec, $sep1000, $decimals );
-		$view->addHelper( 'number', $helper );
+		$helper = new \Aimeos\MW\View\Helper\Number\Standard($view, $sepDec, $sep1000, $decimals);
+		$view->addHelper('number', $helper);
 
 		return $view;
 	}
@@ -162,10 +162,10 @@ 
 	 * @param array $attributes Associative list of request parameters
 	 * @return \Aimeos\MW\View\Iface Modified view object
 	 */
-	protected static function addParam( \Aimeos\MW\View\Iface $view, array $params )
+	protected static function addParam(\Aimeos\MW\View\Iface $view, array $params)
 	{
-		$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);
 
 		return $view;
 	}
@@ -178,10 +178,10 @@ 
 	 * @param ServerRequestInterface $request Request object
 	 * @return \Aimeos\MW\View\Iface Modified view object
 	 */
-	protected static function addRequest( \Aimeos\MW\View\Iface $view, ServerRequestInterface $request )
+	protected static function addRequest(\Aimeos\MW\View\Iface $view, ServerRequestInterface $request)
 	{
-		$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);
 
 		return $view;
 	}
@@ -194,10 +194,10 @@ 
 	 * @param ResponseInterface $response Response object
 	 * @return \Aimeos\MW\View\Iface Modified view object
 	 */
-	protected static function addResponse( \Aimeos\MW\View\Iface $view, ResponseInterface $response )
+	protected static function addResponse(\Aimeos\MW\View\Iface $view, ResponseInterface $response)
 	{
-		$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);
 
 		return $view;
 	}
@@ -210,10 +210,10 @@ 
 	 * @param \Aimeos\MW\Session\Iface $session Session object
 	 * @return \Aimeos\MW\View\Iface Modified view object
 	 */
-	protected function addSession( \Aimeos\MW\View\Iface $view, \Aimeos\MW\Session\Iface $session )
+	protected function addSession(\Aimeos\MW\View\Iface $view, \Aimeos\MW\Session\Iface $session)
 	{
-		$helper = new \Aimeos\MW\View\Helper\Session\Standard( $view, $session );
-		$view->addHelper( 'session', $helper );
+		$helper = new \Aimeos\MW\View\Helper\Session\Standard($view, $session);
+		$view->addHelper('session', $helper);
 
 		return $view;
 	}
@@ -226,20 +226,20 @@ 
 	 * @param string|null $locale ISO language code, e.g. "de" or "de_CH"
 	 * @return \Aimeos\MW\View\Iface Modified view object
 	 */
-	protected function addTranslate( \Aimeos\MW\View\Iface $view, $locale )
+	protected function addTranslate(\Aimeos\MW\View\Iface $view, $locale)
 	{
-		if( $locale !== null )
+		if ($locale !== null)
 		{
-			$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');
 		}
 
-		$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);
 
 		return $view;
 	}
@@ -252,24 +252,24 @@ 
 	 * @param array $attributes Associative list of URI parameters
 	 * @return \Aimeos\MW\View\Iface Modified view object
 	 */
-	protected function addUrl( \Aimeos\MW\View\Iface $view, array $attributes )
+	protected function addUrl(\Aimeos\MW\View\Iface $view, 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'];
 		}
 
-		$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);
 
 		return $view;
 	}
@@ -281,21 +281,21 @@ 
 	 * @param \Aimeos\MW\View\Iface $view View object
 	 * @param \Twig_Environment $twig Twig environment object
 	 */
-	protected function initTwig( \Aimeos\MW\View\Iface $view, \Twig_Environment $twig )
+	protected function initTwig(\Aimeos\MW\View\Iface $view, \Twig_Environment $twig)
 	{
-		$fcn = function( $key, $default = null ) use ( $view ) {
-			return $view->config( $key, $default );
+		$fcn = function($key, $default = null) use ($view) {
+			return $view->config($key, $default);
 		};
-		$twig->addFunction( new \Twig_SimpleFunction( 'aiconfig', $fcn ) );
+		$twig->addFunction(new \Twig_SimpleFunction('aiconfig', $fcn));
 
-		$fcn = function( $singular, array $values = array(), $domain = 'client' ) use ( $view ) {
-			return vsprintf( $view->translate( $domain, $singular ), $values );
+		$fcn = function($singular, array $values = array(), $domain = 'client') use ($view) {
+			return vsprintf($view->translate($domain, $singular), $values);
 		};
-		$twig->addFunction( new \Twig_SimpleFunction( 'aitrans', $fcn ) );
+		$twig->addFunction(new \Twig_SimpleFunction('aitrans', $fcn));
 
-		$fcn = function( $singular, $plural, $number, array $values = array(), $domain = 'client' ) use ( $view ) {
-			return vsprintf( $view->translate( $domain, $singular, $plural, $number ), $values );
+		$fcn = function($singular, $plural, $number, array $values = array(), $domain = 'client') use ($view) {
+			return vsprintf($view->translate($domain, $singular, $plural, $number), $values);
 		};
-		$twig->addFunction( new \Twig_SimpleFunction( 'aitransplural', $fcn ) );
+		$twig->addFunction(new \Twig_SimpleFunction('aitransplural', $fcn));
 	}
 }

Braces +2 added lines, -4 removed lines

@@ -60,8 +60,7 @@ 
 
 			$view = new \Aimeos\MW\View\Standard( $templatePaths, $engines );
 			$this->initTwig( $view, $twig );
-		}
-		else
+		} else
 		{
 			$view = new \Aimeos\MW\View\Standard( $templatePaths );
 		}
@@ -232,8 +231,7 @@ 
 		{
 			$i18n = $this->container->get( 'aimeos.i18n' )->get( array( $locale ) );
 			$translation = $i18n[$locale];
-		}
-		else
+		} else
 		{
 			$translation = new \Aimeos\MW\Translation\None( 'en' );
 		}

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