aimeos / aimeos-symfony

Tests/Command/CacheCommandTest.php

Spacing +6 added lines, -6 removed lines

@@ -14,13 +14,13 @@
 		$kernel = $this->createKernel();
 		$kernel->boot();
 
-		$application = new Application( $kernel );
-		$application->add( new Command\CacheCommand() );
+		$application = new Application($kernel);
+		$application->add(new Command\CacheCommand());
 
-		$command = $application->find( 'aimeos:cache' );
-		$commandTester = new CommandTester( $command );
-		$commandTester->execute( array( 'command' => $command->getName(), 'site' => 'unittest' ) );
+		$command = $application->find('aimeos:cache');
+		$commandTester = new CommandTester($command);
+		$commandTester->execute(array('command' => $command->getName(), 'site' => 'unittest'));
 
-		$this->assertEquals( 0, $commandTester->getStatusCode() );
+		$this->assertEquals(0, $commandTester->getStatusCode());
 	}
 }

Entity/User.php

Spacing +5 added lines, -5 removed lines

@@ -209,7 +209,7 @@ 
 	 */
 	public function getRoles()
 	{
-		return array( 'ROLE_USER' );
+		return array('ROLE_USER');
 	}
 
 
@@ -226,23 +226,23 @@ 
 	 */
 	public function serialize()
 	{
-		return serialize( array(
+		return serialize(array(
 			$this->id,
 			$this->username,
 			$this->password,
-		) );
+		));
 	}
 
 
 	/**
 	 * @see \Serializable::unserialize()
 	 */
-	public function unserialize( $serialized )
+	public function unserialize($serialized)
 	{
 		list (
 			$this->id,
 			$this->username,
 			$this->password,
-		) = unserialize( $serialized );
+		) = unserialize($serialized);
 	}
 }

Entity/FosUser.php

Spacing +7 added lines, -7 removed lines

@@ -209,7 +209,7 @@ 
 	 */
 	public function getSalutation()
 	{
-		return ( isset( $this->salutation ) ? (string) $this->salutation : \Aimeos\MShop\Common\Item\Address\Base::SALUTATION_UNKNOWN );
+		return (isset($this->salutation) ? (string) $this->salutation : \Aimeos\MShop\Common\Item\Address\Base::SALUTATION_UNKNOWN);
 	}
 
 
@@ -220,7 +220,7 @@ 
 	 */
 	public function setSalutation($salutation)
 	{
-		switch( $salutation )
+		switch ($salutation)
 		{
 			case \Aimeos\MShop\Common\Item\Address\Base::SALUTATION_UNKNOWN:
 			case \Aimeos\MShop\Common\Item\Address\Base::SALUTATION_COMPANY:
@@ -229,7 +229,7 @@ 
 			case \Aimeos\MShop\Common\Item\Address\Base::SALUTATION_MR:
 				break;
 			default:
-				throw new \Exception( sprintf( 'Address salutation "%1$s" is unknown', $value ) );
+				throw new \Exception(sprintf('Address salutation "%1$s" is unknown', $value));
 		}
 
 		$this->salutation = (string) $salutation;
@@ -441,7 +441,7 @@ 
 	 */
 	public function setCountryId($countryid)
 	{
-		$this->countryid = strtoupper( (string) $countryid );
+		$this->countryid = strtoupper((string) $countryid);
 	}
 
 
@@ -463,7 +463,7 @@ 
 	 */
 	public function setLanguageId($langid)
 	{
-		$this->langid = strtolower( (string) $langid );
+		$this->langid = strtolower((string) $langid);
 	}
 
 
@@ -542,8 +542,8 @@ 
 	{
 		$pattern = '#^([a-z]+://)?[a-zA-Z0-9\-]+(\.[a-zA-Z0-9\-]+)+(:[0-9]+)?(/.*)?$#';
 
-		if( $website !== '' && preg_match( $pattern, $website ) !== 1 ) {
-			throw new \Exception( sprintf( 'Invalid web site URL "%1$s"', $website ) );
+		if ($website !== '' && preg_match($pattern, $website) !== 1) {
+			throw new \Exception(sprintf('Invalid web site URL "%1$s"', $website));
 		}
 
 		$this->website = (string) $website;

Controller/JqadmController.php

Braces +1 added lines, -2 removed lines

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

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;
 	}

DependencyInjection/Configuration.php

Spacing +12 added lines, -12 removed lines

@@ -29,23 +29,23 @@
 	public function getConfigTreeBuilder()
 	{
 		$treeBuilder = new TreeBuilder();
-		$rootNode = $treeBuilder->root( 'aimeos_shop' );
+		$rootNode = $treeBuilder->root('aimeos_shop');
 
 		$rootNode
 			->children()
-				->booleanNode('disable_sites')->defaultValue( true )->end()
-				->booleanNode('apc_enable')->defaultValue( false )->end()
-				->scalarNode('apc_prefix')->defaultValue( 'sf2:' )->end()
+				->booleanNode('disable_sites')->defaultValue(true)->end()
+				->booleanNode('apc_enable')->defaultValue(false)->end()
+				->scalarNode('apc_prefix')->defaultValue('sf2:')->end()
 				->scalarNode('extdir')->end()
 				->scalarNode('uploaddir')->end()
-				->variableNode('admin')->defaultValue( array() )->end()
-				->variableNode('client')->defaultValue( array() )->end()
-				->variableNode('controller')->defaultValue( array() )->end()
-				->variableNode('i18n')->defaultValue( array() )->end()
-				->variableNode('madmin')->defaultValue( array() )->end()
-				->variableNode('mshop')->defaultValue( array() )->end()
-				->variableNode('resource')->defaultValue( array() )->end()
-				->variableNode('page')->defaultValue( array() )->end()
+				->variableNode('admin')->defaultValue(array())->end()
+				->variableNode('client')->defaultValue(array())->end()
+				->variableNode('controller')->defaultValue(array())->end()
+				->variableNode('i18n')->defaultValue(array())->end()
+				->variableNode('madmin')->defaultValue(array())->end()
+				->variableNode('mshop')->defaultValue(array())->end()
+				->variableNode('resource')->defaultValue(array())->end()
+				->variableNode('page')->defaultValue(array())->end()
 			->end()
 		;
 

Tests/Entity/UserTest.php

Spacing +7 added lines, -7 removed lines

@@ -19,31 +19,31 @@ 
 
 	public function testGetId()
 	{
-		$this->assertEquals( null, $this->object->getId() );
+		$this->assertEquals(null, $this->object->getId());
 	}
 
 
 	public function testGetUsername()
 	{
-		$this->assertEquals( null, $this->object->getUsername() );
+		$this->assertEquals(null, $this->object->getUsername());
 	}
 
 
 	public function testGetPassword()
 	{
-		$this->assertEquals( null, $this->object->getPassword() );
+		$this->assertEquals(null, $this->object->getPassword());
 	}
 
 
 	public function testGetSalt()
 	{
-		$this->assertEquals( 'mshop', $this->object->getSalt() );
+		$this->assertEquals('mshop', $this->object->getSalt());
 	}
 
 
 	public function testGetRoles()
 	{
-		$this->assertEquals( array( 'ROLE_USER' ), $this->object->getRoles() );
+		$this->assertEquals(array('ROLE_USER'), $this->object->getRoles());
 	}
 
 
@@ -55,12 +55,12 @@ 
 
 	public function testSerialize()
 	{
-		$this->assertEquals( 'a:3:{i:0;N;i:1;N;i:2;N;}', $this->object->serialize() );
+		$this->assertEquals('a:3:{i:0;N;i:1;N;i:2;N;}', $this->object->serialize());
 	}
 
 
 	public function testUnserialize()
 	{
-		$this->object->unserialize( 'a:3:{i:0;N;i:1;N;i:2;N;}' );
+		$this->object->unserialize('a:3:{i:0;N;i:1;N;i:2;N;}');
 	}
 }

Controller/ExtadmController.php

Doc Comments +1 added lines, -1 removed lines

@@ -145,7 +145,7 @@
 	 * Creates a list of all available translations.
 	 *
 	 * @param \Aimeos\MShop\Context\Item\Iface $context Context object
-	 * @return array List of language IDs with labels
+	 * @return string List of language IDs with labels
 	 */
 	protected function getJsonLanguages( \Aimeos\MShop\Context\Item\Iface $context )
 	{

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;
 	}

Service/I18n.php

Spacing +13 added lines, -13 removed lines

@@ -29,7 +29,7 @@ 
 	 *
 	 * @param Container $container Container object to access parameters
 	 */
-	public function __construct( Container $container )
+	public function __construct(Container $container)
 	{
 		$this->container = $container;
 	}
@@ -41,27 +41,27 @@ 
 	 * @param array $languageIds List of two letter ISO language IDs
 	 * @return \Aimeos\MW\Translation\Interface[] List of translation objects
 	 */
-	public function get( array $languageIds )
+	public function get(array $languageIds)
 	{
-		$i18nPaths = $this->container->get( 'aimeos' )->get()->getI18nPaths();
+		$i18nPaths = $this->container->get('aimeos')->get()->getI18nPaths();
 
-		foreach( $languageIds as $langid )
+		foreach ($languageIds as $langid)
 		{
-			if( !isset( $this->i18n[$langid] ) )
+			if (!isset($this->i18n[$langid]))
 			{
-				$i18n = new \Aimeos\MW\Translation\Gettext( $i18nPaths, $langid );
+				$i18n = new \Aimeos\MW\Translation\Gettext($i18nPaths, $langid);
 
-				$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 ) {
-					$i18n = new \Aimeos\MW\Translation\Decorator\APC( $i18n, $prefix );
+				if (function_exists('apc_store') === true && $apc === true) {
+					$i18n = new \Aimeos\MW\Translation\Decorator\APC($i18n, $prefix);
 				}
 
-				$translations = $this->container->getParameter( 'aimeos_shop.i18n' );
+				$translations = $this->container->getParameter('aimeos_shop.i18n');
 
-				if( isset( $translations[$langid] ) ) {
-					$i18n = new \Aimeos\MW\Translation\Decorator\Memory( $i18n, $translations[$langid] );
+				if (isset($translations[$langid])) {
+					$i18n = new \Aimeos\MW\Translation\Decorator\Memory($i18n, $translations[$langid]);
 				}
 
 				$this->i18n[$langid] = $i18n;

Tests/Controller/JqadmControllerTest.php

Spacing +36 added lines, -36 removed lines

@@ -12,12 +12,12 @@ 
 		$client = static::createClient(array(), array(
 			'PHP_AUTH_USER' => 'admin',
 			'PHP_AUTH_PW'   => 'adminpass',
-		) );
+		));
 
-		$client->request( 'GET', '/jqadm/file/css' );
+		$client->request('GET', '/jqadm/file/css');
 
-		$this->assertEquals( 200, $client->getResponse()->getStatusCode() );
-		$this->assertContains( '.aimeos', $client->getResponse()->getContent() );
+		$this->assertEquals(200, $client->getResponse()->getStatusCode());
+		$this->assertContains('.aimeos', $client->getResponse()->getContent());
 	}
 
 
@@ -26,12 +26,12 @@ 
 		$client = static::createClient(array(), array(
 			'PHP_AUTH_USER' => 'admin',
 			'PHP_AUTH_PW'   => 'adminpass',
-		) );
+		));
 
-		$client->request( 'GET', '/jqadm/file/js' );
+		$client->request('GET', '/jqadm/file/js');
 
-		$this->assertEquals( 200, $client->getResponse()->getStatusCode() );
-		$this->assertContains( 'Aimeos = {', $client->getResponse()->getContent() );
+		$this->assertEquals(200, $client->getResponse()->getStatusCode());
+		$this->assertContains('Aimeos = {', $client->getResponse()->getContent());
 	}
 
 
@@ -40,13 +40,13 @@ 
 		$client = static::createClient(array(), array(
 			'PHP_AUTH_USER' => 'admin',
 			'PHP_AUTH_PW'   => 'adminpass',
-		) );
+		));
 
-		$client->request( 'GET', '/unittest/jqadm/copy/product/0' );
+		$client->request('GET', '/unittest/jqadm/copy/product/0');
 		$response = $client->getResponse();
 
-		$this->assertEquals( 200, $response->getStatusCode() );
-		$this->assertContains( '<div class="product-item', $response->getContent() );
+		$this->assertEquals(200, $response->getStatusCode());
+		$this->assertContains('<div class="product-item', $response->getContent());
 	}
 
 
@@ -55,13 +55,13 @@ 
 		$client = static::createClient(array(), array(
 			'PHP_AUTH_USER' => 'admin',
 			'PHP_AUTH_PW'   => 'adminpass',
-		) );
+		));
 
-		$client->request( 'GET', '/unittest/jqadm/create/product' );
+		$client->request('GET', '/unittest/jqadm/create/product');
 		$response = $client->getResponse();
 
-		$this->assertEquals( 200, $response->getStatusCode() );
-		$this->assertContains( '<div class="product-item', $response->getContent() );
+		$this->assertEquals(200, $response->getStatusCode());
+		$this->assertContains('<div class="product-item', $response->getContent());
 	}
 
 
@@ -70,13 +70,13 @@ 
 		$client = static::createClient(array(), array(
 			'PHP_AUTH_USER' => 'admin',
 			'PHP_AUTH_PW'   => 'adminpass',
-		) );
+		));
 
-		$client->request( 'GET', '/unittest/jqadm/delete/product/0' );
+		$client->request('GET', '/unittest/jqadm/delete/product/0');
 		$response = $client->getResponse();
 
-		$this->assertEquals( 200, $response->getStatusCode() );
-		$this->assertContains( '<table class="list-items', $response->getContent() );
+		$this->assertEquals(200, $response->getStatusCode());
+		$this->assertContains('<table class="list-items', $response->getContent());
 	}
 
 
@@ -85,13 +85,13 @@ 
 		$client = static::createClient(array(), array(
 			'PHP_AUTH_USER' => 'admin',
 			'PHP_AUTH_PW'   => 'adminpass',
-		) );
+		));
 
-		$client->request( 'GET', '/unittest/jqadm/get/product/0' );
+		$client->request('GET', '/unittest/jqadm/get/product/0');
 		$response = $client->getResponse();
 
-		$this->assertEquals( 200, $response->getStatusCode() );
-		$this->assertContains( '<div class="product-item', $response->getContent() );
+		$this->assertEquals(200, $response->getStatusCode());
+		$this->assertContains('<div class="product-item', $response->getContent());
 	}
 
 
@@ -100,13 +100,13 @@ 
 		$client = static::createClient(array(), array(
 			'PHP_AUTH_USER' => 'admin',
 			'PHP_AUTH_PW'   => 'adminpass',
-		) );
+		));
 
-		$client->request( 'POST', '/unittest/jqadm/save/product/0' );
+		$client->request('POST', '/unittest/jqadm/save/product/0');
 		$response = $client->getResponse();
 
-		$this->assertEquals( 200, $response->getStatusCode() );
-		$this->assertContains( '<div class="product-item', $response->getContent() );
+		$this->assertEquals(200, $response->getStatusCode());
+		$this->assertContains('<div class="product-item', $response->getContent());
 	}
 
 
@@ -115,13 +115,13 @@ 
 		$client = static::createClient(array(), array(
 			'PHP_AUTH_USER' => 'admin',
 			'PHP_AUTH_PW'   => 'adminpass',
-		) );
+		));
 
-		$client->request( 'GET', '/unittest/jqadm/search/product' );
+		$client->request('GET', '/unittest/jqadm/search/product');
 		$response = $client->getResponse();
 
-		$this->assertEquals( 200, $response->getStatusCode() );
-		$this->assertContains( '<table class="list-items', $response->getContent() );
+		$this->assertEquals(200, $response->getStatusCode());
+		$this->assertContains('<table class="list-items', $response->getContent());
 	}
 
 
@@ -130,12 +130,12 @@ 
 		$client = static::createClient(array(), array(
 			'PHP_AUTH_USER' => 'admin',
 			'PHP_AUTH_PW'   => 'adminpass',
-		) );
+		));
 
-		$client->request( 'GET', '/invalid/jqadm/search/product' );
+		$client->request('GET', '/invalid/jqadm/search/product');
 		$response = $client->getResponse();
 
-		$this->assertEquals( 200, $response->getStatusCode() );
-		$this->assertContains( '<table class="list-items', $response->getContent() );
+		$this->assertEquals(200, $response->getStatusCode());
+		$this->assertContains('<table class="list-items', $response->getContent());
 	}
 }