@@ -100,8 +100,7 @@ discard block |
||
| 100 | 100 | || ( ( $user = \Illuminate\Support\Facades\Auth::user() ) !== null && $user->superuser ) |
| 101 | 101 | ) { |
| 102 | 102 | $helper = new \Aimeos\MW\View\Helper\Access\All( $view ); |
| 103 | - } |
|
| 104 | - else |
|
| 103 | + } else |
|
| 105 | 104 | { |
| 106 | 105 | $support = $this->support; |
| 107 | 106 | |
@@ -245,8 +244,7 @@ discard block |
||
| 245 | 244 | { |
| 246 | 245 | $i18n = $this->i18n->get( array( $locale ) ); |
| 247 | 246 | $translation = $i18n[$locale]; |
| 248 | - } |
|
| 249 | - else |
|
| 247 | + } else |
|
| 250 | 248 | { |
| 251 | 249 | $translation = new \Aimeos\MW\Translation\None( 'en' ); |
| 252 | 250 | } |
@@ -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 | |
@@ -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\Context\Item\Iface $lcontext, \Aimeos\Bootstrap $aimeos ) use ( $jobs ) |
|
| 52 | - { |
|
| 51 | + $fcn = function( \Aimeos\MShop\Context\Item\Iface $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 | }; |
@@ -27,18 +27,18 @@ |
||
| 27 | 27 | |
| 28 | 28 | 'resource' => [ |
| 29 | 29 | 'db' => [ |
| 30 | - 'adapter' => config('database.connections.' . config( 'database.default', 'mysql' ) . '.driver', 'mysql'), |
|
| 31 | - 'host' => config('database.connections.' . config( 'database.default', 'mysql' ) . '.host', '127.0.0.1'), |
|
| 32 | - 'port' => config('database.connections.' . config( 'database.default', 'mysql' ) . '.port', '3306'), |
|
| 33 | - 'socket' => config('database.connections.' . config( 'database.default', 'mysql' ) . '.unix_socket', ''), |
|
| 34 | - 'database' => config('database.connections.' . config( 'database.default', 'mysql' ) . '.database', 'forge'), |
|
| 35 | - 'username' => config('database.connections.' . config( 'database.default', 'mysql' ) . '.username', 'forge'), |
|
| 36 | - 'password' => config('database.connections.' . config( 'database.default', 'mysql' ) . '.password', ''), |
|
| 30 | + 'adapter' => config( 'database.connections.' . config( 'database.default', 'mysql' ) . '.driver', 'mysql' ), |
|
| 31 | + 'host' => config( 'database.connections.' . config( 'database.default', 'mysql' ) . '.host', '127.0.0.1' ), |
|
| 32 | + 'port' => config( 'database.connections.' . config( 'database.default', 'mysql' ) . '.port', '3306' ), |
|
| 33 | + 'socket' => config( 'database.connections.' . config( 'database.default', 'mysql' ) . '.unix_socket', '' ), |
|
| 34 | + 'database' => config( 'database.connections.' . config( 'database.default', 'mysql' ) . '.database', 'forge' ), |
|
| 35 | + 'username' => config( 'database.connections.' . config( 'database.default', 'mysql' ) . '.username', 'forge' ), |
|
| 36 | + 'password' => config( 'database.connections.' . config( 'database.default', 'mysql' ) . '.password', '' ), |
|
| 37 | 37 | 'stmt' => config( 'database.default', 'mysql' ) === 'mysql' ? ["SET SESSION sort_buffer_size=2097144; SET NAMES 'utf8mb4'; SET SESSION sql_mode='ANSI'"] : [], |
| 38 | 38 | 'limit' => 3, // maximum number of concurrent database connections |
| 39 | 39 | 'defaultTableOptions' => [ |
| 40 | - 'charset' => config('database.connections.' . config( 'database.default', 'mysql' ) . '.charset'), |
|
| 41 | - 'collate' => config('database.connections.' . config( 'database.default', 'mysql' ) . '.collation'), |
|
| 40 | + 'charset' => config( 'database.connections.' . config( 'database.default', 'mysql' ) . '.charset' ), |
|
| 41 | + 'collate' => config( 'database.connections.' . config( 'database.default', 'mysql' ) . '.collation' ), |
|
| 42 | 42 | ], |
| 43 | 43 | 'driverOptions' => config( 'database.connections.' . config( 'database.default', 'mysql' ) . '.options' ), |
| 44 | 44 | ], |