aimeos / aimeos-laravel

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/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/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

src/Aimeos/Shop/Base/Context.php

Spacing +60 added lines, -60 removed lines

@@ -55,7 +55,7 @@ 
 	 * @param \Aimeos\Shop\Base\Locale $locale Locale object
 	 * @param \Aimeos\Shop\Base\I18n $i18n Internationalisation object
 	 */
-	public function __construct( \Illuminate\Session\Store $session, \Aimeos\Shop\Base\Config $config, \Aimeos\Shop\Base\Locale $locale, \Aimeos\Shop\Base\I18n $i18n )
+	public function __construct(\Illuminate\Session\Store $session, \Aimeos\Shop\Base\Config $config, \Aimeos\Shop\Base\Locale $locale, \Aimeos\Shop\Base\I18n $i18n)
 	{
 		$this->session = $session;
 		$this->config = $config;
@@ -71,36 +71,36 @@ 
 	 * @param string $type Configuration type, i.e. "frontend" or "backend" (deprecated, use \Aimeos\Shop\Base\Config)
 	 * @return \Aimeos\MShop\Context\Item\Iface Context object
 	 */
-	public function get( $locale = true, $type = 'frontend' )
+	public function get($locale = true, $type = 'frontend')
 	{
-		$config = $this->config->get( $type );
+		$config = $this->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);
-			$this->addGroups( $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->addGroups($context);
 
 			$this->context = $context;
 		}
 
-		$this->context->setConfig( $config );
+		$this->context->setConfig($config);
 
-		if( $locale === true )
+		if ($locale === true)
 		{
-			$localeItem = $this->locale->get( $this->context );
-			$this->context->setLocale( $localeItem );
-			$this->context->setI18n( $this->i18n->get( array( $localeItem->getLanguageId() ) ) );
+			$localeItem = $this->locale->get($this->context);
+			$this->context->setLocale($localeItem);
+			$this->context->setI18n($this->i18n->get(array($localeItem->getLanguageId())));
 		}
 
 		return $this->context;
@@ -113,11 +113,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);
 	}
 
 
@@ -127,11 +127,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);
 	}
 
 
@@ -141,14 +141,14 @@ 
 	 * @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)
 	{
 		$config = $context->getConfig();
-		$path = storage_path( 'aimeos' );
+		$path = storage_path('aimeos');
 
-		$fs = new \Aimeos\MW\Filesystem\Manager\Laravel( app( 'filesystem' ), $config, $path );
+		$fs = new \Aimeos\MW\Filesystem\Manager\Laravel(app('filesystem'), $config, $path);
 
-		return $context->setFilesystemManager( $fs );
+		return $context->setFilesystemManager($fs);
 	}
 
 
@@ -158,11 +158,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\Log\Manager\Factory::createManager( $context );
+		$logger = \Aimeos\MAdmin\Log\Manager\Factory::createManager($context);
 
-		return $context->setLogger( $logger );
+		return $context->setLogger($logger);
 	}
 
 
@@ -173,11 +173,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( function() { return app( 'mailer' )->getSwiftMailer(); } );
+		$mail = new \Aimeos\MW\Mail\Swift(function() { return app('mailer')->getSwiftMailer(); } );
 
-		return $context->setMail( $mail );
+		return $context->setMail($mail);
 	}
 
 
@@ -187,11 +187,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);
 	}
 
 
@@ -201,16 +201,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);
 	}
 
 
@@ -220,11 +220,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\Laravel5( $this->session );
+		$session = new \Aimeos\MW\Session\Laravel5($this->session);
 
-		return $context->setSession( $session );
+		return $context->setSession($session);
 	}
 
 
@@ -234,16 +234,16 @@ 
 	 * @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)
 	{
-		if( ( $userid = Auth::id() ) !== null ) {
-			$context->setUserId( $userid );
+		if (($userid = Auth::id()) !== null) {
+			$context->setUserId($userid);
 		}
 
-		if( ( $user = Auth::user() ) !== null ) {
-			$context->setEditor( $user->name );
+		if (($user = Auth::user()) !== null) {
+			$context->setEditor($user->name);
 		} else {
-			$context->setEditor( \Request::ip() );
+			$context->setEditor(\Request::ip());
 		}
 
 		return $context;
@@ -256,14 +256,14 @@ 
 	 * @param \Aimeos\MShop\Context\Item\Iface $context Context object
 	 * @return \Aimeos\MShop\Context\Item\Iface Modified context object
 	 */
-	protected function addGroups( \Aimeos\MShop\Context\Item\Iface $context )
+	protected function addGroups(\Aimeos\MShop\Context\Item\Iface $context)
 	{
-		if( ( $userid = Auth::id() ) !== null )
+		if (($userid = Auth::id()) !== null)
 		{
-			$context->setGroupIds( function() use ( $context, $userid )
+			$context->setGroupIds(function() use ($context, $userid)
 			{
-				$manager = \Aimeos\MShop\Factory::createManager( $context, 'customer' );
-				return $manager->getItem( $userid, array( 'customer/group' ) )->getGroups();
+				$manager = \Aimeos\MShop\Factory::createManager($context, 'customer');
+				return $manager->getItem($userid, array('customer/group'))->getGroups();
 			} );
 		}
 

src/default.php

Spacing +18 added lines, -18 removed lines

@@ -10,16 +10,16 @@ 
 	'uploaddir' => '/',
 
 	'page' => array(
-		'account-index' => array( 'account/profile','account/history','account/favorite','account/watch','basket/mini','catalog/session' ),
-		'basket-index' => array( 'basket/standard','basket/related' ),
-		'catalog-count' => array( 'catalog/count' ),
-		'catalog-detail' => array( 'basket/mini','catalog/stage','catalog/detail','catalog/session' ),
-		'catalog-list' => array( 'basket/mini','catalog/filter','catalog/stage','catalog/lists' ),
-		'catalog-stock' => array( 'catalog/stock' ),
-		'catalog-suggest' => array( 'catalog/suggest' ),
-		'checkout-confirm' => array( 'checkout/confirm' ),
-		'checkout-index' => array( 'checkout/standard' ),
-		'checkout-update' => array( 'checkout/update'),
+		'account-index' => array('account/profile', 'account/history', 'account/favorite', 'account/watch', 'basket/mini', 'catalog/session'),
+		'basket-index' => array('basket/standard', 'basket/related'),
+		'catalog-count' => array('catalog/count'),
+		'catalog-detail' => array('basket/mini', 'catalog/stage', 'catalog/detail', 'catalog/session'),
+		'catalog-list' => array('basket/mini', 'catalog/filter', 'catalog/stage', 'catalog/lists'),
+		'catalog-stock' => array('catalog/stock'),
+		'catalog-suggest' => array('catalog/suggest'),
+		'checkout-confirm' => array('checkout/confirm'),
+		'checkout-index' => array('checkout/standard'),
+		'checkout-update' => array('checkout/update'),
 	),
 
 	'resource' => array(
@@ -37,22 +37,22 @@ 
 		'fs' => array(
 			'adapter' => 'Standard',
 			'basedir' => public_path(),
-			'tempdir' => storage_path( 'tmp' ),
+			'tempdir' => storage_path('tmp'),
 		),
 		'fs-admin' => array(
 			'adapter' => 'Standard',
-			'basedir' => storage_path( 'admin' ),
-			'tempdir' => storage_path( 'tmp' ),
+			'basedir' => storage_path('admin'),
+			'tempdir' => storage_path('tmp'),
 		),
 		'fs-import' => array(
 			'adapter' => 'Standard',
-			'basedir' => storage_path( 'import' ),
-			'tempdir' => storage_path( 'tmp' ),
+			'basedir' => storage_path('import'),
+			'tempdir' => storage_path('tmp'),
 		),
 		'fs-secure' => array(
 			'adapter' => 'Standard',
-			'basedir' => storage_path( 'secure' ),
-			'tempdir' => storage_path( 'tmp' ),
+			'basedir' => storage_path('secure'),
+			'tempdir' => storage_path('tmp'),
 		),
 		'mq' => array(
 			'adapter' => 'Standard',
@@ -288,7 +288,7 @@ 
 						# in the "maxwidth" parameter
 						# 'maxheight' => 280,
 					),
-					'tempdir' => storage_path( 'aimeos' ),
+					'tempdir' => storage_path('aimeos'),
 				),
 			),
 		),

src/routes.php

Spacing +53 added lines, -53 removed lines

@@ -2,7 +2,7 @@ 
 
 Route::group(config('shop.routes.login', ['middleware' => ['web']]), function() {
 
-	Route::match( array( 'GET' ), 'admin', array(
+	Route::match(array('GET'), 'admin', array(
 		'as' => 'aimeos_shop_admin',
 		'uses' => 'Aimeos\Shop\Controller\AdminController@indexAction'
 	));
@@ -12,17 +12,17 @@ 
 
 Route::group(config('shop.routes.extadm', ['prefix' => 'admin/{site}/extadm', 'middleware' => ['web', 'auth']]), function() {
 
-	Route::match( array( 'POST' ), 'do', array(
+	Route::match(array('POST'), 'do', array(
 		'as' => 'aimeos_shop_extadm_json',
 		'uses' => 'Aimeos\Shop\Controller\ExtadmController@doAction'
 	));
 
-	Route::match( array( 'GET' ), 'file', array(
+	Route::match(array('GET'), 'file', array(
 		'as' => 'aimeos_shop_extadm_file',
 		'uses' => 'Aimeos\Shop\Controller\ExtadmController@fileAction'
 	));
 
-	Route::match( array( 'GET' ), '/{lang?}/{tab?}', array(
+	Route::match(array('GET'), '/{lang?}/{tab?}', array(
 		'as' => 'aimeos_shop_extadm',
 		'uses' => 'Aimeos\Shop\Controller\ExtadmController@indexAction'
 	));
@@ -32,117 +32,117 @@ 
 
 Route::group(config('shop.routes.jqadm', ['prefix' => 'admin/{site}/jqadm', 'middleware' => ['web', 'auth']]), function() {
 
-	Route::match( array( 'GET' ), 'file/{type}', array(
+	Route::match(array('GET'), 'file/{type}', array(
 		'as' => 'aimeos_shop_jqadm_file',
 		'uses' => 'Aimeos\Shop\Controller\JqadmController@fileAction'
 	));
 
-	Route::match( array( 'GET', 'POST' ), 'copy/{resource}/{id}', array(
+	Route::match(array('GET', 'POST'), 'copy/{resource}/{id}', array(
 		'as' => 'aimeos_shop_jqadm_copy',
 		'uses' => 'Aimeos\Shop\Controller\JqadmController@copyAction'
-	))->where( array( 'resource' => '[^0-9A-Z\-\_]+', 'id' => '[0-9A-Z\-\_]+' ) );
+	))->where(array('resource' => '[^0-9A-Z\-\_]+', 'id' => '[0-9A-Z\-\_]+'));
 
-	Route::match( array( 'GET', 'POST' ), 'create/{resource}', array(
+	Route::match(array('GET', 'POST'), 'create/{resource}', array(
 		'as' => 'aimeos_shop_jqadm_create',
 		'uses' => 'Aimeos\Shop\Controller\JqadmController@createAction'
-	))->where( array( 'resource' => '[^0-9A-Z\-\_]+' ) );
+	))->where(array('resource' => '[^0-9A-Z\-\_]+'));
 
-	Route::match( array( 'GET', 'POST' ), 'delete/{resource}/{id}', array(
+	Route::match(array('GET', 'POST'), 'delete/{resource}/{id}', array(
 		'as' => 'aimeos_shop_jqadm_delete',
 		'uses' => 'Aimeos\Shop\Controller\JqadmController@deleteAction'
-	))->where( array( 'resource' => '[^0-9A-Z\-\_]+', 'id' => '[0-9A-Z\-\_]+' ) );
+	))->where(array('resource' => '[^0-9A-Z\-\_]+', 'id' => '[0-9A-Z\-\_]+'));
 
-	Route::match( array( 'GET', 'POST' ), 'export/{resource}', array(
+	Route::match(array('GET', 'POST'), 'export/{resource}', array(
 		'as' => 'aimeos_shop_jqadm_export',
 		'uses' => 'Aimeos\Shop\Controller\JqadmController@exportAction'
-	))->where( array( 'resource' => '[^0-9A-Z\-\_]+' ) );
+	))->where(array('resource' => '[^0-9A-Z\-\_]+'));
 
-	Route::match( array( 'GET' ), 'get/{resource}/{id}', array(
+	Route::match(array('GET'), 'get/{resource}/{id}', array(
 		'as' => 'aimeos_shop_jqadm_get',
 		'uses' => 'Aimeos\Shop\Controller\JqadmController@getAction'
-	))->where( array( 'resource' => '[^0-9A-Z\-\_]+', 'id' => '[0-9A-Z\-\_]+' ) );
+	))->where(array('resource' => '[^0-9A-Z\-\_]+', 'id' => '[0-9A-Z\-\_]+'));
 
-	Route::match( array( 'GET', 'POST' ), 'import/{resource}', array(
+	Route::match(array('GET', 'POST'), 'import/{resource}', array(
 		'as' => 'aimeos_shop_jqadm_import',
 		'uses' => 'Aimeos\Shop\Controller\JqadmController@importAction'
-	))->where( array( 'resource' => '[^0-9A-Z\-\_]+' ) );
+	))->where(array('resource' => '[^0-9A-Z\-\_]+'));
 
-	Route::match( array( 'POST' ), 'save/{resource}', array(
+	Route::match(array('POST'), 'save/{resource}', array(
 		'as' => 'aimeos_shop_jqadm_save',
 		'uses' => 'Aimeos\Shop\Controller\JqadmController@saveAction'
-	))->where( array( 'resource' => '[^0-9A-Z\-\_]+' ) );
+	))->where(array('resource' => '[^0-9A-Z\-\_]+'));
 
-	Route::match( array( 'GET', 'POST' ), 'search/{resource}', array(
+	Route::match(array('GET', 'POST'), 'search/{resource}', array(
 		'as' => 'aimeos_shop_jqadm_search',
 		'uses' => 'Aimeos\Shop\Controller\JqadmController@searchAction'
-	))->where( array( 'resource' => '[^0-9A-Z\-\_]+' ) );
+	))->where(array('resource' => '[^0-9A-Z\-\_]+'));
 
 });
 
 
 Route::group(config('shop.routes.jsonadm', ['prefix' => 'admin/{site}/jsonadm', 'middleware' => ['web', 'auth']]), function() {
 
-	Route::match( array( 'DELETE' ), '{resource}/{id?}', array(
+	Route::match(array('DELETE'), '{resource}/{id?}', array(
 		'as' => 'aimeos_shop_jsonadm_delete',
 		'uses' => 'Aimeos\Shop\Controller\JsonadmController@deleteAction'
-	))->where( array( 'resource' => '[^0-9A-Z\-\_]+', 'id' => '[0-9A-Z\-\_]*' ) );
+	))->where(array('resource' => '[^0-9A-Z\-\_]+', 'id' => '[0-9A-Z\-\_]*'));
 
-	Route::match( array( 'GET' ), '{resource}/{id?}', array(
+	Route::match(array('GET'), '{resource}/{id?}', array(
 		'as' => 'aimeos_shop_jsonadm_get',
 		'uses' => 'Aimeos\Shop\Controller\JsonadmController@getAction'
-	))->where( array( 'resource' => '[^0-9A-Z\-\_]+', 'id' => '[0-9A-Z\-\_]*' ) );
+	))->where(array('resource' => '[^0-9A-Z\-\_]+', 'id' => '[0-9A-Z\-\_]*'));
 
-	Route::match( array( 'PATCH' ), '{resource}/{id?}', array(
+	Route::match(array('PATCH'), '{resource}/{id?}', array(
 		'as' => 'aimeos_shop_jsonadm_patch',
 		'uses' => 'Aimeos\Shop\Controller\JsonadmController@patchAction'
-	))->where( array( 'resource' => '[^0-9A-Z\-\_]+', 'id' => '[0-9A-Z\-\_]*' ) );
+	))->where(array('resource' => '[^0-9A-Z\-\_]+', 'id' => '[0-9A-Z\-\_]*'));
 
-	Route::match( array( 'POST' ), '{resource}/{id?}', array(
+	Route::match(array('POST'), '{resource}/{id?}', array(
 		'as' => 'aimeos_shop_jsonadm_post',
 		'uses' => 'Aimeos\Shop\Controller\JsonadmController@postAction'
-	))->where( array( 'resource' => '[^0-9A-Z\-\_]+', 'id' => '[0-9A-Z\-\_]*' ) );
+	))->where(array('resource' => '[^0-9A-Z\-\_]+', 'id' => '[0-9A-Z\-\_]*'));
 
-	Route::match( array( 'PUT' ), '{resource}/{id?}', array(
+	Route::match(array('PUT'), '{resource}/{id?}', array(
 		'as' => 'aimeos_shop_jsonadm_put',
 		'uses' => 'Aimeos\Shop\Controller\JsonadmController@putAction'
-	))->where( array( 'resource' => '[^0-9A-Z\-\_]+', 'id' => '[0-9A-Z\-\_]*' ) );
+	))->where(array('resource' => '[^0-9A-Z\-\_]+', 'id' => '[0-9A-Z\-\_]*'));
 
-	Route::match( array( 'OPTIONS' ), '{resource?}', array(
+	Route::match(array('OPTIONS'), '{resource?}', array(
 		'as' => 'aimeos_shop_jsonadm_options',
 		'uses' => 'Aimeos\Shop\Controller\JsonadmController@optionsAction'
-	))->where( array( 'resource' => '[^0-9A-Z\-\_]*' ) );
+	))->where(array('resource' => '[^0-9A-Z\-\_]*'));
 
 });
 
 
 Route::group(config('shop.routes.jsonapi', ['prefix' => 'jsonapi', 'middleware' => ['web', 'api']]), function() {
 
-	Route::match( array( 'DELETE' ), '{resource}', array(
+	Route::match(array('DELETE'), '{resource}', array(
 		'as' => 'aimeos_shop_jsonapi_delete',
 		'uses' => 'Aimeos\Shop\Controller\JsonapiController@deleteAction'
 	));
 
-	Route::match( array( 'GET' ), '{resource}', array(
+	Route::match(array('GET'), '{resource}', array(
 		'as' => 'aimeos_shop_jsonapi_get',
 		'uses' => 'Aimeos\Shop\Controller\JsonapiController@getAction'
 	));
 
-	Route::match( array( 'PATCH' ), '{resource}', array(
+	Route::match(array('PATCH'), '{resource}', array(
 		'as' => 'aimeos_shop_jsonapi_patch',
 		'uses' => 'Aimeos\Shop\Controller\JsonapiController@patchAction'
 	));
 
-	Route::match( array( 'POST' ), '{resource}', array(
+	Route::match(array('POST'), '{resource}', array(
 		'as' => 'aimeos_shop_jsonapi_post',
 		'uses' => 'Aimeos\Shop\Controller\JsonapiController@postAction'
 	));
 
-	Route::match( array( 'PUT' ), '{resource}', array(
+	Route::match(array('PUT'), '{resource}', array(
 		'as' => 'aimeos_shop_jsonapi_put',
 		'uses' => 'Aimeos\Shop\Controller\JsonapiController@putAction'
 	));
 
-	Route::match( array( 'OPTIONS' ), '{resource?}', array(
+	Route::match(array('OPTIONS'), '{resource?}', array(
 		'as' => 'aimeos_shop_jsonapi_options',
 		'uses' => 'Aimeos\Shop\Controller\JsonapiController@optionsAction'
 	));
@@ -152,22 +152,22 @@ 
 
 Route::group(config('shop.routes.account', ['middleware' => ['web', 'auth']]), function() {
 
-	Route::match( array( 'GET', 'POST' ), 'myaccount/favorite/{fav_action?}/{fav_id?}/{d_prodid?}/{d_name?}/{d_pos?}', array(
+	Route::match(array('GET', 'POST'), 'myaccount/favorite/{fav_action?}/{fav_id?}/{d_prodid?}/{d_name?}/{d_pos?}', array(
 		'as' => 'aimeos_shop_account_favorite',
 		'uses' => 'Aimeos\Shop\Controller\AccountController@indexAction'
 	));
 
-	Route::match( array( 'GET', 'POST' ), 'myaccount/watch/{wat_action?}/{wat_id?}/{d_prodid?}/{d_name?}/{d_pos?}', array(
+	Route::match(array('GET', 'POST'), 'myaccount/watch/{wat_action?}/{wat_id?}/{d_prodid?}/{d_name?}/{d_pos?}', array(
 		'as' => 'aimeos_shop_account_watch',
 		'uses' => 'Aimeos\Shop\Controller\AccountController@indexAction'
 	));
 
-	Route::match( array( 'GET', 'POST' ), 'myaccount/download/{dl_id}', array(
+	Route::match(array('GET', 'POST'), 'myaccount/download/{dl_id}', array(
 		'as' => 'aimeos_shop_account_download',
 		'uses' => 'Aimeos\Shop\Controller\AccountController@downloadAction'
 	));
 
-	Route::match( array( 'GET', 'POST' ), 'myaccount', array(
+	Route::match(array('GET', 'POST'), 'myaccount', array(
 		'as' => 'aimeos_shop_account',
 		'uses' => 'Aimeos\Shop\Controller\AccountController@indexAction'
 	));
@@ -177,47 +177,47 @@ 
 
 Route::group(config('shop.routes.default', ['middleware' => ['web']]), function() {
 
-	Route::match( array( 'GET', 'POST' ), 'count', array(
+	Route::match(array('GET', 'POST'), 'count', array(
 		'as' => 'aimeos_shop_count',
 		'uses' => 'Aimeos\Shop\Controller\CatalogController@countAction'
 	));
 
-	Route::match( array( 'GET', 'POST' ), 'detail/{d_prodid}/{d_name?}/{d_pos?}', array(
+	Route::match(array('GET', 'POST'), 'detail/{d_prodid}/{d_name?}/{d_pos?}', array(
 		'as' => 'aimeos_shop_detail',
 		'uses' => 'Aimeos\Shop\Controller\CatalogController@detailAction'
 	));
 
-	Route::match( array( 'GET', 'POST' ), 'detail/pin/{pin_action?}/{pin_id?}/{d_prodid?}/{d_name?}/{d_pos?}', array(
+	Route::match(array('GET', 'POST'), 'detail/pin/{pin_action?}/{pin_id?}/{d_prodid?}/{d_name?}/{d_pos?}', array(
 		'as' => 'aimeos_shop_session_pinned',
 		'uses' => 'Aimeos\Shop\Controller\CatalogController@detailAction'
 	));
 
-	Route::match( array( 'GET', 'POST' ), 'list', array(
+	Route::match(array('GET', 'POST'), 'list', array(
 		'as' => 'aimeos_shop_list',
 		'uses' => 'Aimeos\Shop\Controller\CatalogController@listAction'
 	));
 
-	Route::match( array( 'GET', 'POST' ), 'suggest', array(
+	Route::match(array('GET', 'POST'), 'suggest', array(
 		'as' => 'aimeos_shop_suggest',
 		'uses' => 'Aimeos\Shop\Controller\CatalogController@suggestAction'
 	));
 
-	Route::match( array( 'GET', 'POST' ), 'stock', array(
+	Route::match(array('GET', 'POST'), 'stock', array(
 		'as' => 'aimeos_shop_stock',
 		'uses' => 'Aimeos\Shop\Controller\CatalogController@stockAction'
 	));
 
-	Route::match( array( 'GET', 'POST' ), 'basket', array(
+	Route::match(array('GET', 'POST'), 'basket', array(
 		'as' => 'aimeos_shop_basket',
 		'uses' => 'Aimeos\Shop\Controller\BasketController@indexAction'
 	));
 
-	Route::match( array( 'GET', 'POST' ), 'checkout/{c_step?}', array(
+	Route::match(array('GET', 'POST'), 'checkout/{c_step?}', array(
 		'as' => 'aimeos_shop_checkout',
 		'uses' => 'Aimeos\Shop\Controller\CheckoutController@indexAction'
 	));
 
-	Route::match( array( 'GET', 'POST' ), 'confirm/{code?}', array(
+	Route::match(array('GET', 'POST'), 'confirm/{code?}', array(
 		'as' => 'aimeos_shop_confirm',
 		'uses' => 'Aimeos\Shop\Controller\CheckoutController@confirmAction'
 	));
@@ -227,7 +227,7 @@ 
 
 Route::group(config('shop.routes.update', []), function() {
 
-	Route::match( array( 'GET', 'POST' ), 'update', array(
+	Route::match(array('GET', 'POST'), 'update', array(
 		'as' => 'aimeos_shop_update',
 		'uses' => 'Aimeos\Shop\Controller\CheckoutController@updateAction'
 	));