aimeos / aimeos-laravel

src/Aimeos/Shop/Base/Locale.php

Spacing +1 added lines, -1 removed lines

@@ -60,7 +60,7 @@
 
 			if( Route::current() )
 			{
-				$site =  Route::input( 'site', $site );
+				$site = Route::input( 'site', $site );
 				$currency = Route::input( 'currency', $currency );
 				$lang = Route::input( 'locale', $lang );
 			}

src/Aimeos/Shop/ShopServiceProvider.php

Spacing +19 added lines, -19 removed lines

@@ -42,8 +42,8 @@ 
 		$this->loadRoutesFrom( $basedir . 'routes.php' );
 		$this->loadViewsFrom( $basedir . 'views', 'shop' );
 
-		$this->publishes( [ $basedir . 'config/shop.php' => config_path( 'shop.php' ) ], 'config' );
-		$this->publishes( [ dirname( $basedir ) . $ds . 'public' => public_path( 'packages/aimeos/shop' ) ], 'public' );
+		$this->publishes( [$basedir . 'config/shop.php' => config_path( 'shop.php' )], 'config' );
+		$this->publishes( [dirname( $basedir ) . $ds . 'public' => public_path( 'packages/aimeos/shop' )], 'public' );
 	}
 
 
@@ -54,38 +54,38 @@ 
 	 */
 	public function register()
 	{
-		$this->mergeConfigFrom( dirname( dirname( __DIR__ ) ) . DIRECTORY_SEPARATOR . 'default.php', 'shop');
+		$this->mergeConfigFrom( dirname( dirname( __DIR__ ) ) . DIRECTORY_SEPARATOR . 'default.php', 'shop' );
 
-		$this->app->singleton('aimeos', function($app) {
-			return new \Aimeos\Shop\Base\Aimeos($app['config']);
+		$this->app->singleton( 'aimeos', function( $app ) {
+			return new \Aimeos\Shop\Base\Aimeos( $app['config'] );
 		});
 
-		$this->app->singleton('aimeos.config', function($app) {
-			return new \Aimeos\Shop\Base\Config($app['config'], $app['aimeos']);
+		$this->app->singleton( 'aimeos.config', function( $app ) {
+			return new \Aimeos\Shop\Base\Config( $app['config'], $app['aimeos'] );
 		});
 
-		$this->app->singleton('aimeos.i18n', function($app) {
-			return new \Aimeos\Shop\Base\I18n($this->app['config'], $app['aimeos']);
+		$this->app->singleton( 'aimeos.i18n', function( $app ) {
+			return new \Aimeos\Shop\Base\I18n( $this->app['config'], $app['aimeos'] );
 		});
 
-		$this->app->singleton('aimeos.locale', function($app) {
-			return new \Aimeos\Shop\Base\Locale($app['config']);
+		$this->app->singleton( 'aimeos.locale', function( $app ) {
+			return new \Aimeos\Shop\Base\Locale( $app['config'] );
 		});
 
-		$this->app->singleton('aimeos.context', function($app) {
-			return new \Aimeos\Shop\Base\Context($app['session.store'], $app['aimeos.config'], $app['aimeos.locale'], $app['aimeos.i18n']);
+		$this->app->singleton( 'aimeos.context', function( $app ) {
+			return new \Aimeos\Shop\Base\Context( $app['session.store'], $app['aimeos.config'], $app['aimeos.locale'], $app['aimeos.i18n'] );
 		});
 
-		$this->app->singleton('aimeos.support', function($app) {
-			return new \Aimeos\Shop\Base\Support($app['aimeos.context'], $app['aimeos.locale']);
+		$this->app->singleton( 'aimeos.support', function( $app ) {
+			return new \Aimeos\Shop\Base\Support( $app['aimeos.context'], $app['aimeos.locale'] );
 		});
 
-		$this->app->singleton('aimeos.view', function($app) {
-			return new \Aimeos\Shop\Base\View($app['config'], $app['aimeos.i18n'], $app['aimeos.support']);
+		$this->app->singleton( 'aimeos.view', function( $app ) {
+			return new \Aimeos\Shop\Base\View( $app['config'], $app['aimeos.i18n'], $app['aimeos.support'] );
 		});
 
-		$this->app->singleton('aimeos.shop', function($app) {
-			return new \Aimeos\Shop\Base\Shop($app['aimeos'], $app['aimeos.context'], $app['aimeos.view']);
+		$this->app->singleton( 'aimeos.shop', function( $app ) {
+			return new \Aimeos\Shop\Base\Shop( $app['aimeos'], $app['aimeos.context'], $app['aimeos.view'] );
 		});
 
 

src/default.php

Spacing +16 added lines, -16 removed lines

@@ -4,40 +4,40 @@
 
 	'apc_enabled' => false,
 	'apc_prefix' => 'laravel:',
-	'extdir' => base_path('ext'),
+	'extdir' => base_path( 'ext' ),
 	'pcntl_max' => 4,
 	'pcntl_priority' => 19,
 	'uploaddir' => '/',
 
 	'page' => array(
-		'account-index' => array( 'account/profile','account/subscription','account/history','account/favorite','account/watch','basket/mini','catalog/session' ),
-		'basket-index' => array( 'basket/standard','basket/related' ),
+		'account-index' => array( 'account/profile', 'account/subscription', '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/lists' ),
+		'catalog-detail' => array( 'basket/mini', 'catalog/stage', 'catalog/detail', 'catalog/session' ),
+		'catalog-list' => array( 'basket/mini', 'catalog/filter', 'catalog/lists' ),
 		'catalog-stock' => array( 'catalog/stock' ),
 		'catalog-suggest' => array( 'catalog/suggest' ),
-		'catalog-tree' => array( 'basket/mini','catalog/filter','catalog/stage','catalog/lists' ),
+		'catalog-tree' => array( 'basket/mini', 'catalog/filter', 'catalog/stage', 'catalog/lists' ),
 		'checkout-confirm' => array( 'checkout/confirm' ),
 		'checkout-index' => array( 'checkout/standard' ),
-		'checkout-update' => array( 'checkout/update'),
+		'checkout-update' => array( 'checkout/update' ),
 	),
 
 	'resource' => array(
 		'db' => array(
-			'adapter' => config('database.connections.mysql.driver', 'mysql'),
-			'host' => config('database.connections.mysql.host', '127.0.0.1'),
-			'port' => config('database.connections.mysql.port', '3306'),
-			'socket' => config('database.connections.mysql.unix_socket', ''),
-			'database' => config('database.connections.mysql.database', 'forge'),
-			'username' => config('database.connections.mysql.username', 'forge'),
-			'password' => config('database.connections.mysql.password', ''),
+			'adapter' => config( 'database.connections.mysql.driver', 'mysql' ),
+			'host' => config( 'database.connections.mysql.host', '127.0.0.1' ),
+			'port' => config( 'database.connections.mysql.port', '3306' ),
+			'socket' => config( 'database.connections.mysql.unix_socket', '' ),
+			'database' => config( 'database.connections.mysql.database', 'forge' ),
+			'username' => config( 'database.connections.mysql.username', 'forge' ),
+			'password' => config( 'database.connections.mysql.password', '' ),
 			'stmt' => ["SET SESSION sort_buffer_size=2097144; SET NAMES 'utf8mb4'; SET SESSION sql_mode='ANSI'"],
 			'opt-persistent' => 0,
 			'limit' => 3,
 			'defaultTableOptions' => [
-				'charset' => config('database.connections.mysql.charset'),
-				'collate' => config('database.connections.mysql.collation'),
+				'charset' => config( 'database.connections.mysql.charset' ),
+				'collate' => config( 'database.connections.mysql.collation' ),
 			],
 		),
 		'fs' => array(

src/views/catalog/detail.blade.php

Spacing +1 added lines, -1 removed lines

@@ -2,7 +2,7 @@
 
 @section('aimeos_scripts')
 	@parent
-    <script type="text/javascript" src="<?php echo asset('packages/aimeos/shop/themes/aimeos-detail.js'); ?>"></script>
+    <script type="text/javascript" src="<?php echo asset( 'packages/aimeos/shop/themes/aimeos-detail.js' ); ?>"></script>
 @stop
 
 @section('aimeos_header')

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::group(config('shop.routes.account', ['middleware' => ['web', 'auth']]), function() {
+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(
 		'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(
 		'as' => 'aimeos_shop_account_watch',
 		'uses' => 'Aimeos\Shop\Controller\AccountController@indexAction'
-	));
+	) );
 
 	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(
 		'as' => 'aimeos_shop_account',
 		'uses' => 'Aimeos\Shop\Controller\AccountController@indexAction'
-	));
+	) );
 
 });
 
 
-Route::group(config('shop.routes.default', ['middleware' => ['web']]), function() {
+Route::group( config( 'shop.routes.default', ['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' ), 'd/{d_name}/{d_prodid}/{d_pos?}', array(
 		'as' => 'aimeos_shop_detail',
 		'uses' => 'Aimeos\Shop\Controller\CatalogController@detailAction'
-	));
+	) );
 
 	Route::match( array( 'GET', 'POST' ), 'd/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(
 		'as' => 'aimeos_shop_list',
 		'uses' => 'Aimeos\Shop\Controller\CatalogController@listAction'
-	));
+	) );
 
 	Route::match( array( 'GET', 'POST' ), 'c/{f_name}/{f_catid}', array(
 		'as' => 'aimeos_shop_tree',
 		'uses' => 'Aimeos\Shop\Controller\CatalogController@treeAction'
-	));
+	) );
 
 	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::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::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'
-));
+) );