aimeos / aimeos-laravel

src/routes.php

Spacing +47 added lines, -47 removed lines

@@ -1,226 +1,226 @@
 <?php
 
-Route::group(config('shop.routes.admin', ['prefix' => 'admin', 'middleware' => ['web']]), function() {
+Route::group( config( 'shop.routes.admin', ['prefix' => 'admin', 'middleware' => ['web']] ), function() {
 
 	Route::match( array( 'GET' ), '', array(
 		'as' => 'aimeos_shop_admin',
 		'uses' => 'Aimeos\Shop\Controller\AdminController@indexAction'
-	));
+	) );
 
 });
 
 
-Route::group(config('shop.routes.jqadm', ['prefix' => 'admin/{site}/jqadm', 'middleware' => ['web', 'auth']]), function() {
+Route::group( config( 'shop.routes.jqadm', ['prefix' => 'admin/{site}/jqadm', 'middleware' => ['web', 'auth']] ), function() {
 
 	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(
 		'as' => 'aimeos_shop_jqadm_copy',
 		'uses' => 'Aimeos\Shop\Controller\JqadmController@copyAction'
-	))->where( array( 'resource' => '[a-z\/]+' ) );
+	) )->where( array( 'resource' => '[a-z\/]+' ) );
 
 	Route::match( array( 'GET', 'POST' ), 'create/{resource}', array(
 		'as' => 'aimeos_shop_jqadm_create',
 		'uses' => 'Aimeos\Shop\Controller\JqadmController@createAction'
-	))->where( array( 'resource' => '[a-z\/]+' ) );
+	) )->where( array( 'resource' => '[a-z\/]+' ) );
 
 	Route::match( array( 'GET', 'POST' ), 'delete/{resource}/{id}', array(
 		'as' => 'aimeos_shop_jqadm_delete',
 		'uses' => 'Aimeos\Shop\Controller\JqadmController@deleteAction'
-	))->where( array( 'resource' => '[a-z\/]+' ) );
+	) )->where( array( 'resource' => '[a-z\/]+' ) );
 
 	Route::match( array( 'GET', 'POST' ), 'export/{resource}', array(
 		'as' => 'aimeos_shop_jqadm_export',
 		'uses' => 'Aimeos\Shop\Controller\JqadmController@exportAction'
-	))->where( array( 'resource' => '[a-z\/]+' ) );
+	) )->where( array( 'resource' => '[a-z\/]+' ) );
 
 	Route::match( array( 'GET' ), 'get/{resource}/{id}', array(
 		'as' => 'aimeos_shop_jqadm_get',
 		'uses' => 'Aimeos\Shop\Controller\JqadmController@getAction'
-	))->where( array( 'resource' => '[a-z\/]+' ) );
+	) )->where( array( 'resource' => '[a-z\/]+' ) );
 
 	Route::match( array( 'POST' ), 'save/{resource}', array(
 		'as' => 'aimeos_shop_jqadm_save',
 		'uses' => 'Aimeos\Shop\Controller\JqadmController@saveAction'
-	))->where( array( 'resource' => '[a-z\/]+' ) );
+	) )->where( array( 'resource' => '[a-z\/]+' ) );
 
 	Route::match( array( 'GET', 'POST' ), 'search/{resource}', array(
 		'as' => 'aimeos_shop_jqadm_search',
 		'uses' => 'Aimeos\Shop\Controller\JqadmController@searchAction'
-	))->where( array( 'resource' => '[a-z\/]+' ) );
+	) )->where( array( 'resource' => '[a-z\/]+' ) );
 
 });
 
 
-Route::group(config('shop.routes.jsonadm', ['prefix' => 'admin/{site}/jsonadm', 'middleware' => ['web', 'auth']]), function() {
+Route::group( config( 'shop.routes.jsonadm', ['prefix' => 'admin/{site}/jsonadm', 'middleware' => ['web', 'auth']] ), function() {
 
 	Route::match( array( 'DELETE' ), '{resource}/{id?}', array(
 		'as' => 'aimeos_shop_jsonadm_delete',
 		'uses' => 'Aimeos\Shop\Controller\JsonadmController@deleteAction'
-	))->where( array( 'resource' => '[a-z\/]+' ) );
+	) )->where( array( 'resource' => '[a-z\/]+' ) );
 
 	Route::match( array( 'GET' ), '{resource}/{id?}', array(
 		'as' => 'aimeos_shop_jsonadm_get',
 		'uses' => 'Aimeos\Shop\Controller\JsonadmController@getAction'
-	))->where( array( 'resource' => '[a-z\/]+' ) );
+	) )->where( array( 'resource' => '[a-z\/]+' ) );
 
 	Route::match( array( 'PATCH' ), '{resource}/{id?}', array(
 		'as' => 'aimeos_shop_jsonadm_patch',
 		'uses' => 'Aimeos\Shop\Controller\JsonadmController@patchAction'
-	))->where( array( 'resource' => '[a-z\/]+' ) );
+	) )->where( array( 'resource' => '[a-z\/]+' ) );
 
 	Route::match( array( 'POST' ), '{resource}/{id?}', array(
 		'as' => 'aimeos_shop_jsonadm_post',
 		'uses' => 'Aimeos\Shop\Controller\JsonadmController@postAction'
-	))->where( array( 'resource' => '[a-z\/]+' ) );
+	) )->where( array( 'resource' => '[a-z\/]+' ) );
 
 	Route::match( array( 'PUT' ), '{resource}/{id?}', array(
 		'as' => 'aimeos_shop_jsonadm_put',
 		'uses' => 'Aimeos\Shop\Controller\JsonadmController@putAction'
-	))->where( array( 'resource' => '[a-z\/]+' ) );
+	) )->where( array( 'resource' => '[a-z\/]+' ) );
 
 	Route::match( array( 'OPTIONS' ), '{resource?}', array(
 		'as' => 'aimeos_shop_jsonadm_options',
 		'uses' => 'Aimeos\Shop\Controller\JsonadmController@optionsAction'
-	))->where( array( 'resource' => '[a-z\/]*' ) );
+	) )->where( array( 'resource' => '[a-z\/]*' ) );
 
 });
 
 
-Route::group(config('shop.routes.jsonapi', ['prefix' => 'jsonapi', 'middleware' => ['web', 'api']]), function() {
+Route::group( config( 'shop.routes.jsonapi', ['prefix' => 'jsonapi', 'middleware' => ['web', 'api']] ), function() {
 
 	Route::match( array( 'DELETE' ), '{resource}', array(
 		'as' => 'aimeos_shop_jsonapi_delete',
 		'uses' => 'Aimeos\Shop\Controller\JsonapiController@deleteAction'
-	));
+	) );
 
 	Route::match( array( 'GET' ), '{resource}', array(
 		'as' => 'aimeos_shop_jsonapi_get',
 		'uses' => 'Aimeos\Shop\Controller\JsonapiController@getAction'
-	));
+	) );
 
 	Route::match( array( 'PATCH' ), '{resource}', array(
 		'as' => 'aimeos_shop_jsonapi_patch',
 		'uses' => 'Aimeos\Shop\Controller\JsonapiController@patchAction'
-	));
+	) );
 
 	Route::match( array( 'POST' ), '{resource}', array(
 		'as' => 'aimeos_shop_jsonapi_post',
 		'uses' => 'Aimeos\Shop\Controller\JsonapiController@postAction'
-	));
+	) );
 
 	Route::match( array( 'PUT' ), '{resource}', array(
 		'as' => 'aimeos_shop_jsonapi_put',
 		'uses' => 'Aimeos\Shop\Controller\JsonapiController@putAction'
-	));
+	) );
 
 	Route::match( array( 'OPTIONS' ), '{resource?}', array(
 		'as' => 'aimeos_shop_jsonapi_options',
 		'uses' => 'Aimeos\Shop\Controller\JsonapiController@optionsAction'
-	));
+	) );
 
 });
 
 
-Route::get('terms', array(
+Route::get( 'terms', array(
 	'as' => 'aimeos_shop_terms',
 	'uses' => 'Aimeos\Shop\Controller\PageController@termsAction'
-));
+) );
 
-Route::get('privacy', array(
+Route::get( 'privacy', array(
 	'as' => 'aimeos_shop_privacy',
 	'uses' => 'Aimeos\Shop\Controller\PageController@privacyAction'
-));
+) );
 
 
-Route::group(config('shop.routes.update', []), function() {
+Route::group( config( 'shop.routes.update', [] ), function() {
 
 	Route::match( array( 'GET', 'POST' ), 'update', array(
 		'as' => 'aimeos_shop_update',
 		'uses' => 'Aimeos\Shop\Controller\CheckoutController@updateAction'
-	));
+	) );
 
 });
 
 
-Route::group(config('shop.routes.account', ['prefix' => 'myaccount', 'middleware' => ['web', 'auth']]), function() {
+Route::group( config( 'shop.routes.account', ['prefix' => 'myaccount', 'middleware' => ['web', 'auth']] ), function() {
 
 	Route::match( array( 'GET', 'POST' ), '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' ), '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' ), 'download/{dl_id}', array(
 		'as' => 'aimeos_shop_account_download',
 		'uses' => 'Aimeos\Shop\Controller\AccountController@downloadAction'
-	));
+	) );
 
 	Route::match( array( 'GET', 'POST' ), '', array(
 		'as' => 'aimeos_shop_account',
 		'uses' => 'Aimeos\Shop\Controller\AccountController@indexAction'
-	));
+	) );
 
 });
 
 
-Route::group(config('shop.routes.default', ['prefix' => 'shop', 'middleware' => ['web']]), function() {
+Route::group( config( 'shop.routes.default', ['prefix' => 'shop', 'middleware' => ['web']] ), function() {
 
 	Route::match( array( 'GET', 'POST' ), 'count', array(
 		'as' => 'aimeos_shop_count',
 		'uses' => 'Aimeos\Shop\Controller\CatalogController@countAction'
-	));
+	) );
 
 	Route::match( array( 'GET', 'POST' ), 'suggest', array(
 		'as' => 'aimeos_shop_suggest',
 		'uses' => 'Aimeos\Shop\Controller\CatalogController@suggestAction'
-	));
+	) );
 
 	Route::match( array( 'GET', 'POST' ), 'stock', array(
 		'as' => 'aimeos_shop_stock',
 		'uses' => 'Aimeos\Shop\Controller\CatalogController@stockAction'
-	));
+	) );
 
 	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(
 		'as' => 'aimeos_shop_checkout',
 		'uses' => 'Aimeos\Shop\Controller\CheckoutController@indexAction'
-	));
+	) );
 
 	Route::match( array( 'GET', 'POST' ), 'confirm/{code?}', array(
 		'as' => 'aimeos_shop_confirm',
 		'uses' => 'Aimeos\Shop\Controller\CheckoutController@confirmAction'
-	));
+	) );
 
 	Route::match( array( 'GET', 'POST' ), 'pin/{pin_action}/{pin_id}/{d_name}', array(
 		'as' => 'aimeos_shop_session_pinned',
 		'uses' => 'Aimeos\Shop\Controller\CatalogController@detailAction'
-	));
+	) );
 
 	Route::match( array( 'GET', 'POST' ), '{f_name}~{f_catid}', array(
 		'as' => 'aimeos_shop_tree',
 		'uses' => 'Aimeos\Shop\Controller\CatalogController@treeAction'
-	));
+	) );
 
 	Route::match( array( 'GET', 'POST' ), '{d_name}/{d_pos?}', array(
 		'as' => 'aimeos_shop_detail',
 		'uses' => 'Aimeos\Shop\Controller\CatalogController@detailAction'
-	));
+	) );
 
 	Route::match( array( 'GET', 'POST' ), '', array(
 		'as' => 'aimeos_shop_list',
 		'uses' => 'Aimeos\Shop\Controller\CatalogController@listAction'
-	));
+	) );
 
 });

src/Aimeos/Shop/Controller/CatalogController.php

Spacing +3 added lines, -3 removed lines

@@ -110,9 +110,9 @@
 			$params['aibody'][$name] = Shop::get( $name )->getBody();
 		}
 
-		return Response::view('shop::catalog.suggest', $params)
-			->header('Cache-Control', 'private, max-age=300' )
-			->header('Content-Type', 'application/json');
+		return Response::view( 'shop::catalog.suggest', $params )
+			->header( 'Cache-Control', 'private, max-age=300' )
+			->header( 'Content-Type', 'application/json' );
 	}
 
 

src/Aimeos/Shop/Base/Locale.php

Braces +10 added lines, -4 removed lines

@@ -68,9 +68,12 @@ 
 			$localeManager = \Aimeos\MShop::create( $context, 'locale' );
 			$disableSites = $this->config->get( 'shop.disableSites', true );
 
-			try {
+			try
+			{
 				$this->locale = $localeManager->bootstrap( $site, $lang, $currency, $disableSites );
-			} catch( \Aimeos\MShop\Locale\Exception $e ) {
+			}
+			catch( \Aimeos\MShop\Locale\Exception $e )
+			{
 				$this->locale = $localeManager->bootstrap( 'default', $lang, $currency, $disableSites );
 			}
 		}
@@ -90,9 +93,12 @@ 
 	{
 		$localeManager = \Aimeos\MShop::create( $context, 'locale' );
 
-		try {
+		try
+		{
 			$localeItem = $localeManager->bootstrap( $site, '', '', false, null, true );
-		} catch( \Aimeos\MShop\Exception $e ) {
+		}
+		catch( \Aimeos\MShop\Exception $e )
+		{
 			$localeItem = $localeManager->createItem();
 		}