Completed
Push — master ( b14069...8dc9a2 )
by Aimeos
05:48
created
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/SetupCommand.php 2 patches
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -29,7 +29,7 @@
 block discarded – undo
29 29
 	{
30 30
 		if( strncmp( $classname, 'Aimeos\\MW\\Setup\\Task\\', 21 ) === 0 )
31 31
 		{
32
-		    $fileName = substr( $classname, 21 ) . '.php';
32
+			$fileName = substr( $classname, 21 ) . '.php';
33 33
 			$paths = explode( PATH_SEPARATOR, get_include_path() );
34 34
 
35 35
 			foreach( $paths as $path )
Please login to merge, or discard this 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.
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.
Command/JobsCommand.php 1 patch
Spacing   +36 added lines, -36 removed lines patch added patch discarded remove patch
@@ -24,19 +24,19 @@  discard block
 block discarded – undo
24 24
 	protected function configure()
25 25
 	{
26 26
 		$names = '';
27
-		$aimeos = new \Aimeos\Bootstrap( array() );
28
-		$cntlPaths = $aimeos->getCustomPaths( 'controller/jobs' );
29
-		$controllers = \Aimeos\Controller\Jobs\Factory::getControllers( $this->getBareContext(), $aimeos, $cntlPaths );
27
+		$aimeos = new \Aimeos\Bootstrap(array());
28
+		$cntlPaths = $aimeos->getCustomPaths('controller/jobs');
29
+		$controllers = \Aimeos\Controller\Jobs\Factory::getControllers($this->getBareContext(), $aimeos, $cntlPaths);
30 30
 
31
-		foreach( $controllers as $key => $controller ) {
32
-			$names .= str_pad( $key, 30 ) . $controller->getName() . PHP_EOL;
31
+		foreach ($controllers as $key => $controller) {
32
+			$names .= str_pad($key, 30) . $controller->getName() . PHP_EOL;
33 33
 		}
34 34
 
35
-		$this->setName( 'aimeos:jobs' );
36
-		$this->setDescription( 'Executes the job controllers' );
37
-		$this->addArgument( 'jobs', InputArgument::REQUIRED, 'One or more job controller names like "admin/job customer/email/watch"' );
38
-		$this->addArgument( 'site', InputArgument::OPTIONAL, 'Site codes to execute the jobs for like "default unittest" (none for all)' );
39
-		$this->setHelp( "Available jobs are:\n" . $names );
35
+		$this->setName('aimeos:jobs');
36
+		$this->setDescription('Executes the job controllers');
37
+		$this->addArgument('jobs', InputArgument::REQUIRED, 'One or more job controller names like "admin/job customer/email/watch"');
38
+		$this->addArgument('site', InputArgument::OPTIONAL, 'Site codes to execute the jobs for like "default unittest" (none for all)');
39
+		$this->setHelp("Available jobs are:\n" . $names);
40 40
 	}
41 41
 
42 42
 
@@ -46,23 +46,23 @@  discard block
 block discarded – undo
46 46
 	 * @param InputInterface $input Input object
47 47
 	 * @param OutputInterface $output Output object
48 48
 	 */
49
-	protected function execute( InputInterface $input, OutputInterface $output )
49
+	protected function execute(InputInterface $input, OutputInterface $output)
50 50
 	{
51 51
 		$context = $this->getContext();
52
-		$aimeos = $this->getContainer()->get( 'aimeos' )->get();
52
+		$aimeos = $this->getContainer()->get('aimeos')->get();
53 53
 
54
-		$jobs = explode( ' ', $input->getArgument( 'jobs' ) );
55
-		$localeManager = \Aimeos\MShop\Locale\Manager\Factory::createManager( $context );
54
+		$jobs = explode(' ', $input->getArgument('jobs'));
55
+		$localeManager = \Aimeos\MShop\Locale\Manager\Factory::createManager($context);
56 56
 
57
-		foreach( $this->getSiteItems( $context, $input ) as $siteItem )
57
+		foreach ($this->getSiteItems($context, $input) as $siteItem)
58 58
 		{
59
-			$localeItem = $localeManager->bootstrap( $siteItem->getCode(), 'en', '', false );
60
-			$context->setLocale( $localeItem );
59
+			$localeItem = $localeManager->bootstrap($siteItem->getCode(), 'en', '', false);
60
+			$context->setLocale($localeItem);
61 61
 
62
-			$output->writeln( sprintf( 'Executing the Aimeos jobs for "<info>%s</info>"', $siteItem->getCode() ) );
62
+			$output->writeln(sprintf('Executing the Aimeos jobs for "<info>%s</info>"', $siteItem->getCode()));
63 63
 
64
-			foreach( $jobs as $jobname ) {
65
-				\Aimeos\Controller\Jobs\Factory::createController( $context, $aimeos, $jobname )->run();
64
+			foreach ($jobs as $jobname) {
65
+				\Aimeos\Controller\Jobs\Factory::createController($context, $aimeos, $jobname)->run();
66 66
 			}
67 67
 		}
68 68
 	}
@@ -77,15 +77,15 @@  discard block
 block discarded – undo
77 77
 	{
78 78
 		$ctx = new \Aimeos\MShop\Context\Item\Standard();
79 79
 
80
-		$conf = new \Aimeos\MW\Config\PHPArray( array(), array() );
81
-		$ctx->setConfig( $conf );
80
+		$conf = new \Aimeos\MW\Config\PHPArray(array(), array());
81
+		$ctx->setConfig($conf);
82 82
 
83
-		$locale = \Aimeos\MShop\Factory::createManager( $ctx, 'locale' )->createItem();
84
-		$locale->setLanguageId( 'en' );
85
-		$ctx->setLocale( $locale );
83
+		$locale = \Aimeos\MShop\Factory::createManager($ctx, 'locale')->createItem();
84
+		$locale->setLanguageId('en');
85
+		$ctx->setLocale($locale);
86 86
 
87
-		$i18n = new \Aimeos\MW\Translation\Zend2( array(), 'gettext', 'en', array( 'disableNotices' => true ) );
88
-		$ctx->setI18n( array( 'en' => $i18n ) );
87
+		$i18n = new \Aimeos\MW\Translation\Zend2(array(), 'gettext', 'en', array('disableNotices' => true));
88
+		$ctx->setI18n(array('en' => $i18n));
89 89
 
90 90
 		return $ctx;
91 91
 	}
@@ -99,18 +99,18 @@  discard block
 block discarded – undo
99 99
 	protected function getContext()
100 100
 	{
101 101
 		$container = $this->getContainer();
102
-		$context = $container->get( 'aimeos_context' )->get( false );
102
+		$context = $container->get('aimeos_context')->get(false);
103 103
 
104
-		$tmplPaths = $container->get('aimeos')->get()->getCustomPaths( 'controller/jobs/layouts' );
105
-		$view = $container->get('aimeos_view')->create( $context->getConfig(), $tmplPaths );
104
+		$tmplPaths = $container->get('aimeos')->get()->getCustomPaths('controller/jobs/layouts');
105
+		$view = $container->get('aimeos_view')->create($context->getConfig(), $tmplPaths);
106 106
 
107
-		$langManager = \Aimeos\MShop\Locale\Manager\Factory::createManager( $context )->getSubManager( 'language' );
108
-		$langids = array_keys( $langManager->searchItems( $langManager->createSearch( true ) ) );
109
-		$i18n = $this->getContainer()->get( 'aimeos_i18n' )->get( $langids );
107
+		$langManager = \Aimeos\MShop\Locale\Manager\Factory::createManager($context)->getSubManager('language');
108
+		$langids = array_keys($langManager->searchItems($langManager->createSearch(true)));
109
+		$i18n = $this->getContainer()->get('aimeos_i18n')->get($langids);
110 110
 
111
-		$context->setEditor( 'aimeos:jobs' );
112
-		$context->setView( $view );
113
-		$context->setI18n( $i18n );
111
+		$context->setEditor('aimeos:jobs');
112
+		$context->setView($view);
113
+		$context->setI18n($i18n);
114 114
 
115 115
 		return $context;
116 116
 	}
Please login to merge, or discard this patch.