aimeos / aimeos-slim

src/Controller/Extadm.php

Doc Comments +1 added lines, -1 removed lines

@@ -160,7 +160,7 @@
 	 * Creates a list of all available translations
 	 *
 	 * @param \Aimeos\Bootstrap $aimeos Aimeos object
-	 * @return array List of language IDs with labels
+	 * @return string List of language IDs with labels
 	 */
 	protected static function getJsonLanguages( \Aimeos\Bootstrap $aimeos )
 	{

Spacing +70 added lines, -70 removed lines

@@ -32,62 +32,62 @@ 
 	 * @param array $args Associative list of route parameters
 	 * @return ResponseInterface $response Modified response object with generated output
 	 */
-	public static function indexAction( ContainerInterface $container, ServerRequestInterface $request, ResponseInterface $response, array $args )
+	public static function indexAction(ContainerInterface $container, ServerRequestInterface $request, ResponseInterface $response, array $args)
 	{
-		$site = ( isset( $args['site'] ) ? $args['site'] : 'default' );
-		$lang = ( isset( $args['lang'] ) ? $args['lang'] : 'en' );
-		$tab = ( isset( $args['tab'] ) ? $args['tab'] : 0 );
+		$site = (isset($args['site']) ? $args['site'] : 'default');
+		$lang = (isset($args['lang']) ? $args['lang'] : 'en');
+		$tab = (isset($args['tab']) ? $args['tab'] : 0);
 
-		$aimeos = $container->get( 'aimeos' );
-		$cntlPaths = $aimeos->getCustomPaths( 'controller/extjs' );
+		$aimeos = $container->get('aimeos');
+		$cntlPaths = $aimeos->getCustomPaths('controller/extjs');
 
-		$context = $container->get( 'aimeos_context' )->get( false, $args );
-		$context = self::setLocale( $context, $site, $lang );
+		$context = $container->get('aimeos_context')->get(false, $args);
+		$context = self::setLocale($context, $site, $lang);
 
-		$controller = new \Aimeos\Controller\ExtJS\JsonRpc( $context, $cntlPaths );
+		$controller = new \Aimeos\Controller\ExtJS\JsonRpc($context, $cntlPaths);
 		$cssFiles = array();
 
-		foreach( $aimeos->getCustomPaths( 'admin/extjs' ) as $base => $paths )
+		foreach ($aimeos->getCustomPaths('admin/extjs') as $base => $paths)
 		{
-			foreach( $paths as $path )
+			foreach ($paths as $path)
 			{
 				$jsbAbsPath = $base . '/' . $path;
 
-				if( !is_file( $jsbAbsPath ) ) {
-					throw new \Exception( sprintf( 'JSB2 file "%1$s" not found', $jsbAbsPath ) );
+				if (!is_file($jsbAbsPath)) {
+					throw new \Exception(sprintf('JSB2 file "%1$s" not found', $jsbAbsPath));
 				}
 
-				$jsb2 = new \Aimeos\MW\Jsb2\Standard( $jsbAbsPath, dirname( $path ) );
-				$cssFiles = array_merge( $cssFiles, $jsb2->getUrls( 'css' ) );
+				$jsb2 = new \Aimeos\MW\Jsb2\Standard($jsbAbsPath, dirname($path));
+				$cssFiles = array_merge($cssFiles, $jsb2->getUrls('css'));
 			}
 		}
 
-		$csrfname = $request->getAttribute( 'csrf_name' );
-		$csrfvalue = $request->getAttribute( 'csrf_value' );
+		$csrfname = $request->getAttribute('csrf_name');
+		$csrfvalue = $request->getAttribute('csrf_value');
 
-		$router = $container->get( 'router' );
-		$jqadmUrl = $router->pathFor( 'aimeos_shop_jqadm_search', array( 'site' => $site, 'resource' => 'product' ) );
-		$jsonUrl = $router->pathFor( 'aimeos_shop_extadm_json', array( 'site' => $site, $csrfname => $csrfvalue ) );
-		$adminUrl = $router->pathFor( 'aimeos_shop_extadm', array( 'site' => '<site>', 'lang' => '<lang>', 'tab' => '<tab>' ) );
+		$router = $container->get('router');
+		$jqadmUrl = $router->pathFor('aimeos_shop_jqadm_search', array('site' => $site, 'resource' => 'product'));
+		$jsonUrl = $router->pathFor('aimeos_shop_extadm_json', array('site' => $site, $csrfname => $csrfvalue));
+		$adminUrl = $router->pathFor('aimeos_shop_extadm', array('site' => '<site>', 'lang' => '<lang>', 'tab' => '<tab>'));
 
 		$vars = array(
 			'lang' => $lang,
 			'cssFiles' => $cssFiles,
-			'languages' => self::getJsonLanguages( $aimeos ),
-			'config' => self::getJsonClientConfig( $context ),
-			'site' => self::getJsonSiteItem( $context, $site ),
-			'i18nContent' => self::getJsonClientI18n( $aimeos->getI18nPaths(), $lang ),
-			'uploaddir' => $context->getConfig()->get( 'uploaddir', '/' ),
+			'languages' => self::getJsonLanguages($aimeos),
+			'config' => self::getJsonClientConfig($context),
+			'site' => self::getJsonSiteItem($context, $site),
+			'i18nContent' => self::getJsonClientI18n($aimeos->getI18nPaths(), $lang),
+			'uploaddir' => $context->getConfig()->get('uploaddir', '/'),
 			'searchSchemas' => $controller->getJsonSearchSchemas(),
 			'itemSchemas' => $controller->getJsonItemSchemas(),
-			'smd' => $controller->getJsonSmd( $jsonUrl ),
+			'smd' => $controller->getJsonSmd($jsonUrl),
 			'urlTemplate' => $adminUrl,
 			'jqadmurl' => $jqadmUrl,
 			'activeTab' => $tab,
 			'version' => \Aimeos\Slim\Bootstrap::getVersion(),
 		);
 
-		return $container->get( 'view' )->render( $response, 'Extadm/index.html.twig', $vars );
+		return $container->get('view')->render($response, 'Extadm/index.html.twig', $vars);
 	}
 
 
@@ -100,21 +100,21 @@ 
 	 * @param array $args Associative list of route parameters
 	 * @return ResponseInterface $response Modified response object with generated output
 	 */
-	public static function doAction( ContainerInterface $container, ServerRequestInterface $request, ResponseInterface $response, array $args )
+	public static function doAction(ContainerInterface $container, ServerRequestInterface $request, ResponseInterface $response, array $args)
 	{
-		$cntlPaths = $container->get( 'aimeos' )->getCustomPaths( 'controller/extjs' );
+		$cntlPaths = $container->get('aimeos')->getCustomPaths('controller/extjs');
 
-		$context = $container->get( 'aimeos_context' )->get( false, $args );
-		$context = self::setLocale( $context );
+		$context = $container->get('aimeos_context')->get(false, $args);
+		$context = self::setLocale($context);
 
 		$params = $request->getQueryParams();
-		if( ( $post = $request->getParsedBody() ) !== null ) {
-			$params = array_merge( $params, (array) $post );
+		if (($post = $request->getParsedBody()) !== null) {
+			$params = array_merge($params, (array) $post);
 		}
 
-		$controller = new \Aimeos\Controller\ExtJS\JsonRpc( $context, $cntlPaths );
-		$output = $controller->process( $params, (string) $request->getBody() );
-		$response->getBody()->write( $output );
+		$controller = new \Aimeos\Controller\ExtJS\JsonRpc($context, $cntlPaths);
+		$output = $controller->process($params, (string) $request->getBody());
+		$response->getBody()->write($output);
 
 		return $response;
 	}
@@ -129,30 +129,30 @@ 
 	 * @param array $args Associative list of route parameters
 	 * @return ResponseInterface $response Modified response object with generated output
 	 */
-	public static function fileAction( ContainerInterface $container, ServerRequestInterface $request, ResponseInterface $response, array $args )
+	public static function fileAction(ContainerInterface $container, ServerRequestInterface $request, ResponseInterface $response, array $args)
 	{
 		$contents = '';
 		$jsFiles = array();
-		$aimeos = $container->get( 'aimeos' );
+		$aimeos = $container->get('aimeos');
 
-		foreach( $aimeos->getCustomPaths( 'admin/extjs' ) as $base => $paths )
+		foreach ($aimeos->getCustomPaths('admin/extjs') as $base => $paths)
 		{
-			foreach( $paths as $path )
+			foreach ($paths as $path)
 			{
 				$jsbAbsPath = $base . '/' . $path;
-				$jsb2 = new \Aimeos\MW\Jsb2\Standard( $jsbAbsPath, dirname( $jsbAbsPath ) );
-				$jsFiles = array_merge( $jsFiles, $jsb2->getFiles( 'js' ) );
+				$jsb2 = new \Aimeos\MW\Jsb2\Standard($jsbAbsPath, dirname($jsbAbsPath));
+				$jsFiles = array_merge($jsFiles, $jsb2->getFiles('js'));
 			}
 		}
 
-		foreach( $jsFiles as $file )
+		foreach ($jsFiles as $file)
 		{
-			if( ( $content = file_get_contents( $file ) ) !== false ) {
+			if (($content = file_get_contents($file)) !== false) {
 				$contents .= $content;
 			}
 		}
 
-		return $response->withHeader( 'Content-Type', 'application/javascript' )->getBody()->write( $contents );
+		return $response->withHeader('Content-Type', 'application/javascript')->getBody()->write($contents);
 	}
 
 
@@ -162,15 +162,15 @@ 
 	 * @param \Aimeos\Bootstrap $aimeos Aimeos object
 	 * @return array List of language IDs with labels
 	 */
-	protected static function getJsonLanguages( \Aimeos\Bootstrap $aimeos )
+	protected static function getJsonLanguages(\Aimeos\Bootstrap $aimeos)
 	{
 		$result = array();
 
-		foreach( $aimeos->getI18nList( 'admin' ) as $id ) {
-			$result[] = array( 'id' => $id, 'label' => $id );
+		foreach ($aimeos->getI18nList('admin') as $id) {
+			$result[] = array('id' => $id, 'label' => $id);
 		}
 
-		return json_encode( $result );
+		return json_encode($result);
 	}
 
 
@@ -180,10 +180,10 @@ 
 	 * @param \Aimeos\MShop\Context\Item\Iface $context Context item object
 	 * @return string JSON encoded configuration object
 	 */
-	protected static function getJsonClientConfig( \Aimeos\MShop\Context\Item\Iface $context )
+	protected static function getJsonClientConfig(\Aimeos\MShop\Context\Item\Iface $context)
 	{
-		$config = $context->getConfig()->get( 'admin/extjs', array() );
-		return json_encode( array( 'admin' => array( 'extjs' => $config ) ), JSON_FORCE_OBJECT );
+		$config = $context->getConfig()->get('admin/extjs', array());
+		return json_encode(array('admin' => array('extjs' => $config)), JSON_FORCE_OBJECT);
 	}
 
 
@@ -194,16 +194,16 @@ 
 	 * @param string $lang ISO language code like "en" or "en_GB"
 	 * @return string JSON encoded translation object
 	 */
-	protected static function getJsonClientI18n( array $i18nPaths, $lang )
+	protected static function getJsonClientI18n(array $i18nPaths, $lang)
 	{
-		$i18n = new \Aimeos\MW\Translation\Gettext( $i18nPaths, $lang );
+		$i18n = new \Aimeos\MW\Translation\Gettext($i18nPaths, $lang);
 
 		$content = array(
-			'admin' => $i18n->getAll( 'admin' ),
-			'admin/ext' => $i18n->getAll( 'admin/ext' ),
+			'admin' => $i18n->getAll('admin'),
+			'admin/ext' => $i18n->getAll('admin/ext'),
 		);
 
-		return json_encode( $content, JSON_FORCE_OBJECT );
+		return json_encode($content, JSON_FORCE_OBJECT);
 	}
 
 
@@ -215,19 +215,19 @@ 
 	 * @return string JSON encoded site item object
 	 * @throws Exception If no site item was found for the code
 	 */
-	protected static function getJsonSiteItem( \Aimeos\MShop\Context\Item\Iface $context, $site )
+	protected static function getJsonSiteItem(\Aimeos\MShop\Context\Item\Iface $context, $site)
 	{
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'locale/site' );
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'locale/site');
 
 		$criteria = $manager->createSearch();
-		$criteria->setConditions( $criteria->compare( '==', 'locale.site.code', $site ) );
-		$items = $manager->searchItems( $criteria );
+		$criteria->setConditions($criteria->compare('==', 'locale.site.code', $site));
+		$items = $manager->searchItems($criteria);
 
-		if( ( $item = reset( $items ) ) === false ) {
-			throw new \Exception( sprintf( 'No site found for code "%1$s"', $site ) );
+		if (($item = reset($items)) === false) {
+			throw new \Exception(sprintf('No site found for code "%1$s"', $site));
 		}
 
-		return json_encode( $item->toArray() );
+		return json_encode($item->toArray());
 	}
 
 
@@ -239,17 +239,17 @@ 
 	 * @param string $locale ISO language code, e.g. "en" or "en_GB"
 	 * @return \Aimeos\MShop\Context\Item\Iface Modified context object
 	 */
-	protected static function setLocale( \Aimeos\MShop\Context\Item\Iface $context, $sitecode = 'default', $locale = null )
+	protected static function setLocale(\Aimeos\MShop\Context\Item\Iface $context, $sitecode = 'default', $locale = null)
 	{
-		$localeManager = \Aimeos\MShop\Factory::createManager( $context, 'locale' );
+		$localeManager = \Aimeos\MShop\Factory::createManager($context, 'locale');
 
 		try {
-			$localeItem = $localeManager->bootstrap( $sitecode, $locale, '', false );
-		} catch( \Aimeos\MShop\Locale\Exception $e ) {
+			$localeItem = $localeManager->bootstrap($sitecode, $locale, '', false);
+		} catch (\Aimeos\MShop\Locale\Exception $e) {
 			$localeItem = $localeManager->createItem();
 		}
 
-		$context->setLocale( $localeItem );
+		$context->setLocale($localeItem);
 
 		return $context;
 	}

src/Controller/Jqadm.php

Spacing +39 added lines, -39 removed lines

@@ -32,10 +32,10 @@ 
 	 * @param array $args Associative list of route parameters
 	 * @return ResponseInterface $response Modified response object with generated output
 	 */
-	public static function copyAction( ContainerInterface $container, ServerRequestInterface $request, ResponseInterface $response, array $args )
+	public static function copyAction(ContainerInterface $container, ServerRequestInterface $request, ResponseInterface $response, array $args)
 	{
-		$cntl = self::createClient( $container, $request, $response, $args );
-		return self::getHtml( $container, $response, $cntl->copy() );
+		$cntl = self::createClient($container, $request, $response, $args);
+		return self::getHtml($container, $response, $cntl->copy());
 	}
 
 
@@ -48,10 +48,10 @@ 
 	 * @param array $args Associative list of route parameters
 	 * @return ResponseInterface $response Modified response object with generated output
 	 */
-	public static function createAction( ContainerInterface $container, ServerRequestInterface $request, ResponseInterface $response, array $args )
+	public static function createAction(ContainerInterface $container, ServerRequestInterface $request, ResponseInterface $response, array $args)
 	{
-		$cntl = self::createClient( $container, $request, $response, $args );
-		return self::getHtml( $container, $response, $cntl->create() );
+		$cntl = self::createClient($container, $request, $response, $args);
+		return self::getHtml($container, $response, $cntl->create());
 	}
 
 
@@ -64,10 +64,10 @@ 
 	 * @param array $args Associative list of route parameters
 	 * @return ResponseInterface $response Modified response object with generated output
 	 */
-	public static function deleteAction( ContainerInterface $container, ServerRequestInterface $request, ResponseInterface $response, array $args )
+	public static function deleteAction(ContainerInterface $container, ServerRequestInterface $request, ResponseInterface $response, array $args)
 	{
-		$cntl = self::createClient( $container, $request, $response, $args );
-		return self::getHtml( $container, $response, $cntl->delete() . $cntl->search() );
+		$cntl = self::createClient($container, $request, $response, $args);
+		return self::getHtml($container, $response, $cntl->delete() . $cntl->search());
 	}
 
 
@@ -80,10 +80,10 @@ 
 	 * @param array $args Associative list of route parameters
 	 * @return ResponseInterface $response Modified response object with generated output
 	 */
-	public static function getAction( ContainerInterface $container, ServerRequestInterface $request, ResponseInterface $response, array $args )
+	public static function getAction(ContainerInterface $container, ServerRequestInterface $request, ResponseInterface $response, array $args)
 	{
-		$cntl = self::createClient( $container, $request, $response, $args );
-		return self::getHtml( $container, $response, $cntl->get() );
+		$cntl = self::createClient($container, $request, $response, $args);
+		return self::getHtml($container, $response, $cntl->get());
 	}
 
 
@@ -96,10 +96,10 @@ 
 	 * @param array $args Associative list of route parameters
 	 * @return ResponseInterface $response Modified response object with generated output
 	 */
-	public static function saveAction( ContainerInterface $container, ServerRequestInterface $request, ResponseInterface $response, array $args )
+	public static function saveAction(ContainerInterface $container, ServerRequestInterface $request, ResponseInterface $response, array $args)
 	{
-		$cntl = self::createClient( $container, $request, $response, $args );
-		return self::getHtml( $container, $response, ( $cntl->save() ? : $cntl->search() ) );
+		$cntl = self::createClient($container, $request, $response, $args);
+		return self::getHtml($container, $response, ($cntl->save() ?: $cntl->search()));
 	}
 
 
@@ -112,10 +112,10 @@ 
 	 * @param array $args Associative list of route parameters
 	 * @return ResponseInterface $response Modified response object with generated output
 	 */
-	public static function searchAction( ContainerInterface $container, ServerRequestInterface $request, ResponseInterface $response, array $args )
+	public static function searchAction(ContainerInterface $container, ServerRequestInterface $request, ResponseInterface $response, array $args)
 	{
-		$cntl = self::createClient( $container, $request, $response, $args );
-		return self::getHtml( $container, $response, $cntl->search() );
+		$cntl = self::createClient($container, $request, $response, $args);
+		return self::getHtml($container, $response, $cntl->search());
 	}
 
 
@@ -128,21 +128,21 @@ 
 	 * @param array $args Associative list of route parameters
 	 * @return \Aimeos\Admin\JQAdm\Iface JQAdm client
 	 */
-	protected static function createClient( ContainerInterface $container, ServerRequestInterface $request, ResponseInterface $response, array $args )
+	protected static function createClient(ContainerInterface $container, ServerRequestInterface $request, ResponseInterface $response, array $args)
 	{
-		$resource = ( isset( $args['resource'] ) ? $args['resource'] : null );
-		$site = ( isset( $args['site'] ) ? $args['site'] : 'default' );
-		$lang = ( isset( $args['lang'] ) ? $args['lang'] : 'en' );
+		$resource = (isset($args['resource']) ? $args['resource'] : null);
+		$site = (isset($args['site']) ? $args['site'] : 'default');
+		$lang = (isset($args['lang']) ? $args['lang'] : 'en');
 
-		$templatePaths = $container->get( 'aimeos' )->getCustomPaths( 'admin/jqadm/templates' );
+		$templatePaths = $container->get('aimeos')->getCustomPaths('admin/jqadm/templates');
 
-		$context = $container->get( 'aimeos_context' )->get( false, $args );
-		$context = self::setLocale( $container->get( 'aimeos_i18n' ), $context, $site, $lang );
+		$context = $container->get('aimeos_context')->get(false, $args);
+		$context = self::setLocale($container->get('aimeos_i18n'), $context, $site, $lang);
 
-		$view = $container->get( 'aimeos_view' )->create( $request, $response, $args, $templatePaths, $lang );
-		$context->setView( $view );
+		$view = $container->get('aimeos_view')->create($request, $response, $args, $templatePaths, $lang);
+		$context->setView($view);
 
-		return \Aimeos\Admin\JQAdm\Factory::createClient( $context, $templatePaths, $resource );
+		return \Aimeos\Admin\JQAdm\Factory::createClient($context, $templatePaths, $resource);
 	}
 
 
@@ -154,12 +154,12 @@ 
 	 * @param string $content Content from admin client
 	 * @return \Illuminate\Contracts\View\View View for rendering the output
 	 */
-	protected static function getHtml( ContainerInterface $container, ResponseInterface $response, $content )
+	protected static function getHtml(ContainerInterface $container, ResponseInterface $response, $content)
 	{
 		$version = \Aimeos\Slim\Bootstrap::getVersion();
-		$content = str_replace( array( '{type}', '{version}' ), array( 'Slim', $version ), $content );
+		$content = str_replace(array('{type}', '{version}'), array('Slim', $version), $content);
 
-		return $container->get( 'view' )->render( $response, 'Jqadm/index.html.twig', array( 'content' => $content ) );
+		return $container->get('view')->render($response, 'Jqadm/index.html.twig', array('content' => $content));
 	}
 
 
@@ -172,23 +172,23 @@ 
 	 * @param string $lang ISO language code, e.g. "en" or "en_GB"
 	 * @return \Aimeos\MShop\Context\Item\Iface Modified context object
 	 */
-	protected static function setLocale( \Aimeos\Slim\Base\I18n $i18n, \Aimeos\MShop\Context\Item\Iface $context, $site, $lang )
+	protected static function setLocale(\Aimeos\Slim\Base\I18n $i18n, \Aimeos\MShop\Context\Item\Iface $context, $site, $lang)
 	{
-		$localeManager = \Aimeos\MShop\Factory::createManager( $context, 'locale' );
+		$localeManager = \Aimeos\MShop\Factory::createManager($context, 'locale');
 
 		try
 		{
-			$localeItem = $localeManager->bootstrap( $site, '', '', false );
-			$localeItem->setLanguageId( null );
-			$localeItem->setCurrencyId( null );
+			$localeItem = $localeManager->bootstrap($site, '', '', false);
+			$localeItem->setLanguageId(null);
+			$localeItem->setCurrencyId(null);
 		}
-		catch( \Aimeos\MShop\Locale\Exception $e )
+		catch (\Aimeos\MShop\Locale\Exception $e)
 		{
 			$localeItem = $localeManager->createItem();
 		}
 
-		$context->setLocale( $localeItem );
-		$context->setI18n( $i18n->get( array( $lang, 'en' ) ) );
+		$context->setLocale($localeItem);
+		$context->setI18n($i18n->get(array($lang, 'en')));
 
 		return $context;
 	}

Braces +1 added lines, -2 removed lines

@@ -216,8 +216,7 @@
 			$localeItem = $localeManager->bootstrap( $sitecode, '', '', false );
 			$localeItem->setLanguageId( null );
 			$localeItem->setCurrencyId( null );
-		}
-		catch( \Aimeos\MShop\Locale\Exception $e )
+		} catch( \Aimeos\MShop\Locale\Exception $e )
 		{
 			$localeItem = $localeManager->createItem();
 		}

src/Controller/Jsonadm.php

Spacing +47 added lines, -47 removed lines

@@ -32,15 +32,15 @@ 
 	 * @param array $args Associative list of route parameters
 	 * @return ResponseInterface $response Modified response object with generated output
 	 */
-	public static function deleteAction( ContainerInterface $container, ServerRequestInterface $request, ResponseInterface $response, array $args )
+	public static function deleteAction(ContainerInterface $container, ServerRequestInterface $request, ResponseInterface $response, array $args)
 	{
 		$status = 500;
 		$header = $request->getHeaders();
 
-		$cntl = self::createController( $container, $request, $response, $args );
-		$result = $cntl->delete( (string) $request->getBody(), $header, $status );
+		$cntl = self::createController($container, $request, $response, $args);
+		$result = $cntl->delete((string) $request->getBody(), $header, $status);
 
-		return self::withResponse( $response, $result, $status, $header );
+		return self::withResponse($response, $result, $status, $header);
 	}
 
 
@@ -53,15 +53,15 @@ 
 	 * @param array $args Associative list of route parameters
 	 * @return ResponseInterface $response Modified response object with generated output
 	 */
-	public static function getAction( ContainerInterface $container, ServerRequestInterface $request, ResponseInterface $response, array $args )
+	public static function getAction(ContainerInterface $container, ServerRequestInterface $request, ResponseInterface $response, array $args)
 	{
 		$status = 500;
 		$header = $request->getHeaders();
 
-		$cntl = self::createController( $container, $request, $response, $args );
-		$result = $cntl->get( (string) $request->getBody(), $header, $status );
+		$cntl = self::createController($container, $request, $response, $args);
+		$result = $cntl->get((string) $request->getBody(), $header, $status);
 
-		return self::withResponse( $response, $result, $status, $header );
+		return self::withResponse($response, $result, $status, $header);
 	}
 
 
@@ -74,15 +74,15 @@ 
 	 * @param array $args Associative list of route parameters
 	 * @return ResponseInterface $response Modified response object with generated output
 	 */
-	public static function patchAction( ContainerInterface $container, ServerRequestInterface $request, ResponseInterface $response, array $args )
+	public static function patchAction(ContainerInterface $container, ServerRequestInterface $request, ResponseInterface $response, array $args)
 	{
 		$status = 500;
 		$header = $request->getHeaders();
 
-		$cntl = self::createController( $container, $request, $response, $args );
-		$result = $cntl->patch( (string) $request->getBody(), $header, $status );
+		$cntl = self::createController($container, $request, $response, $args);
+		$result = $cntl->patch((string) $request->getBody(), $header, $status);
 
-		return self::withResponse( $response, $result, $status, $header );
+		return self::withResponse($response, $result, $status, $header);
 	}
 
 
@@ -95,15 +95,15 @@ 
 	 * @param array $args Associative list of route parameters
 	 * @return ResponseInterface $response Modified response object with generated output
 	 */
-	public static function postAction( ContainerInterface $container, ServerRequestInterface $request, ResponseInterface $response, array $args )
+	public static function postAction(ContainerInterface $container, ServerRequestInterface $request, ResponseInterface $response, array $args)
 	{
 		$status = 500;
 		$header = $request->getHeaders();
 
-		$cntl = self::createController( $container, $request, $response, $args );
-		$result = $cntl->post( (string) $request->getBody(), $header, $status );
+		$cntl = self::createController($container, $request, $response, $args);
+		$result = $cntl->post((string) $request->getBody(), $header, $status);
 
-		return self::withResponse( $response, $result, $status, $header );
+		return self::withResponse($response, $result, $status, $header);
 	}
 
 
@@ -116,15 +116,15 @@ 
 	 * @param array $args Associative list of route parameters
 	 * @return ResponseInterface $response Modified response object with generated output
 	 */
-	public static function putAction( ContainerInterface $container, ServerRequestInterface $request, ResponseInterface $response, array $args )
+	public static function putAction(ContainerInterface $container, ServerRequestInterface $request, ResponseInterface $response, array $args)
 	{
 		$status = 500;
 		$header = $request->getHeaders();
 
-		$cntl = self::createController( $container, $request, $response, $args );
-		$result = $cntl->put( (string) $request->getBody(), $header, $status );
+		$cntl = self::createController($container, $request, $response, $args);
+		$result = $cntl->put((string) $request->getBody(), $header, $status);
 
-		return self::withResponse( $response, $result, $status, $header );
+		return self::withResponse($response, $result, $status, $header);
 	}
 
 
@@ -137,15 +137,15 @@ 
 	 * @param array $args Associative list of route parameters
 	 * @return ResponseInterface $response Modified response object with generated output
 	 */
-	public static function optionsAction( ContainerInterface $container, ServerRequestInterface $request, ResponseInterface $response, array $args )
+	public static function optionsAction(ContainerInterface $container, ServerRequestInterface $request, ResponseInterface $response, array $args)
 	{
 		$status = 500;
 		$header = $request->getHeaders();
 
-		$cntl = self::createController( $container, $request, $response, $args );
-		$result = $cntl->options( (string) $request->getBody(), $header, $status );
+		$cntl = self::createController($container, $request, $response, $args);
+		$result = $cntl->options((string) $request->getBody(), $header, $status);
 
-		return self::withResponse( $response, $result, $status, $header );
+		return self::withResponse($response, $result, $status, $header);
 	}
 
 
@@ -158,21 +158,21 @@ 
 	 * @param array $args Associative list of route parameters
 	 * @return \Aimeos\Controller\JsonAdm\Iface JSON admin controller
 	 */
-	protected static function createController( ContainerInterface $container, ServerRequestInterface $request, ResponseInterface $response, array $args )
+	protected static function createController(ContainerInterface $container, ServerRequestInterface $request, ResponseInterface $response, array $args)
 	{
-		$resource = ( isset( $args['resource'] ) ? $args['resource'] : null );
-		$site = ( isset( $args['site'] ) ? $args['site'] : 'default' );
-		$lang = ( isset( $args['lang'] ) ? $args['lang'] : 'en' );
+		$resource = (isset($args['resource']) ? $args['resource'] : null);
+		$site = (isset($args['site']) ? $args['site'] : 'default');
+		$lang = (isset($args['lang']) ? $args['lang'] : 'en');
 
-		$templatePaths = $container->get( 'aimeos' )->getCustomPaths( 'controller/jsonadm/templates' );
+		$templatePaths = $container->get('aimeos')->getCustomPaths('controller/jsonadm/templates');
 
-		$context = $container->get( 'aimeos_context' )->get( false, $args );
-		$context = self::setLocale( $container->get( 'aimeos_i18n' ), $context, $site, $lang );
+		$context = $container->get('aimeos_context')->get(false, $args);
+		$context = self::setLocale($container->get('aimeos_i18n'), $context, $site, $lang);
 
-		$view = $container->get( 'aimeos_view' )->create( $request, $response, $args, $templatePaths, $lang );
-		$context->setView( $view );
+		$view = $container->get('aimeos_view')->create($request, $response, $args, $templatePaths, $lang);
+		$context->setView($view);
 
-		return \Aimeos\Controller\JsonAdm\Factory::createController( $context, $templatePaths, $resource );
+		return \Aimeos\Controller\JsonAdm\Factory::createController($context, $templatePaths, $resource);
 	}
 
 
@@ -185,13 +185,13 @@ 
 	 * @param array $header List of HTTP headers
 	 * @return ResponseInterface $response Populated response object
 	 */
-	protected static function withResponse( ResponseInterface $response, $content, $status, array $header )
+	protected static function withResponse(ResponseInterface $response, $content, $status, array $header)
 	{
-		$response->getBody()->write( $content );
-		$response = $response->withStatus( $status );
+		$response->getBody()->write($content);
+		$response = $response->withStatus($status);
 
-		foreach( $header as $key => $value ) {
-			$response->withHeader( $key, $value );
+		foreach ($header as $key => $value) {
+			$response->withHeader($key, $value);
 		}
 
 		return $response;
@@ -207,23 +207,23 @@ 
 	 * @param string $lang ISO language code, e.g. "en" or "en_GB"
 	 * @return \Aimeos\MShop\Context\Item\Iface Modified context object
 	 */
-	protected static function setLocale( \Aimeos\Slim\Base\I18n $i18n, \Aimeos\MShop\Context\Item\Iface $context, $sitecode, $lang )
+	protected static function setLocale(\Aimeos\Slim\Base\I18n $i18n, \Aimeos\MShop\Context\Item\Iface $context, $sitecode, $lang)
 	{
-		$localeManager = \Aimeos\MShop\Factory::createManager( $context, 'locale' );
+		$localeManager = \Aimeos\MShop\Factory::createManager($context, 'locale');
 
 		try
 		{
-			$localeItem = $localeManager->bootstrap( $sitecode, '', '', false );
-			$localeItem->setLanguageId( null );
-			$localeItem->setCurrencyId( null );
+			$localeItem = $localeManager->bootstrap($sitecode, '', '', false);
+			$localeItem->setLanguageId(null);
+			$localeItem->setCurrencyId(null);
 		}
-		catch( \Aimeos\MShop\Locale\Exception $e )
+		catch (\Aimeos\MShop\Locale\Exception $e)
 		{
 			$localeItem = $localeManager->createItem();
 		}
 
-		$context->setLocale( $localeItem );
-		$context->setI18n( $i18n->get( array( $lang ) ) );
+		$context->setLocale($localeItem);
+		$context->setI18n($i18n->get(array($lang)));
 
 		return $context;
 	}

Braces +1 added lines, -2 removed lines

@@ -216,8 +216,7 @@
 			$localeItem = $localeManager->bootstrap( $sitecode, '', '', false );
 			$localeItem->setLanguageId( null );
 			$localeItem->setCurrencyId( null );
-		}
-		catch( \Aimeos\MShop\Locale\Exception $e )
+		} catch( \Aimeos\MShop\Locale\Exception $e )
 		{
 			$localeItem = $localeManager->createItem();
 		}

src/aimeos-routes.php

Spacing +96 added lines, -96 removed lines

@@ -1,153 +1,153 @@
 <?php
 
 
-$app->group( $config( 'routes/admin', '/admin/' ), function() {
+$app->group($config('routes/admin', '/admin/'), function() {
 
-	$this->map(['GET'], 'extadm/file', function( $request, $response, $args ) {
-		return \Aimeos\Slim\Controller\Extadm::fileAction( $this, $request, $response, $args );
-	})->setName( 'aimeos_shop_extadm_file' );
+	$this->map(['GET'], 'extadm/file', function($request, $response, $args) {
+		return \Aimeos\Slim\Controller\Extadm::fileAction($this, $request, $response, $args);
+	})->setName('aimeos_shop_extadm_file');
 
-	$this->map(['POST'], 'extadm/do', function( $request, $response, $args ) {
-		return \Aimeos\Slim\Controller\Extadm::doAction( $this, $request, $response, $args );
-	})->setName( 'aimeos_shop_extadm_json' );
+	$this->map(['POST'], 'extadm/do', function($request, $response, $args) {
+		return \Aimeos\Slim\Controller\Extadm::doAction($this, $request, $response, $args);
+	})->setName('aimeos_shop_extadm_json');
 
-	$this->map(['GET'], 'extadm[/{tab:[0-9]+}[/{lang}]]', function( $request, $response, $args ) {
-		return \Aimeos\Slim\Controller\Extadm::indexAction( $this, $request, $response, $args );
-	})->setName( 'aimeos_shop_extadm' );
+	$this->map(['GET'], 'extadm[/{tab:[0-9]+}[/{lang}]]', function($request, $response, $args) {
+		return \Aimeos\Slim\Controller\Extadm::indexAction($this, $request, $response, $args);
+	})->setName('aimeos_shop_extadm');
 
 
-	$this->map(['GET', 'POST'], 'jqadm/copy/{resource:[^0-9]+}/{id:[0-9]+}', function( $request, $response, $args ) {
-		return \Aimeos\Slim\Controller\Jqadm::copyAction( $this, $request, $response, $args );
-	})->setName( 'aimeos_shop_jqadm_copy' );
+	$this->map(['GET', 'POST'], 'jqadm/copy/{resource:[^0-9]+}/{id:[0-9]+}', function($request, $response, $args) {
+		return \Aimeos\Slim\Controller\Jqadm::copyAction($this, $request, $response, $args);
+	})->setName('aimeos_shop_jqadm_copy');
 
-	$this->map(['GET', 'POST'], 'jqadm/create/{resource:[^0-9]+}', function( $request, $response, $args ) {
-		return \Aimeos\Slim\Controller\Jqadm::createAction( $this, $request, $response, $args );
-	})->setName( 'aimeos_shop_jqadm_create' );
+	$this->map(['GET', 'POST'], 'jqadm/create/{resource:[^0-9]+}', function($request, $response, $args) {
+		return \Aimeos\Slim\Controller\Jqadm::createAction($this, $request, $response, $args);
+	})->setName('aimeos_shop_jqadm_create');
 
-	$this->map(['GET', 'POST'], 'jqadm/delete/{resource:[^0-9]+}/{id:[0-9]+}', function( $request, $response, $args ) {
-		return \Aimeos\Slim\Controller\Jqadm::deleteAction( $this, $request, $response, $args );
-	})->setName( 'aimeos_shop_jqadm_delete' );
+	$this->map(['GET', 'POST'], 'jqadm/delete/{resource:[^0-9]+}/{id:[0-9]+}', function($request, $response, $args) {
+		return \Aimeos\Slim\Controller\Jqadm::deleteAction($this, $request, $response, $args);
+	})->setName('aimeos_shop_jqadm_delete');
 
-	$this->map(['GET'], 'jqadm/get/{resource:[^0-9]+}/{id:[0-9]+}', function( $request, $response, $args ) {
-		return \Aimeos\Slim\Controller\Jqadm::getAction( $this, $request, $response, $args );
-	})->setName( 'aimeos_shop_jqadm_get' );
+	$this->map(['GET'], 'jqadm/get/{resource:[^0-9]+}/{id:[0-9]+}', function($request, $response, $args) {
+		return \Aimeos\Slim\Controller\Jqadm::getAction($this, $request, $response, $args);
+	})->setName('aimeos_shop_jqadm_get');
 
-	$this->map(['POST'], 'jqadm/save/{resource:[^0-9]+}[/{id:[0-9]+}]', function( $request, $response, $args ) {
-		return \Aimeos\Slim\Controller\Jqadm::saveAction( $this, $request, $response, $args );
-	})->setName( 'aimeos_shop_jqadm_save' );
+	$this->map(['POST'], 'jqadm/save/{resource:[^0-9]+}[/{id:[0-9]+}]', function($request, $response, $args) {
+		return \Aimeos\Slim\Controller\Jqadm::saveAction($this, $request, $response, $args);
+	})->setName('aimeos_shop_jqadm_save');
 
-	$this->map(['GET', 'POST'], 'jqadm/search/{resource:[^0-9]+}', function( $request, $response, $args ) {
-		return \Aimeos\Slim\Controller\Jqadm::searchAction( $this, $request, $response, $args );
-	})->setName( 'aimeos_shop_jqadm_search' );
+	$this->map(['GET', 'POST'], 'jqadm/search/{resource:[^0-9]+}', function($request, $response, $args) {
+		return \Aimeos\Slim\Controller\Jqadm::searchAction($this, $request, $response, $args);
+	})->setName('aimeos_shop_jqadm_search');
 
 
-	$this->map(['DELETE'], 'jsonadm/{resource:[^0-9]+}[/{id:[0-9]+}]', function( $request, $response, $args ) {
-		return \Aimeos\Slim\Controller\Jsonadm::deleteAction( $this, $request, $response, $args );
-	})->setName( 'aimeos_shop_jsonadm_delete' );
+	$this->map(['DELETE'], 'jsonadm/{resource:[^0-9]+}[/{id:[0-9]+}]', function($request, $response, $args) {
+		return \Aimeos\Slim\Controller\Jsonadm::deleteAction($this, $request, $response, $args);
+	})->setName('aimeos_shop_jsonadm_delete');
 
-	$this->map(['GET'], 'jsonadm/{resource:[^0-9]+}[/{id:[0-9]+}]', function( $request, $response, $args ) {
-		return \Aimeos\Slim\Controller\Jsonadm::getAction( $this, $request, $response, $args );
-	})->setName( 'aimeos_shop_jsonadm_get' );
+	$this->map(['GET'], 'jsonadm/{resource:[^0-9]+}[/{id:[0-9]+}]', function($request, $response, $args) {
+		return \Aimeos\Slim\Controller\Jsonadm::getAction($this, $request, $response, $args);
+	})->setName('aimeos_shop_jsonadm_get');
 
-	$this->map(['PATCH'], 'jsonadm/{resource:[^0-9]+}[/{id:[0-9]+}]', function( $request, $response, $args ) {
-		return \Aimeos\Slim\Controller\Jsonadm::patchAction( $this, $request, $response, $args );
-	})->setName( 'aimeos_shop_jsonadm_patch' );
+	$this->map(['PATCH'], 'jsonadm/{resource:[^0-9]+}[/{id:[0-9]+}]', function($request, $response, $args) {
+		return \Aimeos\Slim\Controller\Jsonadm::patchAction($this, $request, $response, $args);
+	})->setName('aimeos_shop_jsonadm_patch');
 
-	$this->map(['POST'], 'jsonadm/{resource:[^0-9]+}[/{id:[0-9]+}]', function( $request, $response, $args ) {
-		return \Aimeos\Slim\Controller\Jsonadm::postAction( $this, $request, $response, $args );
-	})->setName( 'aimeos_shop_jsonadm_post' );
+	$this->map(['POST'], 'jsonadm/{resource:[^0-9]+}[/{id:[0-9]+}]', function($request, $response, $args) {
+		return \Aimeos\Slim\Controller\Jsonadm::postAction($this, $request, $response, $args);
+	})->setName('aimeos_shop_jsonadm_post');
 
-	$this->map(['PUT'], 'jsonadm/{resource:[^0-9]+}[/{id:[0-9]+}]', function( $request, $response, $args ) {
-		return \Aimeos\Slim\Controller\Jsonadm::putAction( $this, $request, $response, $args );
-	})->setName( 'aimeos_shop_jsonadm_put' );
+	$this->map(['PUT'], 'jsonadm/{resource:[^0-9]+}[/{id:[0-9]+}]', function($request, $response, $args) {
+		return \Aimeos\Slim\Controller\Jsonadm::putAction($this, $request, $response, $args);
+	})->setName('aimeos_shop_jsonadm_put');
 
-	$this->map(['OPTIONS'], 'jsonadm/[{resource}]', function( $request, $response, $args ) {
-		return \Aimeos\Slim\Controller\Jsonadm::optionsAction( $this, $request, $response, $args );
-	})->setName( 'aimeos_shop_jsonadm_options' );
+	$this->map(['OPTIONS'], 'jsonadm/[{resource}]', function($request, $response, $args) {
+		return \Aimeos\Slim\Controller\Jsonadm::optionsAction($this, $request, $response, $args);
+	})->setName('aimeos_shop_jsonadm_options');
 
 });
 
 
-$app->group( $config( 'routes/account', '/' ), function() {
+$app->group($config('routes/account', '/'), function() {
 
-	$this->map(['GET', 'POST'], 'myaccount', function( $request, $response, $args ) {
-		return \Aimeos\Slim\Controller\Account::indexAction( $this, $request, $response, $args );
-	})->setName( 'aimeos_shop_account' );
+	$this->map(['GET', 'POST'], 'myaccount', function($request, $response, $args) {
+		return \Aimeos\Slim\Controller\Account::indexAction($this, $request, $response, $args);
+	})->setName('aimeos_shop_account');
 
-	$this->map(['GET', 'POST'], 'myaccount/favorite[/{fav_action}/{fav_id:[0-9]+}[/{d_prodid:[0-9]+}[/{d_name}[/{l_pos:[0-9]+}]]]]', function( $request, $response, $args ) {
-		return \Aimeos\Slim\Controller\Account::indexAction( $this, $request, $response, $args );
-	})->setName( 'aimeos_shop_account_favorite' );
+	$this->map(['GET', 'POST'], 'myaccount/favorite[/{fav_action}/{fav_id:[0-9]+}[/{d_prodid:[0-9]+}[/{d_name}[/{l_pos:[0-9]+}]]]]', function($request, $response, $args) {
+		return \Aimeos\Slim\Controller\Account::indexAction($this, $request, $response, $args);
+	})->setName('aimeos_shop_account_favorite');
 
-	$this->map(['GET', 'POST'], 'myaccount/watch[/{wat_action}/{wat_id:[0-9]+}[/{d_prodid:[0-9]+}[/{d_name}[/{l_pos:[0-9]+}]]]]', function( $request, $response, $args ) {
-		return \Aimeos\Slim\Controller\Account::indexAction( $this, $request, $response, $args );
-	})->setName( 'aimeos_shop_account_watch' );
+	$this->map(['GET', 'POST'], 'myaccount/watch[/{wat_action}/{wat_id:[0-9]+}[/{d_prodid:[0-9]+}[/{d_name}[/{l_pos:[0-9]+}]]]]', function($request, $response, $args) {
+		return \Aimeos\Slim\Controller\Account::indexAction($this, $request, $response, $args);
+	})->setName('aimeos_shop_account_watch');
 
-	$this->map(['GET', 'POST'], 'myaccount/download/{dl_id}', function( $request, $response, $args ) {
-		return \Aimeos\Slim\Controller\Account::downloadAction( $this, $request, $response, $args );
-	})->setName( 'aimeos_shop_account_download' );
+	$this->map(['GET', 'POST'], 'myaccount/download/{dl_id}', function($request, $response, $args) {
+		return \Aimeos\Slim\Controller\Account::downloadAction($this, $request, $response, $args);
+	})->setName('aimeos_shop_account_download');
 
 });
 
 
-$app->group( $config( 'routes/default', '/' ), function() {
+$app->group($config('routes/default', '/'), function() {
 
-	$this->map(['GET', 'POST'], 'count', function( $request, $response, $args ) {
-		return \Aimeos\Slim\Controller\Catalog::countAction( $this, $request, $response, $args );
-	})->setName( 'aimeos_shop_count' );
+	$this->map(['GET', 'POST'], 'count', function($request, $response, $args) {
+		return \Aimeos\Slim\Controller\Catalog::countAction($this, $request, $response, $args);
+	})->setName('aimeos_shop_count');
 
-	$this->map(['GET', 'POST'], 'detail/{d_prodid:[0-9]+}[/{d_name}[/{l_pos:[0-9]+}]]', function( $request, $response, $args ) {
-		return \Aimeos\Slim\Controller\Catalog::detailAction( $this, $request, $response, $args );
-	})->setName( 'aimeos_shop_detail' );
+	$this->map(['GET', 'POST'], 'detail/{d_prodid:[0-9]+}[/{d_name}[/{l_pos:[0-9]+}]]', function($request, $response, $args) {
+		return \Aimeos\Slim\Controller\Catalog::detailAction($this, $request, $response, $args);
+	})->setName('aimeos_shop_detail');
 
-	$this->map(['GET', 'POST'], 'detail/pin[/{pin_action}/{pin_id:[0-9]+}[/{d_prodid:[0-9]+}[/{d_name}[/{l_pos:[0-9]+}]]]]', function( $request, $response, $args ) {
-		return \Aimeos\Slim\Controller\Catalog::detailAction( $this, $request, $response, $args );
-	})->setName( 'aimeos_shop_session_pinned' );
+	$this->map(['GET', 'POST'], 'detail/pin[/{pin_action}/{pin_id:[0-9]+}[/{d_prodid:[0-9]+}[/{d_name}[/{l_pos:[0-9]+}]]]]', function($request, $response, $args) {
+		return \Aimeos\Slim\Controller\Catalog::detailAction($this, $request, $response, $args);
+	})->setName('aimeos_shop_session_pinned');
 
-	$this->map(['GET', 'POST'], 'list[/{f_catid:[0-9]+}[/{f_name}]]', function( $request, $response, $args ) {
-		return \Aimeos\Slim\Controller\Catalog::listAction( $this, $request, $response, $args );
-	})->setName( 'aimeos_shop_list' );
+	$this->map(['GET', 'POST'], 'list[/{f_catid:[0-9]+}[/{f_name}]]', function($request, $response, $args) {
+		return \Aimeos\Slim\Controller\Catalog::listAction($this, $request, $response, $args);
+	})->setName('aimeos_shop_list');
 
-	$this->map(['GET', 'POST'], 'suggest', function( $request, $response, $args ) {
-		return \Aimeos\Slim\Controller\Catalog::suggestAction( $this, $request, $response, $args );
-	})->setName( 'aimeos_shop_suggest' );
+	$this->map(['GET', 'POST'], 'suggest', function($request, $response, $args) {
+		return \Aimeos\Slim\Controller\Catalog::suggestAction($this, $request, $response, $args);
+	})->setName('aimeos_shop_suggest');
 
-	$this->map(['GET', 'POST'], 'stock', function( $request, $response, $args ) {
-		return \Aimeos\Slim\Controller\Catalog::stockAction( $this, $request, $response, $args );
-	})->setName( 'aimeos_shop_stock' );
+	$this->map(['GET', 'POST'], 'stock', function($request, $response, $args) {
+		return \Aimeos\Slim\Controller\Catalog::stockAction($this, $request, $response, $args);
+	})->setName('aimeos_shop_stock');
 
-	$this->map(['GET', 'POST'], 'basket', function( $request, $response, $args ) {
-		return \Aimeos\Slim\Controller\Basket::indexAction( $this, $request, $response, $args );
-	})->setName( 'aimeos_shop_basket' );
+	$this->map(['GET', 'POST'], 'basket', function($request, $response, $args) {
+		return \Aimeos\Slim\Controller\Basket::indexAction($this, $request, $response, $args);
+	})->setName('aimeos_shop_basket');
 
-	$this->map(['GET', 'POST'], 'checkout[/{c_step}]', function( $request, $response, $args ) {
-		return \Aimeos\Slim\Controller\Checkout::indexAction( $this, $request, $response, $args );
-	})->setName( 'aimeos_shop_checkout' );
+	$this->map(['GET', 'POST'], 'checkout[/{c_step}]', function($request, $response, $args) {
+		return \Aimeos\Slim\Controller\Checkout::indexAction($this, $request, $response, $args);
+	})->setName('aimeos_shop_checkout');
 
 });
 
 
-$app->group( $config( 'routes/confirm', '/' ), function() {
+$app->group($config('routes/confirm', '/'), function() {
 
-	$this->map(['GET', 'POST'], 'confirm[/{code}[/{orderid:[0-9]+}]]', function( $request, $response, $args ) {
-		return \Aimeos\Slim\Controller\Checkout::confirmAction( $this, $request, $response, $args );
-	})->setName( 'aimeos_shop_confirm' );
+	$this->map(['GET', 'POST'], 'confirm[/{code}[/{orderid:[0-9]+}]]', function($request, $response, $args) {
+		return \Aimeos\Slim\Controller\Checkout::confirmAction($this, $request, $response, $args);
+	})->setName('aimeos_shop_confirm');
 
 });
 
 
-$app->group( $config( 'routes/update', '/' ), function() {
+$app->group($config('routes/update', '/'), function() {
 
-	$this->map(['GET', 'POST'], 'update', function( $request, $response, $args ) {
-		return \Aimeos\Slim\Controller\Checkout::updateAction( $this, $request, $response, $args );
-	})->setName( 'aimeos_shop_update' );
+	$this->map(['GET', 'POST'], 'update', function($request, $response, $args) {
+		return \Aimeos\Slim\Controller\Checkout::updateAction($this, $request, $response, $args);
+	})->setName('aimeos_shop_update');
 
 });
 
 
-$app->map(['GET', 'POST'], '/terms', function( $request, $response, $args ) {
+$app->map(['GET', 'POST'], '/terms', function($request, $response, $args) {
 	return 'terms';
-})->setName( 'aimeos_shop_terms' );
+})->setName('aimeos_shop_terms');
 
-$app->map(['GET', 'POST'], '/privacy', function( $request, $response, $args ) {
+$app->map(['GET', 'POST'], '/privacy', function($request, $response, $args) {
 	return 'privacy';
-})->setName( 'aimeos_shop_privacy' );
+})->setName('aimeos_shop_privacy');