Completed
Push — master ( 74bf43...ea64de )
by Aimeos
14:12
created
src/Aimeos/Shop/Controller/JsonapiController.php 1 patch
Spacing   +19 added lines, -19 removed lines patch added patch discarded remove patch
@@ -33,9 +33,9 @@  discard block
 block discarded – undo
33 33
 	 * @param \Psr\Http\Message\ServerRequestInterface $request Request object
34 34
 	 * @return \Psr\Http\Message\ResponseInterface Response object containing the generated output
35 35
 	 */
36
-	public function deleteAction( ServerRequestInterface $request )
36
+	public function deleteAction(ServerRequestInterface $request)
37 37
 	{
38
-		return $this->createClient()->delete( $request, new Response() );
38
+		return $this->createClient()->delete($request, new Response());
39 39
 	}
40 40
 
41 41
 
@@ -45,9 +45,9 @@  discard block
 block discarded – undo
45 45
 	 * @param \Psr\Http\Message\ServerRequestInterface $request Request object
46 46
 	 * @return \Psr\Http\Message\ResponseInterface Response object containing the generated output
47 47
 	 */
48
-	public function getAction( ServerRequestInterface $request )
48
+	public function getAction(ServerRequestInterface $request)
49 49
 	{
50
-		return $this->createClient()->get( $request, new Response() );
50
+		return $this->createClient()->get($request, new Response());
51 51
 	}
52 52
 
53 53
 
@@ -57,9 +57,9 @@  discard block
 block discarded – undo
57 57
 	 * @param \Psr\Http\Message\ServerRequestInterface $request Request object
58 58
 	 * @return \Psr\Http\Message\ResponseInterface Response object containing the generated output
59 59
 	 */
60
-	public function patchAction( ServerRequestInterface $request )
60
+	public function patchAction(ServerRequestInterface $request)
61 61
 	{
62
-		return $this->createClient()->patch( $request, new Response() );
62
+		return $this->createClient()->patch($request, new Response());
63 63
 	}
64 64
 
65 65
 
@@ -69,9 +69,9 @@  discard block
 block discarded – undo
69 69
 	 * @param \Psr\Http\Message\ServerRequestInterface $request Request object
70 70
 	 * @return \Psr\Http\Message\ResponseInterface Response object containing the generated output
71 71
 	 */
72
-	public function postAction( ServerRequestInterface $request )
72
+	public function postAction(ServerRequestInterface $request)
73 73
 	{
74
-		return $this->createClient()->post( $request, new Response() );
74
+		return $this->createClient()->post($request, new Response());
75 75
 	}
76 76
 
77 77
 
@@ -81,9 +81,9 @@  discard block
 block discarded – undo
81 81
 	 * @param \Psr\Http\Message\ServerRequestInterface $request Request object
82 82
 	 * @return \Psr\Http\Message\ResponseInterface Response object containing the generated output
83 83
 	 */
84
-	public function putAction( ServerRequestInterface $request )
84
+	public function putAction(ServerRequestInterface $request)
85 85
 	{
86
-		return $this->createClient()->put( $request, new Response() );
86
+		return $this->createClient()->put($request, new Response());
87 87
 	}
88 88
 
89 89
 
@@ -93,9 +93,9 @@  discard block
 block discarded – undo
93 93
 	 * @param \Psr\Http\Message\ServerRequestInterface $request Request object
94 94
 	 * @return \Psr\Http\Message\ResponseInterface Response object containing the generated output
95 95
 	 */
96
-	public function optionsAction( ServerRequestInterface $request )
96
+	public function optionsAction(ServerRequestInterface $request)
97 97
 	{
98
-		return $this->createClient()->options( $request, new Response() );
98
+		return $this->createClient()->options($request, new Response());
99 99
 	}
100 100
 
101 101
 
@@ -106,15 +106,15 @@  discard block
 block discarded – undo
106 106
 	 */
107 107
 	protected function createClient()
108 108
 	{
109
-		$site = Route::input( 'site', Input::get( 'site', 'default' ) );
110
-		$lang = Input::get( 'lang', config( 'app.locale', 'en' ) );
111
-		$resource = Route::input( 'resource' );
109
+		$site = Route::input('site', Input::get('site', 'default'));
110
+		$lang = Input::get('lang', config('app.locale', 'en'));
111
+		$resource = Route::input('resource');
112 112
 
113
-		$tmplPaths = app( '\Aimeos\Shop\Base\Aimeos' )->get()->getCustomPaths( 'client/jsonapi/templates' );
113
+		$tmplPaths = app('\Aimeos\Shop\Base\Aimeos')->get()->getCustomPaths('client/jsonapi/templates');
114 114
 
115
-		$context = app( '\Aimeos\Shop\Base\Context' )->get();
116
-		$context->setView( app( '\Aimeos\Shop\Base\View' )->create( $context, $tmplPaths, $lang ) );
115
+		$context = app('\Aimeos\Shop\Base\Context')->get();
116
+		$context->setView(app('\Aimeos\Shop\Base\View')->create($context, $tmplPaths, $lang));
117 117
 
118
-		return \Aimeos\Client\JsonApi\Factory::createClient( $context, $tmplPaths, $resource );
118
+		return \Aimeos\Client\JsonApi\Factory::createClient($context, $tmplPaths, $resource);
119 119
 	}
120 120
 }
Please login to merge, or discard this patch.
src/routes.php 1 patch
Spacing   +55 added lines, -55 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,144 +12,144 @@  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
-	Route::match( array( 'DELETE' ), 'jsonadm/{resource}/{id?}', array(
67
+	Route::match(array('DELETE'), 'jsonadm/{resource}/{id?}', array(
68 68
 		'as' => 'aimeos_shop_jsonadm_delete',
69 69
 		'uses' => 'Aimeos\Shop\Controller\JsonadmController@deleteAction'
70
-	))->where( array( 'resource' => '[^0-9]+', 'id' => '[0-9]*' ) );
70
+	))->where(array('resource' => '[^0-9]+', 'id' => '[0-9]*'));
71 71
 
72
-	Route::match( array( 'GET' ), 'jsonadm/{resource}/{id?}', array(
72
+	Route::match(array('GET'), 'jsonadm/{resource}/{id?}', array(
73 73
 		'as' => 'aimeos_shop_jsonadm_get',
74 74
 		'uses' => 'Aimeos\Shop\Controller\JsonadmController@getAction'
75
-	))->where( array( 'resource' => '[^0-9]+', 'id' => '[0-9]*' ) );
75
+	))->where(array('resource' => '[^0-9]+', 'id' => '[0-9]*'));
76 76
 
77
-	Route::match( array( 'PATCH' ), 'jsonadm/{resource}/{id?}', array(
77
+	Route::match(array('PATCH'), 'jsonadm/{resource}/{id?}', array(
78 78
 		'as' => 'aimeos_shop_jsonadm_patch',
79 79
 		'uses' => 'Aimeos\Shop\Controller\JsonadmController@patchAction'
80
-	))->where( array( 'resource' => '[^0-9]+', 'id' => '[0-9]*' ) );
80
+	))->where(array('resource' => '[^0-9]+', 'id' => '[0-9]*'));
81 81
 
82
-	Route::match( array( 'POST' ), 'jsonadm/{resource}/{id?}', array(
82
+	Route::match(array('POST'), 'jsonadm/{resource}/{id?}', array(
83 83
 		'as' => 'aimeos_shop_jsonadm_post',
84 84
 		'uses' => 'Aimeos\Shop\Controller\JsonadmController@postAction'
85
-	))->where( array( 'resource' => '[^0-9]+', 'id' => '[0-9]*' ) );
85
+	))->where(array('resource' => '[^0-9]+', 'id' => '[0-9]*'));
86 86
 
87
-	Route::match( array( 'PUT' ), 'jsonadm/{resource}/{id?}', array(
87
+	Route::match(array('PUT'), 'jsonadm/{resource}/{id?}', array(
88 88
 		'as' => 'aimeos_shop_jsonadm_put',
89 89
 		'uses' => 'Aimeos\Shop\Controller\JsonadmController@putAction'
90
-	))->where( array( 'resource' => '[^0-9]+', 'id' => '[0-9]*' ) );
90
+	))->where(array('resource' => '[^0-9]+', 'id' => '[0-9]*'));
91 91
 
92
-	Route::match( array( 'OPTIONS' ), 'jsonadm/{resource?}', array(
92
+	Route::match(array('OPTIONS'), 'jsonadm/{resource?}', array(
93 93
 		'as' => 'aimeos_shop_jsonadm_options',
94 94
 		'uses' => 'Aimeos\Shop\Controller\JsonadmController@optionsAction'
95
-	))->where( array( 'resource' => '[^0-9]*' ) );
95
+	))->where(array('resource' => '[^0-9]*'));
96 96
 
97 97
 });
98 98
 
99 99
 
100 100
 Route::group(config('shop.routes.jsonapi', ['middleware' => ['web']]), function() {
101 101
 
102
-	Route::match( array( 'DELETE' ), 'jsonapi/{resource}/{id?}', array(
102
+	Route::match(array('DELETE'), 'jsonapi/{resource}/{id?}', array(
103 103
 		'as' => 'aimeos_shop_jsonapi_delete',
104 104
 		'uses' => 'Aimeos\Shop\Controller\JsonapiController@deleteAction'
105
-	))->where( array( 'resource' => '[^0-9]+', 'id' => '[0-9]*' ) );
105
+	))->where(array('resource' => '[^0-9]+', 'id' => '[0-9]*'));
106 106
 
107
-	Route::match( array( 'GET' ), 'jsonapi/{resource}/{id?}', array(
107
+	Route::match(array('GET'), 'jsonapi/{resource}/{id?}', array(
108 108
 		'as' => 'aimeos_shop_jsonapi_get',
109 109
 		'uses' => 'Aimeos\Shop\Controller\JsonapiController@getAction'
110
-	))->where( array( 'resource' => '[^0-9]+', 'id' => '[0-9]*' ) );
110
+	))->where(array('resource' => '[^0-9]+', 'id' => '[0-9]*'));
111 111
 
112
-	Route::match( array( 'PATCH' ), 'jsonapi/{resource}/{id?}', array(
112
+	Route::match(array('PATCH'), 'jsonapi/{resource}/{id?}', array(
113 113
 		'as' => 'aimeos_shop_jsonapi_patch',
114 114
 		'uses' => 'Aimeos\Shop\Controller\JsonapiController@patchAction'
115
-	))->where( array( 'resource' => '[^0-9]+', 'id' => '[0-9]*' ) );
115
+	))->where(array('resource' => '[^0-9]+', 'id' => '[0-9]*'));
116 116
 
117
-	Route::match( array( 'POST' ), 'jsonapi/{resource}/{id?}', array(
117
+	Route::match(array('POST'), 'jsonapi/{resource}/{id?}', array(
118 118
 		'as' => 'aimeos_shop_jsonapi_post',
119 119
 		'uses' => 'Aimeos\Shop\Controller\JsonapiController@postAction'
120
-	))->where( array( 'resource' => '[^0-9]+', 'id' => '[0-9]*' ) );
120
+	))->where(array('resource' => '[^0-9]+', 'id' => '[0-9]*'));
121 121
 
122
-	Route::match( array( 'PUT' ), 'jsonapi/{resource}/{id?}', array(
122
+	Route::match(array('PUT'), 'jsonapi/{resource}/{id?}', array(
123 123
 		'as' => 'aimeos_shop_jsonapi_put',
124 124
 		'uses' => 'Aimeos\Shop\Controller\JsonapiController@putAction'
125
-	))->where( array( 'resource' => '[^0-9]+', 'id' => '[0-9]*' ) );
125
+	))->where(array('resource' => '[^0-9]+', 'id' => '[0-9]*'));
126 126
 
127
-	Route::match( array( 'OPTIONS' ), 'jsonapi/{resource?}', array(
127
+	Route::match(array('OPTIONS'), 'jsonapi/{resource?}', array(
128 128
 		'as' => 'aimeos_shop_jsonapi_options',
129 129
 		'uses' => 'Aimeos\Shop\Controller\JsonapiController@optionsAction'
130
-	))->where( array( 'resource' => '[^0-9]*' ) );
130
+	))->where(array('resource' => '[^0-9]*'));
131 131
 
132 132
 });
133 133
 
134 134
 
135 135
 Route::group(config('shop.routes.account', ['middleware' => ['web', 'auth']]), function() {
136 136
 
137
-	Route::match( array( 'GET', 'POST' ), 'myaccount', array(
137
+	Route::match(array('GET', 'POST'), 'myaccount', array(
138 138
 		'as' => 'aimeos_shop_account',
139 139
 		'uses' => 'Aimeos\Shop\Controller\AccountController@indexAction'
140 140
 	));
141 141
 
142
-	Route::match( array( 'GET', 'POST' ), 'myaccount/favorite/{fav_action?}/{fav_id?}/{d_prodid?}/{d_name?}/{d_pos?}', array(
142
+	Route::match(array('GET', 'POST'), 'myaccount/favorite/{fav_action?}/{fav_id?}/{d_prodid?}/{d_name?}/{d_pos?}', array(
143 143
 		'as' => 'aimeos_shop_account_favorite',
144 144
 		'uses' => 'Aimeos\Shop\Controller\AccountController@indexAction'
145 145
 	));
146 146
 
147
-	Route::match( array( 'GET', 'POST' ), 'myaccount/watch/{wat_action?}/{wat_id?}/{d_prodid?}/{d_name?}/{d_pos?}', array(
147
+	Route::match(array('GET', 'POST'), 'myaccount/watch/{wat_action?}/{wat_id?}/{d_prodid?}/{d_name?}/{d_pos?}', array(
148 148
 		'as' => 'aimeos_shop_account_watch',
149 149
 		'uses' => 'Aimeos\Shop\Controller\AccountController@indexAction'
150 150
 	));
151 151
 
152
-	Route::match( array( 'GET', 'POST' ), 'myaccount/download/{dl_id}', array(
152
+	Route::match(array('GET', 'POST'), 'myaccount/download/{dl_id}', array(
153 153
 		'as' => 'aimeos_shop_account_download',
154 154
 		'uses' => 'Aimeos\Shop\Controller\AccountController@downloadAction'
155 155
 	));
@@ -159,42 +159,42 @@  discard block
 block discarded – undo
159 159
 
160 160
 Route::group(config('shop.routes.default', ['middleware' => ['web']]), function() {
161 161
 
162
-	Route::match( array( 'GET', 'POST' ), 'count', array(
162
+	Route::match(array('GET', 'POST'), 'count', array(
163 163
 		'as' => 'aimeos_shop_count',
164 164
 		'uses' => 'Aimeos\Shop\Controller\CatalogController@countAction'
165 165
 	));
166 166
 
167
-	Route::match( array( 'GET', 'POST' ), 'detail/{d_prodid}/{d_name?}/{d_pos?}', array(
167
+	Route::match(array('GET', 'POST'), 'detail/{d_prodid}/{d_name?}/{d_pos?}', array(
168 168
 		'as' => 'aimeos_shop_detail',
169 169
 		'uses' => 'Aimeos\Shop\Controller\CatalogController@detailAction'
170 170
 	));
171 171
 
172
-	Route::match( array( 'GET', 'POST' ), 'detail/pin/{pin_action?}/{pin_id?}/{d_prodid?}/{d_name?}/{d_pos?}', array(
172
+	Route::match(array('GET', 'POST'), 'detail/pin/{pin_action?}/{pin_id?}/{d_prodid?}/{d_name?}/{d_pos?}', array(
173 173
 		'as' => 'aimeos_shop_session_pinned',
174 174
 		'uses' => 'Aimeos\Shop\Controller\CatalogController@detailAction'
175 175
 	));
176 176
 
177
-	Route::match( array( 'GET', 'POST' ), 'list', array(
177
+	Route::match(array('GET', 'POST'), 'list', array(
178 178
 		'as' => 'aimeos_shop_list',
179 179
 		'uses' => 'Aimeos\Shop\Controller\CatalogController@listAction'
180 180
 	));
181 181
 
182
-	Route::match( array( 'GET', 'POST' ), 'suggest', array(
182
+	Route::match(array('GET', 'POST'), 'suggest', array(
183 183
 		'as' => 'aimeos_shop_suggest',
184 184
 		'uses' => 'Aimeos\Shop\Controller\CatalogController@suggestAction'
185 185
 	));
186 186
 
187
-	Route::match( array( 'GET', 'POST' ), 'stock', array(
187
+	Route::match(array('GET', 'POST'), 'stock', array(
188 188
 		'as' => 'aimeos_shop_stock',
189 189
 		'uses' => 'Aimeos\Shop\Controller\CatalogController@stockAction'
190 190
 	));
191 191
 
192
-	Route::match( array( 'GET', 'POST' ), 'basket', array(
192
+	Route::match(array('GET', 'POST'), 'basket', array(
193 193
 		'as' => 'aimeos_shop_basket',
194 194
 		'uses' => 'Aimeos\Shop\Controller\BasketController@indexAction'
195 195
 	));
196 196
 
197
-	Route::match( array( 'GET', 'POST' ), 'checkout/{c_step?}', array(
197
+	Route::match(array('GET', 'POST'), 'checkout/{c_step?}', array(
198 198
 		'as' => 'aimeos_shop_checkout',
199 199
 		'uses' => 'Aimeos\Shop\Controller\CheckoutController@indexAction'
200 200
 	));
@@ -204,7 +204,7 @@  discard block
 block discarded – undo
204 204
 
205 205
 Route::group(config('shop.routes.confirm', ['middleware' => ['web']]), function() {
206 206
 
207
-	Route::match( array( 'GET', 'POST' ), 'confirm', array(
207
+	Route::match(array('GET', 'POST'), 'confirm', array(
208 208
 		'as' => 'aimeos_shop_confirm',
209 209
 		'uses' => 'Aimeos\Shop\Controller\CheckoutController@confirmAction'
210 210
 	));
@@ -214,7 +214,7 @@  discard block
 block discarded – undo
214 214
 
215 215
 Route::group(config('shop.routes.update', []), function() {
216 216
 
217
-	Route::match( array( 'GET', 'POST' ), 'update', array(
217
+	Route::match(array('GET', 'POST'), 'update', array(
218 218
 		'as' => 'aimeos_shop_update',
219 219
 		'uses' => 'Aimeos\Shop\Controller\CheckoutController@updateAction'
220 220
 	));
Please login to merge, or discard this patch.