aimeos / aimeos-slim

src/Controller/Extadm.php

Doc Comments +1 added lines, -1 removed lines

@@ -160,7 +160,7 @@
 	 * Creates a list of all available translations
 	 *
 	 * @param \Aimeos\Bootstrap $aimeos Aimeos object
-	 * @return array List of language IDs with labels
+	 * @return string List of language IDs with labels
 	 */
 	protected static function getJsonLanguages( \Aimeos\Bootstrap $aimeos )
 	{

Spacing +75 added lines, -75 removed lines

@@ -32,63 +32,63 @@ 
 	 * @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, 'backend' );
-		$context = self::setLocale( $context, $site, $lang );
+		$context = $container->get('aimeos_context')->get(false, $args, 'backend');
+		$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' );
-		$jsonUrl = $router->pathFor( 'aimeos_shop_extadm_json', array( 'site' => $site, $csrfname => $csrfvalue ) );
-		$jqadmUrl = $router->pathFor( 'aimeos_shop_jqadm_search', array( 'site' => $site, 'lang' => $lang, 'resource' => 'dashboard' ) );
-		$adminUrl = $router->pathFor( 'aimeos_shop_extadm', array( 'site' => '<site>', 'lang' => '<lang>', 'tab' => '<tab>' ) );
+		$router = $container->get('router');
+		$jsonUrl = $router->pathFor('aimeos_shop_extadm_json', array('site' => $site, $csrfname => $csrfvalue));
+		$jqadmUrl = $router->pathFor('aimeos_shop_jqadm_search', array('site' => $site, 'lang' => $lang, 'resource' => 'dashboard'));
+		$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 ),
-			'urlTemplate' => str_replace( ['<', '>'], ['{', '}'], urldecode( $adminUrl ) ),
+			'smd' => $controller->getJsonSmd($jsonUrl),
+			'urlTemplate' => str_replace(['<', '>'], ['{', '}'], urldecode($adminUrl)),
 			'jqadmurl' => $jqadmUrl,
 			'activeTab' => $tab,
 			'version' => \Aimeos\Slim\Bootstrap::getVersion(),
-			'extensions' => implode( ',', $aimeos->getExtensions() ),
+			'extensions' => implode(',', $aimeos->getExtensions()),
 		);
 
-		return $container->get( 'view' )->render( $response, 'Extadm/index.html.twig', $vars );
+		return $container->get('view')->render($response, 'Extadm/index.html.twig', $vars);
 	}
 
 
@@ -101,22 +101,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, 'backend' );
-		$context->setView( $container->get( 'aimeos_view' )->create( $context, $request, $response, $args, array() ) );
-		$context = self::setLocale( $context );
+		$context = $container->get('aimeos_context')->get(false, $args, 'backend');
+		$context->setView($container->get('aimeos_view')->create($context, $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;
 	}
@@ -131,30 +131,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);
 	}
 
 
@@ -164,15 +164,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);
 	}
 
 
@@ -182,10 +182,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);
 	}
 
 
@@ -196,16 +196,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);
 	}
 
 
@@ -217,19 +217,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());
 	}
 
 
@@ -241,17 +241,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/Command/Iface.php

Spacing +1 added lines, -1 removed lines

@@ -23,7 +23,7 @@
 	 *
 	 * @param array $argv Associative array from $_SERVER['argv']
 	 */
-	public static function run( array $argv );
+	public static function run(array $argv);
 
 	/**
 	 * Returns the command usage and options

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

jobs.php

Braces +3 added lines, -6 removed lines

@@ -20,14 +20,12 @@ 
 	require 'vendor' . DIRECTORY_SEPARATOR . 'autoload.php';
 
 	\Aimeos\Slim\Command\Jobs::run( $_SERVER['argv'] );
-}
-catch( \Aimeos\Slim\Command\Exception $e )
+} catch( \Aimeos\Slim\Command\Exception $e )
 {
 	echo $e->getMessage() . "\n";
 	echo \Aimeos\Slim\Command\Jobs::usage();
 	exit( 1 );
-}
-catch( \Throwable $t )
+} catch( \Throwable $t )
 {
 	echo "\n\nCaught PHP error while processing setup";
 	echo "\n\nMessage:\n";
@@ -36,8 +34,7 @@ 
 	echo $t->getTraceAsString();
 	echo "\n\n";
 	exit( 1 );
-}
-catch( \Exception $e )
+} catch( \Exception $e )
 {
 	echo "\n\nCaught exception while processing setup";
 	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);
 }

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

src/Controller/Account.php

Spacing +9 added lines, -9 removed lines

@@ -31,10 +31,10 @@ 
 	 * @param array $args Associative list of route parameters
 	 * @return ResponseInterface $response Modified response object with generated output
 	 */
-	public static function indexAction( ContainerInterface $container, ServerRequestInterface $request, ResponseInterface $response, array $args )
+	public static function indexAction(ContainerInterface $container, ServerRequestInterface $request, ResponseInterface $response, array $args)
 	{
-		$contents = $container->get( 'aimeos_page' )->getSections( 'account-index', $request, $response, $args );
-		return $container->get( 'view' )->render( $response, 'Account/index.html.twig', $contents );
+		$contents = $container->get('aimeos_page')->getSections('account-index', $request, $response, $args);
+		return $container->get('view')->render($response, 'Account/index.html.twig', $contents);
 	}
 
 
@@ -47,16 +47,16 @@ 
 	 * @param array $args Associative list of route parameters
 	 * @return ResponseInterface $response Modified response object with generated output
 	 */
-	public static function downloadAction( ContainerInterface $container, ServerRequestInterface $request, ResponseInterface $response, array $args )
+	public static function downloadAction(ContainerInterface $container, ServerRequestInterface $request, ResponseInterface $response, array $args)
 	{
-		$context = $container->get( 'aimeos_context' )->get( true, $args );
+		$context = $container->get('aimeos_context')->get(true, $args);
 		$langid = $context->getLocale()->getLanguageId();
 
-		$view = $container->get( 'aimeos_view' )->create( $context, $request, $response, $args, array(), $langid );
-		$context->setView( $view );
+		$view = $container->get('aimeos_view')->create($context, $request, $response, $args, array(), $langid);
+		$context->setView($view);
 
-		$client = \Aimeos\Client\Html\Factory::createClient( $context, array(), 'account/download' );
-		$client->setView( $view );
+		$client = \Aimeos\Client\Html\Factory::createClient($context, array(), 'account/download');
+		$client->setView($view);
 		$client->process();
 
 		return $view->response();

src/Base/Page.php

Spacing +12 added lines, -12 removed lines

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

src/Base/View.php

Doc Comments -1 removed lines

@@ -143,7 +143,6 @@
 	 * Adds the "param" helper to the view object
 	 *
 	 * @param \Aimeos\MW\View\Iface $view View object
-	 * @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 )

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 );
 		}
@@ -212,8 +211,7 @@ 
 		{
 			$i18n = $this->container->get( 'aimeos_i18n' )->get( array( $locale ) );
 			$translation = $i18n[$locale];
-		}
-		else
+		} else
 		{
 			$translation = new \Aimeos\MW\Translation\None( 'en' );
 		}

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

src/Base/Locale.php

Spacing +15 added lines, -15 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\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;
@@ -67,17 +67,17 @@ 
 	 * @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\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();
 		}

Braces +1 added lines, -2 removed lines

@@ -181,8 +181,7 @@
 			$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();
 		}