Completed
Push — master ( 67c4a6...e61cbc )
by Aimeos
01:50
created
src/routes.php 1 patch
Spacing   +49 added lines, -49 removed lines patch added patch discarded remove patch
@@ -2,7 +2,7 @@  discard block
 block discarded – undo
2 2
 
3 3
 Route::group(config('shop.routes.admin', ['prefix' => 'admin', 'middleware' => ['web']]), function() {
4 4
 
5
-	Route::match( array( 'GET' ), '', array(
5
+	Route::match(array('GET'), '', array(
6 6
 		'as' => 'aimeos_shop_admin',
7 7
 		'uses' => 'Aimeos\Shop\Controller\[email protected]'
8 8
 	));
@@ -12,112 +12,112 @@  discard block
 block discarded – undo
12 12
 
13 13
 Route::group(config('shop.routes.jqadm', ['prefix' => 'admin/{site}/jqadm', 'middleware' => ['web', 'auth']]), function() {
14 14
 
15
-	Route::match( array( 'GET' ), 'file/{type}', array(
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
-	Route::match( array( 'GET', 'POST' ), 'copy/{resource}/{id}', array(
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
-	Route::match( array( 'GET', 'POST' ), 'create/{resource}', array(
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
-	Route::match( array( 'GET', 'POST' ), 'delete/{resource}/{id}', array(
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
-	Route::match( array( 'GET', 'POST' ), 'export/{resource}', array(
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
-	Route::match( array( 'GET' ), 'get/{resource}/{id}', array(
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
-	Route::match( array( 'POST' ), 'save/{resource}', array(
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
-	Route::match( array( 'GET', 'POST' ), 'search/{resource}', array(
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 58
 Route::group(config('shop.routes.jsonadm', ['prefix' => 'admin/{site}/jsonadm', 'middleware' => ['web', 'auth']]), function() {
59 59
 
60
-	Route::match( array( 'DELETE' ), '{resource}/{id?}', array(
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
-	Route::match( array( 'GET' ), '{resource}/{id?}', array(
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
-	Route::match( array( 'PATCH' ), '{resource}/{id?}', array(
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
-	Route::match( array( 'POST' ), '{resource}/{id?}', array(
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
-	Route::match( array( 'PUT' ), '{resource}/{id?}', array(
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
-	Route::match( array( 'OPTIONS' ), '{resource?}', array(
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 93
 Route::group(config('shop.routes.jsonapi', ['prefix' => 'jsonapi', 'middleware' => ['web', 'api']]), function() {
94 94
 
95
-	Route::match( array( 'DELETE' ), '{resource}', array(
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
-	Route::match( array( 'GET' ), '{resource}', array(
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
-	Route::match( array( 'PATCH' ), '{resource}', array(
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
-	Route::match( array( 'POST' ), '{resource}', array(
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
-	Route::match( array( 'PUT' ), '{resource}', array(
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
-	Route::match( array( 'OPTIONS' ), '{resource?}', array(
120
+	Route::match(array('OPTIONS'), '{resource?}', array(
121 121
 		'as' => 'aimeos_shop_jsonapi_options',
122 122
 		'uses' => 'Aimeos\Shop\Controller\[email protected]'
123 123
 	));
@@ -127,22 +127,22 @@  discard block
 block discarded – undo
127 127
 
128 128
 Route::group(config('shop.routes.account', ['middleware' => ['web', 'auth']]), function() {
129 129
 
130
-	Route::match( array( 'GET', 'POST' ), 'myaccount/favorite/{fav_action?}/{fav_id?}/{d_prodid?}/{d_name?}/{d_pos?}', array(
130
+	Route::match(array('GET', 'POST'), 'myaccount/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\[email protected]'
133 133
 	));
134 134
 
135
-	Route::match( array( 'GET', 'POST' ), 'myaccount/watch/{wat_action?}/{wat_id?}/{d_prodid?}/{d_name?}/{d_pos?}', array(
135
+	Route::match(array('GET', 'POST'), 'myaccount/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\[email protected]'
138 138
 	));
139 139
 
140
-	Route::match( array( 'GET', 'POST' ), 'myaccount/download/{dl_id}', array(
140
+	Route::match(array('GET', 'POST'), 'myaccount/download/{dl_id}', array(
141 141
 		'as' => 'aimeos_shop_account_download',
142 142
 		'uses' => 'Aimeos\Shop\Controller\[email protected]'
143 143
 	));
144 144
 
145
-	Route::match( array( 'GET', 'POST' ), 'myaccount', array(
145
+	Route::match(array('GET', 'POST'), 'myaccount', array(
146 146
 		'as' => 'aimeos_shop_account',
147 147
 		'uses' => 'Aimeos\Shop\Controller\[email protected]'
148 148
 	));
@@ -152,52 +152,52 @@  discard block
 block discarded – undo
152 152
 
153 153
 Route::group(config('shop.routes.default', ['middleware' => ['web']]), function() {
154 154
 
155
-	Route::match( array( 'GET', 'POST' ), 'count', array(
155
+	Route::match(array('GET', 'POST'), 'count', array(
156 156
 		'as' => 'aimeos_shop_count',
157 157
 		'uses' => 'Aimeos\Shop\Controller\[email protected]'
158 158
 	));
159 159
 
160
-	Route::match( array( 'GET', 'POST' ), 'detail/{d_name}/{d_prodid}/{d_pos?}', array(
160
+	Route::match(array('GET', 'POST'), 'detail/{d_name}/{d_prodid}/{d_pos?}', array(
161 161
 		'as' => 'aimeos_shop_detail',
162 162
 		'uses' => 'Aimeos\Shop\Controller\[email protected]'
163 163
 	));
164 164
 
165
-	Route::match( array( 'GET', 'POST' ), 'detail/pin/{pin_action?}/{pin_id?}/{d_prodid?}/{d_name?}/{d_pos?}', array(
165
+	Route::match(array('GET', 'POST'), 'detail/pin/{pin_action?}/{pin_id?}/{d_prodid?}/{d_name?}/{d_pos?}', array(
166 166
 		'as' => 'aimeos_shop_session_pinned',
167 167
 		'uses' => 'Aimeos\Shop\Controller\[email protected]'
168 168
 	));
169 169
 
170
-	Route::match( array( 'GET', 'POST' ), 'list', array(
170
+	Route::match(array('GET', 'POST'), 'list', array(
171 171
 		'as' => 'aimeos_shop_list',
172 172
 		'uses' => 'Aimeos\Shop\Controller\[email protected]'
173 173
 	));
174 174
 
175
-	Route::match( array( 'GET', 'POST' ), 'cat/{f_name}/{f_catid}', array(
175
+	Route::match(array('GET', 'POST'), 'cat/{f_name}/{f_catid}', array(
176 176
 		'as' => 'aimeos_shop_tree',
177 177
 		'uses' => 'Aimeos\Shop\Controller\[email protected]'
178 178
 	));
179 179
 
180
-	Route::match( array( 'GET', 'POST' ), 'suggest', array(
180
+	Route::match(array('GET', 'POST'), 'suggest', array(
181 181
 		'as' => 'aimeos_shop_suggest',
182 182
 		'uses' => 'Aimeos\Shop\Controller\[email protected]'
183 183
 	));
184 184
 
185
-	Route::match( array( 'GET', 'POST' ), 'stock', array(
185
+	Route::match(array('GET', 'POST'), 'stock', array(
186 186
 		'as' => 'aimeos_shop_stock',
187 187
 		'uses' => 'Aimeos\Shop\Controller\[email protected]'
188 188
 	));
189 189
 
190
-	Route::match( array( 'GET', 'POST' ), 'basket', array(
190
+	Route::match(array('GET', 'POST'), 'basket', array(
191 191
 		'as' => 'aimeos_shop_basket',
192 192
 		'uses' => 'Aimeos\Shop\Controller\[email protected]'
193 193
 	));
194 194
 
195
-	Route::match( array( 'GET', 'POST' ), 'checkout/{c_step?}', array(
195
+	Route::match(array('GET', 'POST'), 'checkout/{c_step?}', array(
196 196
 		'as' => 'aimeos_shop_checkout',
197 197
 		'uses' => 'Aimeos\Shop\Controller\[email protected]'
198 198
 	));
199 199
 
200
-	Route::match( array( 'GET', 'POST' ), 'confirm/{code?}', array(
200
+	Route::match(array('GET', 'POST'), 'confirm/{code?}', array(
201 201
 		'as' => 'aimeos_shop_confirm',
202 202
 		'uses' => 'Aimeos\Shop\Controller\[email protected]'
203 203
 	));
@@ -207,7 +207,7 @@  discard block
 block discarded – undo
207 207
 
208 208
 Route::group(config('shop.routes.update', []), function() {
209 209
 
210
-	Route::match( array( 'GET', 'POST' ), 'update', array(
210
+	Route::match(array('GET', 'POST'), 'update', array(
211 211
 		'as' => 'aimeos_shop_update',
212 212
 		'uses' => 'Aimeos\Shop\Controller\[email protected]'
213 213
 	));
Please login to merge, or discard this patch.
src/Aimeos/Shop/Controller/CatalogController.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -29,7 +29,7 @@  discard block
 block discarded – undo
29 29
 	 */
30 30
 	public function countAction()
31 31
 	{
32
-		$params = app( '\Aimeos\Shop\Base\Page' )->getSections( 'catalog-count' );
32
+		$params = app('\Aimeos\Shop\Base\Page')->getSections('catalog-count');
33 33
 
34 34
 		return Response::view('shop::catalog.count', $params)
35 35
 			->header('Content-Type', 'application/javascript');
@@ -43,7 +43,7 @@  discard block
 block discarded – undo
43 43
 	 */
44 44
 	public function detailAction()
45 45
 	{
46
-		$params = app( 'Aimeos\Shop\Base\Page' )->getSections( 'catalog-detail' );
46
+		$params = app('Aimeos\Shop\Base\Page')->getSections('catalog-detail');
47 47
 		return Response::view('shop::catalog.detail', $params);
48 48
 	}
49 49
 
@@ -55,7 +55,7 @@  discard block
 block discarded – undo
55 55
 	 */
56 56
 	public function listAction()
57 57
 	{
58
-		$params = app( 'Aimeos\Shop\Base\Page' )->getSections( 'catalog-list' );
58
+		$params = app('Aimeos\Shop\Base\Page')->getSections('catalog-list');
59 59
 		return Response::view('shop::catalog.list', $params);
60 60
 	}
61 61
 
@@ -67,7 +67,7 @@  discard block
 block discarded – undo
67 67
 	 */
68 68
 	public function stockAction()
69 69
 	{
70
-		$params = app( 'Aimeos\Shop\Base\Page' )->getSections( 'catalog-stock' );
70
+		$params = app('Aimeos\Shop\Base\Page')->getSections('catalog-stock');
71 71
 
72 72
 		return Response::view('shop::catalog.stock', $params)
73 73
 			->header('Content-Type', 'application/javascript');
@@ -81,7 +81,7 @@  discard block
 block discarded – undo
81 81
 	 */
82 82
 	public function suggestAction()
83 83
 	{
84
-		$params = app( 'Aimeos\Shop\Base\Page' )->getSections( 'catalog-suggest' );
84
+		$params = app('Aimeos\Shop\Base\Page')->getSections('catalog-suggest');
85 85
 
86 86
 		return Response::view('shop::catalog.suggest', $params)
87 87
 			->header('Content-Type', 'application/json');
@@ -95,7 +95,7 @@  discard block
 block discarded – undo
95 95
 	 */
96 96
 	public function treeAction()
97 97
 	{
98
-		$params = app( 'Aimeos\Shop\Base\Page' )->getSections( 'catalog-tree' );
98
+		$params = app('Aimeos\Shop\Base\Page')->getSections('catalog-tree');
99 99
 		return Response::view('shop::catalog.tree', $params);
100 100
 	}
101 101
 }
102 102
\ No newline at end of file
Please login to merge, or discard this patch.
src/default.php 1 patch
Spacing   +23 added lines, -23 removed lines patch added patch discarded remove patch
@@ -10,17 +10,17 @@  discard block
 block discarded – undo
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' ),
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' ),
18
-		'catalog-stock' => array( 'catalog/stock' ),
19
-		'catalog-suggest' => array( 'catalog/suggest' ),
20
-		'catalog-tree' => array( 'basket/mini','catalog/filter','catalog/stage','catalog/lists' ),
21
-		'checkout-confirm' => array( 'checkout/confirm' ),
22
-		'checkout-index' => array( 'checkout/standard' ),
23
-		'checkout-update' => array( 'checkout/update'),
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
+		'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'),
18
+		'catalog-stock' => array('catalog/stock'),
19
+		'catalog-suggest' => array('catalog/suggest'),
20
+		'catalog-tree' => array('basket/mini', 'catalog/filter', 'catalog/stage', 'catalog/lists'),
21
+		'checkout-confirm' => array('checkout/confirm'),
22
+		'checkout-index' => array('checkout/standard'),
23
+		'checkout-update' => array('checkout/update'),
24 24
 	),
25 25
 
26 26
 	'resource' => array(
@@ -43,22 +43,22 @@  discard block
 block discarded – undo
43 43
 		'fs' => array(
44 44
 			'adapter' => 'Standard',
45 45
 			'basedir' => public_path(),
46
-			'tempdir' => storage_path( 'tmp' ),
46
+			'tempdir' => storage_path('tmp'),
47 47
 		),
48 48
 		'fs-admin' => array(
49 49
 			'adapter' => 'Standard',
50
-			'basedir' => storage_path( 'admin' ),
51
-			'tempdir' => storage_path( 'tmp' ),
50
+			'basedir' => storage_path('admin'),
51
+			'tempdir' => storage_path('tmp'),
52 52
 		),
53 53
 		'fs-import' => array(
54 54
 			'adapter' => 'Standard',
55
-			'basedir' => storage_path( 'import' ),
56
-			'tempdir' => storage_path( 'tmp' ),
55
+			'basedir' => storage_path('import'),
56
+			'tempdir' => storage_path('tmp'),
57 57
 		),
58 58
 		'fs-secure' => array(
59 59
 			'adapter' => 'Standard',
60
-			'basedir' => storage_path( 'secure' ),
61
-			'tempdir' => storage_path( 'tmp' ),
60
+			'basedir' => storage_path('secure'),
61
+			'tempdir' => storage_path('tmp'),
62 62
 		),
63 63
 		'mq' => array(
64 64
 			'adapter' => 'Standard',
@@ -180,10 +180,10 @@  discard block
 block discarded – undo
180 180
 			),
181 181
 			'common' => array(
182 182
 				'content' => array(
183
-					'baseurl' => config( 'app.url' ) . '/',
183
+					'baseurl' => config('app.url').'/',
184 184
 				),
185 185
 				'template' => array(
186
-					'baseurl' => public_path( 'packages/aimeos/shop/themes/elegance' ),
186
+					'baseurl' => public_path('packages/aimeos/shop/themes/elegance'),
187 187
 				),
188 188
 			),
189 189
 			'basket' => array(
@@ -230,8 +230,8 @@  discard block
 block discarded – undo
230 230
 				),
231 231
 			),
232 232
 			'email' => [
233
-				'from-email' => config( 'mail.from.address' ),
234
-				'from-name' => config( 'mail.from.name' ),
233
+				'from-email' => config('mail.from.address'),
234
+				'from-name' => config('mail.from.name'),
235 235
 			],
236 236
 			'locale' => array(
237 237
 				'select' => array(
@@ -308,7 +308,7 @@  discard block
 block discarded – undo
308 308
 						# in the "maxwidth" parameter
309 309
 						# 'maxheight' => 280,
310 310
 					),
311
-					'tempdir' => storage_path( 'aimeos' ),
311
+					'tempdir' => storage_path('aimeos'),
312 312
 				),
313 313
 			),
314 314
 		),
Please login to merge, or discard this patch.