Passed
Push — master ( e9fe6e...6c6334 )
by Aimeos
03:20
created
src/routes.php 1 patch
Spacing   +47 added lines, -47 removed lines patch added patch discarded remove patch
@@ -1,226 +1,226 @@
 block discarded – undo
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\[email protected]'
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\[email protected]'
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\[email protected]'
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\[email protected]'
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\[email protected]'
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\[email protected]'
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\[email protected]'
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\[email protected]'
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\[email protected]'
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\[email protected]'
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\[email protected]'
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\[email protected]'
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\[email protected]'
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\[email protected]'
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\[email protected]'
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\[email protected]'
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\[email protected]'
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\[email protected]'
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\[email protected]'
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\[email protected]'
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\[email protected]'
123
-	));
123
+	) );
124 124
 
125 125
 });
126 126
 
127 127
 
128
-Route::get('terms', array(
128
+Route::get( 'terms', array(
129 129
 	'as' => 'aimeos_shop_terms',
130 130
 	'uses' => 'Aimeos\Shop\Controller\[email protected]'
131
-));
131
+) );
132 132
 
133
-Route::get('privacy', array(
133
+Route::get( 'privacy', array(
134 134
 	'as' => 'aimeos_shop_privacy',
135 135
 	'uses' => 'Aimeos\Shop\Controller\[email protected]'
136
-));
136
+) );
137 137
 
138 138
 
139
-Route::group(config('shop.routes.update', []), function() {
139
+Route::group( config( 'shop.routes.update', [] ), function() {
140 140
 
141 141
 	Route::match( array( 'GET', 'POST' ), 'update', array(
142 142
 		'as' => 'aimeos_shop_update',
143 143
 		'uses' => 'Aimeos\Shop\Controller\[email protected]'
144
-	));
144
+	) );
145 145
 
146 146
 });
147 147
 
148 148
 
149
-Route::group(config('shop.routes.account', ['prefix' => 'myaccount', 'middleware' => ['web', 'auth']]), function() {
149
+Route::group( config( 'shop.routes.account', ['prefix' => 'myaccount', 'middleware' => ['web', 'auth']] ), function() {
150 150
 
151 151
 	Route::match( array( 'GET', 'POST' ), 'favorite/{fav_action?}/{fav_id?}/{d_prodid?}/{d_name?}/{d_pos?}', array(
152 152
 		'as' => 'aimeos_shop_account_favorite',
153 153
 		'uses' => 'Aimeos\Shop\Controller\[email protected]'
154
-	));
154
+	) );
155 155
 
156 156
 	Route::match( array( 'GET', 'POST' ), 'watch/{wat_action?}/{wat_id?}/{d_prodid?}/{d_name?}/{d_pos?}', array(
157 157
 		'as' => 'aimeos_shop_account_watch',
158 158
 		'uses' => 'Aimeos\Shop\Controller\[email protected]'
159
-	));
159
+	) );
160 160
 
161 161
 	Route::match( array( 'GET', 'POST' ), 'download/{dl_id}', array(
162 162
 		'as' => 'aimeos_shop_account_download',
163 163
 		'uses' => 'Aimeos\Shop\Controller\[email protected]'
164
-	));
164
+	) );
165 165
 
166 166
 	Route::match( array( 'GET', 'POST' ), '', array(
167 167
 		'as' => 'aimeos_shop_account',
168 168
 		'uses' => 'Aimeos\Shop\Controller\[email protected]'
169
-	));
169
+	) );
170 170
 
171 171
 });
172 172
 
173 173
 
174
-Route::group(config('shop.routes.default', ['prefix' => 'shop', 'middleware' => ['web']]), function() {
174
+Route::group( config( 'shop.routes.default', ['prefix' => 'shop', 'middleware' => ['web']] ), function() {
175 175
 
176 176
 	Route::match( array( 'GET', 'POST' ), 'count', array(
177 177
 		'as' => 'aimeos_shop_count',
178 178
 		'uses' => 'Aimeos\Shop\Controller\[email protected]'
179
-	));
179
+	) );
180 180
 
181 181
 	Route::match( array( 'GET', 'POST' ), 'suggest', array(
182 182
 		'as' => 'aimeos_shop_suggest',
183 183
 		'uses' => 'Aimeos\Shop\Controller\[email protected]'
184
-	));
184
+	) );
185 185
 
186 186
 	Route::match( array( 'GET', 'POST' ), 'stock', array(
187 187
 		'as' => 'aimeos_shop_stock',
188 188
 		'uses' => 'Aimeos\Shop\Controller\[email protected]'
189
-	));
189
+	) );
190 190
 
191 191
 	Route::match( array( 'GET', 'POST' ), 'basket', array(
192 192
 		'as' => 'aimeos_shop_basket',
193 193
 		'uses' => 'Aimeos\Shop\Controller\[email protected]'
194
-	));
194
+	) );
195 195
 
196 196
 	Route::match( array( 'GET', 'POST' ), 'checkout/{c_step?}', array(
197 197
 		'as' => 'aimeos_shop_checkout',
198 198
 		'uses' => 'Aimeos\Shop\Controller\[email protected]'
199
-	));
199
+	) );
200 200
 
201 201
 	Route::match( array( 'GET', 'POST' ), 'confirm/{code?}', array(
202 202
 		'as' => 'aimeos_shop_confirm',
203 203
 		'uses' => 'Aimeos\Shop\Controller\[email protected]'
204
-	));
204
+	) );
205 205
 
206 206
 	Route::match( array( 'GET', 'POST' ), 'pin/{pin_action}/{pin_id}/{d_name}', array(
207 207
 		'as' => 'aimeos_shop_session_pinned',
208 208
 		'uses' => 'Aimeos\Shop\Controller\[email protected]'
209
-	));
209
+	) );
210 210
 
211 211
 	Route::match( array( 'GET', 'POST' ), '{f_name}~{f_catid}', array(
212 212
 		'as' => 'aimeos_shop_tree',
213 213
 		'uses' => 'Aimeos\Shop\Controller\[email protected]'
214
-	));
214
+	) );
215 215
 
216 216
 	Route::match( array( 'GET', 'POST' ), '{d_name}/{d_pos?}', array(
217 217
 		'as' => 'aimeos_shop_detail',
218 218
 		'uses' => 'Aimeos\Shop\Controller\[email protected]'
219
-	));
219
+	) );
220 220
 
221 221
 	Route::match( array( 'GET', 'POST' ), '', array(
222 222
 		'as' => 'aimeos_shop_list',
223 223
 		'uses' => 'Aimeos\Shop\Controller\[email protected]'
224
-	));
224
+	) );
225 225
 
226 226
 });
Please login to merge, or discard this patch.
src/Aimeos/Shop/Controller/CatalogController.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -110,9 +110,9 @@
 block discarded – undo
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
 
Please login to merge, or discard this patch.
src/Aimeos/Shop/Base/Locale.php 1 patch
Braces   +10 added lines, -4 removed lines patch added patch discarded remove patch
@@ -68,9 +68,12 @@  discard block
 block discarded – undo
68 68
 			$localeManager = \Aimeos\MShop::create( $context, 'locale' );
69 69
 			$disableSites = $this->config->get( 'shop.disableSites', true );
70 70
 
71
-			try {
71
+			try
72
+			{
72 73
 				$this->locale = $localeManager->bootstrap( $site, $lang, $currency, $disableSites );
73
-			} catch( \Aimeos\MShop\Locale\Exception $e ) {
74
+			}
75
+			catch( \Aimeos\MShop\Locale\Exception $e )
76
+			{
74 77
 				$this->locale = $localeManager->bootstrap( 'default', $lang, $currency, $disableSites );
75 78
 			}
76 79
 		}
@@ -90,9 +93,12 @@  discard block
 block discarded – undo
90 93
 	{
91 94
 		$localeManager = \Aimeos\MShop::create( $context, 'locale' );
92 95
 
93
-		try {
96
+		try
97
+		{
94 98
 			$localeItem = $localeManager->bootstrap( $site, '', '', false, null, true );
95
-		} catch( \Aimeos\MShop\Exception $e ) {
99
+		}
100
+		catch( \Aimeos\MShop\Exception $e )
101
+		{
96 102
 			$localeItem = $localeManager->createItem();
97 103
 		}
98 104
 
Please login to merge, or discard this patch.