Completed
Push — master ( cd5efd...6787d3 )
by Aimeos
02:46
created
src/Aimeos/Shop/Command/AbstractCommand.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -22,19 +22,19 @@
 block discarded – undo
22 22
 	 * @param string|array $sites Unique site codes
23 23
 	 * @return \Aimeos\MShop\Locale\Item\Site\Iface[] List of site items
24 24
 	 */
25
-	protected function getSiteItems( \Aimeos\MShop\Context\Item\Iface $context, $sites )
25
+	protected function getSiteItems(\Aimeos\MShop\Context\Item\Iface $context, $sites)
26 26
 	{
27
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'locale/site' );
27
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'locale/site');
28 28
 		$search = $manager->createSearch();
29 29
 
30
-		if( is_scalar( $sites ) && $sites != '' ) {
31
-			$sites = explode( ' ', $sites );
30
+		if (is_scalar($sites) && $sites != '') {
31
+			$sites = explode(' ', $sites);
32 32
 		}
33 33
 
34
-		if( !empty( $sites ) ) {
35
-			$search->setConditions( $search->compare( '==', 'locale.site.code', $sites ) );
34
+		if (!empty($sites)) {
35
+			$search->setConditions($search->compare('==', 'locale.site.code', $sites));
36 36
 		}
37 37
 
38
-		return $manager->searchItems( $search );
38
+		return $manager->searchItems($search);
39 39
 	}
40 40
 }
41 41
\ No newline at end of file
Please login to merge, or discard this patch.
src/Aimeos/Shop/Command/JobsCommand.php 1 patch
Spacing   +23 added lines, -23 removed lines patch added patch discarded remove patch
@@ -43,24 +43,24 @@  discard block
 block discarded – undo
43 43
 	 */
44 44
 	public function fire()
45 45
 	{
46
-		$aimeos = $this->getLaravel()->make( '\Aimeos\Shop\Base\Aimeos' )->get();
46
+		$aimeos = $this->getLaravel()->make('\Aimeos\Shop\Base\Aimeos')->get();
47 47
 		$context = $this->getContext();
48 48
 
49
-		$jobs = explode( ' ', $this->argument( 'jobs' ) );
50
-		$localeManager = \Aimeos\MShop\Locale\Manager\Factory::createManager( $context );
49
+		$jobs = explode(' ', $this->argument('jobs'));
50
+		$localeManager = \Aimeos\MShop\Locale\Manager\Factory::createManager($context);
51 51
 
52
-		foreach( $this->getSiteItems( $context, $this->argument( 'site' ) ) as $siteItem )
52
+		foreach ($this->getSiteItems($context, $this->argument('site')) as $siteItem)
53 53
 		{
54
-			$localeItem = $localeManager->bootstrap( $siteItem->getCode(), '', '', false );
55
-			$localeItem->setLanguageId( null );
56
-			$localeItem->setCurrencyId( null );
54
+			$localeItem = $localeManager->bootstrap($siteItem->getCode(), '', '', false);
55
+			$localeItem->setLanguageId(null);
56
+			$localeItem->setCurrencyId(null);
57 57
 
58
-			$context->setLocale( $localeItem );
58
+			$context->setLocale($localeItem);
59 59
 
60
-			$this->info( sprintf( 'Executing the Aimeos jobs for "%s"', $siteItem->getCode() ) );
60
+			$this->info(sprintf('Executing the Aimeos jobs for "%s"', $siteItem->getCode()));
61 61
 
62
-			foreach( $jobs as $jobname ) {
63
-				\Aimeos\Controller\Jobs\Factory::createController( $context, $aimeos, $jobname )->run();
62
+			foreach ($jobs as $jobname) {
63
+				\Aimeos\Controller\Jobs\Factory::createController($context, $aimeos, $jobname)->run();
64 64
 			}
65 65
 		}
66 66
 	}
@@ -74,8 +74,8 @@  discard block
 block discarded – undo
74 74
 	protected function getArguments()
75 75
 	{
76 76
 		return array(
77
-			array( 'jobs', InputArgument::REQUIRED, 'One or more job controller names like "admin/job customer/email/watch"' ),
78
-			array( 'site', InputArgument::OPTIONAL, 'Site codes to execute the jobs for like "default unittest" (none for all)' ),
77
+			array('jobs', InputArgument::REQUIRED, 'One or more job controller names like "admin/job customer/email/watch"'),
78
+			array('site', InputArgument::OPTIONAL, 'Site codes to execute the jobs for like "default unittest" (none for all)'),
79 79
 		);
80 80
 	}
81 81
 
@@ -98,19 +98,19 @@  discard block
 block discarded – undo
98 98
 	protected function getContext()
99 99
 	{
100 100
 		$lv = $this->getLaravel();
101
-		$aimeos = $lv->make( '\Aimeos\Shop\Base\Aimeos' )->get();
102
-		$context = $lv->make( '\Aimeos\Shop\Base\Context' )->get( false, 'command' );
101
+		$aimeos = $lv->make('\Aimeos\Shop\Base\Aimeos')->get();
102
+		$context = $lv->make('\Aimeos\Shop\Base\Context')->get(false, 'command');
103 103
 
104
-		$tmplPaths = $aimeos->getCustomPaths( 'controller/jobs/templates' );
105
-		$view = $lv->make( '\Aimeos\Shop\Base\View' )->create( $context, $tmplPaths );
104
+		$tmplPaths = $aimeos->getCustomPaths('controller/jobs/templates');
105
+		$view = $lv->make('\Aimeos\Shop\Base\View')->create($context, $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 = $lv->make( '\Aimeos\Shop\Base\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 = $lv->make('\Aimeos\Shop\Base\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.
src/Aimeos/Shop/Command/SetupCommand.php 1 patch
Spacing   +31 added lines, -31 removed lines patch added patch discarded remove patch
@@ -43,39 +43,39 @@  discard block
 block discarded – undo
43 43
 	 */
44 44
 	public function fire()
45 45
 	{
46
-		$ctx = $this->getLaravel()->make( '\Aimeos\Shop\Base\Context' )->get( false, 'command' );
47
-		$ctx->setEditor( 'aimeos:setup' );
46
+		$ctx = $this->getLaravel()->make('\Aimeos\Shop\Base\Context')->get(false, 'command');
47
+		$ctx->setEditor('aimeos:setup');
48 48
 
49 49
 		$config = $ctx->getConfig();
50
-		$site = $this->argument( 'site' );
51
-		$template = $this->argument( 'tplsite' );
50
+		$site = $this->argument('site');
51
+		$template = $this->argument('tplsite');
52 52
 
53
-		$config->set( 'setup/site', $site );
54
-		$dbconfig = $this->getDbConfig( $config );
55
-		$this->setOptions( $config );
53
+		$config->set('setup/site', $site);
54
+		$dbconfig = $this->getDbConfig($config);
55
+		$this->setOptions($config);
56 56
 
57
-		$taskPaths = $this->getLaravel()->make( '\Aimeos\Shop\Base\Aimeos' )->get()->getSetupPaths( $template );
58
-		$manager = new \Aimeos\MW\Setup\Manager\Multiple( $ctx->getDatabaseManager(), $dbconfig, $taskPaths, $ctx );
57
+		$taskPaths = $this->getLaravel()->make('\Aimeos\Shop\Base\Aimeos')->get()->getSetupPaths($template);
58
+		$manager = new \Aimeos\MW\Setup\Manager\Multiple($ctx->getDatabaseManager(), $dbconfig, $taskPaths, $ctx);
59 59
 
60
-		$this->info( sprintf( 'Initializing or updating the Aimeos database tables for site "%1$s"', $site ) );
60
+		$this->info(sprintf('Initializing or updating the Aimeos database tables for site "%1$s"', $site));
61 61
 
62
-		if( ( $task = $this->option( 'task' ) ) && is_array( $task ) ) {
63
-			$task = reset( $task );
62
+		if (($task = $this->option('task')) && is_array($task)) {
63
+			$task = reset($task);
64 64
 		}
65 65
 
66
-		switch( $this->option( 'action' ) )
66
+		switch ($this->option('action'))
67 67
 		{
68 68
 			case 'migrate':
69
-				$manager->migrate( $task );
69
+				$manager->migrate($task);
70 70
 				break;
71 71
 			case 'rollback':
72
-				$manager->rollback( $task );
72
+				$manager->rollback($task);
73 73
 				break;
74 74
 			case 'clean':
75
-				$manager->clean( $task );
75
+				$manager->clean($task);
76 76
 				break;
77 77
 			default:
78
-				throw new \Exception( sprintf( 'Invalid setup action "%1$s"', $this->option( 'action' ) ) );
78
+				throw new \Exception(sprintf('Invalid setup action "%1$s"', $this->option('action')));
79 79
 		}
80 80
 	}
81 81
 
@@ -88,8 +88,8 @@  discard block
 block discarded – undo
88 88
 	protected function getArguments()
89 89
 	{
90 90
 		return array(
91
-			array( 'site', InputArgument::OPTIONAL, 'Site for updating database entries', 'default' ),
92
-			array( 'tplsite', InputArgument::OPTIONAL, 'Site used as template for creating the new one', 'default' ),
91
+			array('site', InputArgument::OPTIONAL, 'Site for updating database entries', 'default'),
92
+			array('tplsite', InputArgument::OPTIONAL, 'Site used as template for creating the new one', 'default'),
93 93
 		);
94 94
 	}
95 95
 
@@ -102,9 +102,9 @@  discard block
 block discarded – undo
102 102
 	protected function getOptions()
103 103
 	{
104 104
 		return array(
105
-			array( 'option', null, InputOption::VALUE_REQUIRED, 'Setup configuration, name and value are separated by ":" like "setup/default/demo:1"', array() ),
106
-			array( 'action', null, InputOption::VALUE_REQUIRED, 'Action name that should be executed, i.e. "migrate", "rollback", "clean"', 'migrate' ),
107
-			array( 'task', null, InputOption::VALUE_REQUIRED, 'Name of the setup task that should be executed', null ),
105
+			array('option', null, InputOption::VALUE_REQUIRED, 'Setup configuration, name and value are separated by ":" like "setup/default/demo:1"', array()),
106
+			array('action', null, InputOption::VALUE_REQUIRED, 'Action name that should be executed, i.e. "migrate", "rollback", "clean"', 'migrate'),
107
+			array('task', null, InputOption::VALUE_REQUIRED, 'Name of the setup task that should be executed', null),
108 108
 		);
109 109
 	}
110 110
 
@@ -115,14 +115,14 @@  discard block
 block discarded – undo
115 115
 	 * @param \Aimeos\MW\Config\Iface $conf Config object
116 116
 	 * @return array Multi-dimensional associative list of database configuration parameters
117 117
 	 */
118
-	protected function getDbConfig( \Aimeos\MW\Config\Iface $conf )
118
+	protected function getDbConfig(\Aimeos\MW\Config\Iface $conf)
119 119
 	{
120
-		$dbconfig = $conf->get( 'resource', array() );
120
+		$dbconfig = $conf->get('resource', array());
121 121
 
122
-		foreach( $dbconfig as $rname => $dbconf )
122
+		foreach ($dbconfig as $rname => $dbconf)
123 123
 		{
124
-			if( strncmp( $rname, 'db', 2 ) !== 0 ) {
125
-				unset( $dbconfig[$rname] );
124
+			if (strncmp($rname, 'db', 2) !== 0) {
125
+				unset($dbconfig[$rname]);
126 126
 			}
127 127
 		}
128 128
 
@@ -137,12 +137,12 @@  discard block
 block discarded – undo
137 137
 	 * @param array Associative list of database configurations
138 138
 	 * @throws \RuntimeException If the format of the options is invalid
139 139
 	 */
140
-	protected function setOptions( \Aimeos\MW\Config\Iface $conf )
140
+	protected function setOptions(\Aimeos\MW\Config\Iface $conf)
141 141
 	{
142
-		foreach( (array) $this->option( 'option' ) as $option )
142
+		foreach ((array) $this->option('option') as $option)
143 143
 		{
144
-			list( $name, $value ) = explode( ':', $option );
145
-			$conf->set( str_replace( '\\', '/', $name ), $value );
144
+			list($name, $value) = explode(':', $option);
145
+			$conf->set(str_replace('\\', '/', $name), $value);
146 146
 		}
147 147
 	}
148 148
 }
Please login to merge, or discard this patch.
src/Aimeos/Shop/Command/CacheCommand.php 1 patch
Spacing   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -42,24 +42,24 @@  discard block
 block discarded – undo
42 42
 	 */
43 43
 	public function fire()
44 44
 	{
45
-		$context = $this->getLaravel()->make( 'Aimeos\Shop\Base\Context' )->get( false, 'command' );
46
-		$context->setEditor( 'aimeos:cache' );
45
+		$context = $this->getLaravel()->make('Aimeos\Shop\Base\Context')->get(false, 'command');
46
+		$context->setEditor('aimeos:cache');
47 47
 
48
-		$localeManager = \Aimeos\MShop\Locale\Manager\Factory::createManager( $context );
48
+		$localeManager = \Aimeos\MShop\Locale\Manager\Factory::createManager($context);
49 49
 
50
-		foreach( $this->getSiteItems( $context, $this->argument( 'site' ) ) as $siteItem )
50
+		foreach ($this->getSiteItems($context, $this->argument('site')) as $siteItem)
51 51
 		{
52
-			$localeItem = $localeManager->bootstrap( $siteItem->getCode(), '', '', false );
52
+			$localeItem = $localeManager->bootstrap($siteItem->getCode(), '', '', false);
53 53
 
54 54
 			$lcontext = clone $context;
55
-			$lcontext->setLocale( $localeItem );
55
+			$lcontext->setLocale($localeItem);
56 56
 
57
-			$cache = new \Aimeos\MAdmin\Cache\Proxy\Standard( $lcontext );
58
-			$lcontext->setCache( $cache );
57
+			$cache = new \Aimeos\MAdmin\Cache\Proxy\Standard($lcontext);
58
+			$lcontext->setCache($cache);
59 59
 
60
-			$this->info( sprintf( 'Clearing the Aimeos cache for site "%1$s"', $siteItem->getCode() ) );
60
+			$this->info(sprintf('Clearing the Aimeos cache for site "%1$s"', $siteItem->getCode()));
61 61
 
62
-			\Aimeos\MAdmin\Cache\Manager\Factory::createManager( $lcontext )->getCache()->clear();
62
+			\Aimeos\MAdmin\Cache\Manager\Factory::createManager($lcontext)->getCache()->clear();
63 63
 		}
64 64
 	}
65 65
 
@@ -72,7 +72,7 @@  discard block
 block discarded – undo
72 72
 	protected function getArguments()
73 73
 	{
74 74
 		return array(
75
-			array( 'site', InputArgument::OPTIONAL, 'Site codes to clear the cache like "default unittest" (none for all)' ),
75
+			array('site', InputArgument::OPTIONAL, 'Site codes to clear the cache like "default unittest" (none for all)'),
76 76
 		);
77 77
 	}
78 78
 
Please login to merge, or discard this patch.
src/Aimeos/Shop/Base/Locale.php 2 patches
Spacing   +19 added lines, -19 removed lines patch added patch discarded remove patch
@@ -38,7 +38,7 @@  discard block
 block discarded – undo
38 38
 	 *
39 39
 	 * @param \Illuminate\Contracts\Config\Repository $config Configuration object
40 40
 	 */
41
-	public function __construct( \Illuminate\Contracts\Config\Repository $config )
41
+	public function __construct(\Illuminate\Contracts\Config\Repository $config)
42 42
 	{
43 43
 		$this->config = $config;
44 44
 	}
@@ -50,25 +50,25 @@  discard block
 block discarded – undo
50 50
 	 * @param \Aimeos\MShop\Context\Item\Iface $context Context object
51 51
 	 * @return \Aimeos\MShop\Locale\Item\Iface Locale item object
52 52
 	 */
53
-	public function get( \Aimeos\MShop\Context\Item\Iface $context )
53
+	public function get(\Aimeos\MShop\Context\Item\Iface $context)
54 54
 	{
55
-		if( $this->locale === null )
55
+		if ($this->locale === null)
56 56
 		{
57
-			$site = Input::get( 'site', 'default' );
58
-			$currency = Input::get( 'currency', '' );
59
-			$lang = Input::get( 'locale', '' );
57
+			$site = Input::get('site', 'default');
58
+			$currency = Input::get('currency', '');
59
+			$lang = Input::get('locale', '');
60 60
 
61
-			if( Route::current() )
61
+			if (Route::current())
62 62
 			{
63
-				$site =  Route::input( 'site', $site );
64
-				$currency = Route::input( 'currency', $currency );
65
-				$lang = Route::input( 'locale', $lang );
63
+				$site = Route::input('site', $site);
64
+				$currency = Route::input('currency', $currency);
65
+				$lang = Route::input('locale', $lang);
66 66
 			}
67 67
 
68
-			$disableSites = $this->config->get( 'shop.disableSites', true );
68
+			$disableSites = $this->config->get('shop.disableSites', true);
69 69
 
70
-			$localeManager = \Aimeos\MShop\Locale\Manager\Factory::createManager( $context );
71
-			$this->locale = $localeManager->bootstrap( $site, $lang, $currency, $disableSites );
70
+			$localeManager = \Aimeos\MShop\Locale\Manager\Factory::createManager($context);
71
+			$this->locale = $localeManager->bootstrap($site, $lang, $currency, $disableSites);
72 72
 		}
73 73
 
74 74
 		return $this->locale;
@@ -82,17 +82,17 @@  discard block
 block discarded – undo
82 82
 	 * @param string $site Unique site code
83 83
 	 * @return \Aimeos\MShop\Locale\Item\Iface Locale item object
84 84
 	 */
85
-	public function getBackend( \Aimeos\MShop\Context\Item\Iface $context, $site )
85
+	public function getBackend(\Aimeos\MShop\Context\Item\Iface $context, $site)
86 86
 	{
87
-		$localeManager = \Aimeos\MShop\Factory::createManager( $context, 'locale' );
87
+		$localeManager = \Aimeos\MShop\Factory::createManager($context, 'locale');
88 88
 
89 89
 		try
90 90
 		{
91
-			$localeItem = $localeManager->bootstrap( $site, '', '', false );
92
-			$localeItem->setLanguageId( null );
93
-			$localeItem->setCurrencyId( null );
91
+			$localeItem = $localeManager->bootstrap($site, '', '', false);
92
+			$localeItem->setLanguageId(null);
93
+			$localeItem->setCurrencyId(null);
94 94
 		}
95
-		catch( \Aimeos\MShop\Locale\Exception $e )
95
+		catch (\Aimeos\MShop\Locale\Exception $e)
96 96
 		{
97 97
 			$localeItem = $localeManager->createItem();
98 98
 		}
Please login to merge, or discard this patch.
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -91,8 +91,7 @@
 block discarded – undo
91 91
 			$localeItem = $localeManager->bootstrap( $site, '', '', false );
92 92
 			$localeItem->setLanguageId( null );
93 93
 			$localeItem->setCurrencyId( null );
94
-		}
95
-		catch( \Aimeos\MShop\Locale\Exception $e )
94
+		} catch( \Aimeos\MShop\Locale\Exception $e )
96 95
 		{
97 96
 			$localeItem = $localeManager->createItem();
98 97
 		}
Please login to merge, or discard this patch.
src/helpers.php 1 patch
Spacing   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -7,7 +7,7 @@  discard block
 block discarded – undo
7 7
  */
8 8
 
9 9
 
10
-if( !function_exists( 'aiconfig' ) )
10
+if (!function_exists('aiconfig'))
11 11
 {
12 12
     /**
13 13
      * Returns the configuration setting for the given key
@@ -16,14 +16,14 @@  discard block
 block discarded – undo
16 16
      * @param mixed $default Default value if the configuration key isn't found
17 17
      * @return mixed Configuration value
18 18
      */
19
-    function aiconfig( $key, $default = null )
19
+    function aiconfig($key, $default = null)
20 20
     {
21
-        return app( '\Aimeos\Shop\Base\Config' )->get()->get( $key, $default );
21
+        return app('\Aimeos\Shop\Base\Config')->get()->get($key, $default);
22 22
     }
23 23
 }
24 24
 
25 25
 
26
-if( !function_exists( 'aitrans' ) )
26
+if (!function_exists('aitrans'))
27 27
 {
28 28
     /**
29 29
      * Translates the given message
@@ -34,16 +34,16 @@  discard block
 block discarded – undo
34 34
      * @param string $locale ISO language code, maybe combine with ISO currency code, e.g. "en_US"
35 35
      * @return string Translated string
36 36
      */
37
-    function aitrans( $singular, array $params = array(), $domain = 'client', $locale = null )
37
+    function aitrans($singular, array $params = array(), $domain = 'client', $locale = null)
38 38
     {
39
-        $i18n = app( '\Aimeos\Shop\Base\Context' )->get()->getI18n( $locale );
39
+        $i18n = app('\Aimeos\Shop\Base\Context')->get()->getI18n($locale);
40 40
 
41
-        return vsprintf( $i18n->dt( $domain, $singular ), $params );
41
+        return vsprintf($i18n->dt($domain, $singular), $params);
42 42
     }
43 43
 }
44 44
 
45 45
 
46
-if( !function_exists( 'aitransplural' ) )
46
+if (!function_exists('aitransplural'))
47 47
 {
48 48
     /**
49 49
      * Translates the given messages based on the number
@@ -56,10 +56,10 @@  discard block
 block discarded – undo
56 56
      * @param string $locale ISO language code, maybe combine with ISO currency code, e.g. "en_US"
57 57
      * @return string Translated string
58 58
      */
59
-    function aitransplural( $singular, $plural, $number, array $params = array(), $domain = 'client', $locale = null )
59
+    function aitransplural($singular, $plural, $number, array $params = array(), $domain = 'client', $locale = null)
60 60
     {
61
-        $i18n = app( '\Aimeos\Shop\Base\Context' )->get()->getI18n( $locale );
61
+        $i18n = app('\Aimeos\Shop\Base\Context')->get()->getI18n($locale);
62 62
 
63
-        return vsprintf( $i18n->dn( $domain, $singular, $plural, $number ), $params );
63
+        return vsprintf($i18n->dn($domain, $singular, $plural, $number), $params);
64 64
     }
65 65
 }
Please login to merge, or discard this patch.
src/Aimeos/Shop/ShopServiceProvider.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -106,12 +106,12 @@
 block discarded – undo
106 106
 		});
107 107
 
108 108
 
109
-		$this->commands( array(
109
+		$this->commands(array(
110 110
 			'Aimeos\Shop\Command\AccountCommand',
111 111
 			'Aimeos\Shop\Command\CacheCommand',
112 112
 			'Aimeos\Shop\Command\SetupCommand',
113 113
 			'Aimeos\Shop\Command\JobsCommand',
114
-		) );
114
+		));
115 115
 	}
116 116
 
117 117
 
Please login to merge, or discard this patch.
src/views/extadm/index.blade.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -9,7 +9,7 @@  discard block
 block discarded – undo
9 9
         <link type="text/css" rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/extjs/3.4.1-1/resources/css/ext-all.css" />
10 10
         <link type="text/css" rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/extjs/3.4.1-1/resources/css/xtheme-gray.css" />
11 11
 @foreach ($cssFiles as $cssFile)
12
-        <link rel="stylesheet" href="<?= asset('packages/aimeos/shop/' . $cssFile) ?>" />
12
+        <link rel="stylesheet" href="<?= asset('packages/aimeos/shop/'.$cssFile) ?>" />
13 13
 @endforeach
14 14
 
15 15
         <script type="text/javascript">
@@ -45,7 +45,7 @@  discard block
 block discarded – undo
45 45
 
46 46
         <script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/extjs/3.4.1-1/adapter/ext/ext-base.js"></script>
47 47
         <script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/extjs/3.4.1-1/ext-all.js"></script>
48
-        <script type="text/javascript" src="<?= route( 'aimeos_shop_extadm_file', array( 'site' => $site ) ); ?>"></script>
48
+        <script type="text/javascript" src="<?= route('aimeos_shop_extadm_file', array('site' => $site)); ?>"></script>
49 49
 
50 50
     </head>
51 51
     <body>
Please login to merge, or discard this patch.
src/Aimeos/Shop/Command/AccountCommand.php 2 patches
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -196,8 +196,7 @@
 block discarded – undo
196 196
 		try
197 197
 		{
198 198
 			$item = $manager->findItem( $code );
199
-		}
200
-		catch( \Aimeos\MShop\Exception $e )
199
+		} catch( \Aimeos\MShop\Exception $e )
201 200
 		{
202 201
 			$item = $manager->createItem();
203 202
 			$item->setLabel( $code );
Please login to merge, or discard this patch.
Spacing   +62 added lines, -62 removed lines patch added patch discarded remove patch
@@ -43,34 +43,34 @@  discard block
 block discarded – undo
43 43
 	 */
44 44
 	public function fire()
45 45
 	{
46
-		$code = $this->argument( 'email' );
47
-		if( ( $password = $this->option( 'password' ) ) === null ) {
48
-			$password = $this->secret( 'Password' );
46
+		$code = $this->argument('email');
47
+		if (($password = $this->option('password')) === null) {
48
+			$password = $this->secret('Password');
49 49
 		}
50 50
 
51
-		$context = $this->getLaravel()->make( 'Aimeos\Shop\Base\Context' )->get( false, 'command' );
52
-		$context->setEditor( 'aimeos:account' );
51
+		$context = $this->getLaravel()->make('Aimeos\Shop\Base\Context')->get(false, 'command');
52
+		$context->setEditor('aimeos:account');
53 53
 
54
-		$localeManager = \Aimeos\MShop\Factory::createManager( $context, 'locale' );
55
-		$localeItem = $localeManager->bootstrap( $this->argument( 'site' ), '', '', false );
56
-		$context->setLocale( $localeItem );
54
+		$localeManager = \Aimeos\MShop\Factory::createManager($context, 'locale');
55
+		$localeItem = $localeManager->bootstrap($this->argument('site'), '', '', false);
56
+		$context->setLocale($localeItem);
57 57
 
58
-		$user = $this->createCustomerItem( $context, $code, $password );
58
+		$user = $this->createCustomerItem($context, $code, $password);
59 59
 
60
-		if( $this->option( 'admin' ) ) {
61
-			$this->addGroup( $context, $user, 'admin' );
60
+		if ($this->option('admin')) {
61
+			$this->addGroup($context, $user, 'admin');
62 62
 		}
63 63
 
64
-		if( $this->option( 'api' ) ) {
65
-			$this->addGroup( $context, $user, 'api' );
64
+		if ($this->option('api')) {
65
+			$this->addGroup($context, $user, 'api');
66 66
 		}
67 67
 
68
-		if( $this->option( 'editor' ) ) {
69
-			$this->addGroup( $context, $user, 'editor' );
68
+		if ($this->option('editor')) {
69
+			$this->addGroup($context, $user, 'editor');
70 70
 		}
71 71
 
72
-		if( $this->option( 'viewer' ) ) {
73
-			$this->addGroup( $context, $user, 'viewer' );
72
+		if ($this->option('viewer')) {
73
+			$this->addGroup($context, $user, 'viewer');
74 74
 		}
75 75
 	}
76 76
 
@@ -82,33 +82,33 @@  discard block
 block discarded – undo
82 82
 	 * @param string $userid Unique user ID
83 83
 	 * @param string $groupid Unique group ID
84 84
 	 */
85
-	protected function addListItem( \Aimeos\MShop\Context\Item\Iface $context, $userid, $groupid )
85
+	protected function addListItem(\Aimeos\MShop\Context\Item\Iface $context, $userid, $groupid)
86 86
 	{
87
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'customer/lists' );
88
-		$typeManager = \Aimeos\MShop\Factory::createManager( $context, 'customer/lists/type' );
87
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'customer/lists');
88
+		$typeManager = \Aimeos\MShop\Factory::createManager($context, 'customer/lists/type');
89 89
 
90
-		$typeid = $typeManager->findItem( 'default', array(), 'customer/group' )->getId();
90
+		$typeid = $typeManager->findItem('default', array(), 'customer/group')->getId();
91 91
 
92 92
 		$search = $manager->createSearch();
93 93
 		$expr = array(
94
-			$search->compare( '==', 'customer.lists.parentid', $userid ),
95
-			$search->compare( '==', 'customer.lists.refid', $groupid ),
96
-			$search->compare( '==', 'customer.lists.domain', 'customer/group' ),
97
-			$search->compare( '==', 'customer.lists.typeid', $typeid ),
94
+			$search->compare('==', 'customer.lists.parentid', $userid),
95
+			$search->compare('==', 'customer.lists.refid', $groupid),
96
+			$search->compare('==', 'customer.lists.domain', 'customer/group'),
97
+			$search->compare('==', 'customer.lists.typeid', $typeid),
98 98
 		);
99
-		$search->setConditions( $search->combine( '&&', $expr ) );
100
-		$search->setSlice( 0, 1 );
99
+		$search->setConditions($search->combine('&&', $expr));
100
+		$search->setSlice(0, 1);
101 101
 
102
-		if( count( $manager->searchItems( $search ) ) === 0 )
102
+		if (count($manager->searchItems($search)) === 0)
103 103
 		{
104 104
 			$item = $manager->createItem();
105
-			$item->setDomain( 'customer/group' );
106
-			$item->setParentId( $userid );
107
-			$item->setTypeId( $typeid );
108
-			$item->setRefId( $groupid );
109
-			$item->setStatus( 1 );
105
+			$item->setDomain('customer/group');
106
+			$item->setParentId($userid);
107
+			$item->setTypeId($typeid);
108
+			$item->setRefId($groupid);
109
+			$item->setStatus(1);
110 110
 
111
-			$manager->saveItem( $item, false );
111
+			$manager->saveItem($item, false);
112 112
 		}
113 113
 	}
114 114
 
@@ -120,13 +120,13 @@  discard block
 block discarded – undo
120 120
 	 * @param \Aimeos\MShop\Customer\Item\Iface $user Aimeos customer object
121 121
 	 * @param string $group Unique customer group code
122 122
 	 */
123
-	protected function addGroup( \Aimeos\MShop\Context\Item\Iface $context, \Aimeos\MShop\Customer\Item\Iface $user, $group )
123
+	protected function addGroup(\Aimeos\MShop\Context\Item\Iface $context, \Aimeos\MShop\Customer\Item\Iface $user, $group)
124 124
 	{
125 125
 		$msg = 'Add "%1$s" group to user "%2$s" for site "%3$s"';
126
-		$this->info( sprintf( $msg, $group, $user->getCode(), $this->argument( 'site' ) ) );
126
+		$this->info(sprintf($msg, $group, $user->getCode(), $this->argument('site')));
127 127
 
128
-		$groupItem = $this->getGroupItem( $context, $group );
129
-		$this->addListItem( $context, $user->getId(), $groupItem->getId() );
128
+		$groupItem = $this->getGroupItem($context, $group);
129
+		$this->addListItem($context, $user->getId(), $groupItem->getId());
130 130
 	}
131 131
 
132 132
 
@@ -140,23 +140,23 @@  discard block
 block discarded – undo
140 140
 	 * @param string $password New user password
141 141
 	 * @return \Aimeos\MShop\Customer\Item\Iface Aimeos customer item object
142 142
 	 */
143
-	protected function createCustomerItem( \Aimeos\MShop\Context\Item\Iface $context, $email, $password )
143
+	protected function createCustomerItem(\Aimeos\MShop\Context\Item\Iface $context, $email, $password)
144 144
 	{
145
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'customer' );
145
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'customer');
146 146
 
147 147
 		try {
148
-			$item = $manager->findItem( $email );
149
-		} catch( \Aimeos\MShop\Exception $e ) {
148
+			$item = $manager->findItem($email);
149
+		} catch (\Aimeos\MShop\Exception $e) {
150 150
 			$item = $manager->createItem();
151 151
 		}
152 152
 
153
-		$item->setCode( $email );
154
-		$item->setLabel( $email );
155
-		$item->getPaymentAddress()->setEmail( $email );
156
-		$item->setPassword( $password );
157
-		$item->setStatus( 1 );
153
+		$item->setCode($email);
154
+		$item->setLabel($email);
155
+		$item->getPaymentAddress()->setEmail($email);
156
+		$item->setPassword($password);
157
+		$item->setStatus(1);
158 158
 
159
-		$manager->saveItem( $item );
159
+		$manager->saveItem($item);
160 160
 
161 161
 		return $item;
162 162
 	}
@@ -170,8 +170,8 @@  discard block
 block discarded – undo
170 170
 	protected function getArguments()
171 171
 	{
172 172
 		return array(
173
-			array( 'email', InputArgument::REQUIRED, 'E-mail address of the account that should be created' ),
174
-			array( 'site', InputArgument::OPTIONAL, 'Site code to create the account for', 'default' ),
173
+			array('email', InputArgument::REQUIRED, 'E-mail address of the account that should be created'),
174
+			array('site', InputArgument::OPTIONAL, 'Site code to create the account for', 'default'),
175 175
 		);
176 176
 	}
177 177
 
@@ -183,21 +183,21 @@  discard block
 block discarded – undo
183 183
 	 * @param string $code Unique customer group code
184 184
 	 * @return \Aimeos\MShop\Customer\Item\Group\Iface Aimeos customer group item object
185 185
 	 */
186
-	protected function getGroupItem( \Aimeos\MShop\Context\Item\Iface $context, $code )
186
+	protected function getGroupItem(\Aimeos\MShop\Context\Item\Iface $context, $code)
187 187
 	{
188
-		$manager = \Aimeos\MShop\Customer\Manager\Factory::createManager( $context )->getSubmanager( 'group' );
188
+		$manager = \Aimeos\MShop\Customer\Manager\Factory::createManager($context)->getSubmanager('group');
189 189
 
190 190
 		try
191 191
 		{
192
-			$item = $manager->findItem( $code );
192
+			$item = $manager->findItem($code);
193 193
 		}
194
-		catch( \Aimeos\MShop\Exception $e )
194
+		catch (\Aimeos\MShop\Exception $e)
195 195
 		{
196 196
 			$item = $manager->createItem();
197
-			$item->setLabel( $code );
198
-			$item->setCode( $code );
197
+			$item->setLabel($code);
198
+			$item->setCode($code);
199 199
 
200
-			$manager->saveItem( $item );
200
+			$manager->saveItem($item);
201 201
 		}
202 202
 
203 203
 		return $item;
@@ -212,11 +212,11 @@  discard block
 block discarded – undo
212 212
 	protected function getOptions()
213 213
 	{
214 214
 		return array(
215
-			array( 'password', null, InputOption::VALUE_REQUIRED, 'Optional password for the account (will ask for if not given)' ),
216
-			array( 'admin', null, InputOption::VALUE_NONE, 'If account should have administrator privileges' ),
217
-			array( 'api', null, InputOption::VALUE_NONE, 'If account should be able to access the APIs' ),
218
-			array( 'editor', null, InputOption::VALUE_NONE, 'If account should have limited editor privileges' ),
219
-			array( 'viewer', null, InputOption::VALUE_NONE, 'If account should only have view privileges' ),
215
+			array('password', null, InputOption::VALUE_REQUIRED, 'Optional password for the account (will ask for if not given)'),
216
+			array('admin', null, InputOption::VALUE_NONE, 'If account should have administrator privileges'),
217
+			array('api', null, InputOption::VALUE_NONE, 'If account should be able to access the APIs'),
218
+			array('editor', null, InputOption::VALUE_NONE, 'If account should have limited editor privileges'),
219
+			array('viewer', null, InputOption::VALUE_NONE, 'If account should only have view privileges'),
220 220
 		);
221 221
 	}
222 222
 }
Please login to merge, or discard this patch.