aimeos / aimeos-symfony

Controller/AbstractController.php

Spacing +11 added lines, -11 removed lines

@@ -28,29 +28,29 @@
 	 * @param string $clientName Html client name
 	 * @return Response Response object containing the generated output
 	 */
-	protected function getOutput( $clientName )
+	protected function getOutput($clientName)
 	{
-		$tmplPaths = $this->container->get( 'aimeos' )->get()->getCustomPaths( 'client/html/templates' );
-		$context = $this->container->get( 'aimeos_context' )->get();
+		$tmplPaths = $this->container->get('aimeos')->get()->getCustomPaths('client/html/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);
 
-		$client = \Aimeos\Client\Html\Factory::createClient( $context, $tmplPaths, $clientName );
-		$client->setView( $view );
+		$client = \Aimeos\Client\Html\Factory::createClient($context, $tmplPaths, $clientName);
+		$client->setView($view);
 		$client->process();
 
-		$twig = $this->container->get( 'twig' );
+		$twig = $this->container->get('twig');
 		$vars = $twig->getGlobals();
 
-		if( !isset( $vars['aiheader'] ) ) {
+		if (!isset($vars['aiheader'])) {
 			$vars['aiheader'] = array();
 		}
 
 		$vars['aiheader'][$clientName] = (string) $client->getHeader();
-		$twig->addGlobal( 'aiheader', $vars['aiheader'] );
+		$twig->addGlobal('aiheader', $vars['aiheader']);
 
-		return new Response( (string) $client->getBody() );
+		return new Response((string) $client->getBody());
 	}
 }

Tests/Controller/AdminControllerTest.php

Spacing +7 added lines, -7 removed lines

@@ -11,11 +11,11 @@ 
 	{
 		$client = static::createClient();
 
-		$client->request( 'GET', '/admin' );
+		$client->request('GET', '/admin');
 		$response = $client->getResponse();
 
-		$this->assertEquals( 200, $response->getStatusCode() );
-		$this->assertContains( '<form class="login"', $response->getContent() );
+		$this->assertEquals(200, $response->getStatusCode());
+		$this->assertContains('<form class="login"', $response->getContent());
 	}
 
 
@@ -24,12 +24,12 @@ 
 		$client = static::createClient(array(), array(
 			'PHP_AUTH_USER' => 'admin',
 			'PHP_AUTH_PW'   => 'adminpass',
-		) );
+		));
 
-		$client->request( 'GET', '/admin' );
+		$client->request('GET', '/admin');
 		$response = $client->getResponse();
 
-		$this->assertEquals( 302, $response->getStatusCode() );
-		$this->assertContains( '/default/jqadm/search/dashboard?lang=en', $response->getContent() );
+		$this->assertEquals(302, $response->getStatusCode());
+		$this->assertContains('/default/jqadm/search/dashboard?lang=en', $response->getContent());
 	}
 }

Controller/AdminController.php

Spacing +11 added lines, -11 removed lines

@@ -29,23 +29,23 @@ 
 	 */
 	public function indexAction()
 	{
-		if( $this->isAdmin() )
+		if ($this->isAdmin())
 		{
-			$params = array( 'site' => 'default', 'resource' => 'dashboard', 'lang' => 'en' );
-			return $this->redirect( $this->generateUrl( 'aimeos_shop_jqadm_search', $params ) );
+			$params = array('site' => 'default', 'resource' => 'dashboard', 'lang' => 'en');
+			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);
 	}
 
 
@@ -56,10 +56,10 @@ 
 	 */
 	protected function isAdmin()
 	{
-		if( $this->has( 'security.authorization_checker' ) && $this->get( 'security.token_storage' )->getToken()
-			&& $this->get( 'security.authorization_checker' )->isGranted( 'ROLE_ADMIN' )
-			|| $this->has( 'security.context' ) && $this->get( 'security.context' )->getToken()
-			&& $this->get( 'security.context' )->isGranted( 'ROLE_ADMIN' )
+		if ($this->has('security.authorization_checker') && $this->get('security.token_storage')->getToken()
+			&& $this->get('security.authorization_checker')->isGranted('ROLE_ADMIN')
+			|| $this->has('security.context') && $this->get('security.context')->getToken()
+			&& $this->get('security.context')->isGranted('ROLE_ADMIN')
 		) {
 			return true;
 		}

Service/View.php

Spacing +39 added lines, -39 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,62 +47,62 @@ 
 	 * @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\MShop\Context\Item\Iface $context, array $templatePaths, $locale = null )
+	public function create(\Aimeos\MShop\Context\Item\Iface $context, array $templatePaths, $locale = null)
 	{
 		$params = $fixed = array();
 		$config = $context->getConfig();
 		$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', ' ' );
-		$decimals = $config->get( 'client/html/common/format/decimals', 2 );
-		$helper = new \Aimeos\MW\View\Helper\Number\Standard( $view, $sepDec, $sep1000, $decimals );
-		$view->addHelper( 'number', $helper );
+		$sepDec = $config->get('client/html/common/format/seperatorDecimal', '.');
+		$sep1000 = $config->get('client/html/common/format/seperator1000', ' ');
+		$decimals = $config->get('client/html/common/format/decimals', 2);
+		$helper = new \Aimeos\MW\View\Helper\Number\Standard($view, $sepDec, $sep1000, $decimals);
+		$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);
 
-		$helper = new \Aimeos\MW\View\Helper\Access\Standard( $view, $this->getGroups( $context ) );
-		$view->addHelper( 'access', $helper );
+		$helper = new \Aimeos\MW\View\Helper\Access\Standard($view, $this->getGroups($context));
+		$view->addHelper('access', $helper);
 
 		return $view;
 	}
@@ -118,15 +118,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;
 		}
 
@@ -140,17 +140,17 @@ 
 	 * @param \Aimeos\MShop\Context\Item\Iface $context Context object
 	 * @return \Closure Function which returns the user group codes
 	 */
-	protected function getGroups( \Aimeos\MShop\Context\Item\Iface $context )
+	protected function getGroups(\Aimeos\MShop\Context\Item\Iface $context)
 	{
-		return function() use ( $context )
+		return function() use ($context)
 		{
 			$list = array();
-			$manager = \Aimeos\MShop\Factory::createManager( $context, 'customer/group' );
+			$manager = \Aimeos\MShop\Factory::createManager($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();
 			}