@@ -19,7 +19,8 @@ |
||
| 19 | 19 | * Aimeos shop service provider for Laravel |
| 20 | 20 | * @package laravel |
| 21 | 21 | */ |
| 22 | -class ShopServiceProvider extends ServiceProvider { |
|
| 22 | +class ShopServiceProvider extends ServiceProvider |
|
| 23 | +{ |
|
| 23 | 24 | |
| 24 | 25 | /** |
| 25 | 26 | * 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 | |
@@ -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 | } |
@@ -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 | |
@@ -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'; |
@@ -100,8 +100,7 @@ discard block |
||
| 100 | 100 | || ( ( $user = \Illuminate\Support\Facades\Auth::user() ) !== null && $user->superuser ) |
| 101 | 101 | ) { |
| 102 | 102 | $helper = new \Aimeos\Base\View\Helper\Access\All( $view ); |
| 103 | - } |
|
| 104 | - else |
|
| 103 | + } else |
|
| 105 | 104 | { |
| 106 | 105 | $support = $this->support; |
| 107 | 106 | |
@@ -166,8 +165,7 @@ discard block |
||
| 166 | 165 | { |
| 167 | 166 | $pattern = $config->get( 'client/html/common/format/pattern' ); |
| 168 | 167 | $helper = new \Aimeos\Base\View\Helper\Number\Locale( $view, $locale, $pattern ); |
| 169 | - } |
|
| 170 | - else |
|
| 168 | + } else |
|
| 171 | 169 | { |
| 172 | 170 | $sep1000 = $config->get( 'client/html/common/format/separator1000', '' ); |
| 173 | 171 | $decsep = $config->get( 'client/html/common/format/separatorDecimal', '.' ); |
@@ -253,8 +251,7 @@ discard block |
||
| 253 | 251 | { |
| 254 | 252 | $i18n = $this->i18n->get( array( $locale ) ); |
| 255 | 253 | $translation = $i18n[$locale]; |
| 256 | - } |
|
| 257 | - else |
|
| 254 | + } else |
|
| 258 | 255 | { |
| 259 | 256 | $translation = new \Aimeos\Base\Translation\None( 'en' ); |
| 260 | 257 | } |
@@ -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 | }; |
@@ -309,9 +309,12 @@ |
||
| 309 | 309 | if( $userid = Auth::guard( $guard )->id() ) |
| 310 | 310 | { |
| 311 | 311 | $context->setGroupIds( function() use ( $context, $userid ) { |
| 312 | - try { |
|
| 312 | + try |
|
| 313 | + { |
|
| 313 | 314 | return \Aimeos\MShop::create( $context, 'customer' )->get( $userid, ['customer/group'] )->getGroups(); |
| 314 | - } catch( \Exception $e ) { |
|
| 315 | + } |
|
| 316 | + catch( \Exception $e ) |
|
| 317 | + { |
|
| 315 | 318 | return []; |
| 316 | 319 | } |
| 317 | 320 | } ); |
@@ -122,7 +122,7 @@ |
||
| 122 | 122 | */ |
| 123 | 123 | protected function addCache( \Aimeos\MShop\ContextIface $context ) : \Aimeos\MShop\ContextIface |
| 124 | 124 | { |
| 125 | - $cache = (new \Aimeos\MAdmin\Cache\Manager\Standard( $context ))->getCache(); |
|
| 125 | + $cache = ( new \Aimeos\MAdmin\Cache\Manager\Standard( $context ) )->getCache(); |
|
| 126 | 126 | |
| 127 | 127 | return $context->setCache( $cache ); |
| 128 | 128 | } |
@@ -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', |