@@ -4,7 +4,7 @@ |
||
| 4 | 4 | { |
| 5 | 5 | public function testSetupCommand() |
| 6 | 6 | { |
| 7 | - $args = array('site' => 'unittest', 'tplsite' => 'unittest', '--option' => 'setup/default/demo:0'); |
|
| 8 | - $this->assertEquals(0, $this->artisan('aimeos:setup', $args)); |
|
| 7 | + $args = array( 'site' => 'unittest', 'tplsite' => 'unittest', '--option' => 'setup/default/demo:0' ); |
|
| 8 | + $this->assertEquals( 0, $this->artisan( 'aimeos:setup', $args ) ); |
|
| 9 | 9 | } |
| 10 | 10 | } |
@@ -283,7 +283,7 @@ |
||
| 283 | 283 | } |
| 284 | 284 | } |
| 285 | 285 | |
| 286 | - $helper = new \Aimeos\MW\View\Helper\Url\Laravel5( $view, app('url'), $fixed ); |
|
| 286 | + $helper = new \Aimeos\MW\View\Helper\Url\Laravel5( $view, app( 'url' ), $fixed ); |
|
| 287 | 287 | $view->addHelper( 'url', $helper ); |
| 288 | 288 | |
| 289 | 289 | return $view; |
@@ -100,12 +100,12 @@ 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 | |
| 108 | - $fcn = function() use ( $support, $context ) { |
|
| 107 | + $fcn = function() use ( $support, $context ) |
|
| 108 | + { |
|
| 109 | 109 | return $support->getGroups( $context ); |
| 110 | 110 | }; |
| 111 | 111 | |
@@ -245,8 +245,7 @@ discard block |
||
| 245 | 245 | { |
| 246 | 246 | $i18n = $this->i18n->get( array( $locale ) ); |
| 247 | 247 | $translation = $i18n[$locale]; |
| 248 | - } |
|
| 249 | - else |
|
| 248 | + } else |
|
| 250 | 249 | { |
| 251 | 250 | $translation = new \Aimeos\MW\Translation\None( 'en' ); |
| 252 | 251 | } |
@@ -4,40 +4,40 @@ |
||
| 4 | 4 | |
| 5 | 5 | 'apc_enabled' => false, |
| 6 | 6 | 'apc_prefix' => 'laravel:', |
| 7 | - 'extdir' => base_path('ext'), |
|
| 7 | + 'extdir' => base_path( 'ext' ), |
|
| 8 | 8 | 'pcntl_max' => 4, |
| 9 | 9 | 'pcntl_priority' => 19, |
| 10 | 10 | 'uploaddir' => '/', |
| 11 | 11 | |
| 12 | 12 | 'page' => array( |
| 13 | - 'account-index' => array( 'account/profile','account/subscription','account/history','account/favorite','account/watch','basket/mini','catalog/session' ), |
|
| 14 | - 'basket-index' => array( 'basket/standard','basket/related' ), |
|
| 13 | + 'account-index' => array( 'account/profile', 'account/subscription', 'account/history', 'account/favorite', 'account/watch', 'basket/mini', 'catalog/session' ), |
|
| 14 | + 'basket-index' => array( 'basket/standard', 'basket/related' ), |
|
| 15 | 15 | 'catalog-count' => array( 'catalog/count' ), |
| 16 | - 'catalog-detail' => array( 'basket/mini','catalog/stage','catalog/detail','catalog/session' ), |
|
| 17 | - 'catalog-list' => array( 'basket/mini','catalog/filter','catalog/lists' ), |
|
| 16 | + 'catalog-detail' => array( 'basket/mini', 'catalog/stage', 'catalog/detail', 'catalog/session' ), |
|
| 17 | + 'catalog-list' => array( 'basket/mini', 'catalog/filter', 'catalog/lists' ), |
|
| 18 | 18 | 'catalog-stock' => array( 'catalog/stock' ), |
| 19 | 19 | 'catalog-suggest' => array( 'catalog/suggest' ), |
| 20 | - 'catalog-tree' => array( 'basket/mini','catalog/filter','catalog/stage','catalog/lists' ), |
|
| 20 | + 'catalog-tree' => array( 'basket/mini', 'catalog/filter', 'catalog/stage', 'catalog/lists' ), |
|
| 21 | 21 | 'checkout-confirm' => array( 'checkout/confirm' ), |
| 22 | 22 | 'checkout-index' => array( 'checkout/standard' ), |
| 23 | - 'checkout-update' => array( 'checkout/update'), |
|
| 23 | + 'checkout-update' => array( 'checkout/update' ), |
|
| 24 | 24 | ), |
| 25 | 25 | |
| 26 | 26 | 'resource' => array( |
| 27 | 27 | 'db' => array( |
| 28 | - 'adapter' => config('database.connections.mysql.driver', 'mysql'), |
|
| 29 | - 'host' => config('database.connections.mysql.host', '127.0.0.1'), |
|
| 30 | - 'port' => config('database.connections.mysql.port', '3306'), |
|
| 31 | - 'socket' => config('database.connections.mysql.unix_socket', ''), |
|
| 32 | - 'database' => config('database.connections.mysql.database', 'forge'), |
|
| 33 | - 'username' => config('database.connections.mysql.username', 'forge'), |
|
| 34 | - 'password' => config('database.connections.mysql.password', ''), |
|
| 28 | + 'adapter' => config( 'database.connections.mysql.driver', 'mysql' ), |
|
| 29 | + 'host' => config( 'database.connections.mysql.host', '127.0.0.1' ), |
|
| 30 | + 'port' => config( 'database.connections.mysql.port', '3306' ), |
|
| 31 | + 'socket' => config( 'database.connections.mysql.unix_socket', '' ), |
|
| 32 | + 'database' => config( 'database.connections.mysql.database', 'forge' ), |
|
| 33 | + 'username' => config( 'database.connections.mysql.username', 'forge' ), |
|
| 34 | + 'password' => config( 'database.connections.mysql.password', '' ), |
|
| 35 | 35 | 'stmt' => ["SET SESSION sort_buffer_size=2097144; SET NAMES 'utf8mb4'; SET SESSION sql_mode='ANSI'"], |
| 36 | 36 | 'opt-persistent' => 0, |
| 37 | 37 | 'limit' => 3, |
| 38 | 38 | 'defaultTableOptions' => [ |
| 39 | - 'charset' => config('database.connections.mysql.charset'), |
|
| 40 | - 'collate' => config('database.connections.mysql.collation'), |
|
| 39 | + 'charset' => config( 'database.connections.mysql.charset' ), |
|
| 40 | + 'collate' => config( 'database.connections.mysql.collation' ), |
|
| 41 | 41 | ], |
| 42 | 42 | ), |
| 43 | 43 | 'fs' => array( |