@@ -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', 'root'), |
|
19 | - 'password' => env('DB_PASSWORD', ''), |
|
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', 'root' ), |
|
19 | + 'password' => env( 'DB_PASSWORD', '' ), |
|
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', 'localhost'), |
|
27 | - 'database' => env('DB_DATABASE', 'laravel'), |
|
28 | - 'username' => env('DB_USERNAME', 'root'), |
|
29 | - 'password' => env('DB_PASSWORD', ''), |
|
26 | + 'host' => env( 'DB_HOST', 'localhost' ), |
|
27 | + 'database' => env( 'DB_DATABASE', 'laravel' ), |
|
28 | + 'username' => env( 'DB_USERNAME', 'root' ), |
|
29 | + 'password' => env( 'DB_PASSWORD', '' ), |
|
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 | } |
@@ -1,226 +1,226 @@ |
||
1 | 1 | <?php |
2 | 2 | |
3 | -Route::group(config('shop.routes.admin', ['prefix' => 'admin', 'middleware' => ['web']]), function() { |
|
3 | +Route::group( config( 'shop.routes.admin', ['prefix' => 'admin', 'middleware' => ['web']] ), function() { |
|
4 | 4 | |
5 | 5 | Route::match( array( 'GET' ), '', array( |
6 | 6 | 'as' => 'aimeos_shop_admin', |
7 | 7 | 'uses' => 'Aimeos\Shop\Controller\AdminController@indexAction' |
8 | - )); |
|
8 | + ) ); |
|
9 | 9 | |
10 | 10 | }); |
11 | 11 | |
12 | 12 | |
13 | -Route::group(config('shop.routes.jqadm', ['prefix' => 'admin/{site}/jqadm', 'middleware' => ['web', 'auth']]), function() { |
|
13 | +Route::group( config( 'shop.routes.jqadm', ['prefix' => 'admin/{site}/jqadm', 'middleware' => ['web', 'auth']] ), function() { |
|
14 | 14 | |
15 | 15 | Route::match( array( 'GET' ), 'file/{type}', array( |
16 | 16 | 'as' => 'aimeos_shop_jqadm_file', |
17 | 17 | 'uses' => 'Aimeos\Shop\Controller\JqadmController@fileAction' |
18 | - )); |
|
18 | + ) ); |
|
19 | 19 | |
20 | 20 | Route::match( array( 'GET', 'POST' ), 'copy/{resource}/{id}', array( |
21 | 21 | 'as' => 'aimeos_shop_jqadm_copy', |
22 | 22 | 'uses' => 'Aimeos\Shop\Controller\JqadmController@copyAction' |
23 | - ))->where( array( 'resource' => '[a-z\/]+' ) ); |
|
23 | + ) )->where( array( 'resource' => '[a-z\/]+' ) ); |
|
24 | 24 | |
25 | 25 | Route::match( array( 'GET', 'POST' ), 'create/{resource}', array( |
26 | 26 | 'as' => 'aimeos_shop_jqadm_create', |
27 | 27 | 'uses' => 'Aimeos\Shop\Controller\JqadmController@createAction' |
28 | - ))->where( array( 'resource' => '[a-z\/]+' ) ); |
|
28 | + ) )->where( array( 'resource' => '[a-z\/]+' ) ); |
|
29 | 29 | |
30 | 30 | Route::match( array( 'GET', 'POST' ), 'delete/{resource}/{id}', array( |
31 | 31 | 'as' => 'aimeos_shop_jqadm_delete', |
32 | 32 | 'uses' => 'Aimeos\Shop\Controller\JqadmController@deleteAction' |
33 | - ))->where( array( 'resource' => '[a-z\/]+' ) ); |
|
33 | + ) )->where( array( 'resource' => '[a-z\/]+' ) ); |
|
34 | 34 | |
35 | 35 | Route::match( array( 'GET', 'POST' ), 'export/{resource}', array( |
36 | 36 | 'as' => 'aimeos_shop_jqadm_export', |
37 | 37 | 'uses' => 'Aimeos\Shop\Controller\JqadmController@exportAction' |
38 | - ))->where( array( 'resource' => '[a-z\/]+' ) ); |
|
38 | + ) )->where( array( 'resource' => '[a-z\/]+' ) ); |
|
39 | 39 | |
40 | 40 | Route::match( array( 'GET' ), 'get/{resource}/{id}', array( |
41 | 41 | 'as' => 'aimeos_shop_jqadm_get', |
42 | 42 | 'uses' => 'Aimeos\Shop\Controller\JqadmController@getAction' |
43 | - ))->where( array( 'resource' => '[a-z\/]+' ) ); |
|
43 | + ) )->where( array( 'resource' => '[a-z\/]+' ) ); |
|
44 | 44 | |
45 | 45 | Route::match( array( 'POST' ), 'save/{resource}', array( |
46 | 46 | 'as' => 'aimeos_shop_jqadm_save', |
47 | 47 | 'uses' => 'Aimeos\Shop\Controller\JqadmController@saveAction' |
48 | - ))->where( array( 'resource' => '[a-z\/]+' ) ); |
|
48 | + ) )->where( array( 'resource' => '[a-z\/]+' ) ); |
|
49 | 49 | |
50 | 50 | Route::match( array( 'GET', 'POST' ), 'search/{resource}', array( |
51 | 51 | 'as' => 'aimeos_shop_jqadm_search', |
52 | 52 | 'uses' => 'Aimeos\Shop\Controller\JqadmController@searchAction' |
53 | - ))->where( array( 'resource' => '[a-z\/]+' ) ); |
|
53 | + ) )->where( array( 'resource' => '[a-z\/]+' ) ); |
|
54 | 54 | |
55 | 55 | }); |
56 | 56 | |
57 | 57 | |
58 | -Route::group(config('shop.routes.jsonadm', ['prefix' => 'admin/{site}/jsonadm', 'middleware' => ['web', 'auth']]), function() { |
|
58 | +Route::group( config( 'shop.routes.jsonadm', ['prefix' => 'admin/{site}/jsonadm', 'middleware' => ['web', 'auth']] ), function() { |
|
59 | 59 | |
60 | 60 | Route::match( array( 'DELETE' ), '{resource}/{id?}', array( |
61 | 61 | 'as' => 'aimeos_shop_jsonadm_delete', |
62 | 62 | 'uses' => 'Aimeos\Shop\Controller\JsonadmController@deleteAction' |
63 | - ))->where( array( 'resource' => '[a-z\/]+' ) ); |
|
63 | + ) )->where( array( 'resource' => '[a-z\/]+' ) ); |
|
64 | 64 | |
65 | 65 | Route::match( array( 'GET' ), '{resource}/{id?}', array( |
66 | 66 | 'as' => 'aimeos_shop_jsonadm_get', |
67 | 67 | 'uses' => 'Aimeos\Shop\Controller\JsonadmController@getAction' |
68 | - ))->where( array( 'resource' => '[a-z\/]+' ) ); |
|
68 | + ) )->where( array( 'resource' => '[a-z\/]+' ) ); |
|
69 | 69 | |
70 | 70 | Route::match( array( 'PATCH' ), '{resource}/{id?}', array( |
71 | 71 | 'as' => 'aimeos_shop_jsonadm_patch', |
72 | 72 | 'uses' => 'Aimeos\Shop\Controller\JsonadmController@patchAction' |
73 | - ))->where( array( 'resource' => '[a-z\/]+' ) ); |
|
73 | + ) )->where( array( 'resource' => '[a-z\/]+' ) ); |
|
74 | 74 | |
75 | 75 | Route::match( array( 'POST' ), '{resource}/{id?}', array( |
76 | 76 | 'as' => 'aimeos_shop_jsonadm_post', |
77 | 77 | 'uses' => 'Aimeos\Shop\Controller\JsonadmController@postAction' |
78 | - ))->where( array( 'resource' => '[a-z\/]+' ) ); |
|
78 | + ) )->where( array( 'resource' => '[a-z\/]+' ) ); |
|
79 | 79 | |
80 | 80 | Route::match( array( 'PUT' ), '{resource}/{id?}', array( |
81 | 81 | 'as' => 'aimeos_shop_jsonadm_put', |
82 | 82 | 'uses' => 'Aimeos\Shop\Controller\JsonadmController@putAction' |
83 | - ))->where( array( 'resource' => '[a-z\/]+' ) ); |
|
83 | + ) )->where( array( 'resource' => '[a-z\/]+' ) ); |
|
84 | 84 | |
85 | 85 | Route::match( array( 'OPTIONS' ), '{resource?}', array( |
86 | 86 | 'as' => 'aimeos_shop_jsonadm_options', |
87 | 87 | 'uses' => 'Aimeos\Shop\Controller\JsonadmController@optionsAction' |
88 | - ))->where( array( 'resource' => '[a-z\/]*' ) ); |
|
88 | + ) )->where( array( 'resource' => '[a-z\/]*' ) ); |
|
89 | 89 | |
90 | 90 | }); |
91 | 91 | |
92 | 92 | |
93 | -Route::group(config('shop.routes.jsonapi', ['prefix' => 'jsonapi', 'middleware' => ['web', 'api']]), function() { |
|
93 | +Route::group( config( 'shop.routes.jsonapi', ['prefix' => 'jsonapi', 'middleware' => ['web', 'api']] ), function() { |
|
94 | 94 | |
95 | 95 | Route::match( array( 'DELETE' ), '{resource}', array( |
96 | 96 | 'as' => 'aimeos_shop_jsonapi_delete', |
97 | 97 | 'uses' => 'Aimeos\Shop\Controller\JsonapiController@deleteAction' |
98 | - )); |
|
98 | + ) ); |
|
99 | 99 | |
100 | 100 | Route::match( array( 'GET' ), '{resource}', array( |
101 | 101 | 'as' => 'aimeos_shop_jsonapi_get', |
102 | 102 | 'uses' => 'Aimeos\Shop\Controller\JsonapiController@getAction' |
103 | - )); |
|
103 | + ) ); |
|
104 | 104 | |
105 | 105 | Route::match( array( 'PATCH' ), '{resource}', array( |
106 | 106 | 'as' => 'aimeos_shop_jsonapi_patch', |
107 | 107 | 'uses' => 'Aimeos\Shop\Controller\JsonapiController@patchAction' |
108 | - )); |
|
108 | + ) ); |
|
109 | 109 | |
110 | 110 | Route::match( array( 'POST' ), '{resource}', array( |
111 | 111 | 'as' => 'aimeos_shop_jsonapi_post', |
112 | 112 | 'uses' => 'Aimeos\Shop\Controller\JsonapiController@postAction' |
113 | - )); |
|
113 | + ) ); |
|
114 | 114 | |
115 | 115 | Route::match( array( 'PUT' ), '{resource}', array( |
116 | 116 | 'as' => 'aimeos_shop_jsonapi_put', |
117 | 117 | 'uses' => 'Aimeos\Shop\Controller\JsonapiController@putAction' |
118 | - )); |
|
118 | + ) ); |
|
119 | 119 | |
120 | 120 | Route::match( array( 'OPTIONS' ), '{resource?}', array( |
121 | 121 | 'as' => 'aimeos_shop_jsonapi_options', |
122 | 122 | 'uses' => 'Aimeos\Shop\Controller\JsonapiController@optionsAction' |
123 | - )); |
|
123 | + ) ); |
|
124 | 124 | |
125 | 125 | }); |
126 | 126 | |
127 | 127 | |
128 | -Route::group(config('shop.routes.account', ['prefix' => 'myaccount', 'middleware' => ['web', 'auth']]), function() { |
|
128 | +Route::group( config( 'shop.routes.account', ['prefix' => 'myaccount', 'middleware' => ['web', 'auth']] ), function() { |
|
129 | 129 | |
130 | 130 | Route::match( array( 'GET', 'POST' ), 'favorite/{fav_action?}/{fav_id?}/{d_prodid?}/{d_name?}/{d_pos?}', array( |
131 | 131 | 'as' => 'aimeos_shop_account_favorite', |
132 | 132 | 'uses' => 'Aimeos\Shop\Controller\AccountController@indexAction' |
133 | - )); |
|
133 | + ) ); |
|
134 | 134 | |
135 | 135 | Route::match( array( 'GET', 'POST' ), 'watch/{wat_action?}/{wat_id?}/{d_prodid?}/{d_name?}/{d_pos?}', array( |
136 | 136 | 'as' => 'aimeos_shop_account_watch', |
137 | 137 | 'uses' => 'Aimeos\Shop\Controller\AccountController@indexAction' |
138 | - )); |
|
138 | + ) ); |
|
139 | 139 | |
140 | 140 | Route::match( array( 'GET', 'POST' ), 'download/{dl_id}', array( |
141 | 141 | 'as' => 'aimeos_shop_account_download', |
142 | 142 | 'uses' => 'Aimeos\Shop\Controller\AccountController@downloadAction' |
143 | - )); |
|
143 | + ) ); |
|
144 | 144 | |
145 | 145 | Route::match( array( 'GET', 'POST' ), '', array( |
146 | 146 | 'as' => 'aimeos_shop_account', |
147 | 147 | 'uses' => 'Aimeos\Shop\Controller\AccountController@indexAction' |
148 | - )); |
|
148 | + ) ); |
|
149 | 149 | |
150 | 150 | }); |
151 | 151 | |
152 | 152 | |
153 | -Route::group(config('shop.routes.default', ['prefix' => 'shop', 'middleware' => ['web']]), function() { |
|
153 | +Route::group( config( 'shop.routes.default', ['prefix' => 'shop', 'middleware' => ['web']] ), function() { |
|
154 | 154 | |
155 | 155 | Route::match( array( 'GET', 'POST' ), 'count', array( |
156 | 156 | 'as' => 'aimeos_shop_count', |
157 | 157 | 'uses' => 'Aimeos\Shop\Controller\CatalogController@countAction' |
158 | - )); |
|
158 | + ) ); |
|
159 | 159 | |
160 | 160 | Route::match( array( 'GET', 'POST' ), 'suggest', array( |
161 | 161 | 'as' => 'aimeos_shop_suggest', |
162 | 162 | 'uses' => 'Aimeos\Shop\Controller\CatalogController@suggestAction' |
163 | - )); |
|
163 | + ) ); |
|
164 | 164 | |
165 | 165 | Route::match( array( 'GET', 'POST' ), 'stock', array( |
166 | 166 | 'as' => 'aimeos_shop_stock', |
167 | 167 | 'uses' => 'Aimeos\Shop\Controller\CatalogController@stockAction' |
168 | - )); |
|
168 | + ) ); |
|
169 | 169 | |
170 | 170 | Route::match( array( 'GET', 'POST' ), 'basket', array( |
171 | 171 | 'as' => 'aimeos_shop_basket', |
172 | 172 | 'uses' => 'Aimeos\Shop\Controller\BasketController@indexAction' |
173 | - )); |
|
173 | + ) ); |
|
174 | 174 | |
175 | 175 | Route::match( array( 'GET', 'POST' ), 'checkout/{c_step?}', array( |
176 | 176 | 'as' => 'aimeos_shop_checkout', |
177 | 177 | 'uses' => 'Aimeos\Shop\Controller\CheckoutController@indexAction' |
178 | - )); |
|
178 | + ) ); |
|
179 | 179 | |
180 | 180 | Route::match( array( 'GET', 'POST' ), 'confirm/{code?}', array( |
181 | 181 | 'as' => 'aimeos_shop_confirm', |
182 | 182 | 'uses' => 'Aimeos\Shop\Controller\CheckoutController@confirmAction' |
183 | - )); |
|
183 | + ) ); |
|
184 | 184 | |
185 | 185 | Route::match( array( 'GET', 'POST' ), 'pin/{pin_action}/{pin_id}/{d_name}', array( |
186 | 186 | 'as' => 'aimeos_shop_session_pinned', |
187 | 187 | 'uses' => 'Aimeos\Shop\Controller\CatalogController@detailAction' |
188 | - )); |
|
188 | + ) ); |
|
189 | 189 | |
190 | 190 | Route::match( array( 'GET', 'POST' ), '{f_name}~{f_catid}', array( |
191 | 191 | 'as' => 'aimeos_shop_tree', |
192 | 192 | 'uses' => 'Aimeos\Shop\Controller\CatalogController@treeAction' |
193 | - )); |
|
193 | + ) ); |
|
194 | 194 | |
195 | 195 | Route::match( array( 'GET', 'POST' ), '{d_name}/{d_pos?}', array( |
196 | 196 | 'as' => 'aimeos_shop_detail', |
197 | 197 | 'uses' => 'Aimeos\Shop\Controller\CatalogController@detailAction' |
198 | - )); |
|
198 | + ) ); |
|
199 | 199 | |
200 | 200 | Route::match( array( 'GET', 'POST' ), '', array( |
201 | 201 | 'as' => 'aimeos_shop_list', |
202 | 202 | 'uses' => 'Aimeos\Shop\Controller\CatalogController@listAction' |
203 | - )); |
|
203 | + ) ); |
|
204 | 204 | |
205 | 205 | }); |
206 | 206 | |
207 | 207 | |
208 | -Route::group(config('shop.routes.update', []), function() { |
|
208 | +Route::group( config( 'shop.routes.update', [] ), function() { |
|
209 | 209 | |
210 | 210 | Route::match( array( 'GET', 'POST' ), 'update', array( |
211 | 211 | 'as' => 'aimeos_shop_update', |
212 | 212 | 'uses' => 'Aimeos\Shop\Controller\CheckoutController@updateAction' |
213 | - )); |
|
213 | + ) ); |
|
214 | 214 | |
215 | 215 | }); |
216 | 216 | |
217 | 217 | |
218 | -Route::get('terms', array( |
|
218 | +Route::get( 'terms', array( |
|
219 | 219 | 'as' => 'aimeos_shop_terms', |
220 | 220 | 'uses' => 'Aimeos\Shop\Controller\PageController@termsAction' |
221 | -)); |
|
221 | +) ); |
|
222 | 222 | |
223 | -Route::get('privacy', array( |
|
223 | +Route::get( 'privacy', array( |
|
224 | 224 | 'as' => 'aimeos_shop_privacy', |
225 | 225 | 'uses' => 'Aimeos\Shop\Controller\PageController@privacyAction' |
226 | -)); |
|
226 | +) ); |