aimeos / aimeos-symfony

Service/Context.php

Spacing +52 added lines, -52 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,35 +192,35 @@ 
 	 *
 	 * @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)
 	{
 		$username = '';
-		$token = $this->container->get( 'security.token_storage' )->getToken();
+		$token = $this->container->get('security.token_storage')->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();
 			}
 		}
-		elseif( $this->container->has( 'request' ) )
+		elseif ($this->container->has('request'))
 		{
-			$username = $this->container->get( 'request' )->getClientIp();
+			$username = $this->container->get('request')->getClientIp();
 		}
 
-		$context->setEditor( $username );
+		$context->setEditor($username);
 	}
 }

Braces +1 added lines, -2 removed lines

@@ -215,8 +215,7 @@
 			} else {
 				$username = $token->getUser();
 			}
-		}
-		elseif( $this->container->has( 'request' ) )
+		} elseif( $this->container->has( 'request' ) )
 		{
 			$username = $this->container->get( 'request' )->getClientIp();
 		}