Passed
Push — master ( 136162...a73ad8 )
by Aimeos
05:24
created
src/Aimeos/Shop/Controller/BasketController.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -36,6 +36,6 @@
 block discarded – undo
36 36
 			$params['aibody'][$name] = Shop::get( $name )->getBody();
37 37
 		}
38 38
 
39
-		return Response::view('shop::basket.index', $params)->header('Cache-Control', 'no-store');
39
+		return Response::view( 'shop::basket.index', $params )->header( 'Cache-Control', 'no-store' );
40 40
 	}
41 41
 }
42 42
\ No newline at end of file
Please login to merge, or discard this patch.
src/Aimeos/Shop/Controller/AccountController.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -36,7 +36,7 @@
 block discarded – undo
36 36
 			$params['aibody'][$name] = Shop::get( $name )->getBody();
37 37
 		}
38 38
 
39
-		return Response::view('shop::account.index', $params);
39
+		return Response::view( 'shop::account.index', $params );
40 40
 	}
41 41
 
42 42
 
Please login to merge, or discard this patch.
src/Aimeos/Shop/Controller/CatalogController.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -36,8 +36,8 @@  discard block
 block discarded – undo
36 36
 			$params['aibody'][$name] = Shop::get( $name )->getBody();
37 37
 		}
38 38
 
39
-		return Response::view('shop::catalog.count', $params)
40
-			->header('Content-Type', 'application/javascript');
39
+		return Response::view( 'shop::catalog.count', $params )
40
+			->header( 'Content-Type', 'application/javascript' );
41 41
 	}
42 42
 
43 43
 
@@ -54,7 +54,7 @@  discard block
 block discarded – undo
54 54
 			$params['aibody'][$name] = Shop::get( $name )->getBody();
55 55
 		}
56 56
 
57
-		return Response::view('shop::catalog.detail', $params);
57
+		return Response::view( 'shop::catalog.detail', $params );
58 58
 	}
59 59
 
60 60
 
@@ -71,7 +71,7 @@  discard block
 block discarded – undo
71 71
 			$params['aibody'][$name] = Shop::get( $name )->getBody();
72 72
 		}
73 73
 
74
-		return Response::view('shop::catalog.list', $params);
74
+		return Response::view( 'shop::catalog.list', $params );
75 75
 	}
76 76
 
77 77
 
@@ -88,8 +88,8 @@  discard block
 block discarded – undo
88 88
 			$params['aibody'][$name] = Shop::get( $name )->getBody();
89 89
 		}
90 90
 
91
-		return Response::view('shop::catalog.stock', $params)
92
-			->header('Content-Type', 'application/javascript');
91
+		return Response::view( 'shop::catalog.stock', $params )
92
+			->header( 'Content-Type', 'application/javascript' );
93 93
 	}
94 94
 
95 95
 
@@ -106,8 +106,8 @@  discard block
 block discarded – undo
106 106
 			$params['aibody'][$name] = Shop::get( $name )->getBody();
107 107
 		}
108 108
 
109
-		return Response::view('shop::catalog.suggest', $params)
110
-			->header('Content-Type', 'application/json');
109
+		return Response::view( 'shop::catalog.suggest', $params )
110
+			->header( 'Content-Type', 'application/json' );
111 111
 	}
112 112
 
113 113
 
@@ -124,6 +124,6 @@  discard block
 block discarded – undo
124 124
 			$params['aibody'][$name] = Shop::get( $name )->getBody();
125 125
 		}
126 126
 
127
-		return Response::view('shop::catalog.tree', $params);
127
+		return Response::view( 'shop::catalog.tree', $params );
128 128
 	}
129 129
 }
130 130
\ No newline at end of file
Please login to merge, or discard this patch.
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\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', ['middleware' => ['web', 'auth']]), function() {
128
+Route::group( config( 'shop.routes.account', ['middleware' => ['web', 'auth']] ), function() {
129 129
 
130 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\AccountController@indexAction'
133
-	));
133
+	) );
134 134
 
135 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\AccountController@indexAction'
138
-	));
138
+	) );
139 139
 
140 140
 	Route::match( array( 'GET', 'POST' ), 'myaccount/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' ), 'myaccount', 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', ['middleware' => ['web']]), function() {
153
+Route::group( config( 'shop.routes.default', ['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' ), 'd/{d_name}/{d_prodid}/{d_pos?}', array(
161 161
 		'as' => 'aimeos_shop_detail',
162 162
 		'uses' => 'Aimeos\Shop\Controller\CatalogController@detailAction'
163
-	));
163
+	) );
164 164
 
165 165
 	Route::match( array( 'GET', 'POST' ), 'd/pin/{pin_action}/{pin_id}/{d_name?}', array(
166 166
 		'as' => 'aimeos_shop_session_pinned',
167 167
 		'uses' => 'Aimeos\Shop\Controller\CatalogController@detailAction'
168
-	));
168
+	) );
169 169
 
170 170
 	Route::match( array( 'GET', 'POST' ), 'list', array(
171 171
 		'as' => 'aimeos_shop_list',
172 172
 		'uses' => 'Aimeos\Shop\Controller\CatalogController@listAction'
173
-	));
173
+	) );
174 174
 
175 175
 	Route::match( array( 'GET', 'POST' ), 'c/{f_name}/{f_catid}', array(
176 176
 		'as' => 'aimeos_shop_tree',
177 177
 		'uses' => 'Aimeos\Shop\Controller\CatalogController@treeAction'
178
-	));
178
+	) );
179 179
 
180 180
 	Route::match( array( 'GET', 'POST' ), 'suggest', array(
181 181
 		'as' => 'aimeos_shop_suggest',
182 182
 		'uses' => 'Aimeos\Shop\Controller\CatalogController@suggestAction'
183
-	));
183
+	) );
184 184
 
185 185
 	Route::match( array( 'GET', 'POST' ), 'stock', array(
186 186
 		'as' => 'aimeos_shop_stock',
187 187
 		'uses' => 'Aimeos\Shop\Controller\CatalogController@stockAction'
188
-	));
188
+	) );
189 189
 
190 190
 	Route::match( array( 'GET', 'POST' ), 'basket', array(
191 191
 		'as' => 'aimeos_shop_basket',
192 192
 		'uses' => 'Aimeos\Shop\Controller\BasketController@indexAction'
193
-	));
193
+	) );
194 194
 
195 195
 	Route::match( array( 'GET', 'POST' ), 'checkout/{c_step?}', array(
196 196
 		'as' => 'aimeos_shop_checkout',
197 197
 		'uses' => 'Aimeos\Shop\Controller\CheckoutController@indexAction'
198
-	));
198
+	) );
199 199
 
200 200
 	Route::match( array( 'GET', 'POST' ), 'confirm/{code?}', array(
201 201
 		'as' => 'aimeos_shop_confirm',
202 202
 		'uses' => 'Aimeos\Shop\Controller\CheckoutController@confirmAction'
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
+) );
Please login to merge, or discard this patch.
tests/Controller/CatalogControllerTest.php 1 patch
Spacing   +19 added lines, -19 removed lines patch added patch discarded remove patch
@@ -5,66 +5,66 @@
 block discarded – undo
5 5
 	public function setUp()
6 6
 	{
7 7
 		parent::setUp();
8
-		View::addLocation(dirname(__DIR__).'/fixtures/views');
8
+		View::addLocation( dirname( __DIR__ ) . '/fixtures/views' );
9 9
 	}
10 10
 
11 11
 
12 12
 	public function testCountAction()
13 13
 	{
14
-		$response = $this->action('GET', '\Aimeos\Shop\Controller\CatalogController@countAction', ['site' => 'unittest']);
14
+		$response = $this->action( 'GET', '\Aimeos\Shop\Controller\CatalogController@countAction', ['site' => 'unittest'] );
15 15
 
16 16
 		$this->assertResponseOk();
17
-		$this->assertContains('.catalog-filter-count', $response->getContent());
18
-		$this->assertContains('.catalog-filter-attribute', $response->getContent());
17
+		$this->assertContains( '.catalog-filter-count', $response->getContent() );
18
+		$this->assertContains( '.catalog-filter-attribute', $response->getContent() );
19 19
 	}
20 20
 
21 21
 
22 22
 	public function testDetailAction()
23 23
 	{
24
-		$response = $this->action('GET', '\Aimeos\Shop\Controller\CatalogController@detailAction', ['site' => 'unittest', 'pin_action' => 'add', 'pin_id' => 0]);
24
+		$response = $this->action( 'GET', '\Aimeos\Shop\Controller\CatalogController@detailAction', ['site' => 'unittest', 'pin_action' => 'add', 'pin_id' => 0] );
25 25
 
26 26
 		$this->assertResponseOk();
27
-		$this->assertContains('<section class="aimeos catalog-stage"', $response->getContent());
28
-		$this->assertContains('<section class="aimeos catalog-detail"', $response->getContent());
29
-		$this->assertContains('<section class="aimeos catalog-session"', $response->getContent());
27
+		$this->assertContains( '<section class="aimeos catalog-stage"', $response->getContent() );
28
+		$this->assertContains( '<section class="aimeos catalog-detail"', $response->getContent() );
29
+		$this->assertContains( '<section class="aimeos catalog-session"', $response->getContent() );
30 30
 	}
31 31
 
32 32
 
33 33
 	public function testListAction()
34 34
 	{
35
-		$response = $this->action('GET', '\Aimeos\Shop\Controller\CatalogController@listAction', ['site' => 'unittest']);
35
+		$response = $this->action( 'GET', '\Aimeos\Shop\Controller\CatalogController@listAction', ['site' => 'unittest'] );
36 36
 
37 37
 		$this->assertResponseOk();
38
-		$this->assertContains('<section class="aimeos catalog-filter"', $response->getContent());
39
-		$this->assertContains('<section class="aimeos catalog-list"', $response->getContent());
38
+		$this->assertContains( '<section class="aimeos catalog-filter"', $response->getContent() );
39
+		$this->assertContains( '<section class="aimeos catalog-list"', $response->getContent() );
40 40
 	}
41 41
 
42 42
 
43 43
 	public function testStockAction()
44 44
 	{
45
-		$response = $this->action('GET', '\Aimeos\Shop\Controller\CatalogController@stockAction', ['site' => 'unittest']);
45
+		$response = $this->action( 'GET', '\Aimeos\Shop\Controller\CatalogController@stockAction', ['site' => 'unittest'] );
46 46
 
47 47
 		$this->assertResponseOk();
48
-		$this->assertContains('.aimeos .product .stock', $response->getContent());
48
+		$this->assertContains( '.aimeos .product .stock', $response->getContent() );
49 49
 	}
50 50
 
51 51
 
52 52
 	public function testSuggestAction()
53 53
 	{
54
-		$response = $this->action('GET', '\Aimeos\Shop\Controller\CatalogController@suggestAction', ['site' => 'unittest'], ['f_search' => 'Cafe']);
54
+		$response = $this->action( 'GET', '\Aimeos\Shop\Controller\CatalogController@suggestAction', ['site' => 'unittest'], ['f_search' => 'Cafe'] );
55 55
 
56 56
 		$this->assertResponseOk();
57
-		$this->assertRegexp('/[{.*}]/', $response->getContent());
57
+		$this->assertRegexp( '/[{.*}]/', $response->getContent() );
58 58
 	}
59 59
 
60 60
 
61 61
 	public function testTreeAction()
62 62
 	{
63
-		$response = $this->action('GET', '\Aimeos\Shop\Controller\CatalogController@treeAction', ['site' => 'unittest', 'f_catid' => 1, 'f_name' => 'test']);
63
+		$response = $this->action( 'GET', '\Aimeos\Shop\Controller\CatalogController@treeAction', ['site' => 'unittest', 'f_catid' => 1, 'f_name' => 'test'] );
64 64
 
65 65
 		$this->assertResponseOk();
66
-		$this->assertContains('<section class="aimeos catalog-filter', $response->getContent());
67
-		$this->assertContains('<section class="aimeos catalog-stage', $response->getContent());
68
-		$this->assertContains('<section class="aimeos catalog-list', $response->getContent());
66
+		$this->assertContains( '<section class="aimeos catalog-filter', $response->getContent() );
67
+		$this->assertContains( '<section class="aimeos catalog-stage', $response->getContent() );
68
+		$this->assertContains( '<section class="aimeos catalog-list', $response->getContent() );
69 69
 	}
70 70
 }
71 71
\ No newline at end of file
Please login to merge, or discard this patch.