aimeos / aimeos-symfony

Controller/AccountController.php

Spacing +7 added lines, -7 removed lines

@@ -29,8 +29,8 @@ 
 	 */
 	public function indexAction()
 	{
-		$params = $this->get( 'aimeos_page' )->getSections( 'account-index' );
-		return $this->render( 'AimeosShopBundle:Account:index.html.twig', $params );
+		$params = $this->get('aimeos_page')->getSections('account-index');
+		return $this->render('AimeosShopBundle:Account:index.html.twig', $params);
 	}
 
 
@@ -44,14 +44,14 @@ 
 		$context = $this->container->get('aimeos_context')->get();
 		$langid = $context->getLocale()->getLanguageId();
 
-		$view = $this->container->get('aimeos_view')->create( $context->getConfig(), array(), $langid );
-		$context->setView( $view );
+		$view = $this->container->get('aimeos_view')->create($context->getConfig(), array(), $langid);
+		$context->setView($view);
 
-		$client = \Aimeos\Client\Html\Factory::createClient( $context, array(), 'account/download' );
-		$client->setView( $view );
+		$client = \Aimeos\Client\Html\Factory::createClient($context, array(), 'account/download');
+		$client->setView($view);
 		$client->process();
 
 		$response = $view->response();
-		return new Response( (string) $response->getBody(), $response->getStatusCode(), $response->getHeaders() );
+		return new Response((string) $response->getBody(), $response->getStatusCode(), $response->getHeaders());
 	}
 }

Tests/Controller/AccountControllerTest.php

Spacing +4 added lines, -4 removed lines

@@ -10,17 +10,17 @@
 	public function testAccount()
 	{
 		$client = static::createClient();
-		$client->request( 'GET', '/unittest/de/EUR/myaccount' );
+		$client->request('GET', '/unittest/de/EUR/myaccount');
 
-		$this->assertContains( 'aimeos account-history', $client->getResponse()->getContent() );
+		$this->assertContains('aimeos account-history', $client->getResponse()->getContent());
 	}
 
 
 	public function testDownload()
 	{
 		$client = static::createClient();
-		$client->request( 'GET', '/unittest/de/EUR/myaccount/download/0' );
+		$client->request('GET', '/unittest/de/EUR/myaccount/download/0');
 
-		$this->assertEquals( 401, $client->getResponse()->getStatusCode() );
+		$this->assertEquals(401, $client->getResponse()->getStatusCode());
 	}
 }

Service/I18n.php

Spacing +13 added lines, -13 removed lines

@@ -29,7 +29,7 @@ 
 	 *
 	 * @param Container $container Container object to access parameters
 	 */
-	public function __construct( Container $container )
+	public function __construct(Container $container)
 	{
 		$this->container = $container;
 	}
@@ -41,27 +41,27 @@ 
 	 * @param array $languageIds List of two letter ISO language IDs
 	 * @return \Aimeos\MW\Translation\Interface[] List of translation objects
 	 */
-	public function get( array $languageIds )
+	public function get(array $languageIds)
 	{
-		$i18nPaths = $this->container->get( 'aimeos' )->get()->getI18nPaths();
+		$i18nPaths = $this->container->get('aimeos')->get()->getI18nPaths();
 
-		foreach( $languageIds as $langid )
+		foreach ($languageIds as $langid)
 		{
-			if( !isset( $this->i18n[$langid] ) )
+			if (!isset($this->i18n[$langid]))
 			{
-				$i18n = new \Aimeos\MW\Translation\Gettext( $i18nPaths, $langid );
+				$i18n = new \Aimeos\MW\Translation\Gettext($i18nPaths, $langid);
 
-				$apc = (bool) $this->container->getParameter( 'aimeos_shop.apc_enable' );
-				$prefix = $this->container->getParameter( 'aimeos_shop.apc_prefix' );
+				$apc = (bool) $this->container->getParameter('aimeos_shop.apc_enable');
+				$prefix = $this->container->getParameter('aimeos_shop.apc_prefix');
 
-				if( function_exists( 'apc_store' ) === true && $apc === true ) {
-					$i18n = new \Aimeos\MW\Translation\Decorator\APC( $i18n, $prefix );
+				if (function_exists('apc_store') === true && $apc === true) {
+					$i18n = new \Aimeos\MW\Translation\Decorator\APC($i18n, $prefix);
 				}
 
-				$translations = $this->container->getParameter( 'aimeos_shop.i18n' );
+				$translations = $this->container->getParameter('aimeos_shop.i18n');
 
-				if( isset( $translations[$langid] ) ) {
-					$i18n = new \Aimeos\MW\Translation\Decorator\Memory( $i18n, $translations[$langid] );
+				if (isset($translations[$langid])) {
+					$i18n = new \Aimeos\MW\Translation\Decorator\Memory($i18n, $translations[$langid]);
 				}
 
 				$this->i18n[$langid] = $i18n;

Controller/JsonadmController.php

Spacing +45 added lines, -45 removed lines

@@ -31,15 +31,15 @@ 
 	 * @param string $site Unique site code
 	 * @return \Symfony\Component\HttpFoundation\Response Response object containing the generated output
 	 */
-	public function deleteAction( Request $request, $resource, $site = 'default' )
+	public function deleteAction(Request $request, $resource, $site = 'default')
 	{
 		$status = 500;
 		$header = $request->headers->all();
 
-		$client = $this->createClient( $site, $resource, $request->get( 'lang', 'en' ) );
-		$result = $client->delete( $request->getContent(), $header, $status );
+		$client = $this->createClient($site, $resource, $request->get('lang', 'en'));
+		$result = $client->delete($request->getContent(), $header, $status);
 
-		return $this->createResponse( $result, $status, $header );
+		return $this->createResponse($result, $status, $header);
 	}
 
 
@@ -51,15 +51,15 @@ 
 	 * @param string $site Unique site code
 	 * @return \Symfony\Component\HttpFoundation\Response Response object containing the generated output
 	 */
-	public function getAction( Request $request, $resource, $site = 'default' )
+	public function getAction(Request $request, $resource, $site = 'default')
 	{
 		$status = 500;
 		$header = $request->headers->all();
 
-		$client = $this->createClient( $site, $resource, $request->get( 'lang', 'en' ) );
-		$result = $client->get( $request->getContent(), $header, $status );
+		$client = $this->createClient($site, $resource, $request->get('lang', 'en'));
+		$result = $client->get($request->getContent(), $header, $status);
 
-		return $this->createResponse( $result, $status, $header );
+		return $this->createResponse($result, $status, $header);
 	}
 
 
@@ -71,15 +71,15 @@ 
 	 * @param string $site Unique site code
 	 * @return \Symfony\Component\HttpFoundation\Response Response object containing the generated output
 	 */
-	public function patchAction( Request $request, $resource, $site = 'default' )
+	public function patchAction(Request $request, $resource, $site = 'default')
 	{
 		$status = 500;
 		$header = $request->headers->all();
 
-		$client = $this->createClient( $site, $resource, $request->get( 'lang', 'en' ) );
-		$result = $client->patch( $request->getContent(), $header, $status );
+		$client = $this->createClient($site, $resource, $request->get('lang', 'en'));
+		$result = $client->patch($request->getContent(), $header, $status);
 
-		return $this->createResponse( $result, $status, $header );
+		return $this->createResponse($result, $status, $header);
 	}
 
 
@@ -91,15 +91,15 @@ 
 	 * @param string $site Unique site code
 	 * @return \Symfony\Component\HttpFoundation\Response Response object containing the generated output
 	 */
-	public function postAction( Request $request, $resource, $site = 'default' )
+	public function postAction(Request $request, $resource, $site = 'default')
 	{
 		$status = 500;
 		$header = $request->headers->all();
 
-		$client = $this->createClient( $site, $resource, $request->get( 'lang', 'en' ) );
-		$result = $client->post( $request->getContent(), $header, $status );
+		$client = $this->createClient($site, $resource, $request->get('lang', 'en'));
+		$result = $client->post($request->getContent(), $header, $status);
 
-		return $this->createResponse( $result, $status, $header );
+		return $this->createResponse($result, $status, $header);
 	}
 
 
@@ -111,15 +111,15 @@ 
 	 * @param string $site Unique site code
 	 * @return \Symfony\Component\HttpFoundation\Response Response object containing the generated output
 	 */
-	public function putAction( Request $request, $resource, $site = 'default' )
+	public function putAction(Request $request, $resource, $site = 'default')
 	{
 		$status = 500;
 		$header = $request->headers->all();
 
-		$client = $this->createClient( $site, $resource, $request->get( 'lang', 'en' ) );
-		$result = $client->put( $request->getContent(), $header, $status );
+		$client = $this->createClient($site, $resource, $request->get('lang', 'en'));
+		$result = $client->put($request->getContent(), $header, $status);
 
-		return $this->createResponse( $result, $status, $header );
+		return $this->createResponse($result, $status, $header);
 	}
 
 
@@ -131,15 +131,15 @@ 
 	 * @param string $site Unique site code
 	 * @return \Symfony\Component\HttpFoundation\Response Response object containing the generated output
 	 */
-	public function optionsAction( Request $request, $resource = '', $site = 'default' )
+	public function optionsAction(Request $request, $resource = '', $site = 'default')
 	{
 		$status = 500;
 		$header = $request->headers->all();
 
-		$client = $this->createClient( $site, $resource, $request->get( 'lang', 'en' ) );
-		$result = $client->options( $request->getContent(), $header, $status );
+		$client = $this->createClient($site, $resource, $request->get('lang', 'en'));
+		$result = $client->options($request->getContent(), $header, $status);
 
-		return $this->createResponse( $result, $status, $header );
+		return $this->createResponse($result, $status, $header);
 	}
 
 
@@ -151,18 +151,18 @@ 
 	 * @param string $lang Language code
 	 * @return \Aimeos\MShop\Context\Item\Iface Context item
 	 */
-	protected function createClient( $site, $resource, $lang )
+	protected function createClient($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 );
-		$context = $this->setLocale( $context, $site, $lang );
+		$context = $this->get('aimeos_context')->get(false);
+		$context = $this->setLocale($context, $site, $lang);
 
-		$view = $this->get('aimeos_view')->create( $context->getConfig(), $templatePaths, $lang );
-		$context->setView( $view );
+		$view = $this->get('aimeos_view')->create($context->getConfig(), $templatePaths, $lang);
+		$context->setView($view);
 
-		return \Aimeos\Admin\JsonAdm\Factory::createClient( $context, $templatePaths, $resource );
+		return \Aimeos\Admin\JsonAdm\Factory::createClient($context, $templatePaths, $resource);
 	}
 
 
@@ -174,14 +174,14 @@ 
 	 * @param array $header List of HTTP headers
 	 * @return Response HTTP response object
 	 */
-	protected function createResponse( $content, $status, array $header )
+	protected function createResponse($content, $status, array $header)
 	{
 		$response = new Response();
-		$response->setContent( $content );
-		$response->setStatusCode( $status );
+		$response->setContent($content);
+		$response->setStatusCode($status);
 
-		foreach( $header as $key => $value ) {
-			$response->headers->set( $key, $value );
+		foreach ($header as $key => $value) {
+			$response->headers->set($key, $value);
 		}
 
 		return $response;
@@ -196,23 +196,23 @@ 
 	 * @param string $lang ISO language code, e.g. "en" or "en_GB"
 	 * @return \Aimeos\MShop\Context\Item\Iface Modified context object
 	 */
-	protected function setLocale( \Aimeos\MShop\Context\Item\Iface $context, $site, $lang )
+	protected function setLocale(\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( $this->get('aimeos_i18n')->get( array( $lang ) ) );
+		$context->setLocale($localeItem);
+		$context->setI18n($this->get('aimeos_i18n')->get(array($lang)));
 
 		return $context;
 	}

Tests/Controller/JqadmControllerTest.php

Spacing +36 added lines, -36 removed lines

@@ -12,12 +12,12 @@ 
 		$client = static::createClient(array(), array(
 			'PHP_AUTH_USER' => 'admin',
 			'PHP_AUTH_PW'   => 'adminpass',
-		) );
+		));
 
-		$client->request( 'GET', '/jqadm/file/css' );
+		$client->request('GET', '/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', '/jqadm/file/js' );
+		$client->request('GET', '/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/0' );
+		$client->request('GET', '/unittest/jqadm/copy/product/0');
 		$response = $client->getResponse();
 
-		$this->assertEquals( 200, $response->getStatusCode() );
-		$this->assertContains( '<div class="product-item', $response->getContent() );
+		$this->assertEquals(200, $response->getStatusCode());
+		$this->assertContains('<div class="product-item', $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( '<div class="product-item', $response->getContent() );
+		$this->assertEquals(200, $response->getStatusCode());
+		$this->assertContains('<div class="product-item', $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( '<table class="list-items', $response->getContent() );
+		$this->assertEquals(200, $response->getStatusCode());
+		$this->assertContains('<table class="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/get/product/0' );
+		$client->request('GET', '/unittest/jqadm/get/product/0');
 		$response = $client->getResponse();
 
-		$this->assertEquals( 200, $response->getStatusCode() );
-		$this->assertContains( '<div class="product-item', $response->getContent() );
+		$this->assertEquals(200, $response->getStatusCode());
+		$this->assertContains('<div class="product-item', $response->getContent());
 	}
 
 
@@ -100,13 +100,13 @@ 
 		$client = static::createClient(array(), array(
 			'PHP_AUTH_USER' => 'admin',
 			'PHP_AUTH_PW'   => 'adminpass',
-		) );
+		));
 
-		$client->request( 'POST', '/unittest/jqadm/save/product/0' );
+		$client->request('POST', '/unittest/jqadm/save/product/0');
 		$response = $client->getResponse();
 
-		$this->assertEquals( 200, $response->getStatusCode() );
-		$this->assertContains( '<div class="product-item', $response->getContent() );
+		$this->assertEquals(200, $response->getStatusCode());
+		$this->assertContains('<div class="product-item', $response->getContent());
 	}
 
 
@@ -115,13 +115,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( '<table class="list-items', $response->getContent() );
+		$this->assertEquals(200, $response->getStatusCode());
+		$this->assertContains('<table class="list-items', $response->getContent());
 	}
 
 
@@ -130,12 +130,12 @@ 
 		$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( 200, $response->getStatusCode() );
-		$this->assertContains( '<table class="list-items', $response->getContent() );
+		$this->assertEquals(200, $response->getStatusCode());
+		$this->assertContains('<table class="list-items', $response->getContent());
 	}
 }

Service/View.php

Spacing +31 added lines, -31 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;
@@ -47,57 +47,57 @@ 
 	 * @param string|null $locale Code of the current language or null for no translation
 	 * @return \Aimeos\MW\View\Iface View object
 	 */
-	public function create( \Aimeos\MW\Config\Iface $config, array $templatePaths, $locale = null )
+	public function create(\Aimeos\MW\Config\Iface $config, array $templatePaths, $locale = null)
 	{
 		$params = $fixed = array();
 		$request = $this->requestStack->getMasterRequest();
 
-		if( $locale !== null )
+		if ($locale !== null)
 		{
-			$params = $request->request->all() + $request->query->all() + $request->attributes->get( '_route_params' );
+			$params = $request->request->all() + $request->query->all() + $request->attributes->get('_route_params');
 			$fixed = $this->getFixedParams();
 
-			$i18n = $this->container->get('aimeos_i18n')->get( array( $locale ) );
+			$i18n = $this->container->get('aimeos_i18n')->get(array($locale));
 			$translation = $i18n[$locale];
 		}
 		else
 		{
-			$translation = new \Aimeos\MW\Translation\None( 'en' );
+			$translation = new \Aimeos\MW\Translation\None('en');
 		}
 
 
-		$view = new \Aimeos\MW\View\Standard( $templatePaths );
+		$view = new \Aimeos\MW\View\Standard($templatePaths);
 
-		$helper = new \Aimeos\MW\View\Helper\Translate\Standard( $view, $translation );
-		$view->addHelper( 'translate', $helper );
+		$helper = new \Aimeos\MW\View\Helper\Translate\Standard($view, $translation);
+		$view->addHelper('translate', $helper);
 
-		$helper = new \Aimeos\MW\View\Helper\Url\Symfony2( $view, $this->container->get( 'router' ), $fixed );
-		$view->addHelper( 'url', $helper );
+		$helper = new \Aimeos\MW\View\Helper\Url\Symfony2($view, $this->container->get('router'), $fixed);
+		$view->addHelper('url', $helper);
 
-		$helper = new \Aimeos\MW\View\Helper\Param\Standard( $view, $params );
-		$view->addHelper( 'param', $helper );
+		$helper = new \Aimeos\MW\View\Helper\Param\Standard($view, $params);
+		$view->addHelper('param', $helper);
 
-		$config = new \Aimeos\MW\Config\Decorator\Protect( clone $config, array( 'admin', 'client' ) );
-		$helper = new \Aimeos\MW\View\Helper\Config\Standard( $view, $config );
-		$view->addHelper( 'config', $helper );
+		$config = new \Aimeos\MW\Config\Decorator\Protect(clone $config, array('admin', 'client'));
+		$helper = new \Aimeos\MW\View\Helper\Config\Standard($view, $config);
+		$view->addHelper('config', $helper);
 
-		$sepDec = $config->get( 'client/html/common/format/seperatorDecimal', '.' );
-		$sep1000 = $config->get( 'client/html/common/format/seperator1000', ' ' );
-		$helper = new \Aimeos\MW\View\Helper\Number\Standard( $view, $sepDec, $sep1000 );
-		$view->addHelper( 'number', $helper );
+		$sepDec = $config->get('client/html/common/format/seperatorDecimal', '.');
+		$sep1000 = $config->get('client/html/common/format/seperator1000', ' ');
+		$helper = new \Aimeos\MW\View\Helper\Number\Standard($view, $sepDec, $sep1000);
+		$view->addHelper('number', $helper);
 
-		if( $request !== null )
+		if ($request !== null)
 		{
-			$helper = new \Aimeos\MW\View\Helper\Request\Symfony2( $view, $request );
-			$view->addHelper( 'request', $helper );
+			$helper = new \Aimeos\MW\View\Helper\Request\Symfony2($view, $request);
+			$view->addHelper('request', $helper);
 		}
 
-		$helper = new \Aimeos\MW\View\Helper\Response\Symfony2( $view );
-		$view->addHelper( 'response', $helper );
+		$helper = new \Aimeos\MW\View\Helper\Response\Symfony2($view);
+		$view->addHelper('response', $helper);
 
-		$token = $this->container->get( 'security.csrf.token_manager' )->getToken( '_token' );
-		$helper = new \Aimeos\MW\View\Helper\Csrf\Standard( $view, '_token', $token->getValue() );
-		$view->addHelper( 'csrf', $helper );
+		$token = $this->container->get('security.csrf.token_manager')->getToken('_token');
+		$helper = new \Aimeos\MW\View\Helper\Csrf\Standard($view, '_token', $token->getValue());
+		$view->addHelper('csrf', $helper);
 
 		return $view;
 	}
@@ -113,15 +113,15 @@ 
 		$urlparams = array();
 		$attr = $this->requestStack->getMasterRequest()->attributes;
 
-		if( ( $site = $attr->get( 'site' ) ) !== null ) {
+		if (($site = $attr->get('site')) !== null) {
 			$urlparams['site'] = $site;
 		}
 
-		if( ( $lang = $attr->get( 'locale' ) ) !== null ) {
+		if (($lang = $attr->get('locale')) !== null) {
 			$urlparams['locale'] = $lang;
 		}
 
-		if( ( $currency = $attr->get( 'currency' ) ) !== null ) {
+		if (($currency = $attr->get('currency')) !== null) {
 			$urlparams['currency'] = $currency;
 		}
 

Service/Context.php

Spacing +58 added lines, -58 removed lines

@@ -34,7 +34,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;
@@ -47,52 +47,52 @@ 
 	 * @param boolean $locale True to add locale object to context, false if not
 	 * @return \Aimeos\MShop\Context\Item\Iface Context object
 	 */
-	public function get( $locale = true )
+	public function get($locale = true)
 	{
-		if( self::$context === null )
+		if (self::$context === null)
 		{
 			$context = new \Aimeos\MShop\Context\Item\Standard();
 
 			$config = $this->getConfig();
-			$context->setConfig( $config );
+			$context->setConfig($config);
 
-			$dbm = new \Aimeos\MW\DB\Manager\PDO( $config );
-			$context->setDatabaseManager( $dbm );
+			$dbm = new \Aimeos\MW\DB\Manager\PDO($config);
+			$context->setDatabaseManager($dbm);
 
-			$fs = new \Aimeos\MW\Filesystem\Manager\Standard( $config );
-			$context->setFilesystemManager( $fs );
+			$fs = new \Aimeos\MW\Filesystem\Manager\Standard($config);
+			$context->setFilesystemManager($fs);
 
-			$mq = new \Aimeos\MW\MQueue\Manager\Standard( $config );
-			$context->setMessageQueueManager( $mq );
+			$mq = new \Aimeos\MW\MQueue\Manager\Standard($config);
+			$context->setMessageQueueManager($mq);
 
 			$container = $this->container;
-			$mail = new \Aimeos\MW\Mail\Swift( function() use ( $container) { return $container->get( 'mailer' ); } );
-			$context->setMail( $mail );
+			$mail = new \Aimeos\MW\Mail\Swift(function() use ($container) { return $container->get('mailer'); } );
+			$context->setMail($mail);
 
-			$logger = \Aimeos\MAdmin\Log\Manager\Factory::createManager( $context );
-			$context->setLogger( $logger );
+			$logger = \Aimeos\MAdmin\Log\Manager\Factory::createManager($context);
+			$context->setLogger($logger);
 
-			$cache = new \Aimeos\MAdmin\Cache\Proxy\Standard( $context );
-			$context->setCache( $cache );
+			$cache = new \Aimeos\MAdmin\Cache\Proxy\Standard($context);
+			$context->setCache($cache);
 
 			self::$context = $context;
 		}
 
 		$context = self::$context;
 
-		if( $locale === true )
+		if ($locale === true)
 		{
-			$localeItem = $this->getLocale( $context );
+			$localeItem = $this->getLocale($context);
 			$langid = $localeItem->getLanguageId();
 
-			$context->setLocale( $localeItem );
-			$context->setI18n( $this->container->get('aimeos_i18n')->get( array( $langid ) ) );
+			$context->setLocale($localeItem);
+			$context->setI18n($this->container->get('aimeos_i18n')->get(array($langid)));
 		}
 
-		$session = new \Aimeos\MW\Session\Symfony2( $this->container->get( 'session' ) );
-		$context->setSession( $session );
+		$session = new \Aimeos\MW\Session\Symfony2($this->container->get('session'));
+		$context->setSession($session);
 
-		$this->addUser( $context );
+		$this->addUser($context);
 
 		return $context;
 	}
@@ -103,39 +103,39 @@ 
 	 *
 	 * @param \Aimeos\MShop\Context\Item\Iface $context Context object
 	 */
-	protected function addUser( \Aimeos\MShop\Context\Item\Iface $context )
+	protected function addUser(\Aimeos\MShop\Context\Item\Iface $context)
 	{
 		$token = null;
 		$username = '';
 
-		if( $this->container->has( 'security.token_storage' ) ) {
-			$token = $this->container->get( 'security.token_storage' )->getToken();
+		if ($this->container->has('security.token_storage')) {
+			$token = $this->container->get('security.token_storage')->getToken();
 		}
-		else if( $this->container->has( 'security.context' ) ) {
-			$token = $this->container->get( 'security.context' )->getToken();
+		else if ($this->container->has('security.context')) {
+			$token = $this->container->get('security.context')->getToken();
 		}
 
-		if( is_object( $token ) )
+		if (is_object($token))
 		{
-			if( method_exists( $token->getUser(), 'getId' ) )
+			if (method_exists($token->getUser(), 'getId'))
 			{
 				$userid = $token->getUser()->getId();
-				$context->setUserId( $userid );
-				$context->setGroupIds( function() use ( $context, $userid )
+				$context->setUserId($userid);
+				$context->setGroupIds(function() use ($context, $userid)
 				{
-					$manager = \Aimeos\MShop\Factory::createManager( $context, 'customer' );
-					return $manager->getItem( $userid, array( 'customer/group' ) )->getGroups();
+					$manager = \Aimeos\MShop\Factory::createManager($context, 'customer');
+					return $manager->getItem($userid, array('customer/group'))->getGroups();
 				} );
 			}
 
-			if( is_object( $token->getUser() ) ) {
-				$username =  $token->getUser()->getUsername();
+			if (is_object($token->getUser())) {
+				$username = $token->getUser()->getUsername();
 			} else {
 				$username = $token->getUser();
 			}
 		}
 
-		$context->setEditor( $username );
+		$context->setEditor($username);
 	}
 
 
@@ -146,27 +146,27 @@ 
 	 */
 	protected function getConfig()
 	{
-		$configPaths = $this->container->get('aimeos')->get()->getConfigPaths( 'mysql' );
+		$configPaths = $this->container->get('aimeos')->get()->getConfigPaths('mysql');
 
-		$conf = new \Aimeos\MW\Config\PHPArray( array(), $configPaths );
+		$conf = new \Aimeos\MW\Config\PHPArray(array(), $configPaths);
 
-		$apc = (bool) $this->container->getParameter( 'aimeos_shop.apc_enable' );
-		$prefix = $this->container->getParameter( 'aimeos_shop.apc_prefix' );
+		$apc = (bool) $this->container->getParameter('aimeos_shop.apc_enable');
+		$prefix = $this->container->getParameter('aimeos_shop.apc_prefix');
 
-		if( function_exists( 'apc_store' ) === true && $apc === true ) {
-			$conf = new \Aimeos\MW\Config\Decorator\APC( $conf, $prefix );
+		if (function_exists('apc_store') === true && $apc === true) {
+			$conf = new \Aimeos\MW\Config\Decorator\APC($conf, $prefix);
 		}
 
 		$local = array(
-			'admin' => $this->container->getParameter( 'aimeos_shop.admin' ),
-			'client' => $this->container->getParameter( 'aimeos_shop.client' ),
-			'controller' => $this->container->getParameter( 'aimeos_shop.controller' ),
-			'madmin' => $this->container->getParameter( 'aimeos_shop.madmin' ),
-			'mshop' => $this->container->getParameter( 'aimeos_shop.mshop' ),
-			'resource' => $this->container->getParameter( 'aimeos_shop.resource' ),
+			'admin' => $this->container->getParameter('aimeos_shop.admin'),
+			'client' => $this->container->getParameter('aimeos_shop.client'),
+			'controller' => $this->container->getParameter('aimeos_shop.controller'),
+			'madmin' => $this->container->getParameter('aimeos_shop.madmin'),
+			'mshop' => $this->container->getParameter('aimeos_shop.mshop'),
+			'resource' => $this->container->getParameter('aimeos_shop.resource'),
 		);
 
-		return new \Aimeos\MW\Config\Decorator\Memory( $conf, $local );
+		return new \Aimeos\MW\Config\Decorator\Memory($conf, $local);
 	}
 
 
@@ -176,19 +176,19 @@ 
 	 * @param \Aimeos\MShop\Context\Item\Iface $context Context object
 	 * @return \Aimeos\MShop\Locale\Item\Iface Locale item object
 	 */
-	protected function getLocale( \Aimeos\MShop\Context\Item\Iface $context )
+	protected function getLocale(\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');
 			$attr = $this->requestStack->getMasterRequest()->attributes;
 
-			$site = $attr->get( 'site', 'default' );
-			$lang = $attr->get( 'locale', '' );
-			$currency = $attr->get( 'currency', '' );
+			$site = $attr->get('site', 'default');
+			$lang = $attr->get('locale', '');
+			$currency = $attr->get('currency', '');
 
-			$localeManager = \Aimeos\MShop\Locale\Manager\Factory::createManager( $context );
-			$this->locale = $localeManager->bootstrap( $site, $lang, $currency, $status );
+			$localeManager = \Aimeos\MShop\Locale\Manager\Factory::createManager($context);
+			$this->locale = $localeManager->bootstrap($site, $lang, $currency, $status);
 		}
 
 		return $this->locale;

Controller/JqadmController.php

Spacing +53 added lines, -53 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,10 +72,10 @@ 
 	 * @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->createClient( $request, $site, $resource );
-		return $this->getHtml( $cntl->copy() );
+		$cntl = $this->createClient($request, $site, $resource);
+		return $this->getHtml($cntl->copy());
 	}
 
 
@@ -87,10 +87,10 @@ 
 	 * @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->createClient( $request, $site, $resource );
-		return $this->getHtml( $cntl->create() );
+		$cntl = $this->createClient($request, $site, $resource);
+		return $this->getHtml($cntl->create());
 	}
 
 
@@ -102,10 +102,10 @@ 
 	 * @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->createClient( $request, $site, $resource );
-		return $this->getHtml( $cntl->delete() . $cntl->search() );
+		$cntl = $this->createClient($request, $site, $resource);
+		return $this->getHtml($cntl->delete().$cntl->search());
 	}
 
 
@@ -117,10 +117,10 @@ 
 	 * @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->createClient( $request, $site, $resource );
-		return $this->getHtml( $cntl->get() );
+		$cntl = $this->createClient($request, $site, $resource);
+		return $this->getHtml($cntl->get());
 	}
 
 
@@ -132,10 +132,10 @@ 
 	 * @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->createClient( $request, $site, $resource );
-		return $this->getHtml( ( $cntl->save() ? : $cntl->search() ) );
+		$cntl = $this->createClient($request, $site, $resource);
+		return $this->getHtml(($cntl->save() ?: $cntl->search()));
 	}
 
 
@@ -147,10 +147,10 @@ 
 	 * @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->createClient( $request, $site, $resource );
-		return $this->getHtml( $cntl->search() );
+		$cntl = $this->createClient($request, $site, $resource);
+		return $this->getHtml($cntl->search());
 	}
 
 
@@ -162,20 +162,20 @@ 
 	 * @param string $resource Resource location, e.g. "product"
 	 * @return \Aimeos\Admin\JQAdm\Iface Context item
 	 */
-	protected function createClient( Request $request, $site, $resource )
+	protected function createClient(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 );
-		$context = $this->setLocale( $context, $site, $lang );
+		$context = $this->get('aimeos_context')->get(false);
+		$context = $this->setLocale($context, $site, $lang);
 
-		$view = $this->get( 'aimeos_view' )->create( $context->getConfig(), $templatePaths, $lang );
-		$context->setView( $view );
+		$view = $this->get('aimeos_view')->create($context->getConfig(), $templatePaths, $lang);
+		$context->setView($view);
 
-		return \Aimeos\Admin\JQAdm\Factory::createClient( $context, $templatePaths, $resource );
+		return \Aimeos\Admin\JQAdm\Factory::createClient($context, $templatePaths, $resource);
 	}
 
 
@@ -185,12 +185,12 @@ 
 	 * @param string $content Content from admin client
 	 * @return Response View for rendering the output
 	 */
-	protected function getHtml( $content )
+	protected function getHtml($content)
 	{
-		$version = $this->get( 'aimeos' )->getVersion();
-		$content = str_replace( array( '{type}', '{version}' ), array( 'Symfony', $version ), $content );
+		$version = $this->get('aimeos')->getVersion();
+		$content = str_replace(array('{type}', '{version}'), array('Symfony', $version), $content);
 
-		return $this->render( 'AimeosShopBundle:Jqadm:index.html.twig', array( 'content' => $content ) );
+		return $this->render('AimeosShopBundle:Jqadm:index.html.twig', array('content' => $content));
 	}
 
 
@@ -202,23 +202,23 @@ 
 	 * @param string $lang ISO language code, e.g. "en" or "en_GB"
 	 * @return \Aimeos\MShop\Context\Item\Iface Modified context object
 	 */
-	protected function setLocale( \Aimeos\MShop\Context\Item\Iface $context, $site, $lang )
+	protected function setLocale(\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( $this->get( 'aimeos_i18n' )->get( array( $lang, 'en' ) ) );
+		$context->setLocale($localeItem);
+		$context->setI18n($this->get('aimeos_i18n')->get(array($lang, 'en')));
 
 		return $context;
 	}

Service/Aimeos.php

Spacing +9 added lines, -9 removed lines

@@ -29,7 +29,7 @@ 
 	 *
 	 * @param Container $container Container object to access parameters
 	 */
-	public function __construct( Container $container )
+	public function __construct(Container $container)
 	{
 		$this->container = $container;
 	}
@@ -42,10 +42,10 @@ 
 	 */
 	public function get()
 	{
-		if( $this->object === null )
+		if ($this->object === null)
 		{
-			$extDirs = (array) $this->container->getParameter( 'aimeos_shop.extdir' );
-			$this->object = new \Aimeos\Bootstrap( $extDirs, false );
+			$extDirs = (array) $this->container->getParameter('aimeos_shop.extdir');
+			$this->object = new \Aimeos\Bootstrap($extDirs, false);
 		}
 
 		return $this->object;
@@ -59,14 +59,14 @@ 
 	 */
 	public function getVersion()
 	{
-		$filename = dirname( $this->container->get( 'kernel' )->getRootDir() ) . DIRECTORY_SEPARATOR . 'composer.lock';
+		$filename = dirname($this->container->get('kernel')->getRootDir()).DIRECTORY_SEPARATOR.'composer.lock';
 
-		if( file_exists( $filename ) === true && ( $content = file_get_contents( $filename ) ) !== false
-			&& ( $content = json_decode( $content, true ) ) !== null && isset( $content['packages'] )
+		if (file_exists($filename) === true && ($content = file_get_contents($filename)) !== false
+			&& ($content = json_decode($content, true)) !== null && isset($content['packages'])
 		) {
-			foreach( (array) $content['packages'] as $item )
+			foreach ((array) $content['packages'] as $item)
 			{
-				if( $item['name'] === 'aimeos/aimeos-symfony' ) {
+				if ($item['name'] === 'aimeos/aimeos-symfony') {
 					return $item['version'];
 				}
 			}