@@ -16,13 +16,13 @@ |
||
16 | 16 | */ |
17 | 17 | class Catalog extends \Illuminate\Support\Facades\Facade |
18 | 18 | { |
19 | - /** |
|
20 | - * Returns a new catalog frontend controller object |
|
21 | - * |
|
22 | - * @return \Aimeos\Controller\Frontend\Catalog\Iface |
|
23 | - */ |
|
24 | - protected static function getFacadeAccessor() |
|
25 | - { |
|
26 | - return \Aimeos\Controller\Frontend::create( app( 'aimeos.context' )->get(), 'catalog' ); |
|
27 | - } |
|
19 | + /** |
|
20 | + * Returns a new catalog frontend controller object |
|
21 | + * |
|
22 | + * @return \Aimeos\Controller\Frontend\Catalog\Iface |
|
23 | + */ |
|
24 | + protected static function getFacadeAccessor() |
|
25 | + { |
|
26 | + return \Aimeos\Controller\Frontend::create( app( 'aimeos.context' )->get(), 'catalog' ); |
|
27 | + } |
|
28 | 28 | } |
@@ -16,13 +16,13 @@ |
||
16 | 16 | */ |
17 | 17 | class Customer extends \Illuminate\Support\Facades\Facade |
18 | 18 | { |
19 | - /** |
|
20 | - * Returns a new customer frontend controller object |
|
21 | - * |
|
22 | - * @return \Aimeos\Controller\Frontend\Customer\Iface |
|
23 | - */ |
|
24 | - protected static function getFacadeAccessor() |
|
25 | - { |
|
26 | - return \Aimeos\Controller\Frontend::create( app( 'aimeos.context' )->get(), 'customer' ); |
|
27 | - } |
|
19 | + /** |
|
20 | + * Returns a new customer frontend controller object |
|
21 | + * |
|
22 | + * @return \Aimeos\Controller\Frontend\Customer\Iface |
|
23 | + */ |
|
24 | + protected static function getFacadeAccessor() |
|
25 | + { |
|
26 | + return \Aimeos\Controller\Frontend::create( app( 'aimeos.context' )->get(), 'customer' ); |
|
27 | + } |
|
28 | 28 | } |
@@ -16,13 +16,13 @@ |
||
16 | 16 | */ |
17 | 17 | class Basket extends \Illuminate\Support\Facades\Facade |
18 | 18 | { |
19 | - /** |
|
20 | - * Returns a new basket frontend controller object |
|
21 | - * |
|
22 | - * @return \Aimeos\Controller\Frontend\Basket\Iface |
|
23 | - */ |
|
24 | - protected static function getFacadeAccessor() |
|
25 | - { |
|
26 | - return \Aimeos\Controller\Frontend::create( app( 'aimeos.context' )->get(), 'basket' ); |
|
27 | - } |
|
19 | + /** |
|
20 | + * Returns a new basket frontend controller object |
|
21 | + * |
|
22 | + * @return \Aimeos\Controller\Frontend\Basket\Iface |
|
23 | + */ |
|
24 | + protected static function getFacadeAccessor() |
|
25 | + { |
|
26 | + return \Aimeos\Controller\Frontend::create( app( 'aimeos.context' )->get(), 'basket' ); |
|
27 | + } |
|
28 | 28 | } |
@@ -16,13 +16,13 @@ |
||
16 | 16 | */ |
17 | 17 | class Product extends \Illuminate\Support\Facades\Facade |
18 | 18 | { |
19 | - /** |
|
20 | - * Returns a new product frontend controller object |
|
21 | - * |
|
22 | - * @return \Aimeos\Controller\Frontend\Product\Iface |
|
23 | - */ |
|
24 | - protected static function getFacadeAccessor() |
|
25 | - { |
|
26 | - return \Aimeos\Controller\Frontend::create( app( 'aimeos.context' )->get(), 'product' ); |
|
27 | - } |
|
19 | + /** |
|
20 | + * Returns a new product frontend controller object |
|
21 | + * |
|
22 | + * @return \Aimeos\Controller\Frontend\Product\Iface |
|
23 | + */ |
|
24 | + protected static function getFacadeAccessor() |
|
25 | + { |
|
26 | + return \Aimeos\Controller\Frontend::create( app( 'aimeos.context' )->get(), 'product' ); |
|
27 | + } |
|
28 | 28 | } |
@@ -16,13 +16,13 @@ |
||
16 | 16 | */ |
17 | 17 | class Service extends \Illuminate\Support\Facades\Facade |
18 | 18 | { |
19 | - /** |
|
20 | - * Returns a new service frontend controller object |
|
21 | - * |
|
22 | - * @return \Aimeos\Controller\Frontend\Service\Iface |
|
23 | - */ |
|
24 | - protected static function getFacadeAccessor() |
|
25 | - { |
|
26 | - return \Aimeos\Controller\Frontend::create( app( 'aimeos.context' )->get(), 'service' ); |
|
27 | - } |
|
19 | + /** |
|
20 | + * Returns a new service frontend controller object |
|
21 | + * |
|
22 | + * @return \Aimeos\Controller\Frontend\Service\Iface |
|
23 | + */ |
|
24 | + protected static function getFacadeAccessor() |
|
25 | + { |
|
26 | + return \Aimeos\Controller\Frontend::create( app( 'aimeos.context' )->get(), 'service' ); |
|
27 | + } |
|
28 | 28 | } |
@@ -16,13 +16,13 @@ |
||
16 | 16 | */ |
17 | 17 | class Attribute extends \Illuminate\Support\Facades\Facade |
18 | 18 | { |
19 | - /** |
|
20 | - * Returns a new attribute frontend controller object |
|
21 | - * |
|
22 | - * @return \Aimeos\Controller\Frontend\Attribute\Iface |
|
23 | - */ |
|
24 | - protected static function getFacadeAccessor() |
|
25 | - { |
|
26 | - return \Aimeos\Controller\Frontend::create( app( 'aimeos.context' )->get(), 'attribute' ); |
|
27 | - } |
|
19 | + /** |
|
20 | + * Returns a new attribute frontend controller object |
|
21 | + * |
|
22 | + * @return \Aimeos\Controller\Frontend\Attribute\Iface |
|
23 | + */ |
|
24 | + protected static function getFacadeAccessor() |
|
25 | + { |
|
26 | + return \Aimeos\Controller\Frontend::create( app( 'aimeos.context' )->get(), 'attribute' ); |
|
27 | + } |
|
28 | 28 | } |
@@ -110,9 +110,9 @@ |
||
110 | 110 | $params['aibody'][$name] = Shop::get( $name )->getBody(); |
111 | 111 | } |
112 | 112 | |
113 | - return Response::view('shop::catalog.suggest', $params) |
|
114 | - ->header('Cache-Control', 'private, max-age=300' ) |
|
115 | - ->header('Content-Type', 'application/json'); |
|
113 | + return Response::view( 'shop::catalog.suggest', $params ) |
|
114 | + ->header( 'Cache-Control', 'private, max-age=300' ) |
|
115 | + ->header( 'Content-Type', 'application/json' ); |
|
116 | 116 | } |
117 | 117 | |
118 | 118 |
@@ -13,11 +13,11 @@ |
||
13 | 13 | $app['config']->set('database.connections.mysql', [ |
14 | 14 | 'driver' => 'mysql', |
15 | 15 | 'host' => env('DB_HOST', '127.0.0.1'), |
16 | - 'port' => env('DB_PORT', '3306'), |
|
16 | + 'port' => env('DB_PORT', '3306'), |
|
17 | 17 | 'database' => env('DB_DATABASE', 'laravel'), |
18 | 18 | 'username' => env('DB_USERNAME', 'aimeos'), |
19 | 19 | 'password' => env('DB_PASSWORD', 'aimeos'), |
20 | - 'unix_socket' => env('DB_SOCKET', ''), |
|
20 | + 'unix_socket' => env('DB_SOCKET', ''), |
|
21 | 21 | 'collation' => 'utf8_unicode_ci', |
22 | 22 | ]); |
23 | 23 |
@@ -2,31 +2,31 @@ discard block |
||
2 | 2 | |
3 | 3 | class AimeosTestAbstract extends Orchestra\Testbench\BrowserKit\TestCase |
4 | 4 | { |
5 | - protected function getEnvironmentSetUp($app) |
|
5 | + protected function getEnvironmentSetUp( $app ) |
|
6 | 6 | { |
7 | 7 | putenv( 'APP_DEBUG=1' ); |
8 | 8 | |
9 | - $app['config']->set('app.key', 'SomeRandomStringWith32Characters'); |
|
10 | - $app['config']->set('app.cipher', 'AES-256-CBC'); |
|
9 | + $app['config']->set( 'app.key', 'SomeRandomStringWith32Characters' ); |
|
10 | + $app['config']->set( 'app.cipher', 'AES-256-CBC' ); |
|
11 | 11 | |
12 | - $app['config']->set('database.default', 'mysql'); |
|
13 | - $app['config']->set('database.connections.mysql', [ |
|
12 | + $app['config']->set( 'database.default', 'mysql' ); |
|
13 | + $app['config']->set( 'database.connections.mysql', [ |
|
14 | 14 | 'driver' => 'mysql', |
15 | - 'host' => env('DB_HOST', '127.0.0.1'), |
|
16 | - 'port' => env('DB_PORT', '3306'), |
|
17 | - 'database' => env('DB_DATABASE', 'laravel'), |
|
18 | - 'username' => env('DB_USERNAME', 'aimeos'), |
|
19 | - 'password' => env('DB_PASSWORD', 'aimeos'), |
|
20 | - 'unix_socket' => env('DB_SOCKET', ''), |
|
15 | + 'host' => env( 'DB_HOST', '127.0.0.1' ), |
|
16 | + 'port' => env( 'DB_PORT', '3306' ), |
|
17 | + 'database' => env( 'DB_DATABASE', 'laravel' ), |
|
18 | + 'username' => env( 'DB_USERNAME', 'aimeos' ), |
|
19 | + 'password' => env( 'DB_PASSWORD', 'aimeos' ), |
|
20 | + 'unix_socket' => env( 'DB_SOCKET', '' ), |
|
21 | 21 | 'collation' => 'utf8_unicode_ci', |
22 | - ]); |
|
22 | + ] ); |
|
23 | 23 | |
24 | - $app['config']->set('shop.resource.db', [ |
|
24 | + $app['config']->set( 'shop.resource.db', [ |
|
25 | 25 | 'adapter' => 'mysql', |
26 | - 'host' => env('DB_HOST', '127.0.0.1'), |
|
27 | - 'database' => env('DB_DATABASE', 'laravel'), |
|
28 | - 'username' => env('DB_USERNAME', 'aimeos'), |
|
29 | - 'password' => env('DB_PASSWORD', 'aimeos'), |
|
26 | + 'host' => env( 'DB_HOST', '127.0.0.1' ), |
|
27 | + 'database' => env( 'DB_DATABASE', 'laravel' ), |
|
28 | + 'username' => env( 'DB_USERNAME', 'aimeos' ), |
|
29 | + 'password' => env( 'DB_PASSWORD', 'aimeos' ), |
|
30 | 30 | 'stmt' => ["SET SESSION sort_buffer_size=2097144; SET SESSION sql_mode='ANSI'; SET NAMES 'utf8_bin'"], |
31 | 31 | 'opt-persistent' => 0, |
32 | 32 | 'limit' => 3, |
@@ -34,23 +34,23 @@ discard block |
||
34 | 34 | 'collate' => 'utf8_unicode_ci', |
35 | 35 | 'charset' => 'utf8', |
36 | 36 | ], |
37 | - ]); |
|
37 | + ] ); |
|
38 | 38 | |
39 | - $app['config']->set('shop.authorize', false); |
|
40 | - $app['config']->set('shop.disableSites', false); |
|
41 | - $app['config']->set('shop.accessControl', false); |
|
42 | - $app['config']->set('shop.routes.jqadm', ['prefix' => '{site}/jqadm']); |
|
43 | - $app['config']->set('shop.routes.jsonadm', ['prefix' => '{site}/jsonadm']); |
|
44 | - $app['config']->set('shop.routes.jsonapi', ['prefix' => '{site}/jsonapi']); |
|
45 | - $app['config']->set('shop.routes.account', ['prefix' => '{site}/myaccount']); |
|
46 | - $app['config']->set('shop.routes.default', ['prefix' => '{site}/shop']); |
|
47 | - $app['config']->set('shop.routes.update', ['prefix' => '{site}']); |
|
48 | - $app['config']->set('shop.routes.login', []); |
|
49 | - $app['config']->set('shop.extdir', dirname( __DIR__ ) . DIRECTORY_SEPARATOR . 'ext' ); |
|
39 | + $app['config']->set( 'shop.authorize', false ); |
|
40 | + $app['config']->set( 'shop.disableSites', false ); |
|
41 | + $app['config']->set( 'shop.accessControl', false ); |
|
42 | + $app['config']->set( 'shop.routes.jqadm', ['prefix' => '{site}/jqadm'] ); |
|
43 | + $app['config']->set( 'shop.routes.jsonadm', ['prefix' => '{site}/jsonadm'] ); |
|
44 | + $app['config']->set( 'shop.routes.jsonapi', ['prefix' => '{site}/jsonapi'] ); |
|
45 | + $app['config']->set( 'shop.routes.account', ['prefix' => '{site}/myaccount'] ); |
|
46 | + $app['config']->set( 'shop.routes.default', ['prefix' => '{site}/shop'] ); |
|
47 | + $app['config']->set( 'shop.routes.update', ['prefix' => '{site}'] ); |
|
48 | + $app['config']->set( 'shop.routes.login', [] ); |
|
49 | + $app['config']->set( 'shop.extdir', dirname( __DIR__ ) . DIRECTORY_SEPARATOR . 'ext' ); |
|
50 | 50 | } |
51 | 51 | |
52 | 52 | |
53 | - protected function getPackageProviders($app) |
|
53 | + protected function getPackageProviders( $app ) |
|
54 | 54 | { |
55 | 55 | return ['Aimeos\Shop\ShopServiceProvider']; |
56 | 56 | } |
@@ -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/bulk', '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/bulk', '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( |