aimeos / aimeos-symfony

Service/View.php

Spacing +28 added lines, -28 removed lines

@@ -31,7 +31,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;
@@ -46,53 +46,53 @@ 
 	 * @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);
 
-		$helper = new \Aimeos\MW\View\Helper\Config\Standard( $view, $config );
-		$view->addHelper( 'config', $helper );
+		$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);
 		}
 
-		$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;
 	}
@@ -108,15 +108,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 +55 added lines, -55 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,49 +47,49 @@ 
 	 * @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);
 
 			$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;
 	}
@@ -100,39 +100,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);
 	}
 
 
@@ -143,26 +143,26 @@ 
 	 */
 	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(
-			'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' ),
+			'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);
 	}
 
 
@@ -172,19 +172,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/JsonadmController.php

Spacing +45 added lines, -45 removed lines

@@ -32,15 +32,15 @@ 
 	 * @param integer|null $id Unique resource ID
 	 * @return \Symfony\Component\HttpFoundation\Response Response object containing the generated output
 	 */
-	public function deleteAction( Request $request, $resource, $site = 'default', $id = null )
+	public function deleteAction(Request $request, $resource, $site = 'default', $id = null)
 	{
 		$status = 500;
 		$header = $request->headers->all();
 
-		$cntl = $this->createController( $site, $resource, $request->get( 'lang', 'en' ) );
-		$result = $cntl->delete( $request->getContent(), $header, $status );
+		$cntl = $this->createController($site, $resource, $request->get('lang', 'en'));
+		$result = $cntl->delete($request->getContent(), $header, $status);
 
-		return $this->createResponse( $result, $status, $header );
+		return $this->createResponse($result, $status, $header);
 	}
 
 
@@ -53,15 +53,15 @@ 
 	 * @param integer|null $id Unique resource ID
 	 * @return \Symfony\Component\HttpFoundation\Response Response object containing the generated output
 	 */
-	public function getAction( Request $request, $resource, $site = 'default', $id = null )
+	public function getAction(Request $request, $resource, $site = 'default', $id = null)
 	{
 		$status = 500;
 		$header = $request->headers->all();
 
-		$cntl = $this->createController( $site, $resource, $request->get( 'lang', 'en' ) );
-		$result = $cntl->get( $request->getContent(), $header, $status );
+		$cntl = $this->createController($site, $resource, $request->get('lang', 'en'));
+		$result = $cntl->get($request->getContent(), $header, $status);
 
-		return $this->createResponse( $result, $status, $header );
+		return $this->createResponse($result, $status, $header);
 	}
 
 
@@ -74,15 +74,15 @@ 
 	 * @param integer|null $id Unique resource ID
 	 * @return \Symfony\Component\HttpFoundation\Response Response object containing the generated output
 	 */
-	public function patchAction( Request $request, $resource, $site = 'default', $id = null )
+	public function patchAction(Request $request, $resource, $site = 'default', $id = null)
 	{
 		$status = 500;
 		$header = $request->headers->all();
 
-		$cntl = $this->createController( $site, $resource, $request->get( 'lang', 'en' ) );
-		$result = $cntl->patch( $request->getContent(), $header, $status );
+		$cntl = $this->createController($site, $resource, $request->get('lang', 'en'));
+		$result = $cntl->patch($request->getContent(), $header, $status);
 
-		return $this->createResponse( $result, $status, $header );
+		return $this->createResponse($result, $status, $header);
 	}
 
 
@@ -95,15 +95,15 @@ 
 	 * @param integer $id Unique ID of the resource
 	 * @return \Symfony\Component\HttpFoundation\Response Response object containing the generated output
 	 */
-	public function postAction( Request $request, $resource, $site = 'default', $id = null )
+	public function postAction(Request $request, $resource, $site = 'default', $id = null)
 	{
 		$status = 500;
 		$header = $request->headers->all();
 
-		$cntl = $this->createController( $site, $resource, $request->get( 'lang', 'en' ) );
-		$result = $cntl->post( $request->getContent(), $header, $status );
+		$cntl = $this->createController($site, $resource, $request->get('lang', 'en'));
+		$result = $cntl->post($request->getContent(), $header, $status);
 
-		return $this->createResponse( $result, $status, $header );
+		return $this->createResponse($result, $status, $header);
 	}
 
 
@@ -116,15 +116,15 @@ 
 	 * @param integer|null $id Unique resource ID
 	 * @return \Symfony\Component\HttpFoundation\Response Response object containing the generated output
 	 */
-	public function putAction( Request $request, $resource, $site = 'default', $id = null )
+	public function putAction(Request $request, $resource, $site = 'default', $id = null)
 	{
 		$status = 500;
 		$header = $request->headers->all();
 
-		$cntl = $this->createController( $site, $resource, $request->get( 'lang', 'en' ) );
-		$result = $cntl->put( $request->getContent(), $header, $status );
+		$cntl = $this->createController($site, $resource, $request->get('lang', 'en'));
+		$result = $cntl->put($request->getContent(), $header, $status);
 
-		return $this->createResponse( $result, $status, $header );
+		return $this->createResponse($result, $status, $header);
 	}
 
 
@@ -136,15 +136,15 @@ 
 	 * @param string $sitecode 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();
 
-		$cntl = $this->createController( $site, $resource, $request->get( 'lang', 'en' ) );
-		$result = $cntl->options( $request->getContent(), $header, $status );
+		$cntl = $this->createController($site, $resource, $request->get('lang', 'en'));
+		$result = $cntl->options($request->getContent(), $header, $status);
 
-		return $this->createResponse( $result, $status, $header );
+		return $this->createResponse($result, $status, $header);
 	}
 
 
@@ -156,18 +156,18 @@ 
 	 * @param string $lang Language code
 	 * @return \Aimeos\MShop\Context\Item\Iface Context item
 	 */
-	protected function createController( $sitecode, $resource, $lang )
+	protected function createController($sitecode, $resource, $lang)
 	{
-		$aimeos = $this->get( 'aimeos' )->get();
-		$templatePaths = $aimeos->getCustomPaths( 'controller/jsonadm/templates' );
+		$aimeos = $this->get('aimeos')->get();
+		$templatePaths = $aimeos->getCustomPaths('controller/jsonadm/templates');
 
-		$context = $this->get( 'aimeos_context' )->get( false );
-		$context = $this->setLocale( $context, $sitecode, $lang );
+		$context = $this->get('aimeos_context')->get(false);
+		$context = $this->setLocale($context, $sitecode, $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\Controller\JsonAdm\Factory::createController( $context, $templatePaths, $resource );
+		return \Aimeos\Controller\JsonAdm\Factory::createController($context, $templatePaths, $resource);
 	}
 
 
@@ -179,14 +179,14 @@ 
 	 * @param array $header List of HTTP headers
 	 * @return \Illuminate\Http\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;
@@ -201,23 +201,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, $sitecode, $lang )
+	protected function setLocale(\Aimeos\MShop\Context\Item\Iface $context, $sitecode, $lang)
 	{
-		$localeManager = \Aimeos\MShop\Factory::createManager( $context, 'locale' );
+		$localeManager = \Aimeos\MShop\Factory::createManager($context, 'locale');
 
 		try
 		{
-			$localeItem = $localeManager->bootstrap( $sitecode, '', '', false );
-			$localeItem->setLanguageId( null );
-			$localeItem->setCurrencyId( null );
+			$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();
 		}
 
-		$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;
 	}

Controller/CheckoutController.php

Spacing +6 added lines, -6 removed lines

@@ -28,8 +28,8 @@ 
 	 */
 	public function confirmAction()
 	{
-		$params = $this->get( 'aimeos_page' )->getSections( 'checkout-confirm' );
-		return $this->render( 'AimeosShopBundle:Checkout:confirm.html.twig', $params );
+		$params = $this->get('aimeos_page')->getSections('checkout-confirm');
+		return $this->render('AimeosShopBundle:Checkout:confirm.html.twig', $params);
 	}
 
 
@@ -40,8 +40,8 @@ 
 	 */
 	public function indexAction()
 	{
-		$params = $this->get( 'aimeos_page' )->getSections( 'checkout-index' );
-		return $this->render( 'AimeosShopBundle:Checkout:index.html.twig', $params );
+		$params = $this->get('aimeos_page')->getSections('checkout-index');
+		return $this->render('AimeosShopBundle:Checkout:index.html.twig', $params);
 	}
 
 
@@ -52,7 +52,7 @@ 
 	 */
 	public function updateAction()
 	{
-		$params = $this->get( 'aimeos_page' )->getSections( 'checkout-update' );
-		return $this->render( 'AimeosShopBundle:Checkout:update.html.twig', $params );
+		$params = $this->get('aimeos_page')->getSections('checkout-update');
+		return $this->render('AimeosShopBundle:Checkout:update.html.twig', $params);
 	}
 }

Controller/BasketController.php

Spacing +2 added lines, -2 removed lines

@@ -28,7 +28,7 @@
 	 */
 	public function indexAction()
 	{
-		$params = $this->get( 'aimeos_page' )->getSections( 'basket-index' );
-		return $this->render( 'AimeosShopBundle:Basket:index.html.twig', $params );
+		$params = $this->get('aimeos_page')->getSections('basket-index');
+		return $this->render('AimeosShopBundle:Basket:index.html.twig', $params);
 	}
 }

Controller/AdminController.php

Spacing +83 added lines, -83 removed lines

@@ -30,54 +30,54 @@ 
 	 * @param integer $tab Number of the currently active tab
 	 * @return \Symfony\Component\HttpFoundation\Response HTML page for the admin interface
 	 */
-	public function indexAction( $site, $lang, $tab )
+	public function indexAction($site, $lang, $tab)
 	{
-		$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);
 
-		$aimeos = $this->get( 'aimeos' )->get();
-		$cntlPaths = $aimeos->getCustomPaths( 'controller/extjs' );
-		$controller = new \Aimeos\Controller\ExtJS\JsonRpc( $context, $cntlPaths );
+		$aimeos = $this->get('aimeos')->get();
+		$cntlPaths = $aimeos->getCustomPaths('controller/extjs');
+		$controller = new \Aimeos\Controller\ExtJS\JsonRpc($context, $cntlPaths);
 		$cssFiles = array();
 
-		foreach( $aimeos->getCustomPaths( 'admin/extjs' ) as $base => $paths )
+		foreach ($aimeos->getCustomPaths('admin/extjs') as $base => $paths)
 		{
-			foreach( $paths as $path )
+			foreach ($paths as $path)
 			{
 				$jsbAbsPath = $base . '/' . $path;
 
-				if( !is_file( $jsbAbsPath ) ) {
-					throw new \Exception( sprintf( 'JSB2 file "%1$s" not found', $jsbAbsPath ) );
+				if (!is_file($jsbAbsPath)) {
+					throw new \Exception(sprintf('JSB2 file "%1$s" not found', $jsbAbsPath));
 				}
 
-				$jsb2 = new \Aimeos\MW\Jsb2\Standard( $jsbAbsPath, dirname( $path ) );
-				$cssFiles = array_merge( $cssFiles, $jsb2->getUrls( 'css' ) );
+				$jsb2 = new \Aimeos\MW\Jsb2\Standard($jsbAbsPath, dirname($path));
+				$cssFiles = array_merge($cssFiles, $jsb2->getUrls('css'));
 			}
 		}
 
-		$params = array( 'site' => '{site}', 'lang' => '{lang}', 'tab' => '{tab}' );
-		$adminUrl = $this->generateUrl( 'aimeos_shop_admin', $params );
+		$params = array('site' => '{site}', 'lang' => '{lang}', 'tab' => '{tab}');
+		$adminUrl = $this->generateUrl('aimeos_shop_admin', $params);
 
-		$token = $this->get( 'security.csrf.token_manager' )->getToken( 'aimeos_admin_token' )->getValue();
-		$jsonUrl = $this->generateUrl( 'aimeos_shop_admin_json', array( '_token' => $token ) );
+		$token = $this->get('security.csrf.token_manager')->getToken('aimeos_admin_token')->getValue();
+		$jsonUrl = $this->generateUrl('aimeos_shop_admin_json', array('_token' => $token));
 
 		$vars = array(
 			'lang' => $lang,
 			'cssFiles' => $cssFiles,
-			'languages' => $this->getJsonLanguages( $context),
-			'config' => $this->getJsonClientConfig( $context ),
-			'site' => $this->getJsonSiteItem( $context, $site ),
-			'i18nContent' => $this->getJsonClientI18n( $aimeos->getI18nPaths(), $lang ),
+			'languages' => $this->getJsonLanguages($context),
+			'config' => $this->getJsonClientConfig($context),
+			'site' => $this->getJsonSiteItem($context, $site),
+			'i18nContent' => $this->getJsonClientI18n($aimeos->getI18nPaths(), $lang),
 			'searchSchemas' => $controller->getJsonSearchSchemas(),
 			'itemSchemas' => $controller->getJsonItemSchemas(),
-			'smd' => $controller->getJsonSmd( $jsonUrl ),
-			'urlTemplate' => urldecode( $adminUrl ),
-			'uploaddir' => $this->container->getParameter( 'aimeos_shop.uploaddir' ),
+			'smd' => $controller->getJsonSmd($jsonUrl),
+			'urlTemplate' => urldecode($adminUrl),
+			'uploaddir' => $this->container->getParameter('aimeos_shop.uploaddir'),
 			'version' => $this->getVersion(),
 			'activeTab' => $tab,
 		);
 
-		return $this->render( 'AimeosShopBundle:Admin:index.html.twig', $vars );
+		return $this->render('AimeosShopBundle:Admin:index.html.twig', $vars);
 	}
 
 
@@ -87,22 +87,22 @@ 
 	 * @param Request $request Symfony request object
 	 * @return \Symfony\Component\HttpFoundation\Response 2.0 RPC message response
 	 */
-	public function doAction( Request $request )
+	public function doAction(Request $request)
 	{
 		$csrfProvider = $this->get('security.csrf.token_manager');
 
-		if( $csrfProvider->isTokenValid( new CsrfToken( 'aimeos_admin_token',  $request->query->get( '_token' ) ) ) !== true ) {
-			throw new \Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException( 'CSRF token is invalid' );
+		if ($csrfProvider->isTokenValid(new CsrfToken('aimeos_admin_token', $request->query->get('_token'))) !== true) {
+			throw new \Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException('CSRF token is invalid');
 		}
 
-		$cntlPaths = $this->get( 'aimeos' )->get()->getCustomPaths( 'controller/extjs' );
-		$context = $this->get( 'aimeos_context' )->get( false );
-		$context = $this->setLocale( $context );
+		$cntlPaths = $this->get('aimeos')->get()->getCustomPaths('controller/extjs');
+		$context = $this->get('aimeos_context')->get(false);
+		$context = $this->setLocale($context);
 
-		$controller = new \Aimeos\Controller\ExtJS\JsonRpc( $context, $cntlPaths );
+		$controller = new \Aimeos\Controller\ExtJS\JsonRpc($context, $cntlPaths);
 
-		$response = $controller->process( $request->request->all(), 'php://input' );
-		return $this->render( 'AimeosShopBundle:Admin:do.html.twig', array( 'output' => $response ) );
+		$response = $controller->process($request->request->all(), 'php://input');
+		return $this->render('AimeosShopBundle:Admin:do.html.twig', array('output' => $response));
 	}
 
 
@@ -115,27 +115,27 @@ 
 	{
 		$contents = '';
 		$jsFiles = array();
-		$aimeos = $this->get( 'aimeos' )->get();
+		$aimeos = $this->get('aimeos')->get();
 
-		foreach( $aimeos->getCustomPaths( 'admin/extjs' ) as $base => $paths )
+		foreach ($aimeos->getCustomPaths('admin/extjs') as $base => $paths)
 		{
-			foreach( $paths as $path )
+			foreach ($paths as $path)
 			{
 				$jsbAbsPath = $base . '/' . $path;
-				$jsb2 = new \Aimeos\MW\Jsb2\Standard( $jsbAbsPath, dirname( $jsbAbsPath ) );
-				$jsFiles = array_merge( $jsFiles, $jsb2->getUrls( 'js', '' ) );
+				$jsb2 = new \Aimeos\MW\Jsb2\Standard($jsbAbsPath, dirname($jsbAbsPath));
+				$jsFiles = array_merge($jsFiles, $jsb2->getUrls('js', ''));
 			}
 		}
 
-		foreach( $jsFiles as $file )
+		foreach ($jsFiles as $file)
 		{
-			if( ( $content = file_get_contents( $file ) ) !== false ) {
+			if (($content = file_get_contents($file)) !== false) {
 				$contents .= $content;
 			}
 		}
 
-		$response = new Response( $contents );
-		$response->headers->set( 'Content-Type', 'application/javascript' );
+		$response = new Response($contents);
+		$response->headers->set('Content-Type', 'application/javascript');
 
 		return $response;
 	}
@@ -147,30 +147,30 @@ 
 	 * @param \Aimeos\MShop\Context\Item\Iface $context Context object
 	 * @return array List of language IDs with labels
 	 */
-	protected function getJsonLanguages( \Aimeos\MShop\Context\Item\Iface $context )
+	protected function getJsonLanguages(\Aimeos\MShop\Context\Item\Iface $context)
 	{
-		$paths = $this->get( 'aimeos' )->get()->getI18nPaths();
+		$paths = $this->get('aimeos')->get()->getI18nPaths();
 		$langs = array();
 
-		if( !isset( $paths['admin'] ) ) {
-			return json_encode( array() );
+		if (!isset($paths['admin'])) {
+			return json_encode(array());
 		}
 
-		foreach( $paths['admin'] as $path )
+		foreach ($paths['admin'] as $path)
 		{
-			$iter = new \DirectoryIterator( $path );
+			$iter = new \DirectoryIterator($path);
 
-			foreach( $iter as $file )
+			foreach ($iter as $file)
 			{
 				$name = $file->getFilename();
 
-				if( preg_match('/^[a-z]{2,3}(_[A-Z]{2})?$/', $name ) ) {
+				if (preg_match('/^[a-z]{2,3}(_[A-Z]{2})?$/', $name)) {
 					$langs[$name] = null;
 				}
 			}
 		}
 
-		return json_encode( $this->getLanguages( $context, array_keys( $langs ) ) );
+		return json_encode($this->getLanguages($context, array_keys($langs)));
 	}
 
 
@@ -180,10 +180,10 @@ 
 	 * @param \Aimeos\MShop\Context\Item\Iface $context Context item object
 	 * @return string JSON encoded configuration object
 	 */
-	protected function getJsonClientConfig( \Aimeos\MShop\Context\Item\Iface $context )
+	protected function getJsonClientConfig(\Aimeos\MShop\Context\Item\Iface $context)
 	{
-		$config = $context->getConfig()->get( 'admin/extjs', array() );
-		return json_encode( array( 'admin' => array( 'extjs' => $config ) ), JSON_FORCE_OBJECT );
+		$config = $context->getConfig()->get('admin/extjs', array());
+		return json_encode(array('admin' => array('extjs' => $config)), JSON_FORCE_OBJECT);
 	}
 
 
@@ -194,16 +194,16 @@ 
 	 * @param string $lang ISO language code like "en" or "en_GB"
 	 * @return string JSON encoded translation object
 	 */
-	protected function getJsonClientI18n( array $i18nPaths, $lang )
+	protected function getJsonClientI18n(array $i18nPaths, $lang)
 	{
-		$i18n = new \Aimeos\MW\Translation\Zend2( $i18nPaths, 'gettext', $lang, array( 'disableNotices' => true ) );
+		$i18n = new \Aimeos\MW\Translation\Zend2($i18nPaths, 'gettext', $lang, array('disableNotices' => true));
 
 		$content = array(
-			'admin' => $i18n->getAll( 'admin' ),
-			'admin/ext' => $i18n->getAll( 'admin/ext' ),
+			'admin' => $i18n->getAll('admin'),
+			'admin/ext' => $i18n->getAll('admin/ext'),
 		);
 
-		return json_encode( $content, JSON_FORCE_OBJECT );
+		return json_encode($content, JSON_FORCE_OBJECT);
 	}
 
 
@@ -215,19 +215,19 @@ 
 	 * @return string JSON encoded site item object
 	 * @throws Exception If no site item was found for the code
 	 */
-	protected function getJsonSiteItem( \Aimeos\MShop\Context\Item\Iface $context, $site )
+	protected function getJsonSiteItem(\Aimeos\MShop\Context\Item\Iface $context, $site)
 	{
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'locale/site' );
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'locale/site');
 
 		$criteria = $manager->createSearch();
-		$criteria->setConditions( $criteria->compare( '==', 'locale.site.code', $site ) );
-		$items = $manager->searchItems( $criteria );
+		$criteria->setConditions($criteria->compare('==', 'locale.site.code', $site));
+		$items = $manager->searchItems($criteria);
 
-		if( ( $item = reset( $items ) ) === false ) {
-			throw new \Exception( sprintf( 'No site found for code "%1$s"', $site ) );
+		if (($item = reset($items)) === false) {
+			throw new \Exception(sprintf('No site found for code "%1$s"', $site));
 		}
 
-		return json_encode( $item->toArray() );
+		return json_encode($item->toArray());
 	}
 
 
@@ -238,18 +238,18 @@ 
 	 * @param array $langIds List of language IDs
 	 * @return array List of associative lists with "id" and "label" as keys
 	 */
-	protected function getLanguages( \Aimeos\MShop\Context\Item\Iface $context, array $langIds )
+	protected function getLanguages(\Aimeos\MShop\Context\Item\Iface $context, array $langIds)
 	{
-		$languageManager = \Aimeos\MShop\Factory::createManager( $context, 'locale/language' );
+		$languageManager = \Aimeos\MShop\Factory::createManager($context, 'locale/language');
 		$result = array();
 
 		$search = $languageManager->createSearch();
-		$search->setConditions( $search->compare('==', 'locale.language.id', $langIds ) );
-		$search->setSortations( array( $search->sort( '-', 'locale.language.status' ), $search->sort( '+', 'locale.language.label' ) ) );
-		$langItems = $languageManager->searchItems( $search );
+		$search->setConditions($search->compare('==', 'locale.language.id', $langIds));
+		$search->setSortations(array($search->sort('-', 'locale.language.status'), $search->sort('+', 'locale.language.label')));
+		$langItems = $languageManager->searchItems($search);
 
-		foreach( $langItems as $id => $item ) {
-			$result[] = array( 'id' => $id, 'label' => $item->getLabel() );
+		foreach ($langItems as $id => $item) {
+			$result[] = array('id' => $id, 'label' => $item->getLabel());
 		}
 
 		return $result;
@@ -263,14 +263,14 @@ 
 	 */
 	protected function getVersion()
 	{
-		$filename = dirname( $this->get( 'kernel' )->getRootDir() ) . DIRECTORY_SEPARATOR . 'composer.lock';
+		$filename = dirname($this->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-symfony2' ) {
+				if ($item['name'] === 'aimeos/aimeos-symfony2') {
 					return $item['version'];
 				}
 			}
@@ -288,17 +288,17 @@ 
 	 * @param string $locale 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, $sitecode = 'default', $locale = null )
+	protected function setLocale(\Aimeos\MShop\Context\Item\Iface $context, $sitecode = 'default', $locale = null)
 	{
-		$localeManager = \Aimeos\MShop\Factory::createManager( $context, 'locale' );
+		$localeManager = \Aimeos\MShop\Factory::createManager($context, 'locale');
 
 		try {
-			$localeItem = $localeManager->bootstrap( $sitecode, $locale, '', false );
-		} catch( \Aimeos\MShop\Locale\Exception $e ) {
+			$localeItem = $localeManager->bootstrap($sitecode, $locale, '', false);
+		} catch (\Aimeos\MShop\Locale\Exception $e) {
 			$localeItem = $localeManager->createItem();
 		}
 
-		$context->setLocale( $localeItem );
+		$context->setLocale($localeItem);
 
 		return $context;
 	}

Controller/CatalogController.php

Spacing +10 added lines, -10 removed lines

@@ -28,8 +28,8 @@ 
 	 */
 	public function countAction()
 	{
-		$params = $this->get( 'aimeos_page' )->getSections( 'catalog-count' );
-		return $this->render( 'AimeosShopBundle:Catalog:count.html.twig', $params );
+		$params = $this->get('aimeos_page')->getSections('catalog-count');
+		return $this->render('AimeosShopBundle:Catalog:count.html.twig', $params);
 	}
 
 
@@ -40,8 +40,8 @@ 
 	 */
 	public function detailAction()
 	{
-		$params = $this->get( 'aimeos_page' )->getSections( 'catalog-detail' );
-		return $this->render( 'AimeosShopBundle:Catalog:detail.html.twig', $params );
+		$params = $this->get('aimeos_page')->getSections('catalog-detail');
+		return $this->render('AimeosShopBundle:Catalog:detail.html.twig', $params);
 	}
 
 
@@ -52,8 +52,8 @@ 
 	 */
 	public function listAction()
 	{
-		$params = $this->get( 'aimeos_page' )->getSections( 'catalog-list' );
-		return $this->render( 'AimeosShopBundle:Catalog:list.html.twig', $params );
+		$params = $this->get('aimeos_page')->getSections('catalog-list');
+		return $this->render('AimeosShopBundle:Catalog:list.html.twig', $params);
 	}
 
 
@@ -64,8 +64,8 @@ 
 	 */
 	public function stockAction()
 	{
-		$params = $this->get( 'aimeos_page' )->getSections( 'catalog-stock' );
-		return $this->render( 'AimeosShopBundle:Catalog:stock.html.twig', $params );
+		$params = $this->get('aimeos_page')->getSections('catalog-stock');
+		return $this->render('AimeosShopBundle:Catalog:stock.html.twig', $params);
 	}
 
 
@@ -76,7 +76,7 @@ 
 	 */
 	public function suggestAction()
 	{
-		$params = $this->get( 'aimeos_page' )->getSections( 'catalog-suggest' );
-		return $this->render( 'AimeosShopBundle:Catalog:suggest.html.twig', $params );
+		$params = $this->get('aimeos_page')->getSections('catalog-suggest');
+		return $this->render('AimeosShopBundle:Catalog:suggest.html.twig', $params);
 	}
 }

Controller/AccountController.php

Spacing +2 added lines, -2 removed lines

@@ -28,7 +28,7 @@
 	 */
 	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);
 	}
 }

Controller/PageController.php

Spacing +2 added lines, -2 removed lines

@@ -28,7 +28,7 @@ 
 	 */
 	public function privacyAction()
 	{
-		return $this->render( 'AimeosShopBundle:Page:privacy.html.twig' );
+		return $this->render('AimeosShopBundle:Page:privacy.html.twig');
 	}
 
 
@@ -39,6 +39,6 @@ 
 	 */
 	public function termsAction()
 	{
-		return $this->render( 'AimeosShopBundle:Page:terms.html.twig' );
+		return $this->render('AimeosShopBundle:Page:terms.html.twig');
 	}
 }