aimeos / aimeos-laravel

src/Aimeos/Shop/Base/I18n.php

Spacing +9 added lines, -9 removed lines

@@ -40,7 +40,7 @@ 
 	 * @param \Illuminate\Contracts\Config\Repository $config Configuration object
 	 * @param \Aimeos\Shop\Base\Aimeos $aimeos Aimeos object
 	 */
-	public function __construct( \Illuminate\Contracts\Config\Repository $config, \Aimeos\Shop\Base\Aimeos $aimeos )
+	public function __construct(\Illuminate\Contracts\Config\Repository $config, \Aimeos\Shop\Base\Aimeos $aimeos)
 	{
 		$this->aimeos = $aimeos;
 		$this->config = $config;
@@ -53,22 +53,22 @@ 
 	 * @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)
 	{
 		$i18nPaths = $this->aimeos->get()->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( $this->config->get( 'shop.apc_enabled', false ) == true ) {
-					$i18n = new \Aimeos\MW\Translation\Decorator\APC( $i18n, $this->config->get( 'shop.apc_prefix', 'laravel:' ) );
+				if ($this->config->get('shop.apc_enabled', false) == true) {
+					$i18n = new \Aimeos\MW\Translation\Decorator\APC($i18n, $this->config->get('shop.apc_prefix', 'laravel:'));
 				}
 
-				if( $this->config->has( 'shop.i18n.' . $langid ) ) {
-					$i18n = new \Aimeos\MW\Translation\Decorator\Memory( $i18n, $this->config->get( 'shop.i18n.' . $langid ) );
+				if ($this->config->has('shop.i18n.'.$langid)) {
+					$i18n = new \Aimeos\MW\Translation\Decorator\Memory($i18n, $this->config->get('shop.i18n.'.$langid));
 				}
 
 				$this->i18n[$langid] = $i18n;

src/Aimeos/Shop/Controller/JsonapiController.php

Spacing +19 added lines, -19 removed lines

@@ -31,9 +31,9 @@ 
 	 * @param \Psr\Http\Message\ServerRequestInterface $request Request object
 	 * @return \Psr\Http\Message\ResponseInterface Response object containing the generated output
 	 */
-	public function deleteAction( ServerRequestInterface $request )
+	public function deleteAction(ServerRequestInterface $request)
 	{
-		return $this->createClient()->delete( $request, new Response() );
+		return $this->createClient()->delete($request, new Response());
 	}
 
 
@@ -43,9 +43,9 @@ 
 	 * @param \Psr\Http\Message\ServerRequestInterface $request Request object
 	 * @return \Psr\Http\Message\ResponseInterface Response object containing the generated output
 	 */
-	public function getAction( ServerRequestInterface $request )
+	public function getAction(ServerRequestInterface $request)
 	{
-		return $this->createClient()->get( $request, new Response() );
+		return $this->createClient()->get($request, new Response());
 	}
 
 
@@ -55,9 +55,9 @@ 
 	 * @param \Psr\Http\Message\ServerRequestInterface $request Request object
 	 * @return \Psr\Http\Message\ResponseInterface Response object containing the generated output
 	 */
-	public function patchAction( ServerRequestInterface $request )
+	public function patchAction(ServerRequestInterface $request)
 	{
-		return $this->createClient()->patch( $request, new Response() );
+		return $this->createClient()->patch($request, new Response());
 	}
 
 
@@ -67,9 +67,9 @@ 
 	 * @param \Psr\Http\Message\ServerRequestInterface $request Request object
 	 * @return \Psr\Http\Message\ResponseInterface Response object containing the generated output
 	 */
-	public function postAction( ServerRequestInterface $request )
+	public function postAction(ServerRequestInterface $request)
 	{
-		return $this->createClient()->post( $request, new Response() );
+		return $this->createClient()->post($request, new Response());
 	}
 
 
@@ -79,9 +79,9 @@ 
 	 * @param \Psr\Http\Message\ServerRequestInterface $request Request object
 	 * @return \Psr\Http\Message\ResponseInterface Response object containing the generated output
 	 */
-	public function putAction( ServerRequestInterface $request )
+	public function putAction(ServerRequestInterface $request)
 	{
-		return $this->createClient()->put( $request, new Response() );
+		return $this->createClient()->put($request, new Response());
 	}
 
 
@@ -91,9 +91,9 @@ 
 	 * @param \Psr\Http\Message\ServerRequestInterface $request Request object
 	 * @return \Psr\Http\Message\ResponseInterface Response object containing the generated output
 	 */
-	public function optionsAction( ServerRequestInterface $request )
+	public function optionsAction(ServerRequestInterface $request)
 	{
-		return $this->createClient()->options( $request, new Response() );
+		return $this->createClient()->options($request, new Response());
 	}
 
 
@@ -104,17 +104,17 @@ 
 	 */
 	protected function createClient()
 	{
-		$resource = Route::input( 'resource' );
-		$related = Route::input( 'related', Input::get( 'related' ) );
+		$resource = Route::input('resource');
+		$related = Route::input('related', Input::get('related'));
 
-		$aimeos = app( '\Aimeos\Shop\Base\Aimeos' )->get();
-		$tmplPaths = $aimeos->getCustomPaths( 'client/jsonapi/templates' );
+		$aimeos = app('\Aimeos\Shop\Base\Aimeos')->get();
+		$tmplPaths = $aimeos->getCustomPaths('client/jsonapi/templates');
 
-		$context = app( '\Aimeos\Shop\Base\Context' )->get();
+		$context = app('\Aimeos\Shop\Base\Context')->get();
 		$langid = $context->getLocale()->getLanguageId();
 
-		$context->setView( app( '\Aimeos\Shop\Base\View' )->create( $context, $tmplPaths, $langid ) );
+		$context->setView(app('\Aimeos\Shop\Base\View')->create($context, $tmplPaths, $langid));
 
-		return \Aimeos\Client\JsonApi\Factory::createClient( $context, $tmplPaths, $resource . '/' . $related );
+		return \Aimeos\Client\JsonApi\Factory::createClient($context, $tmplPaths, $resource.'/'.$related);
 	}
 }

src/Aimeos/Shop/Controller/ExtadmController.php

Spacing +72 added lines, -72 removed lines

@@ -34,66 +34,66 @@ 
 	 * @param \Illuminate\Http\Request $request Laravel request object
 	 * @return \Illuminate\Contracts\View\View View for rendering the output
 	 */
-	public function indexAction( Request $request )
+	public function indexAction(Request $request)
 	{
-		if( config( 'shop.authorize', true ) ) {
-			$this->authorize( 'admin', [ExtadmController::class, ['admin']] );
+		if (config('shop.authorize', true)) {
+			$this->authorize('admin', [ExtadmController::class, ['admin']]);
 		}
 
-		$site = Route::input( 'site', Input::get( 'site', 'default' ) );
-		$lang = Route::input( 'lang', Input::get( 'lang', config( 'app.locale', 'en' ) ) );
-		$tab = Route::input( 'tab', Input::get( 'tab', 0 ) );
+		$site = Route::input('site', Input::get('site', 'default'));
+		$lang = Route::input('lang', Input::get('lang', config('app.locale', 'en')));
+		$tab = Route::input('tab', Input::get('tab', 0));
 
-		$aimeos = app( '\Aimeos\Shop\Base\Aimeos' );
+		$aimeos = app('\Aimeos\Shop\Base\Aimeos');
 
 		$bootstrap = $aimeos->get();
-		$cntlPaths = $bootstrap->getCustomPaths( 'controller/extjs' );
+		$cntlPaths = $bootstrap->getCustomPaths('controller/extjs');
 
-		$context = app( '\Aimeos\Shop\Base\Context' )->get( false, 'backend' );
-		$context->setLocale( app('\Aimeos\Shop\Base\Locale')->getBackend( $context, $site ) );
+		$context = app('\Aimeos\Shop\Base\Context')->get(false, 'backend');
+		$context->setLocale(app('\Aimeos\Shop\Base\Locale')->getBackend($context, $site));
 
-		$controller = new \Aimeos\Controller\ExtJS\JsonRpc( $context, $cntlPaths );
+		$controller = new \Aimeos\Controller\ExtJS\JsonRpc($context, $cntlPaths);
 		$cssFiles = array();
 
-		foreach( $bootstrap->getCustomPaths( 'admin/extjs' ) as $base => $paths )
+		foreach ($bootstrap->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'));
 			}
 		}
 
-		$jsonUrl = route( 'aimeos_shop_extadm_json', array( 'site' => $site, '_token' => csrf_token() ) );
-		$jqadmUrl = route( 'aimeos_shop_jqadm_search', array( 'site' => $site, 'lang' => $lang, 'resource' => 'dashboard' ) );
-		$adminUrl = route( 'aimeos_shop_extadm', array( 'site' => '<site>', 'lang' => '<lang>', 'tab' => '<tab>' ) );
+		$jsonUrl = route('aimeos_shop_extadm_json', array('site' => $site, '_token' => csrf_token()));
+		$jqadmUrl = route('aimeos_shop_jqadm_search', array('site' => $site, 'lang' => $lang, 'resource' => 'dashboard'));
+		$adminUrl = route('aimeos_shop_extadm', array('site' => '<site>', 'lang' => '<lang>', 'tab' => '<tab>'));
 
 		$vars = array(
 			'site' => $site,
 			'lang' => $lang,
 			'cssFiles' => $cssFiles,
-			'languages' => $this->getJsonLanguages( $context),
-			'config' => $this->getJsonClientConfig( $context ),
-			'siteitem' => $this->getJsonSiteItem( $context, $site ),
-			'i18nContent' => $this->getJsonClientI18n( $bootstrap->getI18nPaths(), $lang ),
+			'languages' => $this->getJsonLanguages($context),
+			'config' => $this->getJsonClientConfig($context),
+			'siteitem' => $this->getJsonSiteItem($context, $site),
+			'i18nContent' => $this->getJsonClientI18n($bootstrap->getI18nPaths(), $lang),
 			'searchSchemas' => $controller->getJsonSearchSchemas(),
 			'itemSchemas' => $controller->getJsonItemSchemas(),
-			'smd' => $controller->getJsonSmd( $jsonUrl ),
-			'uploaddir' => config( 'shop::uploaddir' ),
-			'urlTemplate' => str_replace( ['<', '>'], ['{', '}'], urldecode( $adminUrl ) ),
-			'extensions' => implode( ',', $bootstrap->getExtensions() ),
+			'smd' => $controller->getJsonSmd($jsonUrl),
+			'uploaddir' => config('shop::uploaddir'),
+			'urlTemplate' => str_replace(['<', '>'], ['{', '}'], urldecode($adminUrl)),
+			'extensions' => implode(',', $bootstrap->getExtensions()),
 			'version' => $aimeos->getVersion(),
 			'jqadmurl' => $jqadmUrl,
 			'activeTab' => $tab,
 		);
 
-		return View::make( 'shop::extadm.index', $vars );
+		return View::make('shop::extadm.index', $vars);
 	}
 
 
@@ -103,25 +103,25 @@ 
 	 * @param \Illuminate\Http\Request $request Laravel request object
 	 * @return \Illuminate\Contracts\View\View View for rendering the output
 	 */
-	public function doAction( Request $request )
+	public function doAction(Request $request)
 	{
-		if( config( 'shop.authorize', true ) ) {
-			$this->authorize( 'admin', [ExtadmController::class, ['admin']] );
+		if (config('shop.authorize', true)) {
+			$this->authorize('admin', [ExtadmController::class, ['admin']]);
 		}
 
-		$site = Route::input( 'site', Input::get( 'site', 'default' ) );
+		$site = Route::input('site', Input::get('site', 'default'));
 
-		$aimeos = app( '\Aimeos\Shop\Base\Aimeos' )->get();
-		$cntlPaths = $aimeos->getCustomPaths( 'controller/extjs' );
+		$aimeos = app('\Aimeos\Shop\Base\Aimeos')->get();
+		$cntlPaths = $aimeos->getCustomPaths('controller/extjs');
 
-		$context = app( '\Aimeos\Shop\Base\Context' )->get( false, 'backend' );
-		$context->setView( app( '\Aimeos\Shop\Base\View' )->create( $context, array() ) );
-		$context->setLocale( app('\Aimeos\Shop\Base\Locale')->getBackend( $context, $site ) );
+		$context = app('\Aimeos\Shop\Base\Context')->get(false, 'backend');
+		$context->setView(app('\Aimeos\Shop\Base\View')->create($context, array()));
+		$context->setLocale(app('\Aimeos\Shop\Base\Locale')->getBackend($context, $site));
 
-		$controller = new \Aimeos\Controller\ExtJS\JsonRpc( $context, $cntlPaths );
+		$controller = new \Aimeos\Controller\ExtJS\JsonRpc($context, $cntlPaths);
 
-		$response = $controller->process( Input::instance()->request->all(), $request->getContent() );
-		return View::make( 'shop::extadm.do', array( 'output' => $response ) );
+		$response = $controller->process(Input::instance()->request->all(), $request->getContent());
+		return View::make('shop::extadm.do', array('output' => $response));
 	}
 
 
@@ -132,32 +132,32 @@ 
 	 */
 	public function fileAction()
 	{
-		if( config( 'shop.authorize', true ) ) {
-			$this->authorize( 'admin', [ExtadmController::class, ['admin']] );
+		if (config('shop.authorize', true)) {
+			$this->authorize('admin', [ExtadmController::class, ['admin']]);
 		}
 
 		$contents = '';
 		$jsFiles = array();
-		$aimeos = app( '\Aimeos\Shop\Base\Aimeos' )->get();
+		$aimeos = app('\Aimeos\Shop\Base\Aimeos')->get();
 
-		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( $contents )->header( 'Content-Type', 'application/javascript' );
+		return response($contents)->header('Content-Type', 'application/javascript');
 	}
 
 
@@ -167,15 +167,15 @@ 
 	 * @param \Aimeos\MShop\Context\Item\Iface $context Context object
 	 * @return array List of language IDs with labels
 	 */
-	protected function getJsonLanguages( \Aimeos\MShop\Context\Item\Iface $context )
+	protected function getJsonLanguages(\Aimeos\MShop\Context\Item\Iface $context)
 	{
 		$result = array();
 
-		foreach( app( '\Aimeos\Shop\Base\Aimeos' )->get()->getI18nList( 'admin' ) as $id ) {
-			$result[] = array( 'id' => $id, 'label' => $id );
+		foreach (app('\Aimeos\Shop\Base\Aimeos')->get()->getI18nList('admin') as $id) {
+			$result[] = array('id' => $id, 'label' => $id);
 		}
 
-		return json_encode( $result );
+		return json_encode($result);
 	}
 
 
@@ -185,10 +185,10 @@ 
 	 * @param \Aimeos\MShop\Context\Item\Iface $context Context item object
 	 * @return string JSON encoded configuration object
 	 */
-	protected function getJsonClientConfig( \Aimeos\MShop\Context\Item\Iface $context )
+	protected 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);
 	}
 
 
@@ -199,16 +199,16 @@ 
 	 * @param string $lang ISO language code like "en" or "en_GB"
 	 * @return string JSON encoded translation object
 	 */
-	protected function getJsonClientI18n( array $i18nPaths, $lang )
+	protected 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);
 	}
 
 
@@ -220,18 +220,18 @@ 
 	 * @return string JSON encoded site item object
 	 * @throws Exception If no site item was found for the code
 	 */
-	protected function getJsonSiteItem( \Aimeos\MShop\Context\Item\Iface $context, $site )
+	protected 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());
 	}
 }
\ No newline at end of file

src/Aimeos/Shop/Controller/BasketController.php

Spacing +1 added lines, -1 removed lines

@@ -29,7 +29,7 @@
 	 */
 	public function indexAction()
 	{
-		$params = app( '\Aimeos\Shop\Base\Page' )->getSections( 'basket-index' );
+		$params = app('\Aimeos\Shop\Base\Page')->getSections('basket-index');
 		return Response::view('shop::basket.index', $params)->header('Cache-Control', 'no-store');
 	}
 }
\ No newline at end of file

src/Aimeos/Shop/Controller/CheckoutController.php

Spacing +3 added lines, -3 removed lines

@@ -29,7 +29,7 @@ 
 	 */
 	public function confirmAction()
 	{
-		$params = app( '\Aimeos\Shop\Base\Page' )->getSections( 'checkout-confirm' );
+		$params = app('\Aimeos\Shop\Base\Page')->getSections('checkout-confirm');
 		return Response::view('shop::checkout.confirm', $params)->header('Cache-Control', 'no-store');
 	}
 
@@ -41,7 +41,7 @@ 
 	 */
 	public function indexAction()
 	{
-		$params = app( '\Aimeos\Shop\Base\Page' )->getSections( 'checkout-index' );
+		$params = app('\Aimeos\Shop\Base\Page')->getSections('checkout-index');
 		return Response::view('shop::checkout.index', $params)->header('Cache-Control', 'no-store');
 	}
 
@@ -53,7 +53,7 @@ 
 	 */
 	public function updateAction()
 	{
-		$params = app( '\Aimeos\Shop\Base\Page' )->getSections( 'checkout-update' );
+		$params = app('\Aimeos\Shop\Base\Page')->getSections('checkout-update');
 		return Response::view('shop::checkout.update', $params)->header('Cache-Control', 'no-store');
 	}
 }
\ No newline at end of file

src/Aimeos/Shop/Base/Support.php

Spacing +30 added lines, -30 removed lines

@@ -39,7 +39,7 @@ 
 	 * @param \Aimeos\Shop\Base\Context $context Context provider
 	 * @param \Aimeos\Shop\Base\Locale $locale Locale provider
 	 */
-	public function __construct( \Aimeos\Shop\Base\Context $context, \Aimeos\Shop\Base\Locale $locale )
+	public function __construct(\Aimeos\Shop\Base\Context $context, \Aimeos\Shop\Base\Locale $locale)
 	{
 		$this->context = $context;
 		$this->locale = $locale;
@@ -53,22 +53,22 @@ 
 	 * @param string|array $groupcodes Unique user/customer group codes that are allowed
 	 * @return boolean True if user is part of the group, false if not
 	 */
-	public function checkUserGroup( \Illuminate\Foundation\Auth\User $user, $groupcodes )
+	public function checkUserGroup(\Illuminate\Foundation\Auth\User $user, $groupcodes)
 	{
-		$context = $this->context->get( false );
+		$context = $this->context->get(false);
 
 		try {
-			$site = \Aimeos\MShop\Factory::createManager( $context, 'locale/site' )->getItem( $user->siteid )->getCode();
-		} catch( \Exception $e ) {
-			$site = ( Route::current() ? Route::input( 'site', Input::get( 'site', 'default' ) ) : 'default' );
+			$site = \Aimeos\MShop\Factory::createManager($context, 'locale/site')->getItem($user->siteid)->getCode();
+		} catch (\Exception $e) {
+			$site = (Route::current() ? Route::input('site', Input::get('site', 'default')) : 'default');
 		}
 
-		$context->setLocale( $this->locale->getBackend( $context, $site ) );
+		$context->setLocale($this->locale->getBackend($context, $site));
 
-		foreach( array_reverse( $context->getLocale()->getSitePath() ) as $siteid )
+		foreach (array_reverse($context->getLocale()->getSitePath()) as $siteid)
 		{
-			if( $user->siteid === $siteid ) {
-				return $this->checkGroups( $context, $user->id, $groupcodes );
+			if ($user->siteid === $siteid) {
+				return $this->checkGroups($context, $user->id, $groupcodes);
 			}
 		}
 
@@ -84,14 +84,14 @@ 
 	 * @return boolean True if user is part of the group, false if not
 	 * @deprecated Use checkUserGroup() instead
 	 */
-	public function checkGroup( $userid, $groupcodes )
+	public function checkGroup($userid, $groupcodes)
 	{
-		$site = ( Route::current() ? Route::input( 'site', Input::get( 'site', 'default' ) ) : 'default' );
+		$site = (Route::current() ? Route::input('site', Input::get('site', 'default')) : 'default');
 
-		$context = $this->context->get( false );
-		$context->setLocale( $this->locale->getBackend( $context, $site ) );
+		$context = $this->context->get(false);
+		$context->setLocale($this->locale->getBackend($context, $site));
 
-		return $this->checkGroups( $context, $userid, $groupcodes );
+		return $this->checkGroups($context, $userid, $groupcodes);
 	}
 
 
@@ -101,15 +101,15 @@ 
 	 * @param \Aimeos\MShop\Context\Item\Iface $context Context item
 	 * @return string[] List of group codes
 	 */
-	public function getGroups( \Aimeos\MShop\Context\Item\Iface $context )
+	public function getGroups(\Aimeos\MShop\Context\Item\Iface $context)
 	{
 		$list = array();
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'customer/group' );
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'customer/group');
 
 		$search = $manager->createSearch();
-		$search->setConditions( $search->compare( '==', 'customer.group.id', $context->getGroupIds() ) );
+		$search->setConditions($search->compare('==', 'customer.group.id', $context->getGroupIds()));
 
-		foreach( $manager->searchItems( $search ) as $item ) {
+		foreach ($manager->searchItems($search) as $item) {
 			$list[] = $item->getCode();
 		}
 
@@ -125,26 +125,26 @@ 
 	 * @param string[] $groupcodes List of group codes to check against
 	 * @return boolean True if the user is in one of the groups, false if not
 	 */
-	protected function checkGroups( \Aimeos\MShop\Context\Item\Iface $context, $userid, $groupcodes )
+	protected function checkGroups(\Aimeos\MShop\Context\Item\Iface $context, $userid, $groupcodes)
 	{
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'customer/group' );
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'customer/group');
 
 		$search = $manager->createSearch();
-		$search->setConditions( $search->compare( '==', 'customer.group.code', (array) $groupcodes ) );
-		$groupItems = $manager->searchItems( $search );
+		$search->setConditions($search->compare('==', 'customer.group.code', (array) $groupcodes));
+		$groupItems = $manager->searchItems($search);
 
 
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'customer/lists' );
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'customer/lists');
 
 		$search = $manager->createSearch();
 		$expr = array(
-			$search->compare( '==', 'customer.lists.parentid', $userid ),
-			$search->compare( '==', 'customer.lists.refid', array_keys( $groupItems ) ),
-			$search->compare( '==', 'customer.lists.domain', 'customer/group' ),
+			$search->compare('==', 'customer.lists.parentid', $userid),
+			$search->compare('==', 'customer.lists.refid', array_keys($groupItems)),
+			$search->compare('==', 'customer.lists.domain', 'customer/group'),
 		);
-		$search->setConditions( $search->combine( '&&', $expr ) );
-		$search->setSlice( 0, 1 );
+		$search->setConditions($search->combine('&&', $expr));
+		$search->setSlice(0, 1);
 
-		return (bool) count( $manager->searchItems( $search ) );
+		return (bool) count($manager->searchItems($search));
 	}
 }
\ No newline at end of file

src/Aimeos/Shop/Command/AccountCommand.php

Spacing +62 added lines, -62 removed lines

@@ -43,34 +43,34 @@ 
 	 */
 	public function fire()
 	{
-		$code = $this->argument( 'email' );
-		if( ( $password = $this->option( 'password' ) ) === null ) {
-			$password = $this->secret( 'Password' );
+		$code = $this->argument('email');
+		if (($password = $this->option('password')) === null) {
+			$password = $this->secret('Password');
 		}
 
-		$context = $this->getLaravel()->make( 'Aimeos\Shop\Base\Context' )->get( false, 'command' );
-		$context->setEditor( 'aimeos:account' );
+		$context = $this->getLaravel()->make('Aimeos\Shop\Base\Context')->get(false, 'command');
+		$context->setEditor('aimeos:account');
 
-		$localeManager = \Aimeos\MShop\Factory::createManager( $context, 'locale' );
-		$localeItem = $localeManager->bootstrap( $this->argument( 'site' ), '', '', false );
-		$context->setLocale( $localeItem );
+		$localeManager = \Aimeos\MShop\Factory::createManager($context, 'locale');
+		$localeItem = $localeManager->bootstrap($this->argument('site'), '', '', false);
+		$context->setLocale($localeItem);
 
-		$user = $this->createCustomerItem( $context, $code, $password );
+		$user = $this->createCustomerItem($context, $code, $password);
 
-		if( $this->option( 'admin' ) ) {
-			$this->addGroup( $context, $user, 'admin' );
+		if ($this->option('admin')) {
+			$this->addGroup($context, $user, 'admin');
 		}
 
-		if( $this->option( 'api' ) ) {
-			$this->addGroup( $context, $user, 'api' );
+		if ($this->option('api')) {
+			$this->addGroup($context, $user, 'api');
 		}
 
-		if( $this->option( 'editor' ) ) {
-			$this->addGroup( $context, $user, 'editor' );
+		if ($this->option('editor')) {
+			$this->addGroup($context, $user, 'editor');
 		}
 
-		if( $this->option( 'viewer' ) ) {
-			$this->addGroup( $context, $user, 'viewer' );
+		if ($this->option('viewer')) {
+			$this->addGroup($context, $user, 'viewer');
 		}
 	}
 
@@ -82,33 +82,33 @@ 
 	 * @param string $userid Unique user ID
 	 * @param string $groupid Unique group ID
 	 */
-	protected function addListItem( \Aimeos\MShop\Context\Item\Iface $context, $userid, $groupid )
+	protected function addListItem(\Aimeos\MShop\Context\Item\Iface $context, $userid, $groupid)
 	{
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'customer/lists' );
-		$typeManager = \Aimeos\MShop\Factory::createManager( $context, 'customer/lists/type' );
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'customer/lists');
+		$typeManager = \Aimeos\MShop\Factory::createManager($context, 'customer/lists/type');
 
-		$typeid = $typeManager->findItem( 'default', array(), 'customer/group' )->getId();
+		$typeid = $typeManager->findItem('default', array(), 'customer/group')->getId();
 
 		$search = $manager->createSearch();
 		$expr = array(
-			$search->compare( '==', 'customer.lists.parentid', $userid ),
-			$search->compare( '==', 'customer.lists.refid', $groupid ),
-			$search->compare( '==', 'customer.lists.domain', 'customer/group' ),
-			$search->compare( '==', 'customer.lists.typeid', $typeid ),
+			$search->compare('==', 'customer.lists.parentid', $userid),
+			$search->compare('==', 'customer.lists.refid', $groupid),
+			$search->compare('==', 'customer.lists.domain', 'customer/group'),
+			$search->compare('==', 'customer.lists.typeid', $typeid),
 		);
-		$search->setConditions( $search->combine( '&&', $expr ) );
-		$search->setSlice( 0, 1 );
+		$search->setConditions($search->combine('&&', $expr));
+		$search->setSlice(0, 1);
 
-		if( count( $manager->searchItems( $search ) ) === 0 )
+		if (count($manager->searchItems($search)) === 0)
 		{
 			$item = $manager->createItem();
-			$item->setDomain( 'customer/group' );
-			$item->setParentId( $userid );
-			$item->setTypeId( $typeid );
-			$item->setRefId( $groupid );
-			$item->setStatus( 1 );
+			$item->setDomain('customer/group');
+			$item->setParentId($userid);
+			$item->setTypeId($typeid);
+			$item->setRefId($groupid);
+			$item->setStatus(1);
 
-			$manager->saveItem( $item, false );
+			$manager->saveItem($item, false);
 		}
 	}
 
@@ -120,13 +120,13 @@ 
 	 * @param \Aimeos\MShop\Customer\Item\Iface $user Aimeos customer object
 	 * @param string $group Unique customer group code
 	 */
-	protected function addGroup( \Aimeos\MShop\Context\Item\Iface $context, \Aimeos\MShop\Customer\Item\Iface $user, $group )
+	protected function addGroup(\Aimeos\MShop\Context\Item\Iface $context, \Aimeos\MShop\Customer\Item\Iface $user, $group)
 	{
 		$msg = 'Add "%1$s" group to user "%2$s" for site "%3$s"';
-		$this->info( sprintf( $msg, $group, $user->getCode(), $this->argument( 'site' ) ) );
+		$this->info(sprintf($msg, $group, $user->getCode(), $this->argument('site')));
 
-		$groupItem = $this->getGroupItem( $context, $group );
-		$this->addListItem( $context, $user->getId(), $groupItem->getId() );
+		$groupItem = $this->getGroupItem($context, $group);
+		$this->addListItem($context, $user->getId(), $groupItem->getId());
 	}
 
 
@@ -140,23 +140,23 @@ 
 	 * @param string $password New user password
 	 * @return \Aimeos\MShop\Customer\Item\Iface Aimeos customer item object
 	 */
-	protected function createCustomerItem( \Aimeos\MShop\Context\Item\Iface $context, $email, $password )
+	protected function createCustomerItem(\Aimeos\MShop\Context\Item\Iface $context, $email, $password)
 	{
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'customer' );
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'customer');
 
 		try {
-			$item = $manager->findItem( $email );
-		} catch( \Aimeos\MShop\Exception $e ) {
+			$item = $manager->findItem($email);
+		} catch (\Aimeos\MShop\Exception $e) {
 			$item = $manager->createItem();
 		}
 
-		$item->setCode( $email );
-		$item->setLabel( $email );
-		$item->getPaymentAddress()->setEmail( $email );
-		$item->setPassword( $password );
-		$item->setStatus( 1 );
+		$item->setCode($email);
+		$item->setLabel($email);
+		$item->getPaymentAddress()->setEmail($email);
+		$item->setPassword($password);
+		$item->setStatus(1);
 
-		$manager->saveItem( $item );
+		$manager->saveItem($item);
 
 		return $item;
 	}
@@ -170,8 +170,8 @@ 
 	protected function getArguments()
 	{
 		return array(
-			array( 'email', InputArgument::REQUIRED, 'E-mail address of the account that should be created' ),
-			array( 'site', InputArgument::OPTIONAL, 'Site code to create the account for', 'default' ),
+			array('email', InputArgument::REQUIRED, 'E-mail address of the account that should be created'),
+			array('site', InputArgument::OPTIONAL, 'Site code to create the account for', 'default'),
 		);
 	}
 
@@ -183,21 +183,21 @@ 
 	 * @param string $code Unique customer group code
 	 * @return \Aimeos\MShop\Customer\Item\Group\Iface Aimeos customer group item object
 	 */
-	protected function getGroupItem( \Aimeos\MShop\Context\Item\Iface $context, $code )
+	protected function getGroupItem(\Aimeos\MShop\Context\Item\Iface $context, $code)
 	{
-		$manager = \Aimeos\MShop\Customer\Manager\Factory::createManager( $context )->getSubmanager( 'group' );
+		$manager = \Aimeos\MShop\Customer\Manager\Factory::createManager($context)->getSubmanager('group');
 
 		try
 		{
-			$item = $manager->findItem( $code );
+			$item = $manager->findItem($code);
 		}
-		catch( \Aimeos\MShop\Exception $e )
+		catch (\Aimeos\MShop\Exception $e)
 		{
 			$item = $manager->createItem();
-			$item->setLabel( $code );
-			$item->setCode( $code );
+			$item->setLabel($code);
+			$item->setCode($code);
 
-			$manager->saveItem( $item );
+			$manager->saveItem($item);
 		}
 
 		return $item;
@@ -212,11 +212,11 @@ 
 	protected function getOptions()
 	{
 		return array(
-			array( 'password', null, InputOption::VALUE_REQUIRED, 'Optional password for the account (will ask for if not given)' ),
-			array( 'admin', null, InputOption::VALUE_NONE, 'If account should have administrator privileges' ),
-			array( 'api', null, InputOption::VALUE_NONE, 'If account should be able to access the APIs' ),
-			array( 'editor', null, InputOption::VALUE_NONE, 'If account should have limited editor privileges' ),
-			array( 'viewer', null, InputOption::VALUE_NONE, 'If account should only have view privileges' ),
+			array('password', null, InputOption::VALUE_REQUIRED, 'Optional password for the account (will ask for if not given)'),
+			array('admin', null, InputOption::VALUE_NONE, 'If account should have administrator privileges'),
+			array('api', null, InputOption::VALUE_NONE, 'If account should be able to access the APIs'),
+			array('editor', null, InputOption::VALUE_NONE, 'If account should have limited editor privileges'),
+			array('viewer', null, InputOption::VALUE_NONE, 'If account should only have view privileges'),
 		);
 	}
 }

src/Aimeos/Shop/Controller/CatalogController.php

Spacing +5 added lines, -5 removed lines

@@ -29,7 +29,7 @@ 
 	 */
 	public function countAction()
 	{
-		$params = app( '\Aimeos\Shop\Base\Page' )->getSections( 'catalog-count' );
+		$params = app('\Aimeos\Shop\Base\Page')->getSections('catalog-count');
 
 		return Response::view('shop::catalog.count', $params)
 			->header('Content-Type', 'application/javascript');
@@ -43,7 +43,7 @@ 
 	 */
 	public function detailAction()
 	{
-		$params = app( 'Aimeos\Shop\Base\Page' )->getSections( 'catalog-detail' );
+		$params = app('Aimeos\Shop\Base\Page')->getSections('catalog-detail');
 		return Response::view('shop::catalog.detail', $params);
 	}
 
@@ -55,7 +55,7 @@ 
 	 */
 	public function listAction()
 	{
-		$params = app( 'Aimeos\Shop\Base\Page' )->getSections( 'catalog-list' );
+		$params = app('Aimeos\Shop\Base\Page')->getSections('catalog-list');
 		return Response::view('shop::catalog.list', $params);
 	}
 
@@ -67,7 +67,7 @@ 
 	 */
 	public function stockAction()
 	{
-		$params = app( 'Aimeos\Shop\Base\Page' )->getSections( 'catalog-stock' );
+		$params = app('Aimeos\Shop\Base\Page')->getSections('catalog-stock');
 
 		return Response::view('shop::catalog.stock', $params)
 			->header('Content-Type', 'application/javascript');
@@ -81,7 +81,7 @@ 
 	 */
 	public function suggestAction()
 	{
-		$params = app( 'Aimeos\Shop\Base\Page' )->getSections( 'catalog-suggest' );
+		$params = app('Aimeos\Shop\Base\Page')->getSections('catalog-suggest');
 
 		return Response::view('shop::catalog.suggest', $params)
 			->header('Content-Type', 'application/json');

src/Aimeos/Shop/Controller/AccountController.php

Spacing +7 added lines, -7 removed lines

@@ -29,7 +29,7 @@ 
 	 */
 	public function indexAction()
 	{
-		$params = app( '\Aimeos\Shop\Base\Page' )->getSections( 'account-index' );
+		$params = app('\Aimeos\Shop\Base\Page')->getSections('account-index');
 		return Response::view('shop::account.index', $params);
 	}
 
@@ -41,17 +41,17 @@ 
 	 */
 	public function downloadAction()
 	{
-		$context = app( '\Aimeos\Shop\Base\Context' )->get();
+		$context = app('\Aimeos\Shop\Base\Context')->get();
 		$langid = $context->getLocale()->getLanguageId();
 
-		$view = app( '\Aimeos\Shop\Base\View' )->create( $context, array(), $langid );
-		$context->setView( $view );
+		$view = app('\Aimeos\Shop\Base\View')->create($context, 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();
 
 		$response = $view->response();
-		return Response::make( (string) $response->getBody(), $response->getStatusCode(), $response->getHeaders() );
+		return Response::make((string) $response->getBody(), $response->getStatusCode(), $response->getHeaders());
 	}
 }
\ No newline at end of file