aimeos / aimeos-symfony

Service/Support.php

Spacing +4 added lines, -4 removed lines

@@ -27,15 +27,15 @@
 	 * @param \Aimeos\MShop\Context\Item\Iface $context Context object
 	 * @return array List of group codes the user is in
 	 */
-	public function getGroups( \Aimeos\MShop\Context\Item\Iface $context )
+	public function getGroups(\Aimeos\MShop\Context\Item\Iface $context)
 	{
 		$list = array();
-		$manager = \Aimeos\MShop::create( $context, 'customer/group' );
+		$manager = \Aimeos\MShop::create($context, 'customer/group');
 
 		$search = $manager->createSearch();
-		$search->setConditions( $search->compare( '==', 'customer.group.id', $context->getGroupIds() ) );
+		$search->setConditions($search->compare('==', 'customer.group.id', $context->getGroupIds()));
 
-		foreach( $manager->searchItems( $search ) as $item ) {
+		foreach ($manager->searchItems($search) as $item) {
 			$list[] = $item->getCode();
 		}
 

Service/Locale.php

Spacing +13 added lines, -13 removed lines

@@ -32,7 +32,7 @@ 
 	 * @param RequestStack $requestStack Current request stack
 	 * @param Container $container Container object to access parameters
 	 */
-	public function __construct( RequestStack $requestStack, Container $container )
+	public function __construct(RequestStack $requestStack, Container $container)
 	{
 		$this->requestStack = $requestStack;
 		$this->container = $container;
@@ -45,19 +45,19 @@ 
 	 * @param \Aimeos\MShop\Context\Item\Iface $context Context object
 	 * @return \Aimeos\MShop\Locale\Item\Iface Locale item object
 	 */
-	public function get( \Aimeos\MShop\Context\Item\Iface $context )
+	public function get(\Aimeos\MShop\Context\Item\Iface $context)
 	{
-		if( $this->locale === null )
+		if ($this->locale === null)
 		{
-			$status = $this->container->getParameter( 'aimeos_shop.disable_sites' );
+			$status = $this->container->getParameter('aimeos_shop.disable_sites');
 			$request = $this->requestStack->getMasterRequest();
 
-			$site = $request->attributes->get( 'site', $request->query->get( 'site', 'default' ) );
-			$currency = $request->attributes->get( 'currency', $request->query->get( 'currency', '' ) );
-			$lang = $request->attributes->get( 'locale', $request->query->get( 'locale', '' ) );
+			$site = $request->attributes->get('site', $request->query->get('site', 'default'));
+			$currency = $request->attributes->get('currency', $request->query->get('currency', ''));
+			$lang = $request->attributes->get('locale', $request->query->get('locale', ''));
 
-			$localeManager = \Aimeos\MShop::create( $context, 'locale' );
-			$this->locale = $localeManager->bootstrap( $site, $lang, $currency, $status );
+			$localeManager = \Aimeos\MShop::create($context, 'locale');
+			$this->locale = $localeManager->bootstrap($site, $lang, $currency, $status);
 		}
 
 		return $this->locale;
@@ -71,13 +71,13 @@ 
 	 * @param string $site Unique site code
 	 * @return \Aimeos\MShop\Locale\Item\Iface Locale item object
 	 */
-	public function getBackend( \Aimeos\MShop\Context\Item\Iface $context, $site )
+	public function getBackend(\Aimeos\MShop\Context\Item\Iface $context, $site)
 	{
-		$localeManager = \Aimeos\MShop::create( $context, 'locale' );
+		$localeManager = \Aimeos\MShop::create($context, 'locale');
 
 		try {
-			$localeItem = $localeManager->bootstrap( $site, '', '', false, null, true );
-		} catch( \Aimeos\MShop\Exception $e ) {
+			$localeItem = $localeManager->bootstrap($site, '', '', false, null, true);
+		} catch (\Aimeos\MShop\Exception $e) {
 			$localeItem = $localeManager->createItem();
 		}
 

Command/Command.php

Spacing +5 added lines, -5 removed lines

@@ -30,15 +30,15 @@
 	 * @param InputInterface $input Input object
 	 * @return \Aimeos\MShop\Locale\Item\Site\Interface[] List of site items
 	 */
-	protected function getSiteItems( \Aimeos\MShop\Context\Item\Iface $context, InputInterface $input )
+	protected function getSiteItems(\Aimeos\MShop\Context\Item\Iface $context, InputInterface $input)
 	{
-		$manager = \Aimeos\MShop::create( $context, 'locale/site' );
+		$manager = \Aimeos\MShop::create($context, 'locale/site');
 		$search = $manager->createSearch();
 
-		if( ( $codes = (string) $input->getArgument( 'site' ) ) !== '' ) {
-			$search->setConditions( $search->compare( '==', 'locale.site.code', explode( ' ', $codes ) ) );
+		if (($codes = (string) $input->getArgument('site')) !== '') {
+			$search->setConditions($search->compare('==', 'locale.site.code', explode(' ', $codes)));
 		}
 
-		return $manager->searchItems( $search );
+		return $manager->searchItems($search);
 	}
 }

Tests/Controller/JqadmControllerTest.php

Spacing +39 added lines, -39 removed lines

@@ -12,12 +12,12 @@ 
 		$client = static::createClient(array(), array(
 			'PHP_AUTH_USER' => 'admin',
 			'PHP_AUTH_PW'   => 'adminpass',
-		) );
+		));
 
-		$client->request( 'GET', '/unittest/jqadm/file/css' );
+		$client->request('GET', '/unittest/jqadm/file/css');
 
-		$this->assertEquals( 200, $client->getResponse()->getStatusCode() );
-		$this->assertContains( '.aimeos', $client->getResponse()->getContent() );
+		$this->assertEquals(200, $client->getResponse()->getStatusCode());
+		$this->assertContains('.aimeos', $client->getResponse()->getContent());
 	}
 
 
@@ -26,12 +26,12 @@ 
 		$client = static::createClient(array(), array(
 			'PHP_AUTH_USER' => 'admin',
 			'PHP_AUTH_PW'   => 'adminpass',
-		) );
+		));
 
-		$client->request( 'GET', '/unittest/jqadm/file/js' );
+		$client->request('GET', '/unittest/jqadm/file/js');
 
-		$this->assertEquals( 200, $client->getResponse()->getStatusCode() );
-		$this->assertContains( 'Aimeos = {', $client->getResponse()->getContent() );
+		$this->assertEquals(200, $client->getResponse()->getStatusCode());
+		$this->assertContains('Aimeos = {', $client->getResponse()->getContent());
 	}
 
 
@@ -40,13 +40,13 @@ 
 		$client = static::createClient(array(), array(
 			'PHP_AUTH_USER' => 'admin',
 			'PHP_AUTH_PW'   => 'adminpass',
-		) );
+		));
 
-		$client->request( 'GET', '/unittest/jqadm/copy/product/1' );
+		$client->request('GET', '/unittest/jqadm/copy/product/1');
 		$response = $client->getResponse();
 
-		$this->assertEquals( 200, $response->getStatusCode() );
-		$this->assertContains( 'item-product', $response->getContent() );
+		$this->assertEquals(200, $response->getStatusCode());
+		$this->assertContains('item-product', $response->getContent());
 	}
 
 
@@ -55,13 +55,13 @@ 
 		$client = static::createClient(array(), array(
 			'PHP_AUTH_USER' => 'admin',
 			'PHP_AUTH_PW'   => 'adminpass',
-		) );
+		));
 
-		$client->request( 'GET', '/unittest/jqadm/create/product' );
+		$client->request('GET', '/unittest/jqadm/create/product');
 		$response = $client->getResponse();
 
-		$this->assertEquals( 200, $response->getStatusCode() );
-		$this->assertContains( 'item-product', $response->getContent() );
+		$this->assertEquals(200, $response->getStatusCode());
+		$this->assertContains('item-product', $response->getContent());
 	}
 
 
@@ -70,13 +70,13 @@ 
 		$client = static::createClient(array(), array(
 			'PHP_AUTH_USER' => 'admin',
 			'PHP_AUTH_PW'   => 'adminpass',
-		) );
+		));
 
-		$client->request( 'GET', '/unittest/jqadm/delete/product/0' );
+		$client->request('GET', '/unittest/jqadm/delete/product/0');
 		$response = $client->getResponse();
 
-		$this->assertEquals( 200, $response->getStatusCode() );
-		$this->assertContains( 'list-items', $response->getContent() );
+		$this->assertEquals(200, $response->getStatusCode());
+		$this->assertContains('list-items', $response->getContent());
 	}
 
 
@@ -85,13 +85,13 @@ 
 		$client = static::createClient(array(), array(
 			'PHP_AUTH_USER' => 'admin',
 			'PHP_AUTH_PW'   => 'adminpass',
-		) );
+		));
 
-		$client->request( 'GET', '/unittest/jqadm/export/order' );
+		$client->request('GET', '/unittest/jqadm/export/order');
 		$response = $client->getResponse();
 
-		$this->assertEquals( 200, $response->getStatusCode() );
-		$this->assertContains( 'list-items', $response->getContent() );
+		$this->assertEquals(200, $response->getStatusCode());
+		$this->assertContains('list-items', $response->getContent());
 	}
 
 
@@ -100,13 +100,13 @@ 
 		$client = static::createClient(array(), array(
 			'PHP_AUTH_USER' => 'admin',
 			'PHP_AUTH_PW'   => 'adminpass',
-		) );
+		));
 
-		$client->request( 'GET', '/unittest/jqadm/get/product/1' );
+		$client->request('GET', '/unittest/jqadm/get/product/1');
 		$response = $client->getResponse();
 
-		$this->assertEquals( 200, $response->getStatusCode() );
-		$this->assertContains( 'item-product', $response->getContent() );
+		$this->assertEquals(200, $response->getStatusCode());
+		$this->assertContains('item-product', $response->getContent());
 	}
 
 
@@ -115,13 +115,13 @@ 
 		$client = static::createClient(array(), array(
 			'PHP_AUTH_USER' => 'admin',
 			'PHP_AUTH_PW'   => 'adminpass',
-		) );
+		));
 
-		$client->request( 'POST', '/unittest/jqadm/save/product' );
+		$client->request('POST', '/unittest/jqadm/save/product');
 		$response = $client->getResponse();
 
-		$this->assertEquals( 200, $response->getStatusCode() );
-		$this->assertContains( 'item-product', $response->getContent() );
+		$this->assertEquals(200, $response->getStatusCode());
+		$this->assertContains('item-product', $response->getContent());
 	}
 
 
@@ -130,13 +130,13 @@ 
 		$client = static::createClient(array(), array(
 			'PHP_AUTH_USER' => 'admin',
 			'PHP_AUTH_PW'   => 'adminpass',
-		) );
+		));
 
-		$client->request( 'GET', '/unittest/jqadm/search/product' );
+		$client->request('GET', '/unittest/jqadm/search/product');
 		$response = $client->getResponse();
 
-		$this->assertEquals( 200, $response->getStatusCode() );
-		$this->assertContains( 'list-items', $response->getContent() );
+		$this->assertEquals(200, $response->getStatusCode());
+		$this->assertContains('list-items', $response->getContent());
 	}
 
 
@@ -145,11 +145,11 @@ 
 		$client = static::createClient(array(), array(
 			'PHP_AUTH_USER' => 'admin',
 			'PHP_AUTH_PW'   => 'adminpass',
-		) );
+		));
 
-		$client->request( 'GET', '/invalid/jqadm/search/product' );
+		$client->request('GET', '/invalid/jqadm/search/product');
 		$response = $client->getResponse();
 
-		$this->assertEquals( 500, $response->getStatusCode() );
+		$this->assertEquals(500, $response->getStatusCode());
 	}
 }

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));
 	}
 }