aimeos / aimeos-symfony

Service/View.php

Spacing +57 added lines, -57 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,20 +47,20 @@ 
 	 * @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)
 	{
 		$config = $context->getConfig();
-		$view = new \Aimeos\MW\View\Standard( $templatePaths );
-
-		$this->addConfig( $view, $config );
-		$this->addNumber( $view, $config );
-		$this->addRequest( $view );
-		$this->addResponse( $view );
-		$this->addParam( $view );
-		$this->addUrl( $view );
-		$this->addCsrf( $view );
-		$this->addAccess( $view, $context );
-		$this->addTranslate( $view, $config, $locale );
+		$view = new \Aimeos\MW\View\Standard($templatePaths);
+
+		$this->addConfig($view, $config);
+		$this->addNumber($view, $config);
+		$this->addRequest($view);
+		$this->addResponse($view);
+		$this->addParam($view);
+		$this->addUrl($view);
+		$this->addCsrf($view);
+		$this->addAccess($view, $context);
+		$this->addTranslate($view, $config, $locale);
 
 		return $view;
 	}
@@ -73,17 +73,17 @@ 
 	 * @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;
 
-		$fcn = function() use ( $container, $context )
+		$fcn = function() use ($container, $context)
 		{
-			return $container->get( 'aimeos_support' )->getGroups( $context );
+			return $container->get('aimeos_support')->getGroups($context);
 		};
 
-		$helper = new \Aimeos\MW\View\Helper\Access\Standard( $view, $fcn );
-		$view->addHelper( 'access', $helper );
+		$helper = new \Aimeos\MW\View\Helper\Access\Standard($view, $fcn);
+		$view->addHelper('access', $helper);
 
 		return $view;
 	}
@@ -96,11 +96,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;
 	}
@@ -112,11 +112,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;
 	}
@@ -129,14 +129,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/seperatorDecimal', '.' );
-		$sep1000 = $config->get( 'client/html/common/format/seperator1000', ' ' );
-		$decimals = $config->get( 'client/html/common/format/decimals', 2 );
+		$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 );
+		$helper = new \Aimeos\MW\View\Helper\Number\Standard($view, $sepDec, $sep1000, $decimals);
+		$view->addHelper('number', $helper);
 
 		return $view;
 	}
@@ -148,17 +148,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;
 	}
@@ -170,14 +170,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;
@@ -190,10 +190,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;
 	}
@@ -205,30 +205,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;
 	}
@@ -242,20 +242,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, \Aimeos\MW\Config\Iface $config, $locale )
+	protected function addTranslate(\Aimeos\MW\View\Iface $view, \Aimeos\MW\Config\Iface $config, $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;
 	}

Service/Context.php

Spacing +53 added lines, -53 removed lines

@@ -31,7 +31,7 @@ 
 	 *
 	 * @param Container $container Container object to access parameters
 	 */
-	public function __construct( Container $container )
+	public function __construct(Container $container)
 	{
 		$this->container = $container;
 	}
@@ -44,37 +44,37 @@ 
 	 * @param string $type Configuration type ("frontend" or "backend")
 	 * @return \Aimeos\MShop\Context\Item\Iface Context object
 	 */
-	public function get( $locale = true, $type = 'frontend' )
+	public function get($locale = true, $type = 'frontend')
 	{
-		$config = $this->container->get( 'aimeos_config' )->get( $type );
+		$config = $this->container->get('aimeos_config')->get($type);
 
-		if( self::$context === null )
+		if (self::$context === null)
 		{
 			$context = new \Aimeos\MShop\Context\Item\Standard();
-			$context->setConfig( $config );
+			$context->setConfig($config);
 
-			$this->addDataBaseManager( $context );
-			$this->addFilesystemManager( $context );
-			$this->addMessageQueueManager( $context );
-			$this->addLogger( $context );
-			$this->addCache( $context );
-			$this->addMailer( $context);
+			$this->addDataBaseManager($context);
+			$this->addFilesystemManager($context);
+			$this->addMessageQueueManager($context);
+			$this->addLogger($context);
+			$this->addCache($context);
+			$this->addMailer($context);
 
 			self::$context = $context;
 		}
 
 		$context = self::$context;
-		$context->setConfig( $config );
+		$context->setConfig($config);
 
-		if( $locale === true )
+		if ($locale === true)
 		{
-			$localeItem = $this->container->get('aimeos_locale')->get( $context );
-			$context->setI18n( $this->container->get('aimeos_i18n')->get( array( $localeItem->getLanguageId() ) ) );
-			$context->setLocale( $localeItem );
+			$localeItem = $this->container->get('aimeos_locale')->get($context);
+			$context->setI18n($this->container->get('aimeos_i18n')->get(array($localeItem->getLanguageId())));
+			$context->setLocale($localeItem);
 		}
 
-		$this->addSession( $context );
-		$this->addUserGroups( $context);
+		$this->addSession($context);
+		$this->addUserGroups($context);
 
 		return $context;
 	}
@@ -86,10 +86,10 @@ 
 	 * @param \Aimeos\MShop\Context\Item\Iface $context Context object including config
 	 * @return \Aimeos\MShop\Context\Item\Iface Modified context object
 	 */
-	protected function addCache( \Aimeos\MShop\Context\Item\Iface $context )
+	protected function addCache(\Aimeos\MShop\Context\Item\Iface $context)
 	{
-		$cache = new \Aimeos\MAdmin\Cache\Proxy\Standard( $context );
-		$context->setCache( $cache );
+		$cache = new \Aimeos\MAdmin\Cache\Proxy\Standard($context);
+		$context->setCache($cache);
 
 		return $context;
 	}
@@ -101,10 +101,10 @@ 
 	 * @param \Aimeos\MShop\Context\Item\Iface $context Context object
 	 * @return \Aimeos\MShop\Context\Item\Iface Modified context object
 	 */
-	protected function addDatabaseManager( \Aimeos\MShop\Context\Item\Iface $context )
+	protected function addDatabaseManager(\Aimeos\MShop\Context\Item\Iface $context)
 	{
-		$dbm = new \Aimeos\MW\DB\Manager\DBAL( $context->getConfig() );
-		$context->setDatabaseManager( $dbm );
+		$dbm = new \Aimeos\MW\DB\Manager\DBAL($context->getConfig());
+		$context->setDatabaseManager($dbm);
 
 		return $context;
 	}
@@ -116,10 +116,10 @@ 
 	 * @param \Aimeos\MShop\Context\Item\Iface $context Context object
 	 * @return \Aimeos\MShop\Context\Item\Iface Modified context object
 	 */
-	protected function addFilesystemManager( \Aimeos\MShop\Context\Item\Iface $context )
+	protected function addFilesystemManager(\Aimeos\MShop\Context\Item\Iface $context)
 	{
-		$fs = new \Aimeos\MW\Filesystem\Manager\Standard( $context->getConfig() );
-		$context->setFilesystemManager( $fs );
+		$fs = new \Aimeos\MW\Filesystem\Manager\Standard($context->getConfig());
+		$context->setFilesystemManager($fs);
 
 		return $context;
 	}
@@ -131,10 +131,10 @@ 
 	 * @param \Aimeos\MShop\Context\Item\Iface $context Context object
 	 * @return \Aimeos\MShop\Context\Item\Iface Modified context object
 	 */
-	protected function addLogger( \Aimeos\MShop\Context\Item\Iface $context )
+	protected function addLogger(\Aimeos\MShop\Context\Item\Iface $context)
 	{
-		$logger = \Aimeos\MAdmin\Log\Manager\Factory::createManager( $context );
-		$context->setLogger( $logger );
+		$logger = \Aimeos\MAdmin\Log\Manager\Factory::createManager($context);
+		$context->setLogger($logger);
 
 		return $context;
 	}
@@ -147,11 +147,11 @@ 
 	 * @param \Aimeos\MShop\Context\Item\Iface $context Context object
 	 * @return \Aimeos\MShop\Context\Item\Iface Modified context object
 	 */
-	protected function addMailer( \Aimeos\MShop\Context\Item\Iface $context )
+	protected function addMailer(\Aimeos\MShop\Context\Item\Iface $context)
 	{
 		$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);
 
 		return $context;
 	}
@@ -163,10 +163,10 @@ 
 	 * @param \Aimeos\MShop\Context\Item\Iface $context Context object
 	 * @return \Aimeos\MShop\Context\Item\Iface Modified context object
 	 */
-	protected function addMessageQueueManager( \Aimeos\MShop\Context\Item\Iface $context )
+	protected function addMessageQueueManager(\Aimeos\MShop\Context\Item\Iface $context)
 	{
-		$mq = new \Aimeos\MW\MQueue\Manager\Standard( $context->getConfig() );
-		$context->setMessageQueueManager( $mq );
+		$mq = new \Aimeos\MW\MQueue\Manager\Standard($context->getConfig());
+		$context->setMessageQueueManager($mq);
 
 		return $context;
 	}
@@ -178,10 +178,10 @@ 
 	 * @param \Aimeos\MShop\Context\Item\Iface $context Context object
 	 * @return \Aimeos\MShop\Context\Item\Iface Modified context object
 	 */
-	protected function addSession( \Aimeos\MShop\Context\Item\Iface $context )
+	protected function addSession(\Aimeos\MShop\Context\Item\Iface $context)
 	{
-		$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);
 
 		return $context;
 	}
@@ -192,38 +192,38 @@ 
 	 *
 	 * @param \Aimeos\MShop\Context\Item\Iface $context Context object
 	 */
-	protected function addUserGroups( \Aimeos\MShop\Context\Item\Iface $context )
+	protected function addUserGroups(\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);
 	}
 }

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

Service/Locale.php

Spacing +15 added lines, -15 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\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;
@@ -71,17 +71,17 @@ 
 	 * @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\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();
 		}

Braces +1 added lines, -2 removed lines

@@ -210,8 +210,7 @@
 			$localeItem = $localeManager->bootstrap( $sitecode, '', '', false );
 			$localeItem->setLanguageId( null );
 			$localeItem->setCurrencyId( null );
-		}
-		catch( \Aimeos\MShop\Locale\Exception $e )
+		} catch( \Aimeos\MShop\Locale\Exception $e )
 		{
 			$localeItem = $localeManager->createItem();
 		}