aimeos / aimeos-symfony

Tests/Controller/ExtadmControllerTest.php

Spacing +14 added lines, -14 removed lines

@@ -12,12 +12,12 @@ 
 		$client = static::createClient(array(), array(
 			'PHP_AUTH_USER' => 'admin',
 			'PHP_AUTH_PW'   => 'adminpass',
-		) );
-		$crawler = $client->request( 'GET', '/unittest/extadm/de/0' );
+		));
+		$crawler = $client->request('GET', '/unittest/extadm/de/0');
 
-		$this->assertEquals( 200, $client->getResponse()->getStatusCode() );
-		$this->assertEquals( 1, $crawler->filter( 'head:contains("/{site}/extadm/{lang}/{tab}")' )->count() );
-		$this->assertEquals( 1, $crawler->filter( 'body:contains("You need to enable javascript!")' )->count() );
+		$this->assertEquals(200, $client->getResponse()->getStatusCode());
+		$this->assertEquals(1, $crawler->filter('head:contains("/{site}/extadm/{lang}/{tab}")')->count());
+		$this->assertEquals(1, $crawler->filter('body:contains("You need to enable javascript!")')->count());
 	}
 
 
@@ -26,17 +26,17 @@ 
 		$client = static::createClient(array(), array(
 			'PHP_AUTH_USER' => 'admin',
 			'PHP_AUTH_PW'   => 'adminpass',
-		) );
+		));
 
-		$token = $client->getContainer()->get( 'security.csrf.token_manager' )->getToken( 'aimeos_admin_token' );
+		$token = $client->getContainer()->get('security.csrf.token_manager')->getToken('aimeos_admin_token');
 
-		$client->request( 'POST', '/unittest/extadm/do?_token=' . $token->getValue(),
+		$client->request('POST', '/unittest/extadm/do?_token='.$token->getValue(),
 			array(), array(), array('CONTENT_TYPE' => 'application/json'),
 			'[{"jsonrpc":"2.0","method":"Product_Type.searchItems","params":{"site":"unittest"},"id":2}]'
 		);
 
-		$this->assertEquals( 200, $client->getResponse()->getStatusCode() );
-		$this->assertStringStartsWith( '[{', $client->getResponse()->getContent() );
+		$this->assertEquals(200, $client->getResponse()->getStatusCode());
+		$this->assertStringStartsWith('[{', $client->getResponse()->getContent());
 	}
 
 
@@ -45,11 +45,11 @@ 
 		$client = static::createClient(array(), array(
 			'PHP_AUTH_USER' => 'admin',
 			'PHP_AUTH_PW'   => 'adminpass',
-		) );
+		));
 
-		$client->request( 'GET', '/unittest/extadm/file' );
+		$client->request('GET', '/unittest/extadm/file');
 
-		$this->assertEquals( 200, $client->getResponse()->getStatusCode() );
-		$this->assertContains( 'Ext.', $client->getResponse()->getContent() );
+		$this->assertEquals(200, $client->getResponse()->getStatusCode());
+		$this->assertContains('Ext.', $client->getResponse()->getContent());
 	}
 }

Service/Context.php

Spacing +57 added lines, -57 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,52 +47,52 @@ 
 	 * @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\DBAL( $config );
-			$context->setDatabaseManager( $dbm );
+			$dbm = new \Aimeos\MW\DB\Manager\DBAL($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);
 
-			$mq = new \Aimeos\MW\MQueue\Manager\Standard( $config );
-			$context->setMessageQueueManager( $mq );
+			$mq = new \Aimeos\MW\MQueue\Manager\Standard($config);
+			$context->setMessageQueueManager($mq);
 
 			$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;
 	}
@@ -103,39 +103,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);
 	}
 
 
@@ -148,25 +148,25 @@ 
 	{
 		$configPaths = $this->container->get('aimeos')->get()->getConfigPaths();
 
-		$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(
-			'admin' => $this->container->getParameter( 'aimeos_shop.admin' ),
-			'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' ),
+			'admin' => $this->container->getParameter('aimeos_shop.admin'),
+			'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);
 	}
 
 
@@ -176,19 +176,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');
 			$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;

Service/Page.php

Spacing +11 added lines, -11 removed lines

@@ -28,7 +28,7 @@ 
 	 *
 	 * @param Container $container Container object to access parameters
 	 */
-	public function __construct( Container $container )
+	public function __construct(Container $container)
 	{
 		$this->container = $container;
 	}
@@ -40,23 +40,23 @@ 
 	 * @param string $pageName Name of the configured page
 	 * @return array Associative list with body and header output separated by client name
 	 */
-	public function getSections( $pageName )
+	public function getSections($pageName)
 	{
 		$context = $this->container->get('aimeos_context')->get();
-		$pagesConfig = $this->container->getParameter( 'aimeos_shop.page' );
-		$result = array( 'aibody' => array(), 'aiheader' => array() );
+		$pagesConfig = $this->container->getParameter('aimeos_shop.page');
+		$result = array('aibody' => array(), 'aiheader' => array());
 
 		$langid = $context->getLocale()->getLanguageId();
-		$tmplPaths = $this->container->get('aimeos')->get()->getCustomPaths( 'client/html/templates' );
-		$view = $this->container->get('aimeos_view')->create( $context, $tmplPaths, $langid );
-		$context->setView( $view );
+		$tmplPaths = $this->container->get('aimeos')->get()->getCustomPaths('client/html/templates');
+		$view = $this->container->get('aimeos_view')->create($context, $tmplPaths, $langid);
+		$context->setView($view);
 
-		if( isset( $pagesConfig[$pageName] ) )
+		if (isset($pagesConfig[$pageName]))
 		{
-			foreach( (array) $pagesConfig[$pageName] as $clientName )
+			foreach ((array) $pagesConfig[$pageName] as $clientName)
 			{
-				$client = \Aimeos\Client\Html\Factory::createClient( $context, $tmplPaths, $clientName );
-				$client->setView( clone $view );
+				$client = \Aimeos\Client\Html\Factory::createClient($context, $tmplPaths, $clientName);
+				$client->setView(clone $view);
 				$client->process();
 
 				$result['aibody'][$clientName] = $client->getBody();

Service/View.php

Spacing +38 added lines, -38 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,61 +47,61 @@ 
 	 * @param string|null $locale Code of the current language or null for no translation
 	 * @return \Aimeos\MW\View\Iface View object
 	 */
-	public function create( \Aimeos\MShop\Context\Item\Iface $context, array $templatePaths, $locale = null )
+	public function create(\Aimeos\MShop\Context\Item\Iface $context, array $templatePaths, $locale = null)
 	{
 		$params = $fixed = array();
 		$config = $context->getConfig();
 		$request = $this->requestStack->getMasterRequest();
 
-		if( $locale !== null )
+		if ($locale !== null)
 		{
-			$params = $request->request->all() + $request->query->all() + $request->attributes->get( '_route_params' );
+			$params = $request->request->all() + $request->query->all() + $request->attributes->get('_route_params');
 			$fixed = $this->getFixedParams();
 
-			$i18n = $this->container->get('aimeos_i18n')->get( array( $locale ) );
+			$i18n = $this->container->get('aimeos_i18n')->get(array($locale));
 			$translation = $i18n[$locale];
 		}
 		else
 		{
-			$translation = new \Aimeos\MW\Translation\None( 'en' );
+			$translation = new \Aimeos\MW\Translation\None('en');
 		}
 
 
-		$view = new \Aimeos\MW\View\Standard( $templatePaths );
+		$view = new \Aimeos\MW\View\Standard($templatePaths);
 
-		$helper = new \Aimeos\MW\View\Helper\Translate\Standard( $view, $translation );
-		$view->addHelper( 'translate', $helper );
+		$helper = new \Aimeos\MW\View\Helper\Translate\Standard($view, $translation);
+		$view->addHelper('translate', $helper);
 
-		$helper = new \Aimeos\MW\View\Helper\Url\Symfony2( $view, $this->container->get( 'router' ), $fixed );
-		$view->addHelper( 'url', $helper );
+		$helper = new \Aimeos\MW\View\Helper\Url\Symfony2($view, $this->container->get('router'), $fixed);
+		$view->addHelper('url', $helper);
 
-		$helper = new \Aimeos\MW\View\Helper\Param\Standard( $view, $params );
-		$view->addHelper( 'param', $helper );
+		$helper = new \Aimeos\MW\View\Helper\Param\Standard($view, $params);
+		$view->addHelper('param', $helper);
 
-		$config = new \Aimeos\MW\Config\Decorator\Protect( clone $config, array( 'admin', 'client' ) );
-		$helper = new \Aimeos\MW\View\Helper\Config\Standard( $view, $config );
-		$view->addHelper( 'config', $helper );
+		$config = new \Aimeos\MW\Config\Decorator\Protect(clone $config, array('admin', 'client'));
+		$helper = new \Aimeos\MW\View\Helper\Config\Standard($view, $config);
+		$view->addHelper('config', $helper);
 
-		$sepDec = $config->get( 'client/html/common/format/seperatorDecimal', '.' );
-		$sep1000 = $config->get( 'client/html/common/format/seperator1000', ' ' );
-		$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);
 		}
 
-		$helper = new \Aimeos\MW\View\Helper\Response\Symfony2( $view );
-		$view->addHelper( 'response', $helper );
+		$helper = new \Aimeos\MW\View\Helper\Response\Symfony2($view);
+		$view->addHelper('response', $helper);
 
-		$token = $this->container->get( 'security.csrf.token_manager' )->getToken( '_token' );
-		$helper = new \Aimeos\MW\View\Helper\Csrf\Standard( $view, '_token', $token->getValue() );
-		$view->addHelper( 'csrf', $helper );
+		$token = $this->container->get('security.csrf.token_manager')->getToken('_token');
+		$helper = new \Aimeos\MW\View\Helper\Csrf\Standard($view, '_token', $token->getValue());
+		$view->addHelper('csrf', $helper);
 
-		$helper = new \Aimeos\MW\View\Helper\Access\Standard( $view, $this->getGroups( $context ) );
-		$view->addHelper( 'access', $helper );
+		$helper = new \Aimeos\MW\View\Helper\Access\Standard($view, $this->getGroups($context));
+		$view->addHelper('access', $helper);
 
 		return $view;
 	}
@@ -117,15 +117,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;
 		}
 
@@ -139,17 +139,17 @@ 
 	 * @param \Aimeos\MShop\Context\Item\Iface $context Context object
 	 * @return \Closure Function which returns the user group codes
 	 */
-	protected function getGroups( \Aimeos\MShop\Context\Item\Iface $context )
+	protected function getGroups(\Aimeos\MShop\Context\Item\Iface $context)
 	{
-		return function() use ( $context )
+		return function() use ($context)
 		{
 			$list = array();
-			$manager = \Aimeos\MShop\Factory::createManager( $context, 'customer/group' );
+			$manager = \Aimeos\MShop\Factory::createManager($context, 'customer/group');
 
 			$search = $manager->createSearch();
-			$search->setConditions( $search->compare( '==', 'customer.group.id', $context->getGroupIds() ) );
+			$search->setConditions($search->compare('==', 'customer.group.id', $context->getGroupIds()));
 
-			foreach( $manager->searchItems( $search ) as $item ) {
+			foreach ($manager->searchItems($search) as $item) {
 				$list[] = $item->getCode();
 			}
 

Command/JobsCommand.php

Spacing +37 added lines, -37 removed lines

@@ -29,19 +29,19 @@ 
 	protected function configure()
 	{
 		$names = '';
-		$aimeos = new \Aimeos\Bootstrap( array() );
-		$cntlPaths = $aimeos->getCustomPaths( 'controller/jobs' );
-		$controllers = \Aimeos\Controller\Jobs\Factory::getControllers( $this->getBareContext(), $aimeos, $cntlPaths );
+		$aimeos = new \Aimeos\Bootstrap(array());
+		$cntlPaths = $aimeos->getCustomPaths('controller/jobs');
+		$controllers = \Aimeos\Controller\Jobs\Factory::getControllers($this->getBareContext(), $aimeos, $cntlPaths);
 
-		foreach( $controllers as $key => $controller ) {
-			$names .= str_pad( $key, 30 ) . $controller->getName() . PHP_EOL;
+		foreach ($controllers as $key => $controller) {
+			$names .= str_pad($key, 30).$controller->getName().PHP_EOL;
 		}
 
-		$this->setName( 'aimeos:jobs' );
-		$this->setDescription( 'Executes the job controllers' );
-		$this->addArgument( 'jobs', InputArgument::REQUIRED, 'One or more job controller names like "admin/job customer/email/watch"' );
-		$this->addArgument( 'site', InputArgument::OPTIONAL, 'Site codes to execute the jobs for like "default unittest" (none for all)' );
-		$this->setHelp( "Available jobs are:\n" . $names );
+		$this->setName('aimeos:jobs');
+		$this->setDescription('Executes the job controllers');
+		$this->addArgument('jobs', InputArgument::REQUIRED, 'One or more job controller names like "admin/job customer/email/watch"');
+		$this->addArgument('site', InputArgument::OPTIONAL, 'Site codes to execute the jobs for like "default unittest" (none for all)');
+		$this->setHelp("Available jobs are:\n".$names);
 	}
 
 
@@ -51,23 +51,23 @@ 
 	 * @param InputInterface $input Input object
 	 * @param OutputInterface $output Output object
 	 */
-	protected function execute( InputInterface $input, OutputInterface $output )
+	protected function execute(InputInterface $input, OutputInterface $output)
 	{
 		$context = $this->getContext();
-		$aimeos = $this->getContainer()->get( 'aimeos' )->get();
+		$aimeos = $this->getContainer()->get('aimeos')->get();
 
-		$jobs = explode( ' ', $input->getArgument( 'jobs' ) );
-		$localeManager = \Aimeos\MShop\Locale\Manager\Factory::createManager( $context );
+		$jobs = explode(' ', $input->getArgument('jobs'));
+		$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(), 'en', '', false );
-			$context->setLocale( $localeItem );
+			$localeItem = $localeManager->bootstrap($siteItem->getCode(), 'en', '', false);
+			$context->setLocale($localeItem);
 
-			$output->writeln( sprintf( 'Executing the Aimeos jobs for "<info>%s</info>"', $siteItem->getCode() ) );
+			$output->writeln(sprintf('Executing the Aimeos jobs for "<info>%s</info>"', $siteItem->getCode()));
 
-			foreach( $jobs as $jobname ) {
-				\Aimeos\Controller\Jobs\Factory::createController( $context, $aimeos, $jobname )->run();
+			foreach ($jobs as $jobname) {
+				\Aimeos\Controller\Jobs\Factory::createController($context, $aimeos, $jobname)->run();
 			}
 		}
 	}
@@ -82,15 +82,15 @@ 
 	{
 		$ctx = new \Aimeos\MShop\Context\Item\Standard();
 
-		$conf = new \Aimeos\MW\Config\PHPArray( array(), array() );
-		$ctx->setConfig( $conf );
+		$conf = new \Aimeos\MW\Config\PHPArray(array(), array());
+		$ctx->setConfig($conf);
 
-		$locale = \Aimeos\MShop\Factory::createManager( $ctx, 'locale' )->createItem();
-		$locale->setLanguageId( 'en' );
-		$ctx->setLocale( $locale );
+		$locale = \Aimeos\MShop\Factory::createManager($ctx, 'locale')->createItem();
+		$locale->setLanguageId('en');
+		$ctx->setLocale($locale);
 
-		$i18n = new \Aimeos\MW\Translation\None( 'en' );
-		$ctx->setI18n( array( 'en' => $i18n ) );
+		$i18n = new \Aimeos\MW\Translation\None('en');
+		$ctx->setI18n(array('en' => $i18n));
 
 		return $ctx;
 	}
@@ -105,19 +105,19 @@ 
 	{
 		$container = $this->getContainer();
 		$aimeos = $container->get('aimeos')->get();
-		$context = $container->get( 'aimeos_context' )->get( false );
+		$context = $container->get('aimeos_context')->get(false);
 
-		$tmplPaths = $aimeos->getCustomPaths( 'controller/jobs/templates' );
-		$tmplPaths = array_merge( $tmplPaths, $aimeos->getCustomPaths( 'client/html/templates' ) );
-		$view = $container->get('aimeos_view')->create( $context, $tmplPaths );
+		$tmplPaths = $aimeos->getCustomPaths('controller/jobs/templates');
+		$tmplPaths = array_merge($tmplPaths, $aimeos->getCustomPaths('client/html/templates'));
+		$view = $container->get('aimeos_view')->create($context, $tmplPaths);
 
-		$langManager = \Aimeos\MShop\Locale\Manager\Factory::createManager( $context )->getSubManager( 'language' );
-		$langids = array_keys( $langManager->searchItems( $langManager->createSearch( true ) ) );
-		$i18n = $this->getContainer()->get( 'aimeos_i18n' )->get( $langids );
+		$langManager = \Aimeos\MShop\Locale\Manager\Factory::createManager($context)->getSubManager('language');
+		$langids = array_keys($langManager->searchItems($langManager->createSearch(true)));
+		$i18n = $this->getContainer()->get('aimeos_i18n')->get($langids);
 
-		$context->setEditor( 'aimeos:jobs' );
-		$context->setView( $view );
-		$context->setI18n( $i18n );
+		$context->setEditor('aimeos:jobs');
+		$context->setView($view);
+		$context->setI18n($i18n);
 
 		return $context;
 	}

Command/SetupCommand.php

Spacing +44 added lines, -44 removed lines

@@ -30,18 +30,18 @@ 
 	 * @param string $classname Name of the setup task class
 	 * @return boolean True if class is found, false if not
 	 */
-	public static function autoload( $classname )
+	public static function autoload($classname)
 	{
-		if( strncmp( $classname, 'Aimeos\\MW\\Setup\\Task\\', 21 ) === 0 )
+		if (strncmp($classname, 'Aimeos\\MW\\Setup\\Task\\', 21) === 0)
 		{
-			$fileName = substr( $classname, 21 ) . '.php';
-			$paths = explode( PATH_SEPARATOR, get_include_path() );
+			$fileName = substr($classname, 21).'.php';
+			$paths = explode(PATH_SEPARATOR, get_include_path());
 
-			foreach( $paths as $path )
+			foreach ($paths as $path)
 			{
-				$file = $path . DIRECTORY_SEPARATOR . $fileName;
+				$file = $path.DIRECTORY_SEPARATOR.$fileName;
 
-				if( file_exists( $file ) === true && ( include_once $file ) !== false ) {
+				if (file_exists($file) === true && (include_once $file) !== false) {
 					return true;
 				}
 			}
@@ -56,13 +56,13 @@ 
 	 */
 	protected function configure()
 	{
-		$this->setName( 'aimeos:setup');
-		$this->setDescription( 'Initialize or update the Aimeos database tables' );
-		$this->addArgument( 'site', InputArgument::OPTIONAL, 'Site for updating database entries', 'default' );
-		$this->addArgument( 'tplsite', InputArgument::OPTIONAL, 'Template site for creating or updating database entries', 'default' );
-		$this->addOption( 'option', null, InputOption::VALUE_REQUIRED, 'Optional setup configuration, name and value are separated by ":" like "setup/default/demo:1"', array() );
-		$this->addOption( 'action', null, InputOption::VALUE_REQUIRED, 'Action name that should be executed, i.e. "migrate", "rollback", "clean"', 'migrate' );
-		$this->addOption( 'task', null, InputOption::VALUE_REQUIRED, 'Name of the setup task that should be executed', null );
+		$this->setName('aimeos:setup');
+		$this->setDescription('Initialize or update the Aimeos database tables');
+		$this->addArgument('site', InputArgument::OPTIONAL, 'Site for updating database entries', 'default');
+		$this->addArgument('tplsite', InputArgument::OPTIONAL, 'Template site for creating or updating database entries', 'default');
+		$this->addOption('option', null, InputOption::VALUE_REQUIRED, 'Optional setup configuration, name and value are separated by ":" like "setup/default/demo:1"', array());
+		$this->addOption('action', null, InputOption::VALUE_REQUIRED, 'Action name that should be executed, i.e. "migrate", "rollback", "clean"', 'migrate');
+		$this->addOption('task', null, InputOption::VALUE_REQUIRED, 'Name of the setup task that should be executed', null);
 	}
 
 
@@ -72,51 +72,51 @@ 
 	 * @param InputInterface $input Input object
 	 * @param OutputInterface $output Output object
 	 */
-	protected function execute( InputInterface $input, OutputInterface $output )
+	protected function execute(InputInterface $input, OutputInterface $output)
 	{
-		$ctx = $this->getContainer()->get( 'aimeos_context' )->get( false );
-		$ctx->setEditor( 'aimeos:setup' );
+		$ctx = $this->getContainer()->get('aimeos_context')->get(false);
+		$ctx->setEditor('aimeos:setup');
 
 		$config = $ctx->getConfig();
-		$site = $input->getArgument( 'site' );
-		$tplsite = $input->getArgument( 'tplsite' );
+		$site = $input->getArgument('site');
+		$tplsite = $input->getArgument('tplsite');
 
-		$config->set( 'setup/site', $site );
-		$dbconfig = $this->getDbConfig( $config );
-		$this->setOptions( $config, $input );
+		$config->set('setup/site', $site);
+		$dbconfig = $this->getDbConfig($config);
+		$this->setOptions($config, $input);
 
-		$taskPaths = $this->getContainer()->get( 'aimeos' )->get()->getSetupPaths( $tplsite );
+		$taskPaths = $this->getContainer()->get('aimeos')->get()->getSetupPaths($tplsite);
 
 		$includePaths = $taskPaths;
 		$includePaths[] = get_include_path();
 
-		if( set_include_path( implode( PATH_SEPARATOR, $includePaths ) ) === false ) {
-			throw new \Exception( 'Unable to extend include path' );
+		if (set_include_path(implode(PATH_SEPARATOR, $includePaths)) === false) {
+			throw new \Exception('Unable to extend include path');
 		}
 
-		spl_autoload_register( '\Aimeos\ShopBundle\Command\SetupCommand::autoload', true );
+		spl_autoload_register('\Aimeos\ShopBundle\Command\SetupCommand::autoload', true);
 
-		$manager = new \Aimeos\MW\Setup\Manager\Multiple( $ctx->getDatabaseManager(), $dbconfig, $taskPaths, $ctx );
+		$manager = new \Aimeos\MW\Setup\Manager\Multiple($ctx->getDatabaseManager(), $dbconfig, $taskPaths, $ctx);
 
-		$output->writeln( sprintf( 'Initializing or updating the Aimeos database tables for site <info>%1$s</info>', $site ) );
+		$output->writeln(sprintf('Initializing or updating the Aimeos database tables for site <info>%1$s</info>', $site));
 
-		if( ( $task = $input->getOption( 'task' ) ) && is_array( $task ) ) {
-			$task = reset( $task );
+		if (($task = $input->getOption('task')) && is_array($task)) {
+			$task = reset($task);
 		}
 
-		switch( $input->getOption( 'action' ) )
+		switch ($input->getOption('action'))
 		{
 			case 'migrate':
-				$manager->migrate( $task );
+				$manager->migrate($task);
 				break;
 			case 'rollback':
-				$manager->rollback( $task );
+				$manager->rollback($task);
 				break;
 			case 'clean':
-				$manager->clean( $task );
+				$manager->clean($task);
 				break;
 			default:
-				throw new \Exception( sprintf( 'Invalid setup action "%1$s"', $input->getOption( 'action' ) ) );
+				throw new \Exception(sprintf('Invalid setup action "%1$s"', $input->getOption('action')));
 		}
 	}
 
@@ -127,14 +127,14 @@ 
 	 * @param \Aimeos\MW\Config\Iface $conf Config object
 	 * @return array Multi-dimensional associative list of database configuration parameters
 	 */
-	protected function getDbConfig( \Aimeos\MW\Config\Iface $conf )
+	protected function getDbConfig(\Aimeos\MW\Config\Iface $conf)
 	{
-		$dbconfig = $conf->get( 'resource', array() );
+		$dbconfig = $conf->get('resource', array());
 
-		foreach( $dbconfig as $rname => $dbconf )
+		foreach ($dbconfig as $rname => $dbconf)
 		{
-			if( strncmp( $rname, 'db', 2 ) !== 0 ) {
-				unset( $dbconfig[$rname] );
+			if (strncmp($rname, 'db', 2) !== 0) {
+				unset($dbconfig[$rname]);
 			}
 		}
 
@@ -150,12 +150,12 @@ 
 	 * @param array Associative list of database configurations
 	 * @throws \RuntimeException If the format of the options is invalid
 	 */
-	protected function setOptions( \Aimeos\MW\Config\Iface $conf, InputInterface $input )
+	protected function setOptions(\Aimeos\MW\Config\Iface $conf, InputInterface $input)
 	{
-		foreach( (array) $input->getOption( 'option' ) as $option )
+		foreach ((array) $input->getOption('option') as $option)
 		{
-			list( $name, $value ) = explode( ':', $option );
-			$conf->set( $name, $value );
+			list($name, $value) = explode(':', $option);
+			$conf->set($name, $value);
 		}
 	}
 }

Controller/JqadmController.php

Spacing +53 added lines, -53 removed lines

@@ -29,35 +29,35 @@ 
 	 * @param $type File type, i.e. "css" or "js"
 	 * @return Response Response object
 	 */
-	public function fileAction( $type )
+	public function fileAction($type)
 	{
 		$contents = '';
 		$files = array();
-		$aimeos = $this->get( 'aimeos' )->get();
+		$aimeos = $this->get('aimeos')->get();
 
-		foreach( $aimeos->getCustomPaths( 'admin/jqadm' ) as $base => $paths )
+		foreach ($aimeos->getCustomPaths('admin/jqadm') as $base => $paths)
 		{
-			foreach( $paths as $path )
+			foreach ($paths as $path)
 			{
-				$jsbAbsPath = $base . '/' . $path;
-				$jsb2 = new \Aimeos\MW\Jsb2\Standard( $jsbAbsPath, dirname( $jsbAbsPath ) );
-				$files = array_merge( $files, $jsb2->getFiles( $type ) );
+				$jsbAbsPath = $base.'/'.$path;
+				$jsb2 = new \Aimeos\MW\Jsb2\Standard($jsbAbsPath, dirname($jsbAbsPath));
+				$files = array_merge($files, $jsb2->getFiles($type));
 			}
 		}
 
-		foreach( $files as $file )
+		foreach ($files as $file)
 		{
-			if( ( $content = file_get_contents( $file ) ) !== false ) {
+			if (($content = file_get_contents($file)) !== false) {
 				$contents .= $content;
 			}
 		}
 
-		$response = new Response( $contents );
+		$response = new Response($contents);
 
-		if( $type === 'js' ) {
-			$response->headers->set( 'Content-Type', 'application/javascript' );
-		} elseif( $type === 'css' ) {
-			$response->headers->set( 'Content-Type', 'text/css' );
+		if ($type === 'js') {
+			$response->headers->set('Content-Type', 'application/javascript');
+		} elseif ($type === 'css') {
+			$response->headers->set('Content-Type', 'text/css');
 		}
 
 		return $response;
@@ -72,10 +72,10 @@ 
 	 * @param string $site Unique site code
 	 * @return Response Generated output
 	 */
-	public function copyAction( Request $request, $resource, $site = 'default' )
+	public function copyAction(Request $request, $resource, $site = 'default')
 	{
-		$cntl = $this->createClient( $request, $site, $resource );
-		return $this->getHtml( $cntl->copy() );
+		$cntl = $this->createClient($request, $site, $resource);
+		return $this->getHtml($cntl->copy());
 	}
 
 
@@ -87,10 +87,10 @@ 
 	 * @param string $site Unique site code
 	 * @return Response Generated output
 	 */
-	public function createAction( Request $request, $resource, $site = 'default' )
+	public function createAction(Request $request, $resource, $site = 'default')
 	{
-		$cntl = $this->createClient( $request, $site, $resource );
-		return $this->getHtml( $cntl->create() );
+		$cntl = $this->createClient($request, $site, $resource);
+		return $this->getHtml($cntl->create());
 	}
 
 
@@ -102,10 +102,10 @@ 
 	 * @param string $site Unique site code
 	 * @return Response Generated output
 	 */
-	public function deleteAction( Request $request, $resource, $site = 'default' )
+	public function deleteAction(Request $request, $resource, $site = 'default')
 	{
-		$cntl = $this->createClient( $request, $site, $resource );
-		return $this->getHtml( $cntl->delete() . $cntl->search() );
+		$cntl = $this->createClient($request, $site, $resource);
+		return $this->getHtml($cntl->delete().$cntl->search());
 	}
 
 
@@ -117,10 +117,10 @@ 
 	 * @param string $site Unique site code
 	 * @return Response Generated output
 	 */
-	public function getAction( Request $request, $resource, $site = 'default' )
+	public function getAction(Request $request, $resource, $site = 'default')
 	{
-		$cntl = $this->createClient( $request, $site, $resource );
-		return $this->getHtml( $cntl->get() );
+		$cntl = $this->createClient($request, $site, $resource);
+		return $this->getHtml($cntl->get());
 	}
 
 
@@ -132,10 +132,10 @@ 
 	 * @param string $site Unique site code
 	 * @return Response Generated output
 	 */
-	public function saveAction( Request $request, $resource, $site = 'default' )
+	public function saveAction(Request $request, $resource, $site = 'default')
 	{
-		$cntl = $this->createClient( $request, $site, $resource );
-		return $this->getHtml( ( $cntl->save() ? : $cntl->search() ) );
+		$cntl = $this->createClient($request, $site, $resource);
+		return $this->getHtml(($cntl->save() ?: $cntl->search()));
 	}
 
 
@@ -147,10 +147,10 @@ 
 	 * @param string $site Unique site code
 	 * @return Response Generated output
 	 */
-	public function searchAction( Request $request, $resource, $site = 'default' )
+	public function searchAction(Request $request, $resource, $site = 'default')
 	{
-		$cntl = $this->createClient( $request, $site, $resource );
-		return $this->getHtml( $cntl->search() );
+		$cntl = $this->createClient($request, $site, $resource);
+		return $this->getHtml($cntl->search());
 	}
 
 
@@ -162,20 +162,20 @@ 
 	 * @param string $resource Resource location, e.g. "product"
 	 * @return \Aimeos\Admin\JQAdm\Iface Context item
 	 */
-	protected function createClient( Request $request, $site, $resource )
+	protected function createClient(Request $request, $site, $resource)
 	{
-		$lang = $request->get( 'lang', 'en' );
+		$lang = $request->get('lang', 'en');
 
-		$aimeos = $this->get( 'aimeos' )->get();
-		$templatePaths = $aimeos->getCustomPaths( 'admin/jqadm/templates' );
+		$aimeos = $this->get('aimeos')->get();
+		$templatePaths = $aimeos->getCustomPaths('admin/jqadm/templates');
 
-		$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);
 
-		$view = $this->get( 'aimeos_view' )->create( $context, $templatePaths, $lang );
-		$context->setView( $view );
+		$view = $this->get('aimeos_view')->create($context, $templatePaths, $lang);
+		$context->setView($view);
 
-		return \Aimeos\Admin\JQAdm\Factory::createClient( $context, $templatePaths, $resource );
+		return \Aimeos\Admin\JQAdm\Factory::createClient($context, $templatePaths, $resource);
 	}
 
 
@@ -185,12 +185,12 @@ 
 	 * @param string $content Content from admin client
 	 * @return Response View for rendering the output
 	 */
-	protected function getHtml( $content )
+	protected function getHtml($content)
 	{
-		$version = $this->get( 'aimeos' )->getVersion();
-		$content = str_replace( array( '{type}', '{version}' ), array( 'Symfony', $version ), $content );
+		$version = $this->get('aimeos')->getVersion();
+		$content = str_replace(array('{type}', '{version}'), array('Symfony', $version), $content);
 
-		return $this->render( 'AimeosShopBundle:Jqadm:index.html.twig', array( 'content' => $content ) );
+		return $this->render('AimeosShopBundle:Jqadm:index.html.twig', array('content' => $content));
 	}
 
 
@@ -202,23 +202,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, $site, $lang )
+	protected function setLocale(\Aimeos\MShop\Context\Item\Iface $context, $site, $lang)
 	{
-		$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();
 		}
 
-		$context->setLocale( $localeItem );
-		$context->setI18n( $this->get( 'aimeos_i18n' )->get( array( $lang, 'en' ) ) );
+		$context->setLocale($localeItem);
+		$context->setI18n($this->get('aimeos_i18n')->get(array($lang, 'en')));
 
 		return $context;
 	}

Controller/ExtadmController.php

Spacing +71 added lines, -71 removed lines

@@ -30,63 +30,63 @@ 
 	 * @param Request $request Symfony request object
 	 * @return Response Generated output for the admin interface
 	 */
-	public function indexAction( Request $request )
+	public function indexAction(Request $request)
 	{
-		$site = $request->attributes->get( 'site', $request->query->get( 'site', 'default' ) );
-		$lang = $request->attributes->get( 'lang', $request->query->get( 'lang', 'en' ) );
-		$tab = $request->attributes->get( 'tab', $request->query->get( 'tab', 0 ) );
+		$site = $request->attributes->get('site', $request->query->get('site', 'default'));
+		$lang = $request->attributes->get('lang', $request->query->get('lang', 'en'));
+		$tab = $request->attributes->get('tab', $request->query->get('tab', 0));
 
-		$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' );
+		$aimeos = $this->get('aimeos');
 		$bootstrap = $aimeos->get();
 
-		$cntlPaths = $bootstrap->getCustomPaths( 'controller/extjs' );
-		$controller = new \Aimeos\Controller\ExtJS\JsonRpc( $context, $cntlPaths );
+		$cntlPaths = $bootstrap->getCustomPaths('controller/extjs');
+		$controller = new \Aimeos\Controller\ExtJS\JsonRpc($context, $cntlPaths);
 		$cssFiles = array();
 
-		foreach( $bootstrap->getCustomPaths( 'admin/extjs' ) as $base => $paths )
+		foreach ($bootstrap->getCustomPaths('admin/extjs') as $base => $paths)
 		{
-			foreach( $paths as $path )
+			foreach ($paths as $path)
 			{
-				$jsbAbsPath = $base . '/' . $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_extadm', $params );
+		$params = array('site' => '{site}', 'lang' => '{lang}', 'tab' => '{tab}');
+		$adminUrl = $this->generateUrl('aimeos_shop_extadm', $params);
 
-		$token = $this->get( 'security.csrf.token_manager' )->getToken( 'aimeos_admin_token' )->getValue();
-		$jsonUrl = $this->generateUrl( 'aimeos_shop_extadm_json', array( '_token' => $token, 'site' => $site ) );
+		$token = $this->get('security.csrf.token_manager')->getToken('aimeos_admin_token')->getValue();
+		$jsonUrl = $this->generateUrl('aimeos_shop_extadm_json', array('_token' => $token, 'site' => $site));
 
-		$jqadmUrl = $this->generateUrl( 'aimeos_shop_jqadm_search', array( 'site' => $site, 'resource' => 'product' ) );
+		$jqadmUrl = $this->generateUrl('aimeos_shop_jqadm_search', array('site' => $site, 'resource' => 'product'));
 
 		$vars = array(
 			'lang' => $lang,
 			'cssFiles' => $cssFiles,
 			'languages' => $this->getJsonLanguages(),
-			'config' => $this->getJsonClientConfig( $context ),
-			'site' => $this->getJsonSiteItem( $context, $site ),
-			'i18nContent' => $this->getJsonClientI18n( $bootstrap->getI18nPaths(), $lang ),
+			'config' => $this->getJsonClientConfig($context),
+			'site' => $this->getJsonSiteItem($context, $site),
+			'i18nContent' => $this->getJsonClientI18n($bootstrap->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' => $aimeos->getVersion(),
 			'jqadmurl' => $jqadmUrl,
 			'activeTab' => $tab,
 		);
 
-		return $this->render( 'AimeosShopBundle:Extadm:index.html.twig', $vars );
+		return $this->render('AimeosShopBundle:Extadm:index.html.twig', $vars);
 	}
 
 
@@ -96,23 +96,23 @@ 
 	 * @param Request $request Symfony request object
 	 * @return Response JSON 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->setView( $this->get( 'aimeos_view' )->create( $context, array() ) );
-		$context = $this->setLocale( $context );
+		$cntlPaths = $this->get('aimeos')->get()->getCustomPaths('controller/extjs');
+		$context = $this->get('aimeos_context')->get(false);
+		$context->setView($this->get('aimeos_view')->create($context, array()));
+		$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(), $request->getContent() );
-		return $this->render( 'AimeosShopBundle:Extadm:do.html.twig', array( 'output' => $response ) );
+		$response = $controller->process($request->request->all(), $request->getContent());
+		return $this->render('AimeosShopBundle:Extadm:do.html.twig', array('output' => $response));
 	}
 
 
@@ -125,27 +125,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->getFiles( 'js' ) );
+				$jsbAbsPath = $base.'/'.$path;
+				$jsb2 = new \Aimeos\MW\Jsb2\Standard($jsbAbsPath, dirname($jsbAbsPath));
+				$jsFiles = array_merge($jsFiles, $jsb2->getFiles('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;
 	}
@@ -160,11 +160,11 @@ 
 	{
 		$result = array();
 
-		foreach( $this->get( 'aimeos' )->get()->getI18nList( 'admin' ) as $id ) {
-			$result[] = array( 'id' => $id, 'label' => $id );
+		foreach ($this->get('aimeos')->get()->getI18nList('admin') as $id) {
+			$result[] = array('id' => $id, 'label' => $id);
 		}
 
-		return json_encode( $result );
+		return json_encode($result);
 	}
 
 
@@ -174,10 +174,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);
 	}
 
 
@@ -188,16 +188,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\Gettext( $i18nPaths, $lang );
+		$i18n = new \Aimeos\MW\Translation\Gettext($i18nPaths, $lang);
 
 		$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);
 	}
 
 
@@ -209,19 +209,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());
 	}
 
 
@@ -233,17 +233,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/JsonadmController.php

Spacing +45 added lines, -45 removed lines

@@ -31,15 +31,15 @@ 
 	 * @param string $site Unique site code
 	 * @return \Symfony\Component\HttpFoundation\Response Response object containing the generated output
 	 */
-	public function deleteAction( Request $request, $resource, $site = 'default' )
+	public function deleteAction(Request $request, $resource, $site = 'default')
 	{
 		$status = 500;
 		$header = $request->headers->all();
 
-		$client = $this->createClient( $site, $resource, $request->get( 'lang', 'en' ) );
-		$result = $client->delete( $request->getContent(), $header, $status );
+		$client = $this->createClient($site, $resource, $request->get('lang', 'en'));
+		$result = $client->delete($request->getContent(), $header, $status);
 
-		return $this->createResponse( $result, $status, $header );
+		return $this->createResponse($result, $status, $header);
 	}
 
 
@@ -51,15 +51,15 @@ 
 	 * @param string $site Unique site code
 	 * @return \Symfony\Component\HttpFoundation\Response Response object containing the generated output
 	 */
-	public function getAction( Request $request, $resource, $site = 'default' )
+	public function getAction(Request $request, $resource, $site = 'default')
 	{
 		$status = 500;
 		$header = $request->headers->all();
 
-		$client = $this->createClient( $site, $resource, $request->get( 'lang', 'en' ) );
-		$result = $client->get( $request->getContent(), $header, $status );
+		$client = $this->createClient($site, $resource, $request->get('lang', 'en'));
+		$result = $client->get($request->getContent(), $header, $status);
 
-		return $this->createResponse( $result, $status, $header );
+		return $this->createResponse($result, $status, $header);
 	}
 
 
@@ -71,15 +71,15 @@ 
 	 * @param string $site Unique site code
 	 * @return \Symfony\Component\HttpFoundation\Response Response object containing the generated output
 	 */
-	public function patchAction( Request $request, $resource, $site = 'default' )
+	public function patchAction(Request $request, $resource, $site = 'default')
 	{
 		$status = 500;
 		$header = $request->headers->all();
 
-		$client = $this->createClient( $site, $resource, $request->get( 'lang', 'en' ) );
-		$result = $client->patch( $request->getContent(), $header, $status );
+		$client = $this->createClient($site, $resource, $request->get('lang', 'en'));
+		$result = $client->patch($request->getContent(), $header, $status);
 
-		return $this->createResponse( $result, $status, $header );
+		return $this->createResponse($result, $status, $header);
 	}
 
 
@@ -91,15 +91,15 @@ 
 	 * @param string $site Unique site code
 	 * @return \Symfony\Component\HttpFoundation\Response Response object containing the generated output
 	 */
-	public function postAction( Request $request, $resource, $site = 'default' )
+	public function postAction(Request $request, $resource, $site = 'default')
 	{
 		$status = 500;
 		$header = $request->headers->all();
 
-		$client = $this->createClient( $site, $resource, $request->get( 'lang', 'en' ) );
-		$result = $client->post( $request->getContent(), $header, $status );
+		$client = $this->createClient($site, $resource, $request->get('lang', 'en'));
+		$result = $client->post($request->getContent(), $header, $status);
 
-		return $this->createResponse( $result, $status, $header );
+		return $this->createResponse($result, $status, $header);
 	}
 
 
@@ -111,15 +111,15 @@ 
 	 * @param string $site Unique site code
 	 * @return \Symfony\Component\HttpFoundation\Response Response object containing the generated output
 	 */
-	public function putAction( Request $request, $resource, $site = 'default' )
+	public function putAction(Request $request, $resource, $site = 'default')
 	{
 		$status = 500;
 		$header = $request->headers->all();
 
-		$client = $this->createClient( $site, $resource, $request->get( 'lang', 'en' ) );
-		$result = $client->put( $request->getContent(), $header, $status );
+		$client = $this->createClient($site, $resource, $request->get('lang', 'en'));
+		$result = $client->put($request->getContent(), $header, $status);
 
-		return $this->createResponse( $result, $status, $header );
+		return $this->createResponse($result, $status, $header);
 	}
 
 
@@ -131,15 +131,15 @@ 
 	 * @param string $site 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();
 
-		$client = $this->createClient( $site, $resource, $request->get( 'lang', 'en' ) );
-		$result = $client->options( $request->getContent(), $header, $status );
+		$client = $this->createClient($site, $resource, $request->get('lang', 'en'));
+		$result = $client->options($request->getContent(), $header, $status);
 
-		return $this->createResponse( $result, $status, $header );
+		return $this->createResponse($result, $status, $header);
 	}
 
 
@@ -151,18 +151,18 @@ 
 	 * @param string $lang Language code
 	 * @return \Aimeos\MShop\Context\Item\Iface Context item
 	 */
-	protected function createClient( $site, $resource, $lang )
+	protected function createClient($site, $resource, $lang)
 	{
-		$aimeos = $this->get( 'aimeos' )->get();
-		$templatePaths = $aimeos->getCustomPaths( 'admin/jsonadm/templates' );
+		$aimeos = $this->get('aimeos')->get();
+		$templatePaths = $aimeos->getCustomPaths('admin/jsonadm/templates');
 
-		$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);
 
-		$view = $this->get('aimeos_view')->create( $context, $templatePaths, $lang );
-		$context->setView( $view );
+		$view = $this->get('aimeos_view')->create($context, $templatePaths, $lang);
+		$context->setView($view);
 
-		return \Aimeos\Admin\JsonAdm\Factory::createClient( $context, $templatePaths, $resource );
+		return \Aimeos\Admin\JsonAdm\Factory::createClient($context, $templatePaths, $resource);
 	}
 
 
@@ -174,14 +174,14 @@ 
 	 * @param array $header List of HTTP headers
 	 * @return 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;
@@ -196,23 +196,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, $site, $lang )
+	protected function setLocale(\Aimeos\MShop\Context\Item\Iface $context, $site, $lang)
 	{
-		$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();
 		}
 
-		$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;
 	}