aimeos / aimeos-symfony

Command/AccountCommand.php

Spacing +74 added lines, -74 removed lines

@@ -29,14 +29,14 @@ 
 	 */
 	protected function configure()
 	{
-		$this->setName( 'aimeos:account');
-		$this->setDescription( 'Creates new (admin) accounts' );
-		$this->addArgument( 'email', InputArgument::REQUIRED, 'E-mail address of the account that should be created' );
-		$this->addArgument( 'site', InputArgument::OPTIONAL, 'Site codes to create accounts for like "default"', 'default' );
-		$this->addOption( 'password', null, InputOption::VALUE_REQUIRED, 'Optional password for the account (will ask for if not given)' );
-		$this->addOption( 'super', null, InputOption::VALUE_NONE, 'If account should have super user privileges' );
-		$this->addOption( 'admin', null, InputOption::VALUE_NONE, 'If account should have administrator privileges' );
-		$this->addOption( 'editor', null, InputOption::VALUE_NONE, 'If account should have limited editor privileges' );
+		$this->setName('aimeos:account');
+		$this->setDescription('Creates new (admin) accounts');
+		$this->addArgument('email', InputArgument::REQUIRED, 'E-mail address of the account that should be created');
+		$this->addArgument('site', InputArgument::OPTIONAL, 'Site codes to create accounts for like "default"', 'default');
+		$this->addOption('password', null, InputOption::VALUE_REQUIRED, 'Optional password for the account (will ask for if not given)');
+		$this->addOption('super', null, InputOption::VALUE_NONE, 'If account should have super user privileges');
+		$this->addOption('admin', null, InputOption::VALUE_NONE, 'If account should have administrator privileges');
+		$this->addOption('editor', null, InputOption::VALUE_NONE, 'If account should have limited editor privileges');
 	}
 
 
@@ -46,45 +46,45 @@ 
 	 * @param InputInterface $input Input object
 	 * @param OutputInterface $output Output object
 	 */
-	protected function execute( InputInterface $input, OutputInterface $output )
+	protected function execute(InputInterface $input, OutputInterface $output)
 	{
-		$code = $input->getArgument( 'email' );
-		if( ( $password = $input->getOption( 'password' ) ) === null )
+		$code = $input->getArgument('email');
+		if (($password = $input->getOption('password')) === null)
 		{
-			$helper = $this->getHelper( 'question' );
-			$question = new Question( 'Password' );
-			$question->setHidden( true );
+			$helper = $this->getHelper('question');
+			$question = new Question('Password');
+			$question->setHidden(true);
 
-			$password = $helper->ask( $input, $output, $question );
+			$password = $helper->ask($input, $output, $question);
 		}
 
-		$context = $this->getContainer()->get( 'aimeos_context' )->get( false, 'command' );
-		$context->setEditor( 'aimeos:account' );
+		$context = $this->getContainer()->get('aimeos_context')->get(false, 'command');
+		$context->setEditor('aimeos:account');
 
-		$localeManager = \Aimeos\MShop\Locale\Manager\Factory::createManager( $context );
-		$localeItem = $localeManager->bootstrap( $input->getArgument( 'site' ), '', '', false );
-		$context->setLocale( $localeItem );
+		$localeManager = \Aimeos\MShop\Locale\Manager\Factory::createManager($context);
+		$localeItem = $localeManager->bootstrap($input->getArgument('site'), '', '', false);
+		$context->setLocale($localeItem);
 
-		$user = $this->createCustomerItem( $context, $code, $password );
+		$user = $this->createCustomerItem($context, $code, $password);
 
-		if( $input->getOption( 'admin' ) ) {
-			$this->addGroup( $input, $output, $context, $user, 'admin' );
+		if ($input->getOption('admin')) {
+			$this->addGroup($input, $output, $context, $user, 'admin');
 		}
 
-		if( $input->getOption( 'editor' ) ) {
-			$this->addGroup( $input, $output, $context, $user, 'editor' );
+		if ($input->getOption('editor')) {
+			$this->addGroup($input, $output, $context, $user, 'editor');
 		}
 
-		if( $this->getContainer()->has( 'fos_user.user_manager' ) )
+		if ($this->getContainer()->has('fos_user.user_manager'))
 		{
-			$userManager = $this->getContainer()->get( 'fos_user.user_manager' );
+			$userManager = $this->getContainer()->get('fos_user.user_manager');
 
-			if( $input->getOption( 'super' ) ) {
-				$userManager->promote( $code );
+			if ($input->getOption('super')) {
+				$userManager->promote($code);
 			}
 
-			if( $input->getOption( 'admin' ) || $input->getOption( 'editor' ) ) {
-				$userManager->addRole( $code, 'ROLE_ADMIN' );
+			if ($input->getOption('admin') || $input->getOption('editor')) {
+				$userManager->addRole($code, 'ROLE_ADMIN');
 			}
 		}
 	}
@@ -99,24 +99,24 @@ 
 	 * @param \Aimeos\MShop\Customer\Item\Iface $user Aimeos customer object
 	 * @param string $group Unique customer group code
 	 */
-	protected function addGroup( InputInterface $input, OutputInterface $output,
-		\Aimeos\MShop\Context\Item\Iface $context, \Aimeos\MShop\Customer\Item\Iface $user, $group )
+	protected function addGroup(InputInterface $input, OutputInterface $output,
+		\Aimeos\MShop\Context\Item\Iface $context, \Aimeos\MShop\Customer\Item\Iface $user, $group)
 	{
-		$output->writeln( sprintf( 'Add "%1$s" group to user "%2$s" for sites', $group, $user->getCode() ) );
+		$output->writeln(sprintf('Add "%1$s" group to user "%2$s" for sites', $group, $user->getCode()));
 
-		$localeManager = \Aimeos\MShop\Locale\Manager\Factory::createManager( $context );
+		$localeManager = \Aimeos\MShop\Locale\Manager\Factory::createManager($context);
 
-		foreach( $this->getSiteItems( $context, $input ) as $siteItem )
+		foreach ($this->getSiteItems($context, $input) as $siteItem)
 		{
-			$localeItem = $localeManager->bootstrap( $siteItem->getCode(), '', '', false );
+			$localeItem = $localeManager->bootstrap($siteItem->getCode(), '', '', false);
 
 			$lcontext = clone $context;
-			$lcontext->setLocale( $localeItem );
+			$lcontext->setLocale($localeItem);
 
-			$output->writeln( '- ' . $siteItem->getCode() );
+			$output->writeln('- '.$siteItem->getCode());
 
-			$groupItem = $this->getGroupItem( $lcontext, $group );
-			$this->addListItem( $lcontext, $user->getId(), $groupItem->getId() );
+			$groupItem = $this->getGroupItem($lcontext, $group);
+			$this->addListItem($lcontext, $user->getId(), $groupItem->getId());
 		}
 	}
 
@@ -128,31 +128,31 @@ 
 	 * @param string $userid Unique user ID
 	 * @param string $groupid Unique group ID
 	 */
-	protected function addListItem( \Aimeos\MShop\Context\Item\Iface $context, $userid, $groupid )
+	protected function addListItem(\Aimeos\MShop\Context\Item\Iface $context, $userid, $groupid)
 	{
-		$manager = \Aimeos\MShop\Customer\Manager\Factory::createManager( $context )->getSubmanager( 'lists' );
-		$typeid = $manager->getSubmanager( 'type' )->findItem( 'default', array(), 'customer/group' )->getId();
+		$manager = \Aimeos\MShop\Customer\Manager\Factory::createManager($context)->getSubmanager('lists');
+		$typeid = $manager->getSubmanager('type')->findItem('default', array(), 'customer/group')->getId();
 
 		$search = $manager->createSearch();
 		$expr = array(
-			$search->compare( '==', 'customer.lists.parentid', $userid ),
-			$search->compare( '==', 'customer.lists.refid', $groupid ),
-			$search->compare( '==', 'customer.lists.domain', 'customer/group' ),
-			$search->compare( '==', 'customer.lists.typeid', $typeid ),
+			$search->compare('==', 'customer.lists.parentid', $userid),
+			$search->compare('==', 'customer.lists.refid', $groupid),
+			$search->compare('==', 'customer.lists.domain', 'customer/group'),
+			$search->compare('==', 'customer.lists.typeid', $typeid),
 		);
-		$search->setConditions( $search->combine( '&&', $expr ) );
-		$search->setSlice( 0, 1 );
+		$search->setConditions($search->combine('&&', $expr));
+		$search->setSlice(0, 1);
 
-		if( count( $manager->searchItems( $search ) ) === 0 )
+		if (count($manager->searchItems($search)) === 0)
 		{
 			$item = $manager->createItem();
-			$item->setDomain( 'customer/group' );
-			$item->setParentId( $userid );
-			$item->setTypeId( $typeid );
-			$item->setRefId( $groupid );
-			$item->setStatus( 1 );
+			$item->setDomain('customer/group');
+			$item->setParentId($userid);
+			$item->setTypeId($typeid);
+			$item->setRefId($groupid);
+			$item->setStatus(1);
 
-			$manager->saveItem( $item, false );
+			$manager->saveItem($item, false);
 		}
 	}
 
@@ -167,23 +167,23 @@ 
 	 * @param string $password New user password
 	 * @return \Aimeos\MShop\Customer\Item\Iface Aimeos customer item object
 	 */
-	protected function createCustomerItem( \Aimeos\MShop\Context\Item\Iface $context, $email, $password )
+	protected function createCustomerItem(\Aimeos\MShop\Context\Item\Iface $context, $email, $password)
 	{
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'customer' );
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'customer');
 
 		try {
-			$item = $manager->findItem( $email );
-		} catch( \Aimeos\MShop\Exception $e ) {
+			$item = $manager->findItem($email);
+		} catch (\Aimeos\MShop\Exception $e) {
 			$item = $manager->createItem();
 		}
 
-		$item->setCode( $email );
-		$item->setLabel( $email );
-		$item->getPaymentAddress()->setEmail( $email );
-		$item->setPassword( $password );
-		$item->setStatus( 1 );
+		$item->setCode($email);
+		$item->setLabel($email);
+		$item->getPaymentAddress()->setEmail($email);
+		$item->setPassword($password);
+		$item->setStatus(1);
 
-		$manager->saveItem( $item );
+		$manager->saveItem($item);
 
 		return $item;
 	}
@@ -196,21 +196,21 @@ 
 	 * @param string $code Unique customer group code
 	 * @return \Aimeos\MShop\Customer\Item\Group\Iface Aimeos customer group item object
 	 */
-	protected function getGroupItem( \Aimeos\MShop\Context\Item\Iface $context, $code )
+	protected function getGroupItem(\Aimeos\MShop\Context\Item\Iface $context, $code)
 	{
-		$manager = \Aimeos\MShop\Customer\Manager\Factory::createManager( $context )->getSubmanager( 'group' );
+		$manager = \Aimeos\MShop\Customer\Manager\Factory::createManager($context)->getSubmanager('group');
 
 		try
 		{
-			$item = $manager->findItem( $code );
+			$item = $manager->findItem($code);
 		}
-		catch( \Aimeos\MShop\Exception $e )
+		catch (\Aimeos\MShop\Exception $e)
 		{
 			$item = $manager->createItem();
-			$item->setLabel( $code );
-			$item->setCode( $code );
+			$item->setLabel($code);
+			$item->setCode($code);
 
-			$manager->saveItem( $item );
+			$manager->saveItem($item);
 		}
 
 		return $item;

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::createManager( $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::createManager($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;
 				}
 			}

Service/View.php

Spacing +77 added lines, -77 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,27 +47,27 @@ 
 	 * @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)
 	{
-		$twig = $this->container->get( 'twig' );
-		$engine = new \Aimeos\MW\View\Engine\Twig( $twig );
-		$view = new \Aimeos\MW\View\Standard( $templatePaths, array( '.html.twig' => $engine ) );
+		$twig = $this->container->get('twig');
+		$engine = new \Aimeos\MW\View\Engine\Twig($twig);
+		$view = new \Aimeos\MW\View\Standard($templatePaths, array('.html.twig' => $engine));
 
 		$config = $context->getConfig();
 		$session = $context->getSession();
 
-		$this->addCsrf( $view );
-		$this->addAccess( $view, $context );
-		$this->addConfig( $view, $config );
-		$this->addNumber( $view, $config );
-		$this->addParam( $view );
-		$this->addRequest( $view );
-		$this->addResponse( $view );
-		$this->addSession( $view, $session );
-		$this->addTranslate( $view, $locale );
-		$this->addUrl( $view );
+		$this->addCsrf($view);
+		$this->addAccess($view, $context);
+		$this->addConfig($view, $config);
+		$this->addNumber($view, $config);
+		$this->addParam($view);
+		$this->addRequest($view);
+		$this->addResponse($view);
+		$this->addSession($view, $session);
+		$this->addTranslate($view, $locale);
+		$this->addUrl($view);
 
-		$this->initTwig( $view, $twig );
+		$this->initTwig($view, $twig);
 
 		return $view;
 	}
@@ -80,26 +80,26 @@ 
 	 * @param \Aimeos\MShop\Context\Item\Iface $context Context object
 	 * @return \Aimeos\MW\View\Iface Modified view object
 	 */
-	protected function addAccess( \Aimeos\MW\View\Iface $view, \Aimeos\MShop\Context\Item\Iface $context )
+	protected function addAccess(\Aimeos\MW\View\Iface $view, \Aimeos\MShop\Context\Item\Iface $context)
 	{
 		$container = $this->container;
-		$token = $this->container->get( 'security.token_storage' )->getToken();
+		$token = $this->container->get('security.token_storage')->getToken();
 
-		if( is_object( $token ) && is_object( $token->getUser() )
-			&& in_array( 'ROLE_SUPER_ADMIN', (array) $token->getUser()->getRoles() ) )
+		if (is_object($token) && is_object($token->getUser())
+			&& in_array('ROLE_SUPER_ADMIN', (array) $token->getUser()->getRoles()))
 		{
-			$helper = new \Aimeos\MW\View\Helper\Access\All( $view );
+			$helper = new \Aimeos\MW\View\Helper\Access\All($view);
 		}
 		else
 		{
-			$fcn = function() use ( $container, $context ) {
-				return $container->get( 'aimeos_support' )->getGroups( $context );
+			$fcn = function() use ($container, $context) {
+				return $container->get('aimeos_support')->getGroups($context);
 			};
 
-			$helper = new \Aimeos\MW\View\Helper\Access\Standard( $view, $fcn );
+			$helper = new \Aimeos\MW\View\Helper\Access\Standard($view, $fcn);
 		}
 
-		$view->addHelper( 'access', $helper );
+		$view->addHelper('access', $helper);
 
 		return $view;
 	}
@@ -112,11 +112,11 @@ 
 	 * @param \Aimeos\MW\Config\Iface $config Configuration object
 	 * @return \Aimeos\MW\View\Iface Modified view object
 	 */
-	protected function addConfig( \Aimeos\MW\View\Iface $view, \Aimeos\MW\Config\Iface $config )
+	protected function addConfig(\Aimeos\MW\View\Iface $view, \Aimeos\MW\Config\Iface $config)
 	{
-		$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);
 
 		return $view;
 	}
@@ -128,11 +128,11 @@ 
 	 * @param \Aimeos\MW\View\Iface $view View object
 	 * @return \Aimeos\MW\View\Iface Modified view object
 	 */
-	protected function addCsrf( \Aimeos\MW\View\Iface $view )
+	protected function addCsrf(\Aimeos\MW\View\Iface $view)
 	{
-		$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;
 	}
@@ -145,14 +145,14 @@ 
 	 * @param \Aimeos\MW\Config\Iface $config Configuration object
 	 * @return \Aimeos\MW\View\Iface Modified view object
 	 */
-	protected function addNumber( \Aimeos\MW\View\Iface $view, \Aimeos\MW\Config\Iface $config )
+	protected function addNumber(\Aimeos\MW\View\Iface $view, \Aimeos\MW\Config\Iface $config)
 	{
-		$sepDec = $config->get( 'client/html/common/format/separatorDecimal', '.' );
-		$sep1000 = $config->get( 'client/html/common/format/separator1000', ' ' );
-		$decimals = $config->get( 'client/html/common/format/decimals', 2 );
+		$sepDec = $config->get('client/html/common/format/separatorDecimal', '.');
+		$sep1000 = $config->get('client/html/common/format/separator1000', ' ');
+		$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 );
+		$helper = new \Aimeos\MW\View\Helper\Number\Standard($view, $sepDec, $sep1000, $decimals);
+		$view->addHelper('number', $helper);
 
 		return $view;
 	}
@@ -164,17 +164,17 @@ 
 	 * @param \Aimeos\MW\View\Iface $view View object
 	 * @return \Aimeos\MW\View\Iface Modified view object
 	 */
-	protected function addParam( \Aimeos\MW\View\Iface $view )
+	protected function addParam(\Aimeos\MW\View\Iface $view)
 	{
 		$params = array();
 		$request = $this->requestStack->getMasterRequest();
 
-		if( $request !== null ) {
-			$params = $request->request->all() + $request->query->all() + $request->attributes->get( '_route_params' );
+		if ($request !== null) {
+			$params = $request->request->all() + $request->query->all() + $request->attributes->get('_route_params');
 		}
 
-		$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);
 
 		return $view;
 	}
@@ -186,14 +186,14 @@ 
 	 * @param \Aimeos\MW\View\Iface $view View object
 	 * @return \Aimeos\MW\View\Iface Modified view object
 	 */
-	protected function addRequest( \Aimeos\MW\View\Iface $view )
+	protected function addRequest(\Aimeos\MW\View\Iface $view)
 	{
 		$request = $this->requestStack->getMasterRequest();
 
-		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);
 		}
 
 		return $view;
@@ -206,10 +206,10 @@ 
 	 * @param \Aimeos\MW\View\Iface $view View object
 	 * @return \Aimeos\MW\View\Iface Modified view object
 	 */
-	protected function addResponse( \Aimeos\MW\View\Iface $view )
+	protected function addResponse(\Aimeos\MW\View\Iface $view)
 	{
-		$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);
 
 		return $view;
 	}
@@ -222,10 +222,10 @@ 
 	 * @param \Aimeos\MW\Session\Iface $session Session object
 	 * @return \Aimeos\MW\View\Iface Modified view object
 	 */
-	protected function addSession( \Aimeos\MW\View\Iface $view, \Aimeos\MW\Session\Iface $session )
+	protected function addSession(\Aimeos\MW\View\Iface $view, \Aimeos\MW\Session\Iface $session)
 	{
-		$helper = new \Aimeos\MW\View\Helper\Session\Standard( $view, $session );
-		$view->addHelper( 'session', $helper );
+		$helper = new \Aimeos\MW\View\Helper\Session\Standard($view, $session);
+		$view->addHelper('session', $helper);
 
 		return $view;
 	}
@@ -238,20 +238,20 @@ 
 	 * @param string|null $locale ISO language code, e.g. "de" or "de_CH"
 	 * @return \Aimeos\MW\View\Iface Modified view object
 	 */
-	protected function addTranslate( \Aimeos\MW\View\Iface $view, $locale )
+	protected function addTranslate(\Aimeos\MW\View\Iface $view, $locale)
 	{
-		if( $locale !== null )
+		if ($locale !== null)
 		{
-			$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');
 		}
 
-		$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);
 
 		return $view;
 	}
@@ -263,30 +263,30 @@ 
 	 * @param \Aimeos\MW\View\Iface $view View object
 	 * @return \Aimeos\MW\View\Iface Modified view object
 	 */
-	protected function addUrl( \Aimeos\MW\View\Iface $view )
+	protected function addUrl(\Aimeos\MW\View\Iface $view)
 	{
 		$fixed = array();
 		$request = $this->requestStack->getMasterRequest();
 
-		if( $request !== null )
+		if ($request !== null)
 		{
 			$attr = $request->attributes;
 
-			if( ( $site = $attr->get( 'site' ) ) !== null ) {
+			if (($site = $attr->get('site')) !== null) {
 				$fixed['site'] = $site;
 			}
 
-			if( ( $lang = $attr->get( 'locale' ) ) !== null ) {
+			if (($lang = $attr->get('locale')) !== null) {
 				$fixed['locale'] = $lang;
 			}
 
-			if( ( $currency = $attr->get( 'currency' ) ) !== null ) {
+			if (($currency = $attr->get('currency')) !== null) {
 				$fixed['currency'] = $currency;
 			}
 		}
 
-		$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);
 
 		return $view;
 	}
@@ -298,21 +298,21 @@ 
 	 * @param \Aimeos\MW\View\Iface $view View object
 	 * @param \Twig_Environment $twig Twig environment object
 	 */
-	protected function initTwig( \Aimeos\MW\View\Iface $view, \Twig_Environment $twig )
+	protected function initTwig(\Aimeos\MW\View\Iface $view, \Twig_Environment $twig)
 	{
-		$fcn = function( $key, $default = null ) use ( $view ) {
-			return $view->config( $key, $default );
+		$fcn = function($key, $default = null) use ($view) {
+			return $view->config($key, $default);
 		};
-		$twig->addFunction( new \Twig_SimpleFunction( 'aiconfig', $fcn ) );
+		$twig->addFunction(new \Twig_SimpleFunction('aiconfig', $fcn));
 
-		$fcn = function( $singular, array $values = array(), $domain = 'client' ) use ( $view ) {
-			return vsprintf( $view->translate( $domain, $singular ), $values );
+		$fcn = function($singular, array $values = array(), $domain = 'client') use ($view) {
+			return vsprintf($view->translate($domain, $singular), $values);
 		};
-		$twig->addFunction( new \Twig_SimpleFunction( 'aitrans', $fcn ) );
+		$twig->addFunction(new \Twig_SimpleFunction('aitrans', $fcn));
 
-		$fcn = function( $singular, $plural, $number, array $values = array(), $domain = 'client' ) use ( $view ) {
-			return vsprintf( $view->translate( $domain, $singular, $plural, $number ), $values );
+		$fcn = function($singular, $plural, $number, array $values = array(), $domain = 'client') use ($view) {
+			return vsprintf($view->translate($domain, $singular, $plural, $number), $values);
 		};
-		$twig->addFunction( new \Twig_SimpleFunction( 'aitransplural', $fcn ) );
+		$twig->addFunction(new \Twig_SimpleFunction('aitransplural', $fcn));
 	}
 }

Braces +2 added lines, -4 removed lines

@@ -89,8 +89,7 @@ 
 			&& in_array( 'ROLE_SUPER_ADMIN', (array) $token->getUser()->getRoles() ) )
 		{
 			$helper = new \Aimeos\MW\View\Helper\Access\All( $view );
-		}
-		else
+		} else
 		{
 			$fcn = function() use ( $container, $context ) {
 				return $container->get( 'aimeos_support' )->getGroups( $context );
@@ -244,8 +243,7 @@ 
 		{
 			$i18n = $this->container->get( 'aimeos_i18n' )->get( array( $locale ) );
 			$translation = $i18n[$locale];
-		}
-		else
+		} else
 		{
 			$translation = new \Aimeos\MW\Translation\None( 'en' );
 		}