aimeos / aimeos-symfony

Controller/PageController.php

Spacing +2 added lines, -2 removed lines

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

DependencyInjection/AimeosShopExtension.php

Spacing +19 added lines, -19 removed lines

@@ -27,21 +27,21 @@ 
 	/**
 	 * {@inheritDoc}
 	 */
-	public function load( array $configs, ContainerBuilder $container )
+	public function load(array $configs, ContainerBuilder $container)
 	{
 		$configuration = new Configuration();
-		$config = $this->processConfiguration( $configuration, $configs );
+		$config = $this->processConfiguration($configuration, $configs);
 
-		foreach( $configs as $list ) {
-			$this->merge( $config, $list );
+		foreach ($configs as $list) {
+			$this->merge($config, $list);
 		}
 
-		foreach( $config as $key => $value ) {
-			$container->setParameter( 'aimeos_shop.' . $key, $value );
+		foreach ($config as $key => $value) {
+			$container->setParameter('aimeos_shop.' . $key, $value);
 		}
 
-		$loader = new Loader\YamlFileLoader( $container, new FileLocator( dirname( __DIR__ ) . '/Resources/config' ) );
-		$loader->load( 'services.yml' );
+		$loader = new Loader\YamlFileLoader($container, new FileLocator(dirname(__DIR__) . '/Resources/config'));
+		$loader->load('services.yml');
 	}
 
 
@@ -50,13 +50,13 @@ 
 	 *
 	 * @param ContainerBuilder $container ContainerBuilder object
 	 */
-	public function prepend( ContainerBuilder $container )
+	public function prepend(ContainerBuilder $container)
 	{
-		$configFile = dirname( __DIR__ ) . '/Resources/config/aimeos_shop.yml';
-		$config = Yaml::parse( file_get_contents( $configFile ) );
+		$configFile = dirname(__DIR__) . '/Resources/config/aimeos_shop.yml';
+		$config = Yaml::parse(file_get_contents($configFile));
 
-		$container->prependExtensionConfig( 'aimeos_shop', $config );
-		$container->addResource( new FileResource( $configFile ) );
+		$container->prependExtensionConfig('aimeos_shop', $config);
+		$container->addResource(new FileResource($configFile));
 	}
 
 
@@ -66,15 +66,15 @@ 
 	 * @param array &$original Associative list of original values
 	 * @param array $overrule Associative list of new values
 	 */
-	protected function merge( array &$original, array $overrule )
+	protected function merge(array &$original, array $overrule)
 	{
-		foreach( array_keys( $overrule ) as $key )
+		foreach (array_keys($overrule) as $key)
 		{
-			if( isset( $original[$key] ) && is_array( $original[$key] ) ) {
-				if( is_array( $overrule[$key] ) ) {
-					$this->merge( $original[$key], $overrule[$key] );
+			if (isset($original[$key]) && is_array($original[$key])) {
+				if (is_array($overrule[$key])) {
+					$this->merge($original[$key], $overrule[$key]);
 				}
-			} elseif( isset( $overrule[$key] ) ) {
+			} elseif (isset($overrule[$key])) {
 				$original[$key] = $overrule[$key];
 			}
 		}

Command/Command.php

Spacing +5 added lines, -5 removed lines

@@ -25,15 +25,15 @@
 	 * @param InputInterface $input Input object
 	 * @return \Aimeos\MShop\Locale\Item\Site\Interface[] List of site items
 	 */
-	protected function getSiteItems( \Aimeos\MShop\Context\Item\Iface $context, InputInterface $input )
+	protected function getSiteItems(\Aimeos\MShop\Context\Item\Iface $context, InputInterface $input)
 	{
-		$manager = \Aimeos\MShop\Locale\Manager\Factory::createManager( $context )->getSubManager( 'site' );
+		$manager = \Aimeos\MShop\Locale\Manager\Factory::createManager($context)->getSubManager('site');
 		$search = $manager->createSearch();
 
-		if( ( $codes = (string) $input->getArgument( 'site' ) ) !== '' ) {
-			$search->setConditions( $search->compare( '==', 'locale.site.code', explode( ' ', $codes ) ) );
+		if (($codes = (string) $input->getArgument('site')) !== '') {
+			$search->setConditions($search->compare('==', 'locale.site.code', explode(' ', $codes)));
 		}
 
-		return $manager->searchItems( $search );
+		return $manager->searchItems($search);
 	}
 }

Command/CacheCommand.php

Spacing +14 added lines, -14 removed lines

@@ -23,9 +23,9 @@ 
 	 */
 	protected function configure()
 	{
-		$this->setName( 'aimeos:cache' );
-		$this->setDescription( 'Clears the content cache' );
-		$this->addArgument( 'site', InputArgument::OPTIONAL, 'Site codes to clear the cache like "default unittest" (none for all)' );
+		$this->setName('aimeos:cache');
+		$this->setDescription('Clears the content cache');
+		$this->addArgument('site', InputArgument::OPTIONAL, 'Site codes to clear the cache like "default unittest" (none for all)');
 	}
 
 
@@ -35,26 +35,26 @@ 
 	 * @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->getContainer()->get( 'aimeos_context' )->get( false );
-		$context->setEditor( 'aimeos:cache' );
+		$context = $this->getContainer()->get('aimeos_context')->get(false);
+		$context->setEditor('aimeos:cache');
 
-		$localeManager = \Aimeos\MShop\Locale\Manager\Factory::createManager( $context );
+		$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(), '', '', false );
+			$localeItem = $localeManager->bootstrap($siteItem->getCode(), '', '', false);
 
 			$lcontext = clone $context;
-			$lcontext->setLocale( $localeItem );
+			$lcontext->setLocale($localeItem);
 
-			$cache = new \Aimeos\MAdmin\Cache\Proxy\Standard( $lcontext );
-			$lcontext->setCache( $cache );
+			$cache = new \Aimeos\MAdmin\Cache\Proxy\Standard($lcontext);
+			$lcontext->setCache($cache);
 
-			$output->writeln( sprintf( 'Clearing the Aimeos cache for site <info>%1$s</info>', $siteItem->getCode() ) );
+			$output->writeln(sprintf('Clearing the Aimeos cache for site <info>%1$s</info>', $siteItem->getCode()));
 
-			\Aimeos\MAdmin\Cache\Manager\Factory::createManager( $lcontext )->getCache()->flush();
+			\Aimeos\MAdmin\Cache\Manager\Factory::createManager($lcontext)->getCache()->flush();
 		}
 	}
 }

Command/JobsCommand.php

Spacing +36 added lines, -36 removed lines

@@ -24,19 +24,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);
 	}
 
 
@@ -46,23 +46,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();
 			}
 		}
 	}
@@ -77,15 +77,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\Zend2( array(), 'gettext', 'en', array( 'disableNotices' => true ) );
-		$ctx->setI18n( array( 'en' => $i18n ) );
+		$i18n = new \Aimeos\MW\Translation\Zend2(array(), 'gettext', 'en', array('disableNotices' => true));
+		$ctx->setI18n(array('en' => $i18n));
 
 		return $ctx;
 	}
@@ -99,18 +99,18 @@ 
 	protected function getContext()
 	{
 		$container = $this->getContainer();
-		$context = $container->get( 'aimeos_context' )->get( false );
+		$context = $container->get('aimeos_context')->get(false);
 
-		$tmplPaths = $container->get('aimeos')->get()->getCustomPaths( 'controller/jobs/layouts' );
-		$view = $container->get('aimeos_view')->create( $context->getConfig(), $tmplPaths );
+		$tmplPaths = $container->get('aimeos')->get()->getCustomPaths('controller/jobs/layouts');
+		$view = $container->get('aimeos_view')->create($context->getConfig(), $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;
 	}

Tests/Command/JobsCommandTest.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\JobsCommand() );
+		$application = new Application($kernel);
+		$application->add(new Command\JobsCommand());
 
-		$command = $application->find( 'aimeos:jobs' );
-		$commandTester = new CommandTester( $command );
-		$commandTester->execute( array( 'command' => $command->getName(), 'site' => 'unittest', 'jobs' => 'index/rebuild' ) );
+		$command = $application->find('aimeos:jobs');
+		$commandTester = new CommandTester($command);
+		$commandTester->execute(array('command' => $command->getName(), 'site' => 'unittest', 'jobs' => 'index/rebuild'));
 
-		$this->assertEquals( 0, $commandTester->getStatusCode() );
+		$this->assertEquals(0, $commandTester->getStatusCode());
 	}
 }

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;