aimeos / aimeos-symfony

Controller/JsonadmController.php

Spacing +27 added lines, -27 removed lines

@@ -31,10 +31,10 @@ 
 	 * @param string $site Unique site code
 	 * @return \Psr\Http\Message\ResponseInterface Response object containing the generated output
 	 */
-	public function deleteAction( ServerRequestInterface $request, $resource, $site = 'default' )
+	public function deleteAction(ServerRequestInterface $request, $resource, $site = 'default')
 	{
-		$client = $this->createAdmin( $site, $resource, $request->getAttribute( 'lang', 'en' ) );
-		return $client->delete( $request, new Response() );
+		$client = $this->createAdmin($site, $resource, $request->getAttribute('lang', 'en'));
+		return $client->delete($request, new Response());
 	}
 
 
@@ -46,10 +46,10 @@ 
 	 * @param string $site Unique site code
 	 * @return \Psr\Http\Message\ResponseInterface Response object containing the generated output
 	 */
-	public function getAction( ServerRequestInterface $request, $resource, $site = 'default' )
+	public function getAction(ServerRequestInterface $request, $resource, $site = 'default')
 	{
-		$client = $this->createAdmin( $site, $resource, $request->getAttribute( 'lang', 'en' ) );
-		return $client->get( $request, new Response() );
+		$client = $this->createAdmin($site, $resource, $request->getAttribute('lang', 'en'));
+		return $client->get($request, new Response());
 	}
 
 
@@ -61,10 +61,10 @@ 
 	 * @param string $site Unique site code
 	 * @return \Psr\Http\Message\ResponseInterface Response object containing the generated output
 	 */
-	public function patchAction( ServerRequestInterface $request, $resource, $site = 'default' )
+	public function patchAction(ServerRequestInterface $request, $resource, $site = 'default')
 	{
-		$client = $this->createAdmin( $site, $resource, $request->getAttribute( 'lang', 'en' ) );
-		return $client->patch( $request, new Response() );
+		$client = $this->createAdmin($site, $resource, $request->getAttribute('lang', 'en'));
+		return $client->patch($request, new Response());
 	}
 
 
@@ -76,10 +76,10 @@ 
 	 * @param string $site Unique site code
 	 * @return \Psr\Http\Message\ResponseInterface Response object containing the generated output
 	 */
-	public function postAction( ServerRequestInterface $request, $resource, $site = 'default' )
+	public function postAction(ServerRequestInterface $request, $resource, $site = 'default')
 	{
-		$client = $this->createAdmin( $site, $resource, $request->getAttribute( 'lang', 'en' ) );
-		return $client->post( $request, new Response() );
+		$client = $this->createAdmin($site, $resource, $request->getAttribute('lang', 'en'));
+		return $client->post($request, new Response());
 	}
 
 
@@ -91,10 +91,10 @@ 
 	 * @param string $site Unique site code
 	 * @return \Psr\Http\Message\ResponseInterface Response object containing the generated output
 	 */
-	public function putAction( ServerRequestInterface $request, $resource, $site = 'default' )
+	public function putAction(ServerRequestInterface $request, $resource, $site = 'default')
 	{
-		$client = $this->createAdmin( $site, $resource, $request->getAttribute( 'lang', 'en' ) );
-		return $client->put( $request, new Response() );
+		$client = $this->createAdmin($site, $resource, $request->getAttribute('lang', 'en'));
+		return $client->put($request, new Response());
 	}
 
 
@@ -106,10 +106,10 @@ 
 	 * @param string $site Unique site code
 	 * @return \Psr\Http\Message\ResponseInterface Response object containing the generated output
 	 */
-	public function optionsAction( ServerRequestInterface $request, $resource = '', $site = 'default' )
+	public function optionsAction(ServerRequestInterface $request, $resource = '', $site = 'default')
 	{
-		$client = $this->createAdmin( $site, $resource, $request->getAttribute( 'lang', 'en' ) );
-		return $client->options( $request, new Response() );
+		$client = $this->createAdmin($site, $resource, $request->getAttribute('lang', 'en'));
+		return $client->options($request, new Response());
 	}
 
 
@@ -121,18 +121,18 @@ 
 	 * @param string $lang Language code
 	 * @return \Aimeos\MShop\Context\Item\Iface Context item
 	 */
-	protected function createAdmin( $site, $resource, $lang )
+	protected function createAdmin($site, $resource, $lang)
 	{
-		$aimeos = $this->get( 'aimeos' )->get();
-		$templatePaths = $aimeos->getCustomPaths( 'admin/jsonadm/templates' );
+		$aimeos = $this->get('aimeos')->get();
+		$templatePaths = $aimeos->getCustomPaths('admin/jsonadm/templates');
 
-		$context = $this->get( 'aimeos.context' )->get( false, 'backend' );
-		$context->setI18n( $this->get('aimeos.i18n')->get( array( $lang, 'en' ) ) );
-		$context->setLocale( $this->get('aimeos.locale')->getBackend( $context, $site ) );
+		$context = $this->get('aimeos.context')->get(false, 'backend');
+		$context->setI18n($this->get('aimeos.i18n')->get(array($lang, 'en')));
+		$context->setLocale($this->get('aimeos.locale')->getBackend($context, $site));
 
-		$view = $this->get('aimeos.view')->create( $context, $templatePaths, $lang );
-		$context->setView( $view );
+		$view = $this->get('aimeos.view')->create($context, $templatePaths, $lang);
+		$context->setView($view);
 
-		return \Aimeos\Admin\JsonAdm::create( $context, $aimeos, $resource );
+		return \Aimeos\Admin\JsonAdm::create($context, $aimeos, $resource);
 	}
 }

Controller/JsonapiController.php

Spacing +19 added lines, -19 removed lines

@@ -30,9 +30,9 @@ 
 	 * @param string Resource location, e.g. "customer"
 	 * @return \Psr\Http\Message\ResponseInterface Response object containing the generated output
 	 */
-	public function deleteAction( ServerRequestInterface $request, $resource )
+	public function deleteAction(ServerRequestInterface $request, $resource)
 	{
-		return $this->createClient( $request, $resource )->delete( $request, new Response() );
+		return $this->createClient($request, $resource)->delete($request, new Response());
 	}
 
 
@@ -43,9 +43,9 @@ 
 	 * @param string Resource location, e.g. "customer"
 	 * @return \Psr\Http\Message\ResponseInterface Response object containing the generated output
 	 */
-	public function getAction( ServerRequestInterface $request, $resource )
+	public function getAction(ServerRequestInterface $request, $resource)
 	{
-		return $this->createClient( $request, $resource )->get( $request, new Response() );
+		return $this->createClient($request, $resource)->get($request, new Response());
 	}
 
 
@@ -56,9 +56,9 @@ 
 	 * @param string Resource location, e.g. "customer"
 	 * @return \Psr\Http\Message\ResponseInterface Response object containing the generated output
 	 */
-	public function patchAction( ServerRequestInterface $request, $resource )
+	public function patchAction(ServerRequestInterface $request, $resource)
 	{
-		return $this->createClient( $request, $resource )->patch( $request, new Response() );
+		return $this->createClient($request, $resource)->patch($request, new Response());
 	}
 
 
@@ -69,9 +69,9 @@ 
 	 * @param string Resource location, e.g. "customer"
 	 * @return \Psr\Http\Message\ResponseInterface Response object containing the generated output
 	 */
-	public function postAction( ServerRequestInterface $request, $resource )
+	public function postAction(ServerRequestInterface $request, $resource)
 	{
-		return $this->createClient( $request, $resource )->post( $request, new Response() );
+		return $this->createClient($request, $resource)->post($request, new Response());
 	}
 
 
@@ -82,9 +82,9 @@ 
 	 * @param string Resource location, e.g. "customer"
 	 * @return \Psr\Http\Message\ResponseInterface Response object containing the generated output
 	 */
-	public function putAction( ServerRequestInterface $request, $resource )
+	public function putAction(ServerRequestInterface $request, $resource)
 	{
-		return $this->createClient( $request, $resource )->put( $request, new Response() );
+		return $this->createClient($request, $resource)->put($request, new Response());
 	}
 
 
@@ -95,9 +95,9 @@ 
 	 * @param string Resource location, e.g. "customer"
 	 * @return \Psr\Http\Message\ResponseInterface Response object containing the generated output
 	 */
-	public function optionsAction( ServerRequestInterface $request, $resource = '' )
+	public function optionsAction(ServerRequestInterface $request, $resource = '')
 	{
-		return $this->createClient( $request, $resource )->options( $request, new Response() );
+		return $this->createClient($request, $resource)->options($request, new Response());
 	}
 
 
@@ -108,19 +108,19 @@ 
 	 * @param string Resource location, e.g. "customer"
 	 * @return \Aimeos\Client\JsonApi\Iface JSON API client
 	 */
-	protected function createClient( ServerRequestInterface $request, $resource )
+	protected function createClient(ServerRequestInterface $request, $resource)
 	{
 		$args = $request->getAttributes();
 		$params = $request->getQueryParams();
-		$related = ( isset( $args['related'] ) ? $args['related'] : ( isset( $params['related'] ) ? $params['related'] : null ) );
+		$related = (isset($args['related']) ? $args['related'] : (isset($params['related']) ? $params['related'] : null));
 
-		$tmplPaths = $this->container->get( 'aimeos' )->get()->getCustomPaths( 'client/jsonapi/templates' );
-		$context = $this->container->get( 'aimeos.context' )->get();
+		$tmplPaths = $this->container->get('aimeos')->get()->getCustomPaths('client/jsonapi/templates');
+		$context = $this->container->get('aimeos.context')->get();
 		$langid = $context->getLocale()->getLanguageId();
 
-		$view = $this->container->get( 'aimeos.view' )->create( $context, $tmplPaths, $langid );
-		$context->setView( $view );
+		$view = $this->container->get('aimeos.view')->create($context, $tmplPaths, $langid);
+		$context->setView($view);
 
-		return \Aimeos\Client\JsonApi::create( $context, $resource . '/' . $related );
+		return \Aimeos\Client\JsonApi::create($context, $resource.'/'.$related);
 	}
 }

Controller/AccountController.php

Spacing +19 added lines, -19 removed lines

@@ -30,15 +30,15 @@ 
 	public function indexAction()
 	{
 		$params = [];
-		$shop = $this->container->get( 'shop' );
+		$shop = $this->container->get('shop');
 
-		foreach( $this->container->getParameter( 'aimeos_shop.page' )['account-index'] as $name )
+		foreach ($this->container->getParameter('aimeos_shop.page')['account-index'] as $name)
 		{
-			$params['aiheader'][$name] = $shop->get( $name )->getHeader();
-			$params['aibody'][$name] = $shop->get( $name )->getBody();
+			$params['aiheader'][$name] = $shop->get($name)->getHeader();
+			$params['aibody'][$name] = $shop->get($name)->getBody();
 		}
 
-		return $this->render( 'AimeosShopBundle:Account:index.html.twig', $params )->setPrivate()->setMaxAge( 300 );
+		return $this->render('AimeosShopBundle:Account:index.html.twig', $params)->setPrivate()->setMaxAge(300);
 	}
 
 
@@ -49,8 +49,8 @@ 
 	 */
 	public function downloadAction()
 	{
-		$response = $this->container->get( 'shop' )->get( 'account/download' )->getView()->response();
-		return Response::create( (string) $response->getBody(), $response->getStatusCode(), $response->getHeaders() );
+		$response = $this->container->get('shop')->get('account/download')->getView()->response();
+		return Response::create((string) $response->getBody(), $response->getStatusCode(), $response->getHeaders());
 	}
 
 
@@ -61,10 +61,10 @@ 
 	 */
 	public function favoriteComponentAction()
 	{
-		$client = $this->container->get( 'shop' )->get( 'account/favorite' );
-		$this->container->get( 'twig' )->addGlobal( 'aiheader', (string) $client->getHeader() );
+		$client = $this->container->get('shop')->get('account/favorite');
+		$this->container->get('twig')->addGlobal('aiheader', (string) $client->getHeader());
 
-		return new Response( (string) $client->getBody() );
+		return new Response((string) $client->getBody());
 	}
 
 
@@ -75,10 +75,10 @@ 
 	 */
 	public function historyComponentAction()
 	{
-		$client = $this->container->get( 'shop' )->get( 'account/history' );
-		$this->container->get( 'twig' )->addGlobal( 'aiheader', (string) $client->getHeader() );
+		$client = $this->container->get('shop')->get('account/history');
+		$this->container->get('twig')->addGlobal('aiheader', (string) $client->getHeader());
 
-		return new Response( (string) $client->getBody() );
+		return new Response((string) $client->getBody());
 	}
 
 
@@ -89,10 +89,10 @@ 
 	 */
 	public function profileComponentAction()
 	{
-		$client = $this->container->get( 'shop' )->get( 'account/profile' );
-		$this->container->get( 'twig' )->addGlobal( 'aiheader', (string) $client->getHeader() );
+		$client = $this->container->get('shop')->get('account/profile');
+		$this->container->get('twig')->addGlobal('aiheader', (string) $client->getHeader());
 
-		return new Response( (string) $client->getBody() );
+		return new Response((string) $client->getBody());
 	}
 
 
@@ -103,9 +103,9 @@ 
 	 */
 	public function watchComponentAction()
 	{
-		$client = $this->container->get( 'shop' )->get( 'account/watch' );
-		$this->container->get( 'twig' )->addGlobal( 'aiheader', (string) $client->getHeader() );
+		$client = $this->container->get('shop')->get('account/watch');
+		$this->container->get('twig')->addGlobal('aiheader', (string) $client->getHeader());
 
-		return new Response( (string) $client->getBody() );
+		return new Response((string) $client->getBody());
 	}
 }

Controller/CheckoutController.php

Spacing +24 added lines, -24 removed lines

@@ -30,15 +30,15 @@ 
 	public function confirmAction()
 	{
 		$params = [];
-		$shop = $this->container->get( 'shop' );
+		$shop = $this->container->get('shop');
 
-		foreach( $this->container->getParameter( 'aimeos_shop.page' )['checkout-confirm'] as $name )
+		foreach ($this->container->getParameter('aimeos_shop.page')['checkout-confirm'] as $name)
 		{
-			$params['aiheader'][$name] = $shop->get( $name )->getHeader();
-			$params['aibody'][$name] = $shop->get( $name )->getBody();
+			$params['aiheader'][$name] = $shop->get($name)->getHeader();
+			$params['aibody'][$name] = $shop->get($name)->getBody();
 		}
 
-		$response = $this->render( 'AimeosShopBundle:Checkout:confirm.html.twig', $params );
+		$response = $this->render('AimeosShopBundle:Checkout:confirm.html.twig', $params);
 		$response->headers->set('Cache-Control', 'no-store');
 		return $response;
 	}
@@ -52,15 +52,15 @@ 
 	public function indexAction()
 	{
 		$params = [];
-		$shop = $this->container->get( 'shop' );
+		$shop = $this->container->get('shop');
 
-		foreach( $this->container->getParameter( 'aimeos_shop.page' )['checkout-index'] as $name )
+		foreach ($this->container->getParameter('aimeos_shop.page')['checkout-index'] as $name)
 		{
-			$params['aiheader'][$name] = $shop->get( $name )->getHeader();
-			$params['aibody'][$name] = $shop->get( $name )->getBody();
+			$params['aiheader'][$name] = $shop->get($name)->getHeader();
+			$params['aibody'][$name] = $shop->get($name)->getBody();
 		}
 
-		$response = $this->render( 'AimeosShopBundle:Checkout:index.html.twig', $params );
+		$response = $this->render('AimeosShopBundle:Checkout:index.html.twig', $params);
 		$response->headers->set('Cache-Control', 'no-store');
 		return $response;
 	}
@@ -74,15 +74,15 @@ 
 	public function updateAction()
 	{
 		$params = [];
-		$shop = $this->container->get( 'shop' );
+		$shop = $this->container->get('shop');
 
-		foreach( $this->container->getParameter( 'aimeos_shop.page' )['checkout-update'] as $name )
+		foreach ($this->container->getParameter('aimeos_shop.page')['checkout-update'] as $name)
 		{
-			$params['aiheader'][$name] = $shop->get( $name )->getHeader();
-			$params['aibody'][$name] = $shop->get( $name )->getBody();
+			$params['aiheader'][$name] = $shop->get($name)->getHeader();
+			$params['aibody'][$name] = $shop->get($name)->getBody();
 		}
 
-		$response = $this->render( 'AimeosShopBundle:Checkout:update.html.twig', $params );
+		$response = $this->render('AimeosShopBundle:Checkout:update.html.twig', $params);
 		$response->headers->set('Cache-Control', 'no-store');
 		return $response;
 	}
@@ -95,10 +95,10 @@ 
 	 */
 	public function confirmComponentAction()
 	{
-		$client = $this->container->get( 'shop' )->get( 'checkout/confirm' );
-		$this->container->get( 'twig' )->addGlobal( 'aiheader', (string) $client->getHeader() );
+		$client = $this->container->get('shop')->get('checkout/confirm');
+		$this->container->get('twig')->addGlobal('aiheader', (string) $client->getHeader());
 
-		$response = new Response( (string) $client->getBody() );
+		$response = new Response((string) $client->getBody());
 		$response->headers->set('Cache-Control', 'no-store');
 		return $response;
 	}
@@ -111,10 +111,10 @@ 
 	 */
 	public function standardComponentAction()
 	{
-		$client = $this->container->get( 'shop' )->get( 'checkout/standard' );
-		$this->container->get( 'twig' )->addGlobal( 'aiheader', (string) $client->getHeader() );
+		$client = $this->container->get('shop')->get('checkout/standard');
+		$this->container->get('twig')->addGlobal('aiheader', (string) $client->getHeader());
 
-		$response = new Response( (string) $client->getBody() );
+		$response = new Response((string) $client->getBody());
 		$response->headers->set('Cache-Control', 'no-store');
 		return $response;
 	}
@@ -127,10 +127,10 @@ 
 	 */
 	public function updateComponentAction()
 	{
-		$client = $this->container->get( 'shop' )->get( 'checkout/update' );
-		$this->container->get( 'twig' )->addGlobal( 'aiheader', (string) $client->getHeader() );
+		$client = $this->container->get('shop')->get('checkout/update');
+		$this->container->get('twig')->addGlobal('aiheader', (string) $client->getHeader());
 
-		$response = new Response( (string) $client->getBody() );
+		$response = new Response((string) $client->getBody());
 		$response->headers->set('Cache-Control', 'no-store');
 		return $response;
 	}

Controller/JqadmController.php

Spacing +56 added lines, -56 removed lines

@@ -29,35 +29,35 @@ 
 	 * @param $type File type, i.e. "css" or "js"
 	 * @return Response Response object
 	 */
-	public function fileAction( $type )
+	public function fileAction($type)
 	{
 		$contents = '';
 		$files = array();
-		$aimeos = $this->get( 'aimeos' )->get();
+		$aimeos = $this->get('aimeos')->get();
 
-		foreach( $aimeos->getCustomPaths( 'admin/jqadm' ) as $base => $paths )
+		foreach ($aimeos->getCustomPaths('admin/jqadm') as $base => $paths)
 		{
-			foreach( $paths as $path )
+			foreach ($paths as $path)
 			{
-				$jsbAbsPath = $base . '/' . $path;
-				$jsb2 = new \Aimeos\MW\Jsb2\Standard( $jsbAbsPath, dirname( $jsbAbsPath ) );
-				$files = array_merge( $files, $jsb2->getFiles( $type ) );
+				$jsbAbsPath = $base.'/'.$path;
+				$jsb2 = new \Aimeos\MW\Jsb2\Standard($jsbAbsPath, dirname($jsbAbsPath));
+				$files = array_merge($files, $jsb2->getFiles($type));
 			}
 		}
 
-		foreach( $files as $file )
+		foreach ($files as $file)
 		{
-			if( ( $content = file_get_contents( $file ) ) !== false ) {
+			if (($content = file_get_contents($file)) !== false) {
 				$contents .= $content;
 			}
 		}
 
-		$response = new Response( $contents );
+		$response = new Response($contents);
 
-		if( $type === 'js' ) {
-			$response->headers->set( 'Content-Type', 'application/javascript' );
-		} elseif( $type === 'css' ) {
-			$response->headers->set( 'Content-Type', 'text/css' );
+		if ($type === 'js') {
+			$response->headers->set('Content-Type', 'application/javascript');
+		} elseif ($type === 'css') {
+			$response->headers->set('Content-Type', 'text/css');
 		}
 
 		return $response;
@@ -72,15 +72,15 @@ 
 	 * @param string $site Unique site code
 	 * @return Response Generated output
 	 */
-	public function copyAction( Request $request, $resource, $site = 'default' )
+	public function copyAction(Request $request, $resource, $site = 'default')
 	{
-		$cntl = $this->createAdmin( $request, $site, $resource );
+		$cntl = $this->createAdmin($request, $site, $resource);
 
-		if( ( $html = $cntl->copy() ) == '' ) {
+		if (($html = $cntl->copy()) == '') {
 			return $cntl->getView()->response();
 		}
 
-		return $this->getHtml( $html );
+		return $this->getHtml($html);
 	}
 
 
@@ -92,15 +92,15 @@ 
 	 * @param string $site Unique site code
 	 * @return Response Generated output
 	 */
-	public function createAction( Request $request, $resource, $site = 'default' )
+	public function createAction(Request $request, $resource, $site = 'default')
 	{
-		$cntl = $this->createAdmin( $request, $site, $resource );
+		$cntl = $this->createAdmin($request, $site, $resource);
 
-		if( ( $html = $cntl->create() ) == '' ) {
+		if (($html = $cntl->create()) == '') {
 			return $cntl->getView()->response();
 		}
 
-		return $this->getHtml( $html );
+		return $this->getHtml($html);
 	}
 
 
@@ -112,15 +112,15 @@ 
 	 * @param string $site Unique site code
 	 * @return Response Generated output
 	 */
-	public function deleteAction( Request $request, $resource, $site = 'default' )
+	public function deleteAction(Request $request, $resource, $site = 'default')
 	{
-		$cntl = $this->createAdmin( $request, $site, $resource );
+		$cntl = $this->createAdmin($request, $site, $resource);
 
-		if( ( $html = $cntl->delete() ) == '' ) {
+		if (($html = $cntl->delete()) == '') {
 			return $cntl->getView()->response();
 		}
 
-		return $this->getHtml( $html );
+		return $this->getHtml($html);
 	}
 
 
@@ -132,15 +132,15 @@ 
 	 * @param string $site Unique site code
 	 * @return Response Generated output
 	 */
-	public function exportAction( Request $request, $resource, $site = 'default' )
+	public function exportAction(Request $request, $resource, $site = 'default')
 	{
-		$cntl = $this->createAdmin( $request, $site, $resource );
+		$cntl = $this->createAdmin($request, $site, $resource);
 
-		if( ( $html = $cntl->export() ) == '' ) {
+		if (($html = $cntl->export()) == '') {
 			return $cntl->getView()->response();
 		}
 
-		return $this->getHtml( $html );
+		return $this->getHtml($html);
 	}
 
 
@@ -152,15 +152,15 @@ 
 	 * @param string $site Unique site code
 	 * @return Response Generated output
 	 */
-	public function getAction( Request $request, $resource, $site = 'default' )
+	public function getAction(Request $request, $resource, $site = 'default')
 	{
-		$cntl = $this->createAdmin( $request, $site, $resource );
+		$cntl = $this->createAdmin($request, $site, $resource);
 
-		if( ( $html = $cntl->get() ) == '' ) {
+		if (($html = $cntl->get()) == '') {
 			return $cntl->getView()->response();
 		}
 
-		return $this->getHtml( $html );
+		return $this->getHtml($html);
 	}
 
 
@@ -172,15 +172,15 @@ 
 	 * @param string $site Unique site code
 	 * @return Response Generated output
 	 */
-	public function saveAction( Request $request, $resource, $site = 'default' )
+	public function saveAction(Request $request, $resource, $site = 'default')
 	{
-		$cntl = $this->createAdmin( $request, $site, $resource );
+		$cntl = $this->createAdmin($request, $site, $resource);
 
-		if( ( $html = $cntl->save() ) == '' ) {
+		if (($html = $cntl->save()) == '') {
 			return $cntl->getView()->response();
 		}
 
-		return $this->getHtml( $html );
+		return $this->getHtml($html);
 	}
 
 
@@ -192,15 +192,15 @@ 
 	 * @param string $site Unique site code
 	 * @return Response Generated output
 	 */
-	public function searchAction( Request $request, $resource, $site = 'default' )
+	public function searchAction(Request $request, $resource, $site = 'default')
 	{
-		$cntl = $this->createAdmin( $request, $site, $resource );
+		$cntl = $this->createAdmin($request, $site, $resource);
 
-		if( ( $html = $cntl->search() ) == '' ) {
+		if (($html = $cntl->search()) == '') {
 			return $cntl->getView()->response();
 		}
 
-		return $this->getHtml( $html );
+		return $this->getHtml($html);
 	}
 
 
@@ -212,26 +212,26 @@ 
 	 * @param string $resource Resource location, e.g. "product"
 	 * @return \Aimeos\Admin\JQAdm\Iface Context item
 	 */
-	protected function createAdmin( Request $request, $site, $resource )
+	protected function createAdmin(Request $request, $site, $resource)
 	{
-		$lang = $request->get( 'lang', 'en' );
+		$lang = $request->get('lang', 'en');
 
-		$aimeos = $this->get( 'aimeos' )->get();
-		$templatePaths = $aimeos->getCustomPaths( 'admin/jqadm/templates' );
+		$aimeos = $this->get('aimeos')->get();
+		$templatePaths = $aimeos->getCustomPaths('admin/jqadm/templates');
 
-		$context = $this->get( 'aimeos.context' )->get( false, 'backend' );
-		$context->setI18n( $this->get( 'aimeos.i18n' )->get( array( $lang, 'en' ) ) );
-		$context->setLocale( $this->get( 'aimeos.locale' )->getBackend( $context, $site ) );
+		$context = $this->get('aimeos.context')->get(false, 'backend');
+		$context->setI18n($this->get('aimeos.i18n')->get(array($lang, 'en')));
+		$context->setLocale($this->get('aimeos.locale')->getBackend($context, $site));
 
-		$view = $this->get( 'aimeos.view' )->create( $context, $templatePaths, $lang );
+		$view = $this->get('aimeos.view')->create($context, $templatePaths, $lang);
 
 		$view->aimeosType = 'Symfony';
-		$view->aimeosVersion = $this->get( 'aimeos' )->getVersion();
-		$view->aimeosExtensions = implode( ',', $aimeos->getExtensions() );
+		$view->aimeosVersion = $this->get('aimeos')->getVersion();
+		$view->aimeosExtensions = implode(',', $aimeos->getExtensions());
 
-		$context->setView( $view );
+		$context->setView($view);
 
-		return \Aimeos\Admin\JQAdm::create( $context, $aimeos, $resource );
+		return \Aimeos\Admin\JQAdm::create($context, $aimeos, $resource);
 	}
 
 
@@ -241,8 +241,8 @@ 
 	 * @param string $content Content from admin client
 	 * @return Response View for rendering the output
 	 */
-	protected function getHtml( $content )
+	protected function getHtml($content)
 	{
-		return $this->render( 'AimeosShopBundle:Jqadm:index.html.twig', array( 'content' => $content ) );
+		return $this->render('AimeosShopBundle:Jqadm:index.html.twig', array('content' => $content));
 	}
 }

Controller/CatalogController.php

Spacing +62 added lines, -62 removed lines

@@ -30,16 +30,16 @@ 
 	public function countAction()
 	{
 		$params = [];
-		$shop = $this->container->get( 'shop' );
+		$shop = $this->container->get('shop');
 
-		foreach( $this->container->getParameter( 'aimeos_shop.page' )['catalog-count'] as $name )
+		foreach ($this->container->getParameter('aimeos_shop.page')['catalog-count'] as $name)
 		{
-			$params['aiheader'][$name] = $shop->get( $name )->getHeader();
-			$params['aibody'][$name] = $shop->get( $name )->getBody();
+			$params['aiheader'][$name] = $shop->get($name)->getHeader();
+			$params['aibody'][$name] = $shop->get($name)->getBody();
 		}
 
-		$response = $this->render( 'AimeosShopBundle:Catalog:count.html.twig', $params )->setMaxAge( 300 );
-		$response->headers->set( 'Content-Type', 'application/javascript' );
+		$response = $this->render('AimeosShopBundle:Catalog:count.html.twig', $params)->setMaxAge(300);
+		$response->headers->set('Content-Type', 'application/javascript');
 		return $response;
 	}
 
@@ -52,15 +52,15 @@ 
 	public function detailAction()
 	{
 		$params = [];
-		$shop = $this->container->get( 'shop' );
+		$shop = $this->container->get('shop');
 
-		foreach( $this->container->getParameter( 'aimeos_shop.page' )['catalog-detail'] as $name )
+		foreach ($this->container->getParameter('aimeos_shop.page')['catalog-detail'] as $name)
 		{
-			$params['aiheader'][$name] = $shop->get( $name )->getHeader();
-			$params['aibody'][$name] = $shop->get( $name )->getBody();
+			$params['aiheader'][$name] = $shop->get($name)->getHeader();
+			$params['aibody'][$name] = $shop->get($name)->getBody();
 		}
 
-		return $this->render( 'AimeosShopBundle:Catalog:detail.html.twig', $params );
+		return $this->render('AimeosShopBundle:Catalog:detail.html.twig', $params);
 	}
 
 
@@ -72,15 +72,15 @@ 
 	public function listAction()
 	{
 		$params = [];
-		$shop = $this->container->get( 'shop' );
+		$shop = $this->container->get('shop');
 
-		foreach( $this->container->getParameter( 'aimeos_shop.page' )['catalog-list'] as $name )
+		foreach ($this->container->getParameter('aimeos_shop.page')['catalog-list'] as $name)
 		{
-			$params['aiheader'][$name] = $shop->get( $name )->getHeader();
-			$params['aibody'][$name] = $shop->get( $name )->getBody();
+			$params['aiheader'][$name] = $shop->get($name)->getHeader();
+			$params['aibody'][$name] = $shop->get($name)->getBody();
 		}
 
-		return $this->render( 'AimeosShopBundle:Catalog:list.html.twig', $params );
+		return $this->render('AimeosShopBundle:Catalog:list.html.twig', $params);
 	}
 
 
@@ -92,15 +92,15 @@ 
 	public function treeAction()
 	{
 		$params = [];
-		$shop = $this->container->get( 'shop' );
+		$shop = $this->container->get('shop');
 
-		foreach( $this->container->getParameter( 'aimeos_shop.page' )['catalog-tree'] as $name )
+		foreach ($this->container->getParameter('aimeos_shop.page')['catalog-tree'] as $name)
 		{
-			$params['aiheader'][$name] = $shop->get( $name )->getHeader();
-			$params['aibody'][$name] = $shop->get( $name )->getBody();
+			$params['aiheader'][$name] = $shop->get($name)->getHeader();
+			$params['aibody'][$name] = $shop->get($name)->getBody();
 		}
 
-		return $this->render( 'AimeosShopBundle:Catalog:tree.html.twig', $params );
+		return $this->render('AimeosShopBundle:Catalog:tree.html.twig', $params);
 	}
 
 
@@ -112,16 +112,16 @@ 
 	public function stockAction()
 	{
 		$params = [];
-		$shop = $this->container->get( 'shop' );
+		$shop = $this->container->get('shop');
 
-		foreach( $this->container->getParameter( 'aimeos_shop.page' )['catalog-stock'] as $name )
+		foreach ($this->container->getParameter('aimeos_shop.page')['catalog-stock'] as $name)
 		{
-			$params['aiheader'][$name] = $shop->get( $name )->getHeader();
-			$params['aibody'][$name] = $shop->get( $name )->getBody();
+			$params['aiheader'][$name] = $shop->get($name)->getHeader();
+			$params['aibody'][$name] = $shop->get($name)->getBody();
 		}
 
-		$response = $this->render( 'AimeosShopBundle:Catalog:stock.html.twig', $params )->setMaxAge( 30 );
-		$response->headers->set( 'Content-Type', 'application/javascript' );
+		$response = $this->render('AimeosShopBundle:Catalog:stock.html.twig', $params)->setMaxAge(30);
+		$response->headers->set('Content-Type', 'application/javascript');
 		return $response;
 	}
 
@@ -134,16 +134,16 @@ 
 	public function suggestAction()
 	{
 		$params = [];
-		$shop = $this->container->get( 'shop' );
+		$shop = $this->container->get('shop');
 
-		foreach( $this->container->getParameter( 'aimeos_shop.page' )['catalog-suggest'] as $name )
+		foreach ($this->container->getParameter('aimeos_shop.page')['catalog-suggest'] as $name)
 		{
-			$params['aiheader'][$name] = $shop->get( $name )->getHeader();
-			$params['aibody'][$name] = $shop->get( $name )->getBody();
+			$params['aiheader'][$name] = $shop->get($name)->getHeader();
+			$params['aibody'][$name] = $shop->get($name)->getBody();
 		}
 
-		$response = $this->render( 'AimeosShopBundle:Catalog:suggest.html.twig', $params );
-		$response->headers->set( 'Content-Type', 'application/json' );
+		$response = $this->render('AimeosShopBundle:Catalog:suggest.html.twig', $params);
+		$response->headers->set('Content-Type', 'application/json');
 		return $response;
 	}
 
@@ -155,12 +155,12 @@ 
 	 */
 	public function countComponentAction()
 	{
-		$client = $this->container->get( 'shop' )->get( 'catalog/count' );
-		$this->container->get( 'twig' )->addGlobal( 'aiheader', (string) $client->getHeader() );
+		$client = $this->container->get('shop')->get('catalog/count');
+		$this->container->get('twig')->addGlobal('aiheader', (string) $client->getHeader());
 
-		$response = new Response( (string) $client->getBody() );
-		$response->headers->set( 'Content-Type', 'application/javascript' );
-		return $response->setMaxAge( 300 );
+		$response = new Response((string) $client->getBody());
+		$response->headers->set('Content-Type', 'application/javascript');
+		return $response->setMaxAge(300);
 	}
 
 
@@ -171,10 +171,10 @@ 
 	 */
 	public function detailComponentAction()
 	{
-		$client = $this->container->get( 'shop' )->get( 'catalog/detail' );
-		$this->container->get( 'twig' )->addGlobal( 'aiheader', (string) $client->getHeader() );
+		$client = $this->container->get('shop')->get('catalog/detail');
+		$this->container->get('twig')->addGlobal('aiheader', (string) $client->getHeader());
 
-		return new Response( (string) $client->getBody() );
+		return new Response((string) $client->getBody());
 	}
 
 
@@ -185,10 +185,10 @@ 
 	 */
 	public function filterComponentAction()
 	{
-		$client = $this->container->get( 'shop' )->get( 'catalog/filter' );
-		$this->container->get( 'twig' )->addGlobal( 'aiheader', (string) $client->getHeader() );
+		$client = $this->container->get('shop')->get('catalog/filter');
+		$this->container->get('twig')->addGlobal('aiheader', (string) $client->getHeader());
 
-		return new Response( (string) $client->getBody() );
+		return new Response((string) $client->getBody());
 	}
 
 
@@ -199,10 +199,10 @@ 
 	 */
 	public function listComponentAction()
 	{
-		$client = $this->container->get( 'shop' )->get( 'catalog/lists' );
-		$this->container->get( 'twig' )->addGlobal( 'aiheader', (string) $client->getHeader() );
+		$client = $this->container->get('shop')->get('catalog/lists');
+		$this->container->get('twig')->addGlobal('aiheader', (string) $client->getHeader());
 
-		return new Response( (string) $client->getBody() );
+		return new Response((string) $client->getBody());
 	}
 
 
@@ -213,10 +213,10 @@ 
 	 */
 	public function sessionComponentAction()
 	{
-		$client = $this->container->get( 'shop' )->get( 'catalog/session' );
-		$this->container->get( 'twig' )->addGlobal( 'aiheader', (string) $client->getHeader() );
+		$client = $this->container->get('shop')->get('catalog/session');
+		$this->container->get('twig')->addGlobal('aiheader', (string) $client->getHeader());
 
-		return new Response( (string) $client->getBody() );
+		return new Response((string) $client->getBody());
 	}
 
 
@@ -227,10 +227,10 @@ 
 	 */
 	public function stageComponentAction()
 	{
-		$client = $this->container->get( 'shop' )->get( 'catalog/stage' );
-		$this->container->get( 'twig' )->addGlobal( 'aiheader', (string) $client->getHeader() );
+		$client = $this->container->get('shop')->get('catalog/stage');
+		$this->container->get('twig')->addGlobal('aiheader', (string) $client->getHeader());
 
-		return new Response( (string) $client->getBody() );
+		return new Response((string) $client->getBody());
 	}
 
 
@@ -241,12 +241,12 @@ 
 	 */
 	public function stockComponentAction()
 	{
-		$client = $this->container->get( 'shop' )->get( 'catalog/stock' );
-		$this->container->get( 'twig' )->addGlobal( 'aiheader', (string) $client->getHeader() );
+		$client = $this->container->get('shop')->get('catalog/stock');
+		$this->container->get('twig')->addGlobal('aiheader', (string) $client->getHeader());
 
-		$response = new Response( (string) $client->getBody() );
-		$response->headers->set( 'Content-Type', 'application/javascript' );
-		return $response->setMaxAge( 30 );
+		$response = new Response((string) $client->getBody());
+		$response->headers->set('Content-Type', 'application/javascript');
+		return $response->setMaxAge(30);
 	}
 
 
@@ -257,11 +257,11 @@ 
 	 */
 	public function suggestComponentAction()
 	{
-		$client = $this->container->get( 'shop' )->get( 'catalog/suggest' );
-		$this->container->get( 'twig' )->addGlobal( 'aiheader', (string) $client->getHeader() );
+		$client = $this->container->get('shop')->get('catalog/suggest');
+		$this->container->get('twig')->addGlobal('aiheader', (string) $client->getHeader());
 
-		$response = new Response( (string) $client->getBody() );
-		$response->headers->set( 'Content-Type', 'application/json' );
+		$response = new Response((string) $client->getBody());
+		$response->headers->set('Content-Type', 'application/json');
 		return $response;
 	}
 }

Controller/AdminController.php

Spacing +19 added lines, -19 removed lines

@@ -28,36 +28,36 @@ 
 	 * @param Request $request Symfony request object
 	 * @return Response Generated HTML page for the admin interface
 	 */
-	public function indexAction( Request $request )
+	public function indexAction(Request $request)
 	{
-		if( $this->hasRole( ['ROLE_ADMIN', 'ROLE_SUPER_ADMIN'] ) )
+		if ($this->hasRole(['ROLE_ADMIN', 'ROLE_SUPER_ADMIN']))
 		{
-			$context = $this->get( 'aimeos.context' )->get( false );
-			$user = $this->get( 'security.token_storage' )->getToken()->getUser();
-			$siteManager = \Aimeos\MShop\Factory::create( $context, 'locale/site' );
-			$siteCode = ( $user->getSiteId() ? $siteManager->getItem( $user->getSiteId() )->getCode() : 'default' );
-			$locale = $user->getLanguageId() ?: $this->getParameter( 'locale' );
+			$context = $this->get('aimeos.context')->get(false);
+			$user = $this->get('security.token_storage')->getToken()->getUser();
+			$siteManager = \Aimeos\MShop\Factory::create($context, 'locale/site');
+			$siteCode = ($user->getSiteId() ? $siteManager->getItem($user->getSiteId())->getCode() : 'default');
+			$locale = $user->getLanguageId() ?: $this->getParameter('locale');
 
 			$params = array(
 				'resource' => 'dashboard',
-				'site' => $request->attributes->get( 'site', $request->query->get( 'site', $siteCode ) ),
-				'lang' => $request->attributes->get( 'lang', $request->query->get( 'lang', $locale ) ),
+				'site' => $request->attributes->get('site', $request->query->get('site', $siteCode)),
+				'lang' => $request->attributes->get('lang', $request->query->get('lang', $locale)),
 			);
-			return $this->redirect( $this->generateUrl( 'aimeos_shop_jqadm_search', $params ) );
+			return $this->redirect($this->generateUrl('aimeos_shop_jqadm_search', $params));
 		}
 
 
-		$param = array( 'error' => '', 'username' => '' );
+		$param = array('error' => '', 'username' => '');
 
-		if( $this->has( 'security.authentication_utils' ) )
+		if ($this->has('security.authentication_utils'))
 		{
-			$auth = $this->get( 'security.authentication_utils' );
+			$auth = $this->get('security.authentication_utils');
 
 			$param['error'] = $auth->getLastAuthenticationError();
 			$param['username'] = $auth->getLastUsername();
 		}
 
-		return $this->render( 'AimeosShopBundle:Admin:index.html.twig', $param );
+		return $this->render('AimeosShopBundle:Admin:index.html.twig', $param);
 	}
 
 
@@ -67,15 +67,15 @@ 
 	 * @param array $roles List of role names where at least one must match
 	 * @return boolean True if authenticated and is admin, false if not
 	 */
-	protected function hasRole( array $roles )
+	protected function hasRole(array $roles)
 	{
-		if( $this->has( 'security.authorization_checker' ) && $this->get( 'security.token_storage' )->getToken() )
+		if ($this->has('security.authorization_checker') && $this->get('security.token_storage')->getToken())
 		{
-			$checker = $this->get( 'security.authorization_checker' );
+			$checker = $this->get('security.authorization_checker');
 
-			foreach( $roles as $role )
+			foreach ($roles as $role)
 			{
-				if( $checker->isGranted( $role ) ) {
+				if ($checker->isGranted($role)) {
 					return true;
 				}
 			}

Controller/BasketController.php

Spacing +14 added lines, -14 removed lines

@@ -30,15 +30,15 @@ 
 	public function indexAction()
 	{
 		$params = [];
-		$shop = $this->container->get( 'shop' );
+		$shop = $this->container->get('shop');
 
-		foreach( $this->container->getParameter( 'aimeos_shop.page' )['basket-index'] as $name )
+		foreach ($this->container->getParameter('aimeos_shop.page')['basket-index'] as $name)
 		{
-			$params['aiheader'][$name] = $shop->get( $name )->getHeader();
-			$params['aibody'][$name] = $shop->get( $name )->getBody();
+			$params['aiheader'][$name] = $shop->get($name)->getHeader();
+			$params['aibody'][$name] = $shop->get($name)->getBody();
 		}
 
-		$response =  $this->render( 'AimeosShopBundle:Basket:index.html.twig', $params );
+		$response = $this->render('AimeosShopBundle:Basket:index.html.twig', $params);
 		$response->headers->set('Cache-Control', 'no-store');
 		return $response;
 	}
@@ -50,10 +50,10 @@ 
 	 */
 	public function miniComponentAction()
 	{
-		$client = $this->container->get( 'shop' )->get( 'basket/mini' );
-		$this->container->get( 'twig' )->addGlobal( 'aiheader', (string) $client->getHeader() );
+		$client = $this->container->get('shop')->get('basket/mini');
+		$this->container->get('twig')->addGlobal('aiheader', (string) $client->getHeader());
 
-		$response = new Response( (string) $client->getBody() );
+		$response = new Response((string) $client->getBody());
 		$response->headers->set('Cache-Control', 'no-store');
 		return $response;
 	}
@@ -66,10 +66,10 @@ 
 	 */
 	public function relatedComponentAction()
 	{
-		$client = $this->container->get( 'shop' )->get( 'basket/related' );
-		$this->container->get( 'twig' )->addGlobal( 'aiheader', (string) $client->getHeader() );
+		$client = $this->container->get('shop')->get('basket/related');
+		$this->container->get('twig')->addGlobal('aiheader', (string) $client->getHeader());
 
-		$response = new Response( (string) $client->getBody() );
+		$response = new Response((string) $client->getBody());
 		$response->headers->set('Cache-Control', 'no-store');
 		return $response;
 	}
@@ -82,10 +82,10 @@ 
 	 */
 	public function standardComponentAction()
 	{
-		$client = $this->container->get( 'shop' )->get( 'basket/standard' );
-		$this->container->get( 'twig' )->addGlobal( 'aiheader', (string) $client->getHeader() );
+		$client = $this->container->get('shop')->get('basket/standard');
+		$this->container->get('twig')->addGlobal('aiheader', (string) $client->getHeader());
 
-		$response = new Response( (string) $client->getBody() );
+		$response = new Response((string) $client->getBody());
 		$response->headers->set('Cache-Control', 'no-store');
 		return $response;
 	}

Controller/LocaleController.php

Spacing +4 added lines, -4 removed lines

@@ -29,10 +29,10 @@
 	 */
 	public function selectComponentAction()
 	{
-		$shop = $this->container->get( 'shop' );
-		$client = $shop->get( 'locale/select' );
-		$this->container->get( 'twig' )->addGlobal( 'aiheader', (string) $client->getHeader() );
+		$shop = $this->container->get('shop');
+		$client = $shop->get('locale/select');
+		$this->container->get('twig')->addGlobal('aiheader', (string) $client->getHeader());
 
-		return new Response( (string) $client->getBody() );
+		return new Response((string) $client->getBody());
 	}
 }