@@ -271,7 +271,7 @@  | 
                                                    ||
| 271 | 271 | |
| 272 | 272 |  	Route::group( $conf, function() { | 
                                                        
| 273 | 273 | |
| 274 | -		Route::match(['GET', 'POST'], '{path?}', [ | 
                                                        |
| 274 | +		Route::match( ['GET', 'POST'], '{path?}', [ | 
                                                        |
| 275 | 275 | 'as' => 'aimeos_page',  | 
                                                        
| 276 | 276 | 'uses' => '\Aimeos\Shop\Controller\PageController@indexAction'  | 
                                                        
| 277 | 277 |  		] )->where( ['locale' => '[a-z]{2}(\_[A-Z]{2})?', 'site' => '[A-Za-z0-9\.\-]+'] ); | 
                                                        
@@ -86,9 +86,12 @@  | 
                                                    ||
| 86 | 86 |  	{ | 
                                                        
| 87 | 87 | $localeManager = \Aimeos\MShop::create( $context, 'locale' );  | 
                                                        
| 88 | 88 | |
| 89 | -		try { | 
                                                        |
| 89 | + try  | 
                                                        |
| 90 | +		{ | 
                                                        |
| 90 | 91 | $localeItem = $localeManager->bootstrap( $site, '', '', false, null, true );  | 
                                                        
| 91 | -		} catch( \Aimeos\MShop\Exception $e ) { | 
                                                        |
| 92 | + }  | 
                                                        |
| 93 | + catch( \Aimeos\MShop\Exception $e )  | 
                                                        |
| 94 | +		{ | 
                                                        |
| 92 | 95 | $localeItem = $localeManager->create();  | 
                                                        
| 93 | 96 | }  | 
                                                        
| 94 | 97 | |
@@ -260,7 +260,7 @@  | 
                                                    ||
| 260 | 260 | $siteManager = \Aimeos\MShop::create( $context, 'locale/site');  | 
                                                        
| 261 | 261 | $context->config()->apply( $siteManager->find( $site )->getConfig() );  | 
                                                        
| 262 | 262 | |
| 263 | - $paths = $aimeos->getTemplatePaths( 'admin/jqadm/templates', $context->locale()->getSiteItem()->getTheme() );  | 
                                                        |
| 263 | + $paths = $aimeos->getTemplatePaths( 'admin/jqadm/templates', $context->locale()->getSiteItem()->getTheme() );  | 
                                                        |
| 264 | 264 | $view = app( 'aimeos.view' )->create( $context, $paths, $lang );  | 
                                                        
| 265 | 265 | |
| 266 | 266 | $view->aimeosType = 'Laravel';  | 
                                                        
@@ -257,7 +257,7 @@  | 
                                                    ||
| 257 | 257 | $context->setI18n( app( 'aimeos.i18n' )->get( array( $lang, 'en' ) ) );  | 
                                                        
| 258 | 258 | $context->setLocale( app( 'aimeos.locale' )->getBackend( $context, $site ) );  | 
                                                        
| 259 | 259 | |
| 260 | - $siteManager = \Aimeos\MShop::create( $context, 'locale/site');  | 
                                                        |
| 260 | + $siteManager = \Aimeos\MShop::create( $context, 'locale/site' );  | 
                                                        |
| 261 | 261 | $context->config()->apply( $siteManager->find( $site )->getConfig() );  | 
                                                        
| 262 | 262 | |
| 263 | 263 | $paths = $aimeos->getTemplatePaths( 'admin/jqadm/templates', $context->locale()->getSiteItem()->getTheme() );  | 
                                                        
@@ -44,13 +44,14 @@  | 
                                                    ||
| 44 | 44 |  			{ | 
                                                        
| 45 | 45 | \Composer\Factory::createHttpDownloader( $event->getIO(), $config )  | 
                                                        
| 46 | 46 | ->get( 'https://api.github.com/graphql', $options );  | 
                                                        
| 47 | - }  | 
                                                        |
| 48 | - else  | 
                                                        |
| 47 | + } else  | 
                                                        |
| 49 | 48 |  			{ | 
                                                        
| 50 | 49 | \Composer\Factory::createRemoteFilesystem( $event->getIO(), $config )  | 
                                                        
| 51 | 50 | ->getContents( 'github.com', 'https://api.github.com/graphql', false, $options );  | 
                                                        
| 52 | 51 | }  | 
                                                        
| 53 | 52 | }  | 
                                                        
| 54 | -		catch( \Exception $e ) {} | 
                                                        |
| 53 | + catch( \Exception $e )  | 
                                                        |
| 54 | +		{ | 
                                                        |
| 55 | +}  | 
                                                        |
| 55 | 56 | }  | 
                                                        
| 56 | 57 | }  | 
                                                        
@@ -16,7 +16,8 @@  | 
                                                    ||
| 16 | 16 | /**  | 
                                                        
| 17 | 17 | * Aimeos shop service provider for Laravel  | 
                                                        
| 18 | 18 | */  | 
                                                        
| 19 | -class ShopServiceProvider extends ServiceProvider { | 
                                                        |
| 19 | +class ShopServiceProvider extends ServiceProvider  | 
                                                        |
| 20 | +{ | 
                                                        |
| 20 | 21 | |
| 21 | 22 | /**  | 
                                                        
| 22 | 23 | * Indicates if loading of the provider is deferred.  | 
                                                        
@@ -68,9 +68,12 @@  | 
                                                    ||
| 68 | 68 | |
| 69 | 69 | $manager = \Aimeos\MShop::create( $context, 'customer' );  | 
                                                        
| 70 | 70 | |
| 71 | -		try { | 
                                                        |
| 71 | + try  | 
                                                        |
| 72 | +		{ | 
                                                        |
| 72 | 73 | $item = $manager->find( $email );  | 
                                                        
| 73 | -		} catch( \Aimeos\MShop\Exception $e ) { | 
                                                        |
| 74 | + }  | 
                                                        |
| 75 | + catch( \Aimeos\MShop\Exception $e )  | 
                                                        |
| 76 | +		{ | 
                                                        |
| 74 | 77 | $item = $manager->create();  | 
                                                        
| 75 | 78 | }  | 
                                                        
| 76 | 79 | |
@@ -48,8 +48,7 @@  | 
                                                    ||
| 48 | 48 | $jobs = $this->argument( 'jobs' );  | 
                                                        
| 49 | 49 | $jobs = !is_array( $jobs ) ? explode( ' ', (string) $jobs ) : $jobs;  | 
                                                        
| 50 | 50 | |
| 51 | - $fcn = function( \Aimeos\MShop\ContextIface $lcontext, \Aimeos\Bootstrap $aimeos ) use ( $jobs )  | 
                                                        |
| 52 | -		{ | 
                                                        |
| 51 | +		$fcn = function( \Aimeos\MShop\ContextIface $lcontext, \Aimeos\Bootstrap $aimeos ) use ( $jobs ) { | 
                                                        |
| 53 | 52 |  			$jobfcn = function( $context, $aimeos, $jobname ) { | 
                                                        
| 54 | 53 | \Aimeos\Controller\Jobs::create( $context, $aimeos, $jobname )->run();  | 
                                                        
| 55 | 54 | };  | 
                                                        
@@ -62,25 +62,25 @@  | 
                                                    ||
| 62 | 62 | 'adapter' => 'Standard',  | 
                                                        
| 63 | 63 | 'tempdir' => storage_path( 'tmp' ),  | 
                                                        
| 64 | 64 | 'basedir' => public_path(),  | 
                                                        
| 65 | -			'baseurl' => rtrim(env('ASSET_URL', PHP_SAPI == 'cli' ? env('APP_URL') : ''), '/'), | 
                                                        |
| 65 | + 'baseurl' => rtrim( env( 'ASSET_URL', PHP_SAPI == 'cli' ? env( 'APP_URL' ) : '' ), '/' ),  | 
                                                        |
| 66 | 66 | ],  | 
                                                        
| 67 | 67 | 'fs-media' => [  | 
                                                        
| 68 | 68 | 'adapter' => 'Standard',  | 
                                                        
| 69 | 69 | 'tempdir' => storage_path( 'tmp' ),  | 
                                                        
| 70 | 70 | 'basedir' => public_path( 'aimeos' ),  | 
                                                        
| 71 | -			'baseurl' => rtrim(env('ASSET_URL', PHP_SAPI == 'cli' ? env('APP_URL') : ''), '/') . '/aimeos', | 
                                                        |
| 71 | + 'baseurl' => rtrim( env( 'ASSET_URL', PHP_SAPI == 'cli' ? env( 'APP_URL' ) : '' ), '/' ) . '/aimeos',  | 
                                                        |
| 72 | 72 | ],  | 
                                                        
| 73 | 73 | 'fs-mimeicon' => [  | 
                                                        
| 74 | 74 | 'adapter' => 'Standard',  | 
                                                        
| 75 | 75 | 'tempdir' => storage_path( 'tmp' ),  | 
                                                        
| 76 | 76 | 'basedir' => public_path( 'vendor/shop/mimeicons' ),  | 
                                                        
| 77 | -			'baseurl' => rtrim(env('ASSET_URL', PHP_SAPI == 'cli' ? env('APP_URL') : ''), '/') . '/vendor/shop/mimeicons', | 
                                                        |
| 77 | + 'baseurl' => rtrim( env( 'ASSET_URL', PHP_SAPI == 'cli' ? env( 'APP_URL' ) : '' ), '/' ) . '/vendor/shop/mimeicons',  | 
                                                        |
| 78 | 78 | ],  | 
                                                        
| 79 | 79 | 'fs-theme' => [  | 
                                                        
| 80 | 80 | 'adapter' => 'Standard',  | 
                                                        
| 81 | 81 | 'tempdir' => storage_path( 'tmp' ),  | 
                                                        
| 82 | 82 | 'basedir' => public_path( 'vendor/shop/themes' ),  | 
                                                        
| 83 | -			'baseurl' => rtrim(env('ASSET_URL', PHP_SAPI == 'cli' ? env('APP_URL') : ''), '/') . '/vendor/shop/themes', | 
                                                        |
| 83 | + 'baseurl' => rtrim( env( 'ASSET_URL', PHP_SAPI == 'cli' ? env( 'APP_URL' ) : '' ), '/' ) . '/vendor/shop/themes',  | 
                                                        |
| 84 | 84 | ],  | 
                                                        
| 85 | 85 | 'fs-admin' => [  | 
                                                        
| 86 | 86 | 'adapter' => 'Standard',  | 
                                                        
@@ -1,6 +1,7 @@  | 
                                                    ||
| 1 | 1 | <?php  | 
                                                        
| 2 | 2 | |
| 3 | -switch( config( 'database.default', 'mysql' ) ) { | 
                                                        |
| 3 | +switch( config( 'database.default', 'mysql' ) )  | 
                                                        |
| 4 | +{ | 
                                                        |
| 4 | 5 | case 'pgsql': $aimeosIndexManagerName = 'PgSQL'; break;  | 
                                                        
| 5 | 6 | case 'sqlsrv': $aimeosIndexManagerName = 'SQLSrv'; break;  | 
                                                        
| 6 | 7 | default: $aimeosIndexManagerName = 'MySQL';  |