Completed
Push — master ( 736351...fa1b4a )
by Aimeos
12:13
created
Controller/PageController.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -28,7 +28,7 @@  discard block
 block discarded – undo
28 28
 	 */
29 29
 	public function privacyAction()
30 30
 	{
31
-		return $this->render( 'AimeosShopBundle:Page:privacy.html.twig' );
31
+		return $this->render('AimeosShopBundle:Page:privacy.html.twig');
32 32
 	}
33 33
 
34 34
 
@@ -39,6 +39,6 @@  discard block
 block discarded – undo
39 39
 	 */
40 40
 	public function termsAction()
41 41
 	{
42
-		return $this->render( 'AimeosShopBundle:Page:terms.html.twig' );
42
+		return $this->render('AimeosShopBundle:Page:terms.html.twig');
43 43
 	}
44 44
 }
Please login to merge, or discard this patch.
DependencyInjection/AimeosShopExtension.php 1 patch
Spacing   +19 added lines, -19 removed lines patch added patch discarded remove patch
@@ -27,21 +27,21 @@  discard block
 block discarded – undo
27 27
 	/**
28 28
 	 * {@inheritDoc}
29 29
 	 */
30
-	public function load( array $configs, ContainerBuilder $container )
30
+	public function load(array $configs, ContainerBuilder $container)
31 31
 	{
32 32
 		$configuration = new Configuration();
33
-		$config = $this->processConfiguration( $configuration, $configs );
33
+		$config = $this->processConfiguration($configuration, $configs);
34 34
 
35
-		foreach( $configs as $list ) {
36
-			$this->merge( $config, $list );
35
+		foreach ($configs as $list) {
36
+			$this->merge($config, $list);
37 37
 		}
38 38
 
39
-		foreach( $config as $key => $value ) {
40
-			$container->setParameter( 'aimeos_shop.' . $key, $value );
39
+		foreach ($config as $key => $value) {
40
+			$container->setParameter('aimeos_shop.' . $key, $value);
41 41
 		}
42 42
 
43
-		$loader = new Loader\YamlFileLoader( $container, new FileLocator( dirname( __DIR__ ) . '/Resources/config' ) );
44
-		$loader->load( 'services.yml' );
43
+		$loader = new Loader\YamlFileLoader($container, new FileLocator(dirname(__DIR__) . '/Resources/config'));
44
+		$loader->load('services.yml');
45 45
 	}
46 46
 
47 47
 
@@ -50,13 +50,13 @@  discard block
 block discarded – undo
50 50
 	 *
51 51
 	 * @param ContainerBuilder $container ContainerBuilder object
52 52
 	 */
53
-	public function prepend( ContainerBuilder $container )
53
+	public function prepend(ContainerBuilder $container)
54 54
 	{
55
-		$configFile = dirname( __DIR__ ) . '/Resources/config/aimeos_shop.yml';
56
-		$config = Yaml::parse( file_get_contents( $configFile ) );
55
+		$configFile = dirname(__DIR__) . '/Resources/config/aimeos_shop.yml';
56
+		$config = Yaml::parse(file_get_contents($configFile));
57 57
 
58
-		$container->prependExtensionConfig( 'aimeos_shop', $config );
59
-		$container->addResource( new FileResource( $configFile ) );
58
+		$container->prependExtensionConfig('aimeos_shop', $config);
59
+		$container->addResource(new FileResource($configFile));
60 60
 	}
61 61
 
62 62
 
@@ -66,15 +66,15 @@  discard block
 block discarded – undo
66 66
 	 * @param array &$original Associative list of original values
67 67
 	 * @param array $overrule Associative list of new values
68 68
 	 */
69
-	protected function merge( array &$original, array $overrule )
69
+	protected function merge(array &$original, array $overrule)
70 70
 	{
71
-		foreach( array_keys( $overrule ) as $key )
71
+		foreach (array_keys($overrule) as $key)
72 72
 		{
73
-			if( isset( $original[$key] ) && is_array( $original[$key] ) ) {
74
-				if( is_array( $overrule[$key] ) ) {
75
-					$this->merge( $original[$key], $overrule[$key] );
73
+			if (isset($original[$key]) && is_array($original[$key])) {
74
+				if (is_array($overrule[$key])) {
75
+					$this->merge($original[$key], $overrule[$key]);
76 76
 				}
77
-			} elseif( isset( $overrule[$key] ) ) {
77
+			} elseif (isset($overrule[$key])) {
78 78
 				$original[$key] = $overrule[$key];
79 79
 			}
80 80
 		}
Please login to merge, or discard this patch.
Command/Command.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -25,15 +25,15 @@
 block discarded – undo
25 25
 	 * @param InputInterface $input Input object
26 26
 	 * @return \Aimeos\MShop\Locale\Item\Site\Interface[] List of site items
27 27
 	 */
28
-	protected function getSiteItems( \Aimeos\MShop\Context\Item\Iface $context, InputInterface $input )
28
+	protected function getSiteItems(\Aimeos\MShop\Context\Item\Iface $context, InputInterface $input)
29 29
 	{
30
-		$manager = \Aimeos\MShop\Locale\Manager\Factory::createManager( $context )->getSubManager( 'site' );
30
+		$manager = \Aimeos\MShop\Locale\Manager\Factory::createManager($context)->getSubManager('site');
31 31
 		$search = $manager->createSearch();
32 32
 
33
-		if( ( $codes = (string) $input->getArgument( 'site' ) ) !== '' ) {
34
-			$search->setConditions( $search->compare( '==', 'locale.site.code', explode( ' ', $codes ) ) );
33
+		if (($codes = (string) $input->getArgument('site')) !== '') {
34
+			$search->setConditions($search->compare('==', 'locale.site.code', explode(' ', $codes)));
35 35
 		}
36 36
 
37
-		return $manager->searchItems( $search );
37
+		return $manager->searchItems($search);
38 38
 	}
39 39
 }
Please login to merge, or discard this patch.
Command/CacheCommand.php 1 patch
Spacing   +14 added lines, -14 removed lines patch added patch discarded remove patch
@@ -23,9 +23,9 @@  discard block
 block discarded – undo
23 23
 	 */
24 24
 	protected function configure()
25 25
 	{
26
-		$this->setName( 'aimeos:cache' );
27
-		$this->setDescription( 'Clears the content cache' );
28
-		$this->addArgument( 'site', InputArgument::OPTIONAL, 'Site codes to clear the cache like "default unittest" (none for all)' );
26
+		$this->setName('aimeos:cache');
27
+		$this->setDescription('Clears the content cache');
28
+		$this->addArgument('site', InputArgument::OPTIONAL, 'Site codes to clear the cache like "default unittest" (none for all)');
29 29
 	}
30 30
 
31 31
 
@@ -35,26 +35,26 @@  discard block
 block discarded – undo
35 35
 	 * @param InputInterface $input Input object
36 36
 	 * @param OutputInterface $output Output object
37 37
 	 */
38
-	protected function execute( InputInterface $input, OutputInterface $output )
38
+	protected function execute(InputInterface $input, OutputInterface $output)
39 39
 	{
40
-		$context = $this->getContainer()->get( 'aimeos_context' )->get( false );
41
-		$context->setEditor( 'aimeos:cache' );
40
+		$context = $this->getContainer()->get('aimeos_context')->get(false);
41
+		$context->setEditor('aimeos:cache');
42 42
 
43
-		$localeManager = \Aimeos\MShop\Locale\Manager\Factory::createManager( $context );
43
+		$localeManager = \Aimeos\MShop\Locale\Manager\Factory::createManager($context);
44 44
 
45
-		foreach( $this->getSiteItems( $context, $input ) as $siteItem )
45
+		foreach ($this->getSiteItems($context, $input) as $siteItem)
46 46
 		{
47
-			$localeItem = $localeManager->bootstrap( $siteItem->getCode(), '', '', false );
47
+			$localeItem = $localeManager->bootstrap($siteItem->getCode(), '', '', false);
48 48
 
49 49
 			$lcontext = clone $context;
50
-			$lcontext->setLocale( $localeItem );
50
+			$lcontext->setLocale($localeItem);
51 51
 
52
-			$cache = new \Aimeos\MAdmin\Cache\Proxy\Standard( $lcontext );
53
-			$lcontext->setCache( $cache );
52
+			$cache = new \Aimeos\MAdmin\Cache\Proxy\Standard($lcontext);
53
+			$lcontext->setCache($cache);
54 54
 
55
-			$output->writeln( sprintf( 'Clearing the Aimeos cache for site <info>%1$s</info>', $siteItem->getCode() ) );
55
+			$output->writeln(sprintf('Clearing the Aimeos cache for site <info>%1$s</info>', $siteItem->getCode()));
56 56
 
57
-			\Aimeos\MAdmin\Cache\Manager\Factory::createManager( $lcontext )->getCache()->flush();
57
+			\Aimeos\MAdmin\Cache\Manager\Factory::createManager($lcontext)->getCache()->flush();
58 58
 		}
59 59
 	}
60 60
 }
Please login to merge, or discard this patch.
Tests/Command/JobsCommandTest.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -14,13 +14,13 @@
 block discarded – undo
14 14
 		$kernel = $this->createKernel();
15 15
 		$kernel->boot();
16 16
 
17
-		$application = new Application( $kernel );
18
-		$application->add( new Command\JobsCommand() );
17
+		$application = new Application($kernel);
18
+		$application->add(new Command\JobsCommand());
19 19
 
20
-		$command = $application->find( 'aimeos:jobs' );
21
-		$commandTester = new CommandTester( $command );
22
-		$commandTester->execute( array( 'command' => $command->getName(), 'site' => 'unittest', 'jobs' => 'index/rebuild' ) );
20
+		$command = $application->find('aimeos:jobs');
21
+		$commandTester = new CommandTester($command);
22
+		$commandTester->execute(array('command' => $command->getName(), 'site' => 'unittest', 'jobs' => 'index/rebuild'));
23 23
 
24
-		$this->assertEquals( 0, $commandTester->getStatusCode() );
24
+		$this->assertEquals(0, $commandTester->getStatusCode());
25 25
 	}
26 26
 }
Please login to merge, or discard this patch.
Tests/Command/CacheCommandTest.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -14,13 +14,13 @@
 block discarded – undo
14 14
 		$kernel = $this->createKernel();
15 15
 		$kernel->boot();
16 16
 
17
-		$application = new Application( $kernel );
18
-		$application->add( new Command\CacheCommand() );
17
+		$application = new Application($kernel);
18
+		$application->add(new Command\CacheCommand());
19 19
 
20
-		$command = $application->find( 'aimeos:cache' );
21
-		$commandTester = new CommandTester( $command );
22
-		$commandTester->execute( array( 'command' => $command->getName(), 'site' => 'unittest' ) );
20
+		$command = $application->find('aimeos:cache');
21
+		$commandTester = new CommandTester($command);
22
+		$commandTester->execute(array('command' => $command->getName(), 'site' => 'unittest'));
23 23
 
24
-		$this->assertEquals( 0, $commandTester->getStatusCode() );
24
+		$this->assertEquals(0, $commandTester->getStatusCode());
25 25
 	}
26 26
 }
Please login to merge, or discard this patch.
Entity/User.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -209,7 +209,7 @@  discard block
 block discarded – undo
209 209
 	 */
210 210
 	public function getRoles()
211 211
 	{
212
-		return array( 'ROLE_USER' );
212
+		return array('ROLE_USER');
213 213
 	}
214 214
 
215 215
 
@@ -226,23 +226,23 @@  discard block
 block discarded – undo
226 226
 	 */
227 227
 	public function serialize()
228 228
 	{
229
-		return serialize( array(
229
+		return serialize(array(
230 230
 			$this->id,
231 231
 			$this->username,
232 232
 			$this->password,
233
-		) );
233
+		));
234 234
 	}
235 235
 
236 236
 
237 237
 	/**
238 238
 	 * @see \Serializable::unserialize()
239 239
 	 */
240
-	public function unserialize( $serialized )
240
+	public function unserialize($serialized)
241 241
 	{
242 242
 		list (
243 243
 			$this->id,
244 244
 			$this->username,
245 245
 			$this->password,
246
-		) = unserialize( $serialized );
246
+		) = unserialize($serialized);
247 247
 	}
248 248
 }
Please login to merge, or discard this patch.
Entity/FosUser.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -209,7 +209,7 @@  discard block
 block discarded – undo
209 209
 	 */
210 210
 	public function getSalutation()
211 211
 	{
212
-		return ( isset( $this->salutation ) ? (string) $this->salutation : \Aimeos\MShop\Common\Item\Address\Base::SALUTATION_UNKNOWN );
212
+		return (isset($this->salutation) ? (string) $this->salutation : \Aimeos\MShop\Common\Item\Address\Base::SALUTATION_UNKNOWN);
213 213
 	}
214 214
 
215 215
 
@@ -220,7 +220,7 @@  discard block
 block discarded – undo
220 220
 	 */
221 221
 	public function setSalutation($salutation)
222 222
 	{
223
-		switch( $salutation )
223
+		switch ($salutation)
224 224
 		{
225 225
 			case \Aimeos\MShop\Common\Item\Address\Base::SALUTATION_UNKNOWN:
226 226
 			case \Aimeos\MShop\Common\Item\Address\Base::SALUTATION_COMPANY:
@@ -229,7 +229,7 @@  discard block
 block discarded – undo
229 229
 			case \Aimeos\MShop\Common\Item\Address\Base::SALUTATION_MR:
230 230
 				break;
231 231
 			default:
232
-				throw new \Exception( sprintf( 'Address salutation "%1$s" is unknown', $value ) );
232
+				throw new \Exception(sprintf('Address salutation "%1$s" is unknown', $value));
233 233
 		}
234 234
 
235 235
 		$this->salutation = (string) $salutation;
@@ -441,7 +441,7 @@  discard block
 block discarded – undo
441 441
 	 */
442 442
 	public function setCountryId($countryid)
443 443
 	{
444
-		$this->countryid = strtoupper( (string) $countryid );
444
+		$this->countryid = strtoupper((string) $countryid);
445 445
 	}
446 446
 
447 447
 
@@ -463,7 +463,7 @@  discard block
 block discarded – undo
463 463
 	 */
464 464
 	public function setLanguageId($langid)
465 465
 	{
466
-		$this->langid = strtolower( (string) $langid );
466
+		$this->langid = strtolower((string) $langid);
467 467
 	}
468 468
 
469 469
 
@@ -542,8 +542,8 @@  discard block
 block discarded – undo
542 542
 	{
543 543
 		$pattern = '#^([a-z]+://)?[a-zA-Z0-9\-]+(\.[a-zA-Z0-9\-]+)+(:[0-9]+)?(/.*)?$#';
544 544
 
545
-		if( $website !== '' && preg_match( $pattern, $website ) !== 1 ) {
546
-			throw new \Exception( sprintf( 'Invalid web site URL "%1$s"', $website ) );
545
+		if ($website !== '' && preg_match($pattern, $website) !== 1) {
546
+			throw new \Exception(sprintf('Invalid web site URL "%1$s"', $website));
547 547
 		}
548 548
 
549 549
 		$this->website = (string) $website;
Please login to merge, or discard this patch.
Command/SetupCommand.php 1 patch
Spacing   +35 added lines, -35 removed lines patch added patch discarded remove patch
@@ -25,18 +25,18 @@  discard block
 block discarded – undo
25 25
 	 * @param string $classname Name of the setup task class
26 26
 	 * @return boolean True if class is found, false if not
27 27
 	 */
28
-	public static function autoload( $classname )
28
+	public static function autoload($classname)
29 29
 	{
30
-		if( strncmp( $classname, 'Aimeos\\MW\\Setup\\Task\\', 21 ) === 0 )
30
+		if (strncmp($classname, 'Aimeos\\MW\\Setup\\Task\\', 21) === 0)
31 31
 		{
32
-			$fileName = substr( $classname, 21 ) . '.php';
33
-			$paths = explode( PATH_SEPARATOR, get_include_path() );
32
+			$fileName = substr($classname, 21) . '.php';
33
+			$paths = explode(PATH_SEPARATOR, get_include_path());
34 34
 
35
-			foreach( $paths as $path )
35
+			foreach ($paths as $path)
36 36
 			{
37 37
 				$file = $path . DIRECTORY_SEPARATOR . $fileName;
38 38
 
39
-				if( file_exists( $file ) === true && ( include_once $file ) !== false ) {
39
+				if (file_exists($file) === true && (include_once $file) !== false) {
40 40
 					return true;
41 41
 				}
42 42
 			}
@@ -51,11 +51,11 @@  discard block
 block discarded – undo
51 51
 	 */
52 52
 	protected function configure()
53 53
 	{
54
-		$this->setName( 'aimeos:setup');
55
-		$this->setDescription( 'Initialize or update the Aimeos database tables' );
56
-		$this->addArgument( 'site', InputArgument::OPTIONAL, 'Site for updating database entries', 'default' );
57
-		$this->addArgument( 'tplsite', InputArgument::OPTIONAL, 'Template site for creating or updating database entries', 'default' );
58
-		$this->addOption( 'option', null, InputOption::VALUE_REQUIRED, 'Optional setup configuration, name and value are separated by ":" like "setup/default/demo:1"', array() );
54
+		$this->setName('aimeos:setup');
55
+		$this->setDescription('Initialize or update the Aimeos database tables');
56
+		$this->addArgument('site', InputArgument::OPTIONAL, 'Site for updating database entries', 'default');
57
+		$this->addArgument('tplsite', InputArgument::OPTIONAL, 'Template site for creating or updating database entries', 'default');
58
+		$this->addOption('option', null, InputOption::VALUE_REQUIRED, 'Optional setup configuration, name and value are separated by ":" like "setup/default/demo:1"', array());
59 59
 	}
60 60
 
61 61
 
@@ -65,35 +65,35 @@  discard block
 block discarded – undo
65 65
 	 * @param InputInterface $input Input object
66 66
 	 * @param OutputInterface $output Output object
67 67
 	 */
68
-	protected function execute( InputInterface $input, OutputInterface $output )
68
+	protected function execute(InputInterface $input, OutputInterface $output)
69 69
 	{
70
-		$ctx = $this->getContainer()->get( 'aimeos_context' )->get( false );
71
-		$ctx->setEditor( 'aimeos:setup' );
70
+		$ctx = $this->getContainer()->get('aimeos_context')->get(false);
71
+		$ctx->setEditor('aimeos:setup');
72 72
 
73 73
 		$config = $ctx->getConfig();
74
-		$site = $input->getArgument( 'site' );
75
-		$tplsite = $input->getArgument( 'tplsite' );
74
+		$site = $input->getArgument('site');
75
+		$tplsite = $input->getArgument('tplsite');
76 76
 
77
-		$config->set( 'setup/site', $site );
78
-		$dbconfig = $this->getDbConfig( $config );
79
-		$this->setOptions( $config, $input );
77
+		$config->set('setup/site', $site);
78
+		$dbconfig = $this->getDbConfig($config);
79
+		$this->setOptions($config, $input);
80 80
 
81
-		$taskPaths = $this->getContainer()->get( 'aimeos' )->get()->getSetupPaths( $tplsite );
81
+		$taskPaths = $this->getContainer()->get('aimeos')->get()->getSetupPaths($tplsite);
82 82
 
83 83
 		$includePaths = $taskPaths;
84 84
 		$includePaths[] = get_include_path();
85 85
 
86
-		if( set_include_path( implode( PATH_SEPARATOR, $includePaths ) ) === false ) {
87
-			throw new \Exception( 'Unable to extend include path' );
86
+		if (set_include_path(implode(PATH_SEPARATOR, $includePaths)) === false) {
87
+			throw new \Exception('Unable to extend include path');
88 88
 		}
89 89
 
90
-		spl_autoload_register( '\Aimeos\ShopBundle\Command\SetupCommand::autoload', true );
90
+		spl_autoload_register('\Aimeos\ShopBundle\Command\SetupCommand::autoload', true);
91 91
 
92
-		$manager = new \Aimeos\MW\Setup\Manager\Multiple( $ctx->getDatabaseManager(), $dbconfig, $taskPaths, $ctx );
92
+		$manager = new \Aimeos\MW\Setup\Manager\Multiple($ctx->getDatabaseManager(), $dbconfig, $taskPaths, $ctx);
93 93
 
94
-		$output->writeln( sprintf( 'Initializing or updating the Aimeos database tables for site <info>%1$s</info>', $site ) );
94
+		$output->writeln(sprintf('Initializing or updating the Aimeos database tables for site <info>%1$s</info>', $site));
95 95
 
96
-		$manager->run( 'mysql' );
96
+		$manager->run('mysql');
97 97
 	}
98 98
 
99 99
 
@@ -103,14 +103,14 @@  discard block
 block discarded – undo
103 103
 	 * @param \Aimeos\MW\Config\Iface $conf Config object
104 104
 	 * @return array Multi-dimensional associative list of database configuration parameters
105 105
 	 */
106
-	protected function getDbConfig( \Aimeos\MW\Config\Iface $conf )
106
+	protected function getDbConfig(\Aimeos\MW\Config\Iface $conf)
107 107
 	{
108
-		$dbconfig = $conf->get( 'resource', array() );
108
+		$dbconfig = $conf->get('resource', array());
109 109
 
110
-		foreach( $dbconfig as $rname => $dbconf )
110
+		foreach ($dbconfig as $rname => $dbconf)
111 111
 		{
112
-			if( strncmp( $rname, 'db', 2 ) !== 0 ) {
113
-				unset( $dbconfig[$rname] );
112
+			if (strncmp($rname, 'db', 2) !== 0) {
113
+				unset($dbconfig[$rname]);
114 114
 			}
115 115
 		}
116 116
 
@@ -126,12 +126,12 @@  discard block
 block discarded – undo
126 126
 	 * @param array Associative list of database configurations
127 127
 	 * @throws \RuntimeException If the format of the options is invalid
128 128
 	 */
129
-	protected function setOptions( \Aimeos\MW\Config\Iface $conf, InputInterface $input )
129
+	protected function setOptions(\Aimeos\MW\Config\Iface $conf, InputInterface $input)
130 130
 	{
131
-		foreach( (array) $input->getOption( 'option' ) as $option )
131
+		foreach ((array) $input->getOption('option') as $option)
132 132
 		{
133
-			list( $name, $value ) = explode( ':', $option );
134
-			$conf->set( $name, $value );
133
+			list($name, $value) = explode(':', $option);
134
+			$conf->set($name, $value);
135 135
 		}
136 136
 	}
137 137
 }
Please login to merge, or discard this patch.