Completed
Push — master ( 8fee28...58868a )
by Aimeos
15:08
created
src/Aimeos/Shop/Controller/JsonapiController.php 1 patch
Spacing   +19 added lines, -19 removed lines patch added patch discarded remove patch
@@ -31,9 +31,9 @@  discard block
 block discarded – undo
31 31
 	 * @param \Psr\Http\Message\ServerRequestInterface $request Request object
32 32
 	 * @return \Psr\Http\Message\ResponseInterface Response object containing the generated output
33 33
 	 */
34
-	public function deleteAction( ServerRequestInterface $request )
34
+	public function deleteAction(ServerRequestInterface $request)
35 35
 	{
36
-		return $this->createClient()->delete( $request, new Response() );
36
+		return $this->createClient()->delete($request, new Response());
37 37
 	}
38 38
 
39 39
 
@@ -43,9 +43,9 @@  discard block
 block discarded – undo
43 43
 	 * @param \Psr\Http\Message\ServerRequestInterface $request Request object
44 44
 	 * @return \Psr\Http\Message\ResponseInterface Response object containing the generated output
45 45
 	 */
46
-	public function getAction( ServerRequestInterface $request )
46
+	public function getAction(ServerRequestInterface $request)
47 47
 	{
48
-		return $this->createClient()->get( $request, new Response() );
48
+		return $this->createClient()->get($request, new Response());
49 49
 	}
50 50
 
51 51
 
@@ -55,9 +55,9 @@  discard block
 block discarded – undo
55 55
 	 * @param \Psr\Http\Message\ServerRequestInterface $request Request object
56 56
 	 * @return \Psr\Http\Message\ResponseInterface Response object containing the generated output
57 57
 	 */
58
-	public function patchAction( ServerRequestInterface $request )
58
+	public function patchAction(ServerRequestInterface $request)
59 59
 	{
60
-		return $this->createClient()->patch( $request, new Response() );
60
+		return $this->createClient()->patch($request, new Response());
61 61
 	}
62 62
 
63 63
 
@@ -67,9 +67,9 @@  discard block
 block discarded – undo
67 67
 	 * @param \Psr\Http\Message\ServerRequestInterface $request Request object
68 68
 	 * @return \Psr\Http\Message\ResponseInterface Response object containing the generated output
69 69
 	 */
70
-	public function postAction( ServerRequestInterface $request )
70
+	public function postAction(ServerRequestInterface $request)
71 71
 	{
72
-		return $this->createClient()->post( $request, new Response() );
72
+		return $this->createClient()->post($request, new Response());
73 73
 	}
74 74
 
75 75
 
@@ -79,9 +79,9 @@  discard block
 block discarded – undo
79 79
 	 * @param \Psr\Http\Message\ServerRequestInterface $request Request object
80 80
 	 * @return \Psr\Http\Message\ResponseInterface Response object containing the generated output
81 81
 	 */
82
-	public function putAction( ServerRequestInterface $request )
82
+	public function putAction(ServerRequestInterface $request)
83 83
 	{
84
-		return $this->createClient()->put( $request, new Response() );
84
+		return $this->createClient()->put($request, new Response());
85 85
 	}
86 86
 
87 87
 
@@ -91,9 +91,9 @@  discard block
 block discarded – undo
91 91
 	 * @param \Psr\Http\Message\ServerRequestInterface $request Request object
92 92
 	 * @return \Psr\Http\Message\ResponseInterface Response object containing the generated output
93 93
 	 */
94
-	public function optionsAction( ServerRequestInterface $request )
94
+	public function optionsAction(ServerRequestInterface $request)
95 95
 	{
96
-		return $this->createClient()->options( $request, new Response() );
96
+		return $this->createClient()->options($request, new Response());
97 97
 	}
98 98
 
99 99
 
@@ -104,17 +104,17 @@  discard block
 block discarded – undo
104 104
 	 */
105 105
 	protected function createClient()
106 106
 	{
107
-		$resource = Route::input( 'resource' );
108
-		$related = Input::get( 'related' );
107
+		$resource = Route::input('resource');
108
+		$related = Input::get('related');
109 109
 
110
-		$aimeos = app( '\Aimeos\Shop\Base\Aimeos' )->get();
111
-		$tmplPaths = $aimeos->getCustomPaths( 'client/jsonapi/templates' );
110
+		$aimeos = app('\Aimeos\Shop\Base\Aimeos')->get();
111
+		$tmplPaths = $aimeos->getCustomPaths('client/jsonapi/templates');
112 112
 
113
-		$context = app( '\Aimeos\Shop\Base\Context' )->get();
113
+		$context = app('\Aimeos\Shop\Base\Context')->get();
114 114
 		$langid = $context->getLocale()->getLanguageId();
115 115
 
116
-		$context->setView( app( '\Aimeos\Shop\Base\View' )->create( $context, $tmplPaths, $langid ) );
116
+		$context->setView(app('\Aimeos\Shop\Base\View')->create($context, $tmplPaths, $langid));
117 117
 
118
-		return \Aimeos\Client\JsonApi\Factory::createClient( $context, $tmplPaths, $resource . '/' . $related );
118
+		return \Aimeos\Client\JsonApi\Factory::createClient($context, $tmplPaths, $resource.'/'.$related);
119 119
 	}
120 120
 }
Please login to merge, or discard this patch.
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.login', ['middleware' => ['web']]), function() {
4 4
 
5
-	Route::match( array( 'GET' ), 'admin', array(
5
+	Route::match(array('GET'), 'admin', array(
6 6
 		'as' => 'aimeos_shop_admin',
7 7
 		'uses' => 'Aimeos\Shop\Controller\AdminController@indexAction'
8 8
 	));
@@ -12,123 +12,123 @@  discard block
 block discarded – undo
12 12
 
13 13
 Route::group(config('shop.routes.admin', ['middleware' => ['web', 'auth']]), function() {
14 14
 
15
-	Route::match( array( 'GET' ), 'extadm', array(
15
+	Route::match(array('GET'), 'extadm', array(
16 16
 		'as' => 'aimeos_shop_extadm',
17 17
 		'uses' => 'Aimeos\Shop\Controller\ExtadmController@indexAction'
18 18
 	));
19 19
 
20
-	Route::match( array( 'GET' ), 'extadm/file', array(
20
+	Route::match(array('GET'), 'extadm/file', array(
21 21
 		'as' => 'aimeos_shop_extadm_file',
22 22
 		'uses' => 'Aimeos\Shop\Controller\ExtadmController@fileAction'
23 23
 	));
24 24
 
25
-	Route::match( array( 'POST' ), 'extadm/do', array(
25
+	Route::match(array('POST'), 'extadm/do', array(
26 26
 		'as' => 'aimeos_shop_extadm_json',
27 27
 		'uses' => 'Aimeos\Shop\Controller\ExtadmController@doAction'
28 28
 	));
29 29
 
30 30
 
31
-	Route::match( array( 'GET' ), 'jqadm/file/{type}', array(
31
+	Route::match(array('GET'), 'jqadm/file/{type}', array(
32 32
 		'as' => 'aimeos_shop_jqadm_file',
33 33
 		'uses' => 'Aimeos\Shop\Controller\JqadmController@fileAction'
34 34
 	));
35 35
 
36
-	Route::match( array( 'GET', 'POST' ), 'jqadm/copy/{resource}/{id}', array(
36
+	Route::match(array('GET', 'POST'), 'jqadm/copy/{resource}/{id}', array(
37 37
 		'as' => 'aimeos_shop_jqadm_copy',
38 38
 		'uses' => 'Aimeos\Shop\Controller\JqadmController@copyAction'
39
-	))->where( array( 'resource' => '[^0-9]+', 'id' => '[0-9]+' ) );
39
+	))->where(array('resource' => '[^0-9]+', 'id' => '[0-9]+'));
40 40
 
41
-	Route::match( array( 'GET', 'POST' ), 'jqadm/create/{resource}', array(
41
+	Route::match(array('GET', 'POST'), 'jqadm/create/{resource}', array(
42 42
 		'as' => 'aimeos_shop_jqadm_create',
43 43
 		'uses' => 'Aimeos\Shop\Controller\JqadmController@createAction'
44
-	))->where( array( 'resource' => '[^0-9]+' ) );
44
+	))->where(array('resource' => '[^0-9]+'));
45 45
 
46
-	Route::match( array( 'GET', 'POST' ), 'jqadm/delete/{resource}/{id}', array(
46
+	Route::match(array('GET', 'POST'), 'jqadm/delete/{resource}/{id}', array(
47 47
 		'as' => 'aimeos_shop_jqadm_delete',
48 48
 		'uses' => 'Aimeos\Shop\Controller\JqadmController@deleteAction'
49
-	))->where( array( 'resource' => '[^0-9]+', 'id' => '[0-9]+' ) );
49
+	))->where(array('resource' => '[^0-9]+', 'id' => '[0-9]+'));
50 50
 
51
-	Route::match( array( 'GET' ), 'jqadm/get/{resource}/{id}', array(
51
+	Route::match(array('GET'), 'jqadm/get/{resource}/{id}', array(
52 52
 		'as' => 'aimeos_shop_jqadm_get',
53 53
 		'uses' => 'Aimeos\Shop\Controller\JqadmController@getAction'
54
-	))->where( array( 'resource' => '[^0-9]*', 'id' => '[0-9]+' ) );
54
+	))->where(array('resource' => '[^0-9]*', 'id' => '[0-9]+'));
55 55
 
56
-	Route::match( array( 'POST' ), 'jqadm/save/{resource}/{id?}', array(
56
+	Route::match(array('POST'), 'jqadm/save/{resource}/{id?}', array(
57 57
 		'as' => 'aimeos_shop_jqadm_save',
58 58
 		'uses' => 'Aimeos\Shop\Controller\JqadmController@saveAction'
59
-	))->where( array( 'resource' => '[^0-9]+', 'id' => '[0-9]*' ) );
59
+	))->where(array('resource' => '[^0-9]+', 'id' => '[0-9]*'));
60 60
 
61
-	Route::match( array( 'GET', 'POST' ), 'jqadm/search/{resource}', array(
61
+	Route::match(array('GET', 'POST'), 'jqadm/search/{resource}', array(
62 62
 		'as' => 'aimeos_shop_jqadm_search',
63 63
 		'uses' => 'Aimeos\Shop\Controller\JqadmController@searchAction'
64
-	))->where( array( 'resource' => '[^0-9]+' ) );
64
+	))->where(array('resource' => '[^0-9]+'));
65 65
 
66 66
 });
67 67
 
68 68
 
69 69
 Route::group(config('shop.routes.jsonadm', ['middleware' => ['api', 'auth']]), function() {
70 70
 
71
-	Route::match( array( 'DELETE' ), 'jsonadm/{resource}/{id?}', array(
71
+	Route::match(array('DELETE'), 'jsonadm/{resource}/{id?}', array(
72 72
 		'as' => 'aimeos_shop_jsonadm_delete',
73 73
 		'uses' => 'Aimeos\Shop\Controller\JsonadmController@deleteAction'
74
-	))->where( array( 'resource' => '[^0-9]+', 'id' => '[0-9]*' ) );
74
+	))->where(array('resource' => '[^0-9]+', 'id' => '[0-9]*'));
75 75
 
76
-	Route::match( array( 'GET' ), 'jsonadm/{resource}/{id?}', array(
76
+	Route::match(array('GET'), 'jsonadm/{resource}/{id?}', array(
77 77
 		'as' => 'aimeos_shop_jsonadm_get',
78 78
 		'uses' => 'Aimeos\Shop\Controller\JsonadmController@getAction'
79
-	))->where( array( 'resource' => '[^0-9]+', 'id' => '[0-9]*' ) );
79
+	))->where(array('resource' => '[^0-9]+', 'id' => '[0-9]*'));
80 80
 
81
-	Route::match( array( 'PATCH' ), 'jsonadm/{resource}/{id?}', array(
81
+	Route::match(array('PATCH'), 'jsonadm/{resource}/{id?}', array(
82 82
 		'as' => 'aimeos_shop_jsonadm_patch',
83 83
 		'uses' => 'Aimeos\Shop\Controller\JsonadmController@patchAction'
84
-	))->where( array( 'resource' => '[^0-9]+', 'id' => '[0-9]*' ) );
84
+	))->where(array('resource' => '[^0-9]+', 'id' => '[0-9]*'));
85 85
 
86
-	Route::match( array( 'POST' ), 'jsonadm/{resource}/{id?}', array(
86
+	Route::match(array('POST'), 'jsonadm/{resource}/{id?}', array(
87 87
 		'as' => 'aimeos_shop_jsonadm_post',
88 88
 		'uses' => 'Aimeos\Shop\Controller\JsonadmController@postAction'
89
-	))->where( array( 'resource' => '[^0-9]+', 'id' => '[0-9]*' ) );
89
+	))->where(array('resource' => '[^0-9]+', 'id' => '[0-9]*'));
90 90
 
91
-	Route::match( array( 'PUT' ), 'jsonadm/{resource}/{id?}', array(
91
+	Route::match(array('PUT'), 'jsonadm/{resource}/{id?}', array(
92 92
 		'as' => 'aimeos_shop_jsonadm_put',
93 93
 		'uses' => 'Aimeos\Shop\Controller\JsonadmController@putAction'
94
-	))->where( array( 'resource' => '[^0-9]+', 'id' => '[0-9]*' ) );
94
+	))->where(array('resource' => '[^0-9]+', 'id' => '[0-9]*'));
95 95
 
96
-	Route::match( array( 'OPTIONS' ), 'jsonadm/{resource?}', array(
96
+	Route::match(array('OPTIONS'), 'jsonadm/{resource?}', array(
97 97
 		'as' => 'aimeos_shop_jsonadm_options',
98 98
 		'uses' => 'Aimeos\Shop\Controller\JsonadmController@optionsAction'
99
-	))->where( array( 'resource' => '[^0-9]*' ) );
99
+	))->where(array('resource' => '[^0-9]*'));
100 100
 
101 101
 });
102 102
 
103 103
 
104 104
 Route::group(config('shop.routes.jsonapi', ['middleware' => ['api']]), function() {
105 105
 
106
-	Route::match( array( 'DELETE' ), 'jsonapi/{resource}/{id?}', array(
106
+	Route::match(array('DELETE'), 'jsonapi/{resource}/{id?}', array(
107 107
 		'as' => 'aimeos_shop_jsonapi_delete',
108 108
 		'uses' => 'Aimeos\Shop\Controller\JsonapiController@deleteAction'
109 109
 	));
110 110
 
111
-	Route::match( array( 'GET' ), 'jsonapi/{resource}/{id?}', array(
111
+	Route::match(array('GET'), 'jsonapi/{resource}/{id?}', array(
112 112
 		'as' => 'aimeos_shop_jsonapi_get',
113 113
 		'uses' => 'Aimeos\Shop\Controller\JsonapiController@getAction'
114 114
 	));
115 115
 
116
-	Route::match( array( 'PATCH' ), 'jsonapi/{resource}/{id?}', array(
116
+	Route::match(array('PATCH'), 'jsonapi/{resource}/{id?}', array(
117 117
 		'as' => 'aimeos_shop_jsonapi_patch',
118 118
 		'uses' => 'Aimeos\Shop\Controller\JsonapiController@patchAction'
119 119
 	));
120 120
 
121
-	Route::match( array( 'POST' ), 'jsonapi/{resource}/{id?}', array(
121
+	Route::match(array('POST'), 'jsonapi/{resource}/{id?}', array(
122 122
 		'as' => 'aimeos_shop_jsonapi_post',
123 123
 		'uses' => 'Aimeos\Shop\Controller\JsonapiController@postAction'
124 124
 	));
125 125
 
126
-	Route::match( array( 'PUT' ), 'jsonapi/{resource}/{id?}', array(
126
+	Route::match(array('PUT'), 'jsonapi/{resource}/{id?}', array(
127 127
 		'as' => 'aimeos_shop_jsonapi_put',
128 128
 		'uses' => 'Aimeos\Shop\Controller\JsonapiController@putAction'
129 129
 	));
130 130
 
131
-	Route::match( array( 'OPTIONS' ), 'jsonapi/{resource?}', array(
131
+	Route::match(array('OPTIONS'), 'jsonapi/{resource?}', array(
132 132
 		'as' => 'aimeos_shop_jsonapi_options',
133 133
 		'uses' => 'Aimeos\Shop\Controller\JsonapiController@optionsAction'
134 134
 	));
@@ -138,22 +138,22 @@  discard block
 block discarded – undo
138 138
 
139 139
 Route::group(config('shop.routes.account', ['middleware' => ['web', 'auth']]), function() {
140 140
 
141
-	Route::match( array( 'GET', 'POST' ), 'myaccount', array(
141
+	Route::match(array('GET', 'POST'), 'myaccount', array(
142 142
 		'as' => 'aimeos_shop_account',
143 143
 		'uses' => 'Aimeos\Shop\Controller\AccountController@indexAction'
144 144
 	));
145 145
 
146
-	Route::match( array( 'GET', 'POST' ), 'myaccount/favorite/{fav_action?}/{fav_id?}/{d_prodid?}/{d_name?}/{d_pos?}', array(
146
+	Route::match(array('GET', 'POST'), 'myaccount/favorite/{fav_action?}/{fav_id?}/{d_prodid?}/{d_name?}/{d_pos?}', array(
147 147
 		'as' => 'aimeos_shop_account_favorite',
148 148
 		'uses' => 'Aimeos\Shop\Controller\AccountController@indexAction'
149 149
 	));
150 150
 
151
-	Route::match( array( 'GET', 'POST' ), 'myaccount/watch/{wat_action?}/{wat_id?}/{d_prodid?}/{d_name?}/{d_pos?}', array(
151
+	Route::match(array('GET', 'POST'), 'myaccount/watch/{wat_action?}/{wat_id?}/{d_prodid?}/{d_name?}/{d_pos?}', array(
152 152
 		'as' => 'aimeos_shop_account_watch',
153 153
 		'uses' => 'Aimeos\Shop\Controller\AccountController@indexAction'
154 154
 	));
155 155
 
156
-	Route::match( array( 'GET', 'POST' ), 'myaccount/download/{dl_id}', array(
156
+	Route::match(array('GET', 'POST'), 'myaccount/download/{dl_id}', array(
157 157
 		'as' => 'aimeos_shop_account_download',
158 158
 		'uses' => 'Aimeos\Shop\Controller\AccountController@downloadAction'
159 159
 	));
@@ -163,42 +163,42 @@  discard block
 block discarded – undo
163 163
 
164 164
 Route::group(config('shop.routes.default', ['middleware' => ['web']]), function() {
165 165
 
166
-	Route::match( array( 'GET', 'POST' ), 'count', array(
166
+	Route::match(array('GET', 'POST'), 'count', array(
167 167
 		'as' => 'aimeos_shop_count',
168 168
 		'uses' => 'Aimeos\Shop\Controller\CatalogController@countAction'
169 169
 	));
170 170
 
171
-	Route::match( array( 'GET', 'POST' ), 'detail/{d_prodid}/{d_name?}/{d_pos?}', array(
171
+	Route::match(array('GET', 'POST'), 'detail/{d_prodid}/{d_name?}/{d_pos?}', array(
172 172
 		'as' => 'aimeos_shop_detail',
173 173
 		'uses' => 'Aimeos\Shop\Controller\CatalogController@detailAction'
174 174
 	));
175 175
 
176
-	Route::match( array( 'GET', 'POST' ), 'detail/pin/{pin_action?}/{pin_id?}/{d_prodid?}/{d_name?}/{d_pos?}', array(
176
+	Route::match(array('GET', 'POST'), 'detail/pin/{pin_action?}/{pin_id?}/{d_prodid?}/{d_name?}/{d_pos?}', array(
177 177
 		'as' => 'aimeos_shop_session_pinned',
178 178
 		'uses' => 'Aimeos\Shop\Controller\CatalogController@detailAction'
179 179
 	));
180 180
 
181
-	Route::match( array( 'GET', 'POST' ), 'list', array(
181
+	Route::match(array('GET', 'POST'), 'list', array(
182 182
 		'as' => 'aimeos_shop_list',
183 183
 		'uses' => 'Aimeos\Shop\Controller\CatalogController@listAction'
184 184
 	));
185 185
 
186
-	Route::match( array( 'GET', 'POST' ), 'suggest', array(
186
+	Route::match(array('GET', 'POST'), 'suggest', array(
187 187
 		'as' => 'aimeos_shop_suggest',
188 188
 		'uses' => 'Aimeos\Shop\Controller\CatalogController@suggestAction'
189 189
 	));
190 190
 
191
-	Route::match( array( 'GET', 'POST' ), 'stock', array(
191
+	Route::match(array('GET', 'POST'), 'stock', array(
192 192
 		'as' => 'aimeos_shop_stock',
193 193
 		'uses' => 'Aimeos\Shop\Controller\CatalogController@stockAction'
194 194
 	));
195 195
 
196
-	Route::match( array( 'GET', 'POST' ), 'basket', array(
196
+	Route::match(array('GET', 'POST'), 'basket', array(
197 197
 		'as' => 'aimeos_shop_basket',
198 198
 		'uses' => 'Aimeos\Shop\Controller\BasketController@indexAction'
199 199
 	));
200 200
 
201
-	Route::match( array( 'GET', 'POST' ), 'checkout/{c_step?}', array(
201
+	Route::match(array('GET', 'POST'), 'checkout/{c_step?}', array(
202 202
 		'as' => 'aimeos_shop_checkout',
203 203
 		'uses' => 'Aimeos\Shop\Controller\CheckoutController@indexAction'
204 204
 	));
@@ -208,7 +208,7 @@  discard block
 block discarded – undo
208 208
 
209 209
 Route::group(config('shop.routes.confirm', ['middleware' => ['web']]), function() {
210 210
 
211
-	Route::match( array( 'GET', 'POST' ), 'confirm', array(
211
+	Route::match(array('GET', 'POST'), 'confirm', array(
212 212
 		'as' => 'aimeos_shop_confirm',
213 213
 		'uses' => 'Aimeos\Shop\Controller\CheckoutController@confirmAction'
214 214
 	));
@@ -218,7 +218,7 @@  discard block
 block discarded – undo
218 218
 
219 219
 Route::group(config('shop.routes.update', []), function() {
220 220
 
221
-	Route::match( array( 'GET', 'POST' ), 'update', array(
221
+	Route::match(array('GET', 'POST'), 'update', array(
222 222
 		'as' => 'aimeos_shop_update',
223 223
 		'uses' => 'Aimeos\Shop\Controller\CheckoutController@updateAction'
224 224
 	));
Please login to merge, or discard this patch.