aimeos / aimeos-laravel

src/routes.php

Spacing +44 added lines, -44 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,37 +32,37 @@ 
 
 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'
 	));
 
-	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'
 	));
 
-	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'
 	));
 
-	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'
 	));
 
-	Route::match( array( 'POST' ), 'save/{resource}/{id?}', array(
+	Route::match(array('POST'), 'save/{resource}/{id?}', array(
 		'as' => 'aimeos_shop_jqadm_save',
 		'uses' => 'Aimeos\Shop\Controller\JqadmController@saveAction'
-	))->defaults( 'id', '' );
+	))->defaults('id', '');
 
-	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'
 	));
@@ -72,67 +72,67 @@ 
 
 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'
 	));
@@ -142,22 +142,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'
 	));
@@ -167,42 +167,42 @@ 
 
 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'
 	));
@@ -212,7 +212,7 @@ 
 
 Route::group(config('shop.routes.confirm', ['middleware' => ['web']]), function() {
 
-	Route::match( array( 'GET', 'POST' ), 'confirm', array(
+	Route::match(array('GET', 'POST'), 'confirm', array(
 		'as' => 'aimeos_shop_confirm',
 		'uses' => 'Aimeos\Shop\Controller\CheckoutController@confirmAction'
 	));
@@ -222,7 +222,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'
 	));

src/Aimeos/Shop/Base/Context.php

Spacing +53 added lines, -53 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,35 +71,35 @@ 
 	 * @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->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->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;
@@ -112,10 +112,10 @@ 
 	 * @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 );
-		$context->setCache( $cache );
+		$cache = new \Aimeos\MAdmin\Cache\Proxy\Standard($context);
+		$context->setCache($cache);
 
 		return $context;
 	}
@@ -127,10 +127,10 @@ 
 	 * @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() );
-		$context->setDatabaseManager( $dbm );
+		$dbm = new \Aimeos\MW\DB\Manager\DBAL($context->getConfig());
+		$context->setDatabaseManager($dbm);
 
 		return $context;
 	}
@@ -142,13 +142,13 @@ 
 	 * @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 );
-		$context->setFilesystemManager( $fs );
+		$fs = new \Aimeos\MW\Filesystem\Manager\Laravel(app('filesystem'), $config, $path);
+		$context->setFilesystemManager($fs);
 
 		return $context;
 	}
@@ -160,10 +160,10 @@ 
 	 * @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 );
-		$context->setLogger( $logger );
+		$logger = \Aimeos\MAdmin\Log\Manager\Factory::createManager($context);
+		$context->setLogger($logger);
 
 		return $context;
 	}
@@ -176,10 +176,10 @@ 
 	 * @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(); } );
-		$context->setMail( $mail );
+		$mail = new \Aimeos\MW\Mail\Swift(function() { return app('mailer')->getSwiftMailer(); } );
+		$context->setMail($mail);
 
 		return $context;
 	}
@@ -191,10 +191,10 @@ 
 	 * @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() );
-		$context->setMessageQueueManager( $mq );
+		$mq = new \Aimeos\MW\MQueue\Manager\Standard($context->getConfig());
+		$context->setMessageQueueManager($mq);
 
 		return $context;
 	}
@@ -206,10 +206,10 @@ 
 	 * @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 );
-		$context->setSession( $session );
+		$session = new \Aimeos\MW\Session\Laravel5($this->session);
+		$context->setSession($session);
 
 		return $context;
 	}
@@ -221,16 +221,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;
@@ -243,14 +243,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/Aimeos/Shop/Base/View.php

Spacing +54 added lines, -54 removed lines

@@ -41,7 +41,7 @@ 
 	 * @param \Aimeos\Shop\Base\I18n $i18n I18n object
 	 * @param \Aimeos\Shop\Base\Support $support Support object
 	 */
-	public function __construct( \Aimeos\Shop\Base\I18n $i18n, \Aimeos\Shop\Base\Support $support )
+	public function __construct(\Aimeos\Shop\Base\I18n $i18n, \Aimeos\Shop\Base\Support $support)
 	{
 		$this->i18n = $i18n;
 		$this->support = $support;
@@ -56,21 +56,21 @@ 
 	 * @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, array $templatePaths, $locale = null )
+	public function create(\Aimeos\MShop\Context\Item\Iface $context, array $templatePaths, $locale = null)
 	{
-		$engine = new \Aimeos\MW\View\Engine\Blade( app( 'Illuminate\Contracts\View\Factory' ) );
-		$view = new \Aimeos\MW\View\Standard( $templatePaths, array( '.blade.php' => $engine ) );
+		$engine = new \Aimeos\MW\View\Engine\Blade(app('Illuminate\Contracts\View\Factory'));
+		$view = new \Aimeos\MW\View\Standard($templatePaths, array('.blade.php' => $engine));
 		$config = $context->getConfig();
 
-		$this->addCsrf( $view );
-		$this->addAccess( $view, $context );
-		$this->addConfig( $view, $config );
-		$this->addNumber( $view, $config );
-		$this->addParam( $view );
-		$this->addRequest( $view );
-		$this->addResponse( $view );
-		$this->addTranslate( $view, $locale );
-		$this->addUrl( $view );
+		$this->addCsrf($view);
+		$this->addAccess($view, $context);
+		$this->addConfig($view, $config);
+		$this->addNumber($view, $config);
+		$this->addParam($view);
+		$this->addRequest($view);
+		$this->addResponse($view);
+		$this->addTranslate($view, $locale);
+		$this->addUrl($view);
 
 		return $view;
 	}
@@ -83,16 +83,16 @@ 
 	 * @param \Aimeos\MShop\Context\Item\Iface $context Context object
 	 * @return \Aimeos\MW\View\Iface Modified view object
 	 */
-	protected function addAccess( \Aimeos\MW\View\Iface $view, \Aimeos\MShop\Context\Item\Iface $context )
+	protected function addAccess(\Aimeos\MW\View\Iface $view, \Aimeos\MShop\Context\Item\Iface $context)
 	{
 		$support = $this->support;
 
-		$fcn = function() use ( $support, $context ) {
-			return $support->getGroups( $context );
+		$fcn = function() use ($support, $context) {
+			return $support->getGroups($context);
 		};
 
-		$helper = new \Aimeos\MW\View\Helper\Access\Standard( $view, $fcn );
-		$view->addHelper( 'access', $helper );
+		$helper = new \Aimeos\MW\View\Helper\Access\Standard($view, $fcn);
+		$view->addHelper('access', $helper);
 
 		return $view;
 	}
@@ -105,11 +105,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;
 	}
@@ -121,10 +121,10 @@ 
 	 * @param \Aimeos\MW\View\Iface $view View object
 	 * @return \Aimeos\MW\View\Iface Modified view object
 	 */
-	protected function addCsrf( \Aimeos\MW\View\Iface $view )
+	protected function addCsrf(\Aimeos\MW\View\Iface $view)
 	{
-		$helper = new \Aimeos\MW\View\Helper\Csrf\Standard( $view, '_token', csrf_token() );
-		$view->addHelper( 'csrf', $helper );
+		$helper = new \Aimeos\MW\View\Helper\Csrf\Standard($view, '_token', csrf_token());
+		$view->addHelper('csrf', $helper);
 
 		return $view;
 	}
@@ -137,14 +137,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;
 	}
@@ -156,11 +156,11 @@ 
 	 * @param \Aimeos\MW\View\Iface $view View object
 	 * @return \Aimeos\MW\View\Iface Modified view object
 	 */
-	protected function addParam( \Aimeos\MW\View\Iface $view )
+	protected function addParam(\Aimeos\MW\View\Iface $view)
 	{
-		$params = ( Route::current() ? Route::current()->parameters() : array() ) + Input::all();
-		$helper = new \Aimeos\MW\View\Helper\Param\Standard( $view, $params );
-		$view->addHelper( 'param', $helper );
+		$params = (Route::current() ? Route::current()->parameters() : array()) + Input::all();
+		$helper = new \Aimeos\MW\View\Helper\Param\Standard($view, $params);
+		$view->addHelper('param', $helper);
 
 		return $view;
 	}
@@ -172,10 +172,10 @@ 
 	 * @param \Aimeos\MW\View\Iface $view View object
 	 * @return \Aimeos\MW\View\Iface Modified view object
 	 */
-	protected function addRequest( \Aimeos\MW\View\Iface $view )
+	protected function addRequest(\Aimeos\MW\View\Iface $view)
 	{
-		$helper = new \Aimeos\MW\View\Helper\Request\Laravel5( $view, Request::instance() );
-		$view->addHelper( 'request', $helper );
+		$helper = new \Aimeos\MW\View\Helper\Request\Laravel5($view, Request::instance());
+		$view->addHelper('request', $helper);
 
 		return $view;
 	}
@@ -187,10 +187,10 @@ 
 	 * @param \Aimeos\MW\View\Iface $view View object
 	 * @return \Aimeos\MW\View\Iface Modified view object
 	 */
-	protected function addResponse( \Aimeos\MW\View\Iface $view )
+	protected function addResponse(\Aimeos\MW\View\Iface $view)
 	{
-		$helper = new \Aimeos\MW\View\Helper\Response\Laravel5( $view );
-		$view->addHelper( 'response', $helper );
+		$helper = new \Aimeos\MW\View\Helper\Response\Laravel5($view);
+		$view->addHelper('response', $helper);
 
 		return $view;
 	}
@@ -203,20 +203,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->i18n->get( array( $locale ) );
+			$i18n = $this->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;
 	}
@@ -228,27 +228,27 @@ 
 	 * @param \Aimeos\MW\View\Iface $view View object
 	 * @return \Aimeos\MW\View\Iface Modified view object
 	 */
-	protected function addUrl( \Aimeos\MW\View\Iface $view )
+	protected function addUrl(\Aimeos\MW\View\Iface $view)
 	{
 		$fixed = array();
 
-		if( Route::current() )
+		if (Route::current())
 		{
-			if( ( $value = Route::input( 'site' ) ) !== null ) {
+			if (($value = Route::input('site')) !== null) {
 				$fixed['site'] = $value;
 			}
 
-			if( ( $value = Route::input( 'locale' ) ) !== null ) {
+			if (($value = Route::input('locale')) !== null) {
 				$fixed['locale'] = $value;
 			}
 
-			if( ( $value = Route::input( 'currency' ) ) !== null ) {
+			if (($value = Route::input('currency')) !== null) {
 				$fixed['currency'] = $value;
 			}
 		}
 
-		$helper = new \Aimeos\MW\View\Helper\Url\Laravel5( $view, app('url'), $fixed );
-		$view->addHelper( 'url', $helper );
+		$helper = new \Aimeos\MW\View\Helper\Url\Laravel5($view, app('url'), $fixed);
+		$view->addHelper('url', $helper);
 
 		return $view;
 	}

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/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)->header('Cache-Control', 'private, max-age=300');
 	}
 
@@ -41,18 +41,18 @@ 
 	 */
 	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())
 			->header('Cache-Control', 'private, max-age=300', false);
 	}
 }
\ 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')
@@ -44,7 +44,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)->header('Cache-Control', 'max-age=43200');
 	}
 
@@ -56,7 +56,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)->header('Cache-Control', 'max-age=43200');
 	}
 
@@ -68,7 +68,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')
@@ -83,7 +83,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/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/views/jqadm/index.blade.php

Spacing +2 added lines, -2 removed lines

@@ -11,7 +11,7 @@ 
 		<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/tether/1.4.0/css/tether.min.css" integrity="sha256-y4TDcAD4/j5o4keZvggf698Cr9Oc7JZ+gGMax23qmVA=" crossorigin="anonymous" />
 		<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css" integrity="sha256-eZrrJcwDc/3uDhsdt61sL2oOBY362qM3lon1gyExkL0=" crossorigin="anonymous" />
 		<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-alpha.6/css/bootstrap.min.css" integrity="sha384-rwoIResjU2yc3z8GV/NPeZWAv56rSmLldC3R/AZzGRnGxQQKnKkoFVhFQhNUwEyJ" crossorigin="anonymous">
-		<link rel="stylesheet" href="<?= route( 'aimeos_shop_jqadm_file', array( 'site' => $site, 'lang' => 'en', 'type' => 'css' ) ); ?>">
+		<link rel="stylesheet" href="<?= route('aimeos_shop_jqadm_file', array('site' => $site, 'lang' => 'en', 'type' => 'css')); ?>">
 	</head>
 	<body>
 
@@ -24,6 +24,6 @@ 
 		<script src="https://cdnjs.cloudflare.com/ajax/libs/ckeditor/4.6.2/ckeditor.js" integrity="sha256-TD9khtuB9OoHJICSCe1SngH2RckROdDPDb5JJaUTi7I=" crossorigin="anonymous"></script>
 		<script src="https://cdnjs.cloudflare.com/ajax/libs/ckeditor/4.6.2/adapters/jquery.js" integrity="sha256-kWca68zAjkLv7iMEyHDuFKa9KxIij+DiCScmbTMlJHM=" crossorigin="anonymous"></script>
 		<script src="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-alpha.6/js/bootstrap.min.js" integrity="sha384-vBWWzlZJ8ea9aCX4pEW3rVHjgjt7zpkNpZk+02D9phzyeVkE+jo0ieGizqPLForn" crossorigin="anonymous"></script>
-		<script src="<?= route( 'aimeos_shop_jqadm_file', array( 'site' => $site, 'lang' => 'en', 'type' => 'js' ) ); ?>"></script>
+		<script src="<?= route('aimeos_shop_jqadm_file', array('site' => $site, 'lang' => 'en', 'type' => 'js')); ?>"></script>
 	</body>
 </html>