Completed
Push — master ( 697e3b...a08d75 )
by Aimeos
02:01
created
src/Controller/Jqadm.php 1 patch
Spacing   +59 added lines, -59 removed lines patch added patch discarded remove patch
@@ -32,36 +32,36 @@  discard block
 block discarded – undo
32 32
 	 * @param array $args Associative list of route parameters
33 33
 	 * @return ResponseInterface $response Modified response object with generated output
34 34
 	 */
35
-	public static function fileAction( ContainerInterface $container, ServerRequestInterface $request, ResponseInterface $response, array $args )
35
+	public static function fileAction(ContainerInterface $container, ServerRequestInterface $request, ResponseInterface $response, array $args)
36 36
 	{
37 37
 		$contents = '';
38 38
 		$files = array();
39
-		$aimeos = $container->get( 'aimeos' );
40
-		$type = ( isset( $args['type'] ) ? $args['type'] : 'js' );
39
+		$aimeos = $container->get('aimeos');
40
+		$type = (isset($args['type']) ? $args['type'] : 'js');
41 41
 
42
-		foreach( $aimeos->getCustomPaths( 'admin/jqadm' ) as $base => $paths )
42
+		foreach ($aimeos->getCustomPaths('admin/jqadm') as $base => $paths)
43 43
 		{
44
-			foreach( $paths as $path )
44
+			foreach ($paths as $path)
45 45
 			{
46
-				$jsbAbsPath = $base . '/' . $path;
47
-				$jsb2 = new \Aimeos\MW\Jsb2\Standard( $jsbAbsPath, dirname( $jsbAbsPath ) );
48
-				$files = array_merge( $files, $jsb2->getFiles( $type ) );
46
+				$jsbAbsPath = $base.'/'.$path;
47
+				$jsb2 = new \Aimeos\MW\Jsb2\Standard($jsbAbsPath, dirname($jsbAbsPath));
48
+				$files = array_merge($files, $jsb2->getFiles($type));
49 49
 			}
50 50
 		}
51 51
 
52
-		foreach( $files as $file )
52
+		foreach ($files as $file)
53 53
 		{
54
-			if( ( $content = file_get_contents( $file ) ) !== false ) {
54
+			if (($content = file_get_contents($file)) !== false) {
55 55
 				$contents .= $content;
56 56
 			}
57 57
 		}
58 58
 
59
-		$response->getBody()->write( $contents );
59
+		$response->getBody()->write($contents);
60 60
 
61
-		if( $type === 'js' ) {
62
-			$response = $response->withHeader( 'Content-Type', 'application/javascript' );
63
-		} elseif( $type === 'css' ) {
64
-			$response = $response->withHeader( 'Content-Type', 'text/css' );
61
+		if ($type === 'js') {
62
+			$response = $response->withHeader('Content-Type', 'application/javascript');
63
+		} elseif ($type === 'css') {
64
+			$response = $response->withHeader('Content-Type', 'text/css');
65 65
 		}
66 66
 
67 67
 		return $response;
@@ -77,15 +77,15 @@  discard block
 block discarded – undo
77 77
 	 * @param array $args Associative list of route parameters
78 78
 	 * @return ResponseInterface $response Modified response object with generated output
79 79
 	 */
80
-	public static function copyAction( ContainerInterface $container, ServerRequestInterface $request, ResponseInterface $response, array $args )
80
+	public static function copyAction(ContainerInterface $container, ServerRequestInterface $request, ResponseInterface $response, array $args)
81 81
 	{
82
-		$cntl = self::createClient( $container, $request, $response, $args );
82
+		$cntl = self::createClient($container, $request, $response, $args);
83 83
 
84
-		if( ( $html = $cntl->copy() ) == '' ) {
84
+		if (($html = $cntl->copy()) == '') {
85 85
 			return $cntl->getView()->response();
86 86
 		}
87 87
 
88
-		return self::getHtml( $container, $response, $html );
88
+		return self::getHtml($container, $response, $html);
89 89
 	}
90 90
 
91 91
 
@@ -98,15 +98,15 @@  discard block
 block discarded – undo
98 98
 	 * @param array $args Associative list of route parameters
99 99
 	 * @return ResponseInterface $response Modified response object with generated output
100 100
 	 */
101
-	public static function createAction( ContainerInterface $container, ServerRequestInterface $request, ResponseInterface $response, array $args )
101
+	public static function createAction(ContainerInterface $container, ServerRequestInterface $request, ResponseInterface $response, array $args)
102 102
 	{
103
-		$cntl = self::createClient( $container, $request, $response, $args );
103
+		$cntl = self::createClient($container, $request, $response, $args);
104 104
 
105
-		if( ( $html = $cntl->create() ) == '' ) {
105
+		if (($html = $cntl->create()) == '') {
106 106
 			return $cntl->getView()->response();
107 107
 		}
108 108
 
109
-		return self::getHtml( $container, $response, $html );
109
+		return self::getHtml($container, $response, $html);
110 110
 	}
111 111
 
112 112
 
@@ -119,15 +119,15 @@  discard block
 block discarded – undo
119 119
 	 * @param array $args Associative list of route parameters
120 120
 	 * @return ResponseInterface $response Modified response object with generated output
121 121
 	 */
122
-	public static function deleteAction( ContainerInterface $container, ServerRequestInterface $request, ResponseInterface $response, array $args )
122
+	public static function deleteAction(ContainerInterface $container, ServerRequestInterface $request, ResponseInterface $response, array $args)
123 123
 	{
124
-		$cntl = self::createClient( $container, $request, $response, $args );
124
+		$cntl = self::createClient($container, $request, $response, $args);
125 125
 
126
-		if( ( $html = $cntl->delete() ) == '' ) {
126
+		if (($html = $cntl->delete()) == '') {
127 127
 			return $cntl->getView()->response();
128 128
 		}
129 129
 
130
-		return self::getHtml( $container, $response, $html );
130
+		return self::getHtml($container, $response, $html);
131 131
 	}
132 132
 
133 133
 
@@ -140,15 +140,15 @@  discard block
 block discarded – undo
140 140
 	 * @param array $args Associative list of route parameters
141 141
 	 * @return ResponseInterface $response Modified response object with generated output
142 142
 	 */
143
-	public static function exportAction( ContainerInterface $container, ServerRequestInterface $request, ResponseInterface $response, array $args )
143
+	public static function exportAction(ContainerInterface $container, ServerRequestInterface $request, ResponseInterface $response, array $args)
144 144
 	{
145
-		$cntl = self::createClient( $container, $request, $response, $args );
145
+		$cntl = self::createClient($container, $request, $response, $args);
146 146
 
147
-		if( ( $html = $cntl->export() ) == '' ) {
147
+		if (($html = $cntl->export()) == '') {
148 148
 			return $cntl->getView()->response();
149 149
 		}
150 150
 
151
-		return self::getHtml( $container, $response, $html );
151
+		return self::getHtml($container, $response, $html);
152 152
 	}
153 153
 
154 154
 
@@ -161,15 +161,15 @@  discard block
 block discarded – undo
161 161
 	 * @param array $args Associative list of route parameters
162 162
 	 * @return ResponseInterface $response Modified response object with generated output
163 163
 	 */
164
-	public static function getAction( ContainerInterface $container, ServerRequestInterface $request, ResponseInterface $response, array $args )
164
+	public static function getAction(ContainerInterface $container, ServerRequestInterface $request, ResponseInterface $response, array $args)
165 165
 	{
166
-		$cntl = self::createClient( $container, $request, $response, $args );
166
+		$cntl = self::createClient($container, $request, $response, $args);
167 167
 
168
-		if( ( $html = $cntl->get() ) == '' ) {
168
+		if (($html = $cntl->get()) == '') {
169 169
 			return $cntl->getView()->response();
170 170
 		}
171 171
 
172
-		return self::getHtml( $container, $response, $html );
172
+		return self::getHtml($container, $response, $html);
173 173
 	}
174 174
 
175 175
 
@@ -182,15 +182,15 @@  discard block
 block discarded – undo
182 182
 	 * @param array $args Associative list of route parameters
183 183
 	 * @return ResponseInterface $response Modified response object with generated output
184 184
 	 */
185
-	public static function saveAction( ContainerInterface $container, ServerRequestInterface $request, ResponseInterface $response, array $args )
185
+	public static function saveAction(ContainerInterface $container, ServerRequestInterface $request, ResponseInterface $response, array $args)
186 186
 	{
187
-		$cntl = self::createClient( $container, $request, $response, $args );
187
+		$cntl = self::createClient($container, $request, $response, $args);
188 188
 
189
-		if( ( $html = $cntl->save() ) == '' ) {
189
+		if (($html = $cntl->save()) == '') {
190 190
 			return $cntl->getView()->response();
191 191
 		}
192 192
 
193
-		return self::getHtml( $container, $response, $html );
193
+		return self::getHtml($container, $response, $html);
194 194
 	}
195 195
 
196 196
 
@@ -203,15 +203,15 @@  discard block
 block discarded – undo
203 203
 	 * @param array $args Associative list of route parameters
204 204
 	 * @return ResponseInterface $response Modified response object with generated output
205 205
 	 */
206
-	public static function searchAction( ContainerInterface $container, ServerRequestInterface $request, ResponseInterface $response, array $args )
206
+	public static function searchAction(ContainerInterface $container, ServerRequestInterface $request, ResponseInterface $response, array $args)
207 207
 	{
208
-		$cntl = self::createClient( $container, $request, $response, $args );
208
+		$cntl = self::createClient($container, $request, $response, $args);
209 209
 
210
-		if( ( $html = $cntl->search() ) == '' ) {
210
+		if (($html = $cntl->search()) == '') {
211 211
 			return $cntl->getView()->response();
212 212
 		}
213 213
 
214
-		return self::getHtml( $container, $response, $html );
214
+		return self::getHtml($container, $response, $html);
215 215
 	}
216 216
 
217 217
 
@@ -224,24 +224,24 @@  discard block
 block discarded – undo
224 224
 	 * @param array $args Associative list of route parameters
225 225
 	 * @return \Aimeos\Admin\JQAdm\Iface JQAdm client
226 226
 	 */
227
-	protected static function createClient( ContainerInterface $container, ServerRequestInterface $request, ResponseInterface $response, array $args )
227
+	protected static function createClient(ContainerInterface $container, ServerRequestInterface $request, ResponseInterface $response, array $args)
228 228
 	{
229
-		$aimeos = $container->get( 'aimeos' );
230
-		$templatePaths = $aimeos->getCustomPaths( 'admin/jqadm/templates' );
229
+		$aimeos = $container->get('aimeos');
230
+		$templatePaths = $aimeos->getCustomPaths('admin/jqadm/templates');
231 231
 		$params = $args + (array) $request->getParsedBody() + (array) $request->getQueryParams();
232 232
 
233
-		$resource = ( isset( $params['resource'] ) ? $params['resource'] : null );
234
-		$site = ( isset( $params['site'] ) ? $params['site'] : 'default' );
235
-		$lang = ( isset( $params['lang'] ) ? $params['lang'] : 'en' );
233
+		$resource = (isset($params['resource']) ? $params['resource'] : null);
234
+		$site = (isset($params['site']) ? $params['site'] : 'default');
235
+		$lang = (isset($params['lang']) ? $params['lang'] : 'en');
236 236
 
237
-		$context = $container->get( 'aimeos_context' )->get( false, $args, 'backend' );
238
-		$context->setI18n( $container->get( 'aimeos_i18n' )->get( array( $lang, 'en' ) ) );
239
-		$context->setLocale( $container->get( 'aimeos_locale' )->getBackend( $context, $site ) );
237
+		$context = $container->get('aimeos_context')->get(false, $args, 'backend');
238
+		$context->setI18n($container->get('aimeos_i18n')->get(array($lang, 'en')));
239
+		$context->setLocale($container->get('aimeos_locale')->getBackend($context, $site));
240 240
 
241
-		$view = $container->get( 'aimeos_view' )->create( $context, $request, $response, $args, $templatePaths, $lang );
242
-		$context->setView( $view );
241
+		$view = $container->get('aimeos_view')->create($context, $request, $response, $args, $templatePaths, $lang);
242
+		$context->setView($view);
243 243
 
244
-		return \Aimeos\Admin\JQAdm\Factory::createClient( $context, $templatePaths, $resource )->setAimeos( $aimeos );
244
+		return \Aimeos\Admin\JQAdm\Factory::createClient($context, $templatePaths, $resource)->setAimeos($aimeos);
245 245
 	}
246 246
 
247 247
 
@@ -253,12 +253,12 @@  discard block
 block discarded – undo
253 253
 	 * @param string $content Content from admin client
254 254
 	 * @return \Illuminate\Contracts\View\View View for rendering the output
255 255
 	 */
256
-	protected static function getHtml( ContainerInterface $container, ResponseInterface $response, $content )
256
+	protected static function getHtml(ContainerInterface $container, ResponseInterface $response, $content)
257 257
 	{
258 258
 		$version = \Aimeos\Slim\Bootstrap::getVersion();
259
-		$extnames = implode( ',', $container->get( 'aimeos' )->getExtensions() );
260
-		$content = str_replace( ['{type}', '{version}', '{extensions}'], ['Slim', $version, $extnames], $content );
259
+		$extnames = implode(',', $container->get('aimeos')->getExtensions());
260
+		$content = str_replace(['{type}', '{version}', '{extensions}'], ['Slim', $version, $extnames], $content);
261 261
 
262
-		return $container->get( 'view' )->render( $response, 'Jqadm/index.html.twig', array( 'content' => $content ) );
262
+		return $container->get('view')->render($response, 'Jqadm/index.html.twig', array('content' => $content));
263 263
 	}
264 264
 }
Please login to merge, or discard this patch.
src/aimeos-routes.php 1 patch
Spacing   +126 added lines, -126 removed lines patch added patch discarded remove patch
@@ -1,202 +1,202 @@
 block discarded – undo
1 1
 <?php
2 2
 
3 3
 
4
-$app->group( $config( 'routes/admin', '/admin' ), function() use ( $config ) {
4
+$app->group($config('routes/admin', '/admin'), function() use ($config) {
5 5
 
6
-	$this->map(['GET', 'POST'], '', function( $request, $response, $args ) use ( $config ) {
7
-		return $response->withHeader( 'Location', $config( 'routes/jqadm', '/admin/default/jqadm' ) . '/search/dashboard' );
8
-	})->setName( 'aimeos_shop_admin' );
6
+	$this->map(['GET', 'POST'], '', function($request, $response, $args) use ($config) {
7
+		return $response->withHeader('Location', $config('routes/jqadm', '/admin/default/jqadm').'/search/dashboard');
8
+	})->setName('aimeos_shop_admin');
9 9
 
10 10
 });
11 11
 
12 12
 
13
-$app->group( $config( 'routes/extadm', '/admin/{site}/extadm' ), function() use ( $config ) {
13
+$app->group($config('routes/extadm', '/admin/{site}/extadm'), function() use ($config) {
14 14
 
15
-	$this->map(['GET'], '/file', function( $request, $response, $args ) {
16
-		return \Aimeos\Slim\Controller\Extadm::fileAction( $this, $request, $response, $args );
17
-	})->setName( 'aimeos_shop_extadm_file' );
15
+	$this->map(['GET'], '/file', function($request, $response, $args) {
16
+		return \Aimeos\Slim\Controller\Extadm::fileAction($this, $request, $response, $args);
17
+	})->setName('aimeos_shop_extadm_file');
18 18
 
19
-	$this->map(['POST'], '/do', function( $request, $response, $args ) {
20
-		return \Aimeos\Slim\Controller\Extadm::doAction( $this, $request, $response, $args );
21
-	})->setName( 'aimeos_shop_extadm_json' );
19
+	$this->map(['POST'], '/do', function($request, $response, $args) {
20
+		return \Aimeos\Slim\Controller\Extadm::doAction($this, $request, $response, $args);
21
+	})->setName('aimeos_shop_extadm_json');
22 22
 
23
-	$this->map(['GET'], '[/{lang}[/{tab:[0-9]+}]]', function( $request, $response, $args ) {
24
-		return \Aimeos\Slim\Controller\Extadm::indexAction( $this, $request, $response, $args );
25
-	})->setName( 'aimeos_shop_extadm' );
23
+	$this->map(['GET'], '[/{lang}[/{tab:[0-9]+}]]', function($request, $response, $args) {
24
+		return \Aimeos\Slim\Controller\Extadm::indexAction($this, $request, $response, $args);
25
+	})->setName('aimeos_shop_extadm');
26 26
 
27 27
 });
28 28
 
29 29
 
30
-$app->group( $config( 'routes/jqadm', '/admin/{site}/jqadm' ), function() use ( $config ) {
30
+$app->group($config('routes/jqadm', '/admin/{site}/jqadm'), function() use ($config) {
31 31
 
32
-	$this->map(['GET'], '/file/{type}', function( $request, $response, $args ) {
33
-		return \Aimeos\Slim\Controller\Jqadm::fileAction( $this, $request, $response, $args );
34
-	})->setName( 'aimeos_shop_jqadm_file' );
32
+	$this->map(['GET'], '/file/{type}', function($request, $response, $args) {
33
+		return \Aimeos\Slim\Controller\Jqadm::fileAction($this, $request, $response, $args);
34
+	})->setName('aimeos_shop_jqadm_file');
35 35
 
36
-	$this->map(['GET', 'POST'], '/copy/{resource:[^0-9A-Z\-\_]+}[/{id:[0-9A-Z\-\_]*}]', function( $request, $response, $args ) {
37
-		return \Aimeos\Slim\Controller\Jqadm::copyAction( $this, $request, $response, $args );
38
-	})->setName( 'aimeos_shop_jqadm_copy' );
36
+	$this->map(['GET', 'POST'], '/copy/{resource:[^0-9A-Z\-\_]+}[/{id:[0-9A-Z\-\_]*}]', function($request, $response, $args) {
37
+		return \Aimeos\Slim\Controller\Jqadm::copyAction($this, $request, $response, $args);
38
+	})->setName('aimeos_shop_jqadm_copy');
39 39
 
40
-	$this->map(['GET', 'POST'], '/create/{resource:[^0-9A-Z\-\_]+}', function( $request, $response, $args ) {
41
-		return \Aimeos\Slim\Controller\Jqadm::createAction( $this, $request, $response, $args );
42
-	})->setName( 'aimeos_shop_jqadm_create' );
40
+	$this->map(['GET', 'POST'], '/create/{resource:[^0-9A-Z\-\_]+}', function($request, $response, $args) {
41
+		return \Aimeos\Slim\Controller\Jqadm::createAction($this, $request, $response, $args);
42
+	})->setName('aimeos_shop_jqadm_create');
43 43
 
44
-	$this->map(['GET', 'POST'], '/delete/{resource:[^0-9A-Z\-\_]+}[/{id:[0-9A-Z\-\_]*}]', function( $request, $response, $args ) {
45
-		return \Aimeos\Slim\Controller\Jqadm::deleteAction( $this, $request, $response, $args );
46
-	})->setName( 'aimeos_shop_jqadm_delete' );
44
+	$this->map(['GET', 'POST'], '/delete/{resource:[^0-9A-Z\-\_]+}[/{id:[0-9A-Z\-\_]*}]', function($request, $response, $args) {
45
+		return \Aimeos\Slim\Controller\Jqadm::deleteAction($this, $request, $response, $args);
46
+	})->setName('aimeos_shop_jqadm_delete');
47 47
 
48
-	$this->map(['GET', 'POST'], '/export/{resource:[^0-9A-Z\-\_]+}', function( $request, $response, $args ) {
49
-		return \Aimeos\Slim\Controller\Jqadm::exportAction( $this, $request, $response, $args );
50
-	})->setName( 'aimeos_shop_jqadm_export' );
48
+	$this->map(['GET', 'POST'], '/export/{resource:[^0-9A-Z\-\_]+}', function($request, $response, $args) {
49
+		return \Aimeos\Slim\Controller\Jqadm::exportAction($this, $request, $response, $args);
50
+	})->setName('aimeos_shop_jqadm_export');
51 51
 
52
-	$this->map(['GET'], '/get/{resource:[^0-9A-Z\-\_]+}[/{id:[0-9A-Z\-\_]*}]', function( $request, $response, $args ) {
53
-		return \Aimeos\Slim\Controller\Jqadm::getAction( $this, $request, $response, $args );
54
-	})->setName( 'aimeos_shop_jqadm_get' );
52
+	$this->map(['GET'], '/get/{resource:[^0-9A-Z\-\_]+}[/{id:[0-9A-Z\-\_]*}]', function($request, $response, $args) {
53
+		return \Aimeos\Slim\Controller\Jqadm::getAction($this, $request, $response, $args);
54
+	})->setName('aimeos_shop_jqadm_get');
55 55
 
56
-	$this->map(['POST'], '/save/{resource:[^0-9A-Z\-\_]+}[/{id:[0-9A-Z\-\_]*}]', function( $request, $response, $args ) {
57
-		return \Aimeos\Slim\Controller\Jqadm::saveAction( $this, $request, $response, $args );
58
-	})->setName( 'aimeos_shop_jqadm_save' );
56
+	$this->map(['POST'], '/save/{resource:[^0-9A-Z\-\_]+}[/{id:[0-9A-Z\-\_]*}]', function($request, $response, $args) {
57
+		return \Aimeos\Slim\Controller\Jqadm::saveAction($this, $request, $response, $args);
58
+	})->setName('aimeos_shop_jqadm_save');
59 59
 
60
-	$this->map(['GET', 'POST'], '/search/{resource:[^0-9A-Z\-\_]+}', function( $request, $response, $args ) {
61
-		return \Aimeos\Slim\Controller\Jqadm::searchAction( $this, $request, $response, $args );
62
-	})->setName( 'aimeos_shop_jqadm_search' );
60
+	$this->map(['GET', 'POST'], '/search/{resource:[^0-9A-Z\-\_]+}', function($request, $response, $args) {
61
+		return \Aimeos\Slim\Controller\Jqadm::searchAction($this, $request, $response, $args);
62
+	})->setName('aimeos_shop_jqadm_search');
63 63
 
64 64
 });
65 65
 
66 66
 
67
-$app->group( $config( 'routes/jsonadm', '/admin/{site}/jsonadm' ), function() use ( $config ) {
67
+$app->group($config('routes/jsonadm', '/admin/{site}/jsonadm'), function() use ($config) {
68 68
 
69
-	$this->map(['DELETE'], '/{resource:[^0-9A-Z\-\_]+}[/{id:[0-9A-Z\-\_]*}]', function( $request, $response, $args ) {
70
-		return \Aimeos\Slim\Controller\Jsonadm::deleteAction( $this, $request, $response, $args );
71
-	})->setName( 'aimeos_shop_jsonadm_delete' );
69
+	$this->map(['DELETE'], '/{resource:[^0-9A-Z\-\_]+}[/{id:[0-9A-Z\-\_]*}]', function($request, $response, $args) {
70
+		return \Aimeos\Slim\Controller\Jsonadm::deleteAction($this, $request, $response, $args);
71
+	})->setName('aimeos_shop_jsonadm_delete');
72 72
 
73
-	$this->map(['GET'], '/{resource:[^0-9A-Z\-\_]+}[/{id:[0-9A-Z\-\_]*}]', function( $request, $response, $args ) {
74
-		return \Aimeos\Slim\Controller\Jsonadm::getAction( $this, $request, $response, $args );
75
-	})->setName( 'aimeos_shop_jsonadm_get' );
73
+	$this->map(['GET'], '/{resource:[^0-9A-Z\-\_]+}[/{id:[0-9A-Z\-\_]*}]', function($request, $response, $args) {
74
+		return \Aimeos\Slim\Controller\Jsonadm::getAction($this, $request, $response, $args);
75
+	})->setName('aimeos_shop_jsonadm_get');
76 76
 
77
-	$this->map(['PATCH'], '/{resource:[^0-9A-Z\-\_]+}[/{id:[0-9A-Z\-\_]*}]', function( $request, $response, $args ) {
78
-		return \Aimeos\Slim\Controller\Jsonadm::patchAction( $this, $request, $response, $args );
79
-	})->setName( 'aimeos_shop_jsonadm_patch' );
77
+	$this->map(['PATCH'], '/{resource:[^0-9A-Z\-\_]+}[/{id:[0-9A-Z\-\_]*}]', function($request, $response, $args) {
78
+		return \Aimeos\Slim\Controller\Jsonadm::patchAction($this, $request, $response, $args);
79
+	})->setName('aimeos_shop_jsonadm_patch');
80 80
 
81
-	$this->map(['POST'], '/{resource:[^0-9A-Z\-\_]+}[/{id:[0-9A-Z\-\_]*}]', function( $request, $response, $args ) {
82
-		return \Aimeos\Slim\Controller\Jsonadm::postAction( $this, $request, $response, $args );
83
-	})->setName( 'aimeos_shop_jsonadm_post' );
81
+	$this->map(['POST'], '/{resource:[^0-9A-Z\-\_]+}[/{id:[0-9A-Z\-\_]*}]', function($request, $response, $args) {
82
+		return \Aimeos\Slim\Controller\Jsonadm::postAction($this, $request, $response, $args);
83
+	})->setName('aimeos_shop_jsonadm_post');
84 84
 
85
-	$this->map(['PUT'], '/{resource:[^0-9A-Z\-\_]+}[/{id:[0-9A-Z\-\_]*}]', function( $request, $response, $args ) {
86
-		return \Aimeos\Slim\Controller\Jsonadm::putAction( $this, $request, $response, $args );
87
-	})->setName( 'aimeos_shop_jsonadm_put' );
85
+	$this->map(['PUT'], '/{resource:[^0-9A-Z\-\_]+}[/{id:[0-9A-Z\-\_]*}]', function($request, $response, $args) {
86
+		return \Aimeos\Slim\Controller\Jsonadm::putAction($this, $request, $response, $args);
87
+	})->setName('aimeos_shop_jsonadm_put');
88 88
 
89
-	$this->map(['OPTIONS'], '/[{resource}]', function( $request, $response, $args ) {
90
-		return \Aimeos\Slim\Controller\Jsonadm::optionsAction( $this, $request, $response, $args );
91
-	})->setName( 'aimeos_shop_jsonadm_options' );
89
+	$this->map(['OPTIONS'], '/[{resource}]', function($request, $response, $args) {
90
+		return \Aimeos\Slim\Controller\Jsonadm::optionsAction($this, $request, $response, $args);
91
+	})->setName('aimeos_shop_jsonadm_options');
92 92
 
93 93
 });
94 94
 
95 95
 
96
-$app->group( $config( 'routes/jsonapi', '/jsonapi' ), function() use ( $config ) {
96
+$app->group($config('routes/jsonapi', '/jsonapi'), function() use ($config) {
97 97
 
98
-	$this->map(['DELETE'], '/{resource}', function( $request, $response, $args ) {
99
-		return \Aimeos\Slim\Controller\Jsonapi::deleteAction( $this, $request, $response, $args );
100
-	})->setName( 'aimeos_shop_jsonapi_delete' );
98
+	$this->map(['DELETE'], '/{resource}', function($request, $response, $args) {
99
+		return \Aimeos\Slim\Controller\Jsonapi::deleteAction($this, $request, $response, $args);
100
+	})->setName('aimeos_shop_jsonapi_delete');
101 101
 
102
-	$this->map(['GET'], '/{resource}', function( $request, $response, $args ) {
103
-		return \Aimeos\Slim\Controller\Jsonapi::getAction( $this, $request, $response, $args );
104
-	})->setName( 'aimeos_shop_jsonapi_get' );
102
+	$this->map(['GET'], '/{resource}', function($request, $response, $args) {
103
+		return \Aimeos\Slim\Controller\Jsonapi::getAction($this, $request, $response, $args);
104
+	})->setName('aimeos_shop_jsonapi_get');
105 105
 
106
-	$this->map(['PATCH'], '/{resource}', function( $request, $response, $args ) {
107
-		return \Aimeos\Slim\Controller\Jsonapi::patchAction( $this, $request, $response, $args );
108
-	})->setName( 'aimeos_shop_jsonapi_patch' );
106
+	$this->map(['PATCH'], '/{resource}', function($request, $response, $args) {
107
+		return \Aimeos\Slim\Controller\Jsonapi::patchAction($this, $request, $response, $args);
108
+	})->setName('aimeos_shop_jsonapi_patch');
109 109
 
110
-	$this->map(['POST'], '/{resource}', function( $request, $response, $args ) {
111
-		return \Aimeos\Slim\Controller\Jsonapi::postAction( $this, $request, $response, $args );
112
-	})->setName( 'aimeos_shop_jsonapi_post' );
110
+	$this->map(['POST'], '/{resource}', function($request, $response, $args) {
111
+		return \Aimeos\Slim\Controller\Jsonapi::postAction($this, $request, $response, $args);
112
+	})->setName('aimeos_shop_jsonapi_post');
113 113
 
114
-	$this->map(['PUT'], '/{resource}', function( $request, $response, $args ) {
115
-		return \Aimeos\Slim\Controller\Jsonapi::putAction( $this, $request, $response, $args );
116
-	})->setName( 'aimeos_shop_jsonapi_put' );
114
+	$this->map(['PUT'], '/{resource}', function($request, $response, $args) {
115
+		return \Aimeos\Slim\Controller\Jsonapi::putAction($this, $request, $response, $args);
116
+	})->setName('aimeos_shop_jsonapi_put');
117 117
 
118
-	$this->map(['OPTIONS'], '/[{resource}]', function( $request, $response, $args ) {
119
-		return \Aimeos\Slim\Controller\Jsonapi::optionsAction( $this, $request, $response, $args );
120
-	})->setName( 'aimeos_shop_jsonapi_options' );
118
+	$this->map(['OPTIONS'], '/[{resource}]', function($request, $response, $args) {
119
+		return \Aimeos\Slim\Controller\Jsonapi::optionsAction($this, $request, $response, $args);
120
+	})->setName('aimeos_shop_jsonapi_options');
121 121
 
122 122
 });
123 123
 
124 124
 
125
-$app->group( $config( 'routes/account', '' ), function() {
125
+$app->group($config('routes/account', ''), function() {
126 126
 
127
-	$this->map(['GET', 'POST'], '/myaccount', function( $request, $response, $args ) {
128
-		return \Aimeos\Slim\Controller\Account::indexAction( $this, $request, $response, $args );
129
-	})->setName( 'aimeos_shop_account' );
127
+	$this->map(['GET', 'POST'], '/myaccount', function($request, $response, $args) {
128
+		return \Aimeos\Slim\Controller\Account::indexAction($this, $request, $response, $args);
129
+	})->setName('aimeos_shop_account');
130 130
 
131
-	$this->map(['GET', 'POST'], '/myaccount/favorite[/{fav_action}/{fav_id:[0-9]+}[/{d_prodid:[0-9]+}[/{d_name}[/{d_pos:[0-9]+}]]]]', function( $request, $response, $args ) {
132
-		return \Aimeos\Slim\Controller\Account::indexAction( $this, $request, $response, $args );
133
-	})->setName( 'aimeos_shop_account_favorite' );
131
+	$this->map(['GET', 'POST'], '/myaccount/favorite[/{fav_action}/{fav_id:[0-9]+}[/{d_prodid:[0-9]+}[/{d_name}[/{d_pos:[0-9]+}]]]]', function($request, $response, $args) {
132
+		return \Aimeos\Slim\Controller\Account::indexAction($this, $request, $response, $args);
133
+	})->setName('aimeos_shop_account_favorite');
134 134
 
135
-	$this->map(['GET', 'POST'], '/myaccount/watch[/{wat_action}/{wat_id:[0-9]+}[/{d_prodid:[0-9]+}[/{d_name}[/{d_pos:[0-9]+}]]]]', function( $request, $response, $args ) {
136
-		return \Aimeos\Slim\Controller\Account::indexAction( $this, $request, $response, $args );
137
-	})->setName( 'aimeos_shop_account_watch' );
135
+	$this->map(['GET', 'POST'], '/myaccount/watch[/{wat_action}/{wat_id:[0-9]+}[/{d_prodid:[0-9]+}[/{d_name}[/{d_pos:[0-9]+}]]]]', function($request, $response, $args) {
136
+		return \Aimeos\Slim\Controller\Account::indexAction($this, $request, $response, $args);
137
+	})->setName('aimeos_shop_account_watch');
138 138
 
139
-	$this->map(['GET', 'POST'], '/myaccount/download/{dl_id}', function( $request, $response, $args ) {
140
-		return \Aimeos\Slim\Controller\Account::downloadAction( $this, $request, $response, $args );
141
-	})->setName( 'aimeos_shop_account_download' );
139
+	$this->map(['GET', 'POST'], '/myaccount/download/{dl_id}', function($request, $response, $args) {
140
+		return \Aimeos\Slim\Controller\Account::downloadAction($this, $request, $response, $args);
141
+	})->setName('aimeos_shop_account_download');
142 142
 
143 143
 });
144 144
 
145 145
 
146
-$app->group( $config( 'routes/default', '' ), function() {
146
+$app->group($config('routes/default', ''), function() {
147 147
 
148
-	$this->map(['GET', 'POST'], '/count', function( $request, $response, $args ) {
149
-		return \Aimeos\Slim\Controller\Catalog::countAction( $this, $request, $response, $args );
150
-	})->setName( 'aimeos_shop_count' );
148
+	$this->map(['GET', 'POST'], '/count', function($request, $response, $args) {
149
+		return \Aimeos\Slim\Controller\Catalog::countAction($this, $request, $response, $args);
150
+	})->setName('aimeos_shop_count');
151 151
 
152
-	$this->map(['GET', 'POST'], '/detail/{d_prodid:[0-9]+}[/{d_name}[/{d_pos:[0-9]+}]]', function( $request, $response, $args ) {
153
-		return \Aimeos\Slim\Controller\Catalog::detailAction( $this, $request, $response, $args );
154
-	})->setName( 'aimeos_shop_detail' );
152
+	$this->map(['GET', 'POST'], '/detail/{d_prodid:[0-9]+}[/{d_name}[/{d_pos:[0-9]+}]]', function($request, $response, $args) {
153
+		return \Aimeos\Slim\Controller\Catalog::detailAction($this, $request, $response, $args);
154
+	})->setName('aimeos_shop_detail');
155 155
 
156
-	$this->map(['GET', 'POST'], '/detail/pin[/{pin_action}/{pin_id:[0-9]+}[/{d_prodid:[0-9]+}[/{d_name}[/{d_pos:[0-9]+}]]]]', function( $request, $response, $args ) {
157
-		return \Aimeos\Slim\Controller\Catalog::detailAction( $this, $request, $response, $args );
158
-	})->setName( 'aimeos_shop_session_pinned' );
156
+	$this->map(['GET', 'POST'], '/detail/pin[/{pin_action}/{pin_id:[0-9]+}[/{d_prodid:[0-9]+}[/{d_name}[/{d_pos:[0-9]+}]]]]', function($request, $response, $args) {
157
+		return \Aimeos\Slim\Controller\Catalog::detailAction($this, $request, $response, $args);
158
+	})->setName('aimeos_shop_session_pinned');
159 159
 
160
-	$this->map(['GET', 'POST'], '/list[/{f_catid:[0-9]+}[/{f_name}]]', function( $request, $response, $args ) {
161
-		return \Aimeos\Slim\Controller\Catalog::listAction( $this, $request, $response, $args );
162
-	})->setName( 'aimeos_shop_list' );
160
+	$this->map(['GET', 'POST'], '/list[/{f_catid:[0-9]+}[/{f_name}]]', function($request, $response, $args) {
161
+		return \Aimeos\Slim\Controller\Catalog::listAction($this, $request, $response, $args);
162
+	})->setName('aimeos_shop_list');
163 163
 
164
-	$this->map(['GET', 'POST'], '/suggest', function( $request, $response, $args ) {
165
-		return \Aimeos\Slim\Controller\Catalog::suggestAction( $this, $request, $response, $args );
166
-	})->setName( 'aimeos_shop_suggest' );
164
+	$this->map(['GET', 'POST'], '/suggest', function($request, $response, $args) {
165
+		return \Aimeos\Slim\Controller\Catalog::suggestAction($this, $request, $response, $args);
166
+	})->setName('aimeos_shop_suggest');
167 167
 
168
-	$this->map(['GET', 'POST'], '/stock', function( $request, $response, $args ) {
169
-		return \Aimeos\Slim\Controller\Catalog::stockAction( $this, $request, $response, $args );
170
-	})->setName( 'aimeos_shop_stock' );
168
+	$this->map(['GET', 'POST'], '/stock', function($request, $response, $args) {
169
+		return \Aimeos\Slim\Controller\Catalog::stockAction($this, $request, $response, $args);
170
+	})->setName('aimeos_shop_stock');
171 171
 
172
-	$this->map(['GET', 'POST'], '/basket', function( $request, $response, $args ) {
173
-		return \Aimeos\Slim\Controller\Basket::indexAction( $this, $request, $response, $args );
174
-	})->setName( 'aimeos_shop_basket' );
172
+	$this->map(['GET', 'POST'], '/basket', function($request, $response, $args) {
173
+		return \Aimeos\Slim\Controller\Basket::indexAction($this, $request, $response, $args);
174
+	})->setName('aimeos_shop_basket');
175 175
 
176
-	$this->map(['GET', 'POST'], '/checkout[/{c_step}]', function( $request, $response, $args ) {
177
-		return \Aimeos\Slim\Controller\Checkout::indexAction( $this, $request, $response, $args );
178
-	})->setName( 'aimeos_shop_checkout' );
176
+	$this->map(['GET', 'POST'], '/checkout[/{c_step}]', function($request, $response, $args) {
177
+		return \Aimeos\Slim\Controller\Checkout::indexAction($this, $request, $response, $args);
178
+	})->setName('aimeos_shop_checkout');
179 179
 
180
-	$this->map(['GET', 'POST'], '/confirm[/{code}]', function( $request, $response, $args ) {
181
-		return \Aimeos\Slim\Controller\Checkout::confirmAction( $this, $request, $response, $args );
182
-	})->setName( 'aimeos_shop_confirm' );
180
+	$this->map(['GET', 'POST'], '/confirm[/{code}]', function($request, $response, $args) {
181
+		return \Aimeos\Slim\Controller\Checkout::confirmAction($this, $request, $response, $args);
182
+	})->setName('aimeos_shop_confirm');
183 183
 
184 184
 });
185 185
 
186 186
 
187
-$app->group( $config( 'routes/update', '' ), function() {
187
+$app->group($config('routes/update', ''), function() {
188 188
 
189
-	$this->map(['GET', 'POST'], '/update', function( $request, $response, $args ) {
190
-		return \Aimeos\Slim\Controller\Checkout::updateAction( $this, $request, $response, $args );
191
-	})->setName( 'aimeos_shop_update' );
189
+	$this->map(['GET', 'POST'], '/update', function($request, $response, $args) {
190
+		return \Aimeos\Slim\Controller\Checkout::updateAction($this, $request, $response, $args);
191
+	})->setName('aimeos_shop_update');
192 192
 
193 193
 });
194 194
 
195 195
 
196
-$app->map(['GET', 'POST'], '/terms', function( $request, $response, $args ) {
196
+$app->map(['GET', 'POST'], '/terms', function($request, $response, $args) {
197 197
 	return 'terms';
198
-})->setName( 'aimeos_shop_terms' );
198
+})->setName('aimeos_shop_terms');
199 199
 
200
-$app->map(['GET', 'POST'], '/privacy', function( $request, $response, $args ) {
200
+$app->map(['GET', 'POST'], '/privacy', function($request, $response, $args) {
201 201
 	return 'privacy';
202
-})->setName( 'aimeos_shop_privacy' );
202
+})->setName('aimeos_shop_privacy');
Please login to merge, or discard this patch.