Completed
Push — master ( da2dea...5ebe79 )
by Aimeos
22:25
created
src/Aimeos/Shop/Base/View.php 1 patch
Spacing   +24 added lines, -24 removed lines patch added patch discarded remove patch
@@ -31,48 +31,48 @@  discard block
 block discarded – undo
31 31
 	 * @param string|null $locale Code of the current language or null for no translation
32 32
 	 * @return \Aimeos\MW\View\Iface View object
33 33
 	 */
34
-	public function create( \Aimeos\MW\Config\Iface $config, array $templatePaths, $locale = null )
34
+	public function create(\Aimeos\MW\Config\Iface $config, array $templatePaths, $locale = null)
35 35
 	{
36 36
 		$params = $fixed = array();
37 37
 
38
-		if( $locale !== null )
38
+		if ($locale !== null)
39 39
 		{
40 40
 			$params = Route::current()->parameters() + Input::all();
41 41
 			$fixed = $this->getFixedParams();
42 42
 
43
-			$i18n = app('\Aimeos\Shop\Base\I18n')->get( array( $locale ) );
43
+			$i18n = app('\Aimeos\Shop\Base\I18n')->get(array($locale));
44 44
 			$translation = $i18n[$locale];
45 45
 		}
46 46
 		else
47 47
 		{
48
-			$translation = new \Aimeos\MW\Translation\None( 'en' );
48
+			$translation = new \Aimeos\MW\Translation\None('en');
49 49
 		}
50 50
 
51 51
 
52
-		$view = new \Aimeos\MW\View\Standard( $templatePaths );
52
+		$view = new \Aimeos\MW\View\Standard($templatePaths);
53 53
 
54
-		$helper = new \Aimeos\MW\View\Helper\Translate\Standard( $view, $translation );
55
-		$view->addHelper( 'translate', $helper );
54
+		$helper = new \Aimeos\MW\View\Helper\Translate\Standard($view, $translation);
55
+		$view->addHelper('translate', $helper);
56 56
 
57
-		$helper = new \Aimeos\MW\View\Helper\Url\Laravel5( $view, app('url'), $fixed );
58
-		$view->addHelper( 'url', $helper );
57
+		$helper = new \Aimeos\MW\View\Helper\Url\Laravel5($view, app('url'), $fixed);
58
+		$view->addHelper('url', $helper);
59 59
 
60
-		$helper = new \Aimeos\MW\View\Helper\Param\Standard( $view, $params );
61
-		$view->addHelper( 'param', $helper );
60
+		$helper = new \Aimeos\MW\View\Helper\Param\Standard($view, $params);
61
+		$view->addHelper('param', $helper);
62 62
 
63
-		$helper = new \Aimeos\MW\View\Helper\Config\Standard( $view, $config );
64
-		$view->addHelper( 'config', $helper );
63
+		$helper = new \Aimeos\MW\View\Helper\Config\Standard($view, $config);
64
+		$view->addHelper('config', $helper);
65 65
 
66
-		$sepDec = $config->get( 'client/html/common/format/seperatorDecimal', '.' );
67
-		$sep1000 = $config->get( 'client/html/common/format/seperator1000', ' ' );
68
-		$helper = new \Aimeos\MW\View\Helper\Number\Standard( $view, $sepDec, $sep1000 );
69
-		$view->addHelper( 'number', $helper );
66
+		$sepDec = $config->get('client/html/common/format/seperatorDecimal', '.');
67
+		$sep1000 = $config->get('client/html/common/format/seperator1000', ' ');
68
+		$helper = new \Aimeos\MW\View\Helper\Number\Standard($view, $sepDec, $sep1000);
69
+		$view->addHelper('number', $helper);
70 70
 
71
-		$helper = new \Aimeos\MW\View\Helper\Request\Laravel5( $view, Request::instance() );
72
-		$view->addHelper( 'request', $helper );
71
+		$helper = new \Aimeos\MW\View\Helper\Request\Laravel5($view, Request::instance());
72
+		$view->addHelper('request', $helper);
73 73
 
74
-		$helper = new \Aimeos\MW\View\Helper\Csrf\Standard( $view, '_token', csrf_token() );
75
-		$view->addHelper( 'csrf', $helper );
74
+		$helper = new \Aimeos\MW\View\Helper\Csrf\Standard($view, '_token', csrf_token());
75
+		$view->addHelper('csrf', $helper);
76 76
 
77 77
 		return $view;
78 78
 	}
@@ -87,15 +87,15 @@  discard block
 block discarded – undo
87 87
 	{
88 88
 		$fixed = array();
89 89
 
90
-		if( ( $value = Route::input( 'site' ) ) !== null ) {
90
+		if (($value = Route::input('site')) !== null) {
91 91
 			$fixed['site'] = $value;
92 92
 		}
93 93
 
94
-		if( ( $value = Route::input( 'locale' ) ) !== null ) {
94
+		if (($value = Route::input('locale')) !== null) {
95 95
 			$fixed['locale'] = $value;
96 96
 		}
97 97
 
98
-		if( ( $value = Route::input( 'currency' ) ) !== null ) {
98
+		if (($value = Route::input('currency')) !== null) {
99 99
 			$fixed['currency'] = $value;
100 100
 		}
101 101
 
Please login to merge, or discard this patch.
src/Aimeos/Shop/Command/SetupCommand.php 1 patch
Spacing   +25 added lines, -25 removed lines patch added patch discarded remove patch
@@ -36,31 +36,31 @@  discard block
 block discarded – undo
36 36
 	 */
37 37
 	public function fire()
38 38
 	{
39
-		$ctx = $this->getLaravel()->make( '\Aimeos\Shop\Base\Context' )->get( false );
40
-		$ctx->setEditor( 'aimeos:setup' );
39
+		$ctx = $this->getLaravel()->make('\Aimeos\Shop\Base\Context')->get(false);
40
+		$ctx->setEditor('aimeos:setup');
41 41
 
42 42
 		$config = $ctx->getConfig();
43
-		$site = $this->argument( 'site' );
44
-		$template = $this->argument( 'tplsite' );
43
+		$site = $this->argument('site');
44
+		$template = $this->argument('tplsite');
45 45
 
46
-		$config->set( 'setup/site', $site );
47
-		$dbconfig = $this->getDbConfig( $config );
48
-		$this->setOptions( $config );
46
+		$config->set('setup/site', $site);
47
+		$dbconfig = $this->getDbConfig($config);
48
+		$this->setOptions($config);
49 49
 
50
-		$taskPaths = $this->getLaravel()->make( '\Aimeos\Shop\Base\Aimeos' )->get()->getSetupPaths( $template );
50
+		$taskPaths = $this->getLaravel()->make('\Aimeos\Shop\Base\Aimeos')->get()->getSetupPaths($template);
51 51
 
52 52
 		$includePaths = $taskPaths;
53 53
 		$includePaths[] = get_include_path();
54 54
 
55
-		if( set_include_path( implode( PATH_SEPARATOR, $includePaths ) ) === false ) {
56
-			throw new Exception( 'Unable to extend include path' );
55
+		if (set_include_path(implode(PATH_SEPARATOR, $includePaths)) === false) {
56
+			throw new Exception('Unable to extend include path');
57 57
 		}
58 58
 
59
-		$manager = new \Aimeos\MW\Setup\Manager\Multiple( $ctx->getDatabaseManager(), $dbconfig, $taskPaths, $ctx );
59
+		$manager = new \Aimeos\MW\Setup\Manager\Multiple($ctx->getDatabaseManager(), $dbconfig, $taskPaths, $ctx);
60 60
 
61
-		$this->info( sprintf( 'Initializing or updating the Aimeos database tables for site "%1$s"', $site ) );
61
+		$this->info(sprintf('Initializing or updating the Aimeos database tables for site "%1$s"', $site));
62 62
 
63
-		$manager->run( 'mysql' );
63
+		$manager->run('mysql');
64 64
 	}
65 65
 
66 66
 
@@ -72,8 +72,8 @@  discard block
 block discarded – undo
72 72
 	protected function getArguments()
73 73
 	{
74 74
 		return array(
75
-			array( 'site', InputArgument::OPTIONAL, 'Site for updating database entries', 'default' ),
76
-			array( 'tplsite', InputArgument::OPTIONAL, 'Site used as template for creating the new one', 'default' ),
75
+			array('site', InputArgument::OPTIONAL, 'Site for updating database entries', 'default'),
76
+			array('tplsite', InputArgument::OPTIONAL, 'Site used as template for creating the new one', 'default'),
77 77
 		);
78 78
 	}
79 79
 
@@ -86,7 +86,7 @@  discard block
 block discarded – undo
86 86
 	protected function getOptions()
87 87
 	{
88 88
 		return array(
89
-			array( 'option', null, InputOption::VALUE_REQUIRED, 'Optional setup configuration, name and value are separated by ":" like "setup/default/demo:1"', array() ),
89
+			array('option', null, InputOption::VALUE_REQUIRED, 'Optional setup configuration, name and value are separated by ":" like "setup/default/demo:1"', array()),
90 90
 		);
91 91
 	}
92 92
 
@@ -97,14 +97,14 @@  discard block
 block discarded – undo
97 97
 	 * @param \Aimeos\MW\Config\Iface $conf Config object
98 98
 	 * @return array Multi-dimensional associative list of database configuration parameters
99 99
 	 */
100
-	protected function getDbConfig( \Aimeos\MW\Config\Iface $conf )
100
+	protected function getDbConfig(\Aimeos\MW\Config\Iface $conf)
101 101
 	{
102
-		$dbconfig = $conf->get( 'resource', array() );
102
+		$dbconfig = $conf->get('resource', array());
103 103
 
104
-		foreach( $dbconfig as $rname => $dbconf )
104
+		foreach ($dbconfig as $rname => $dbconf)
105 105
 		{
106
-			if( strncmp( $rname, 'db', 2 ) !== 0 ) {
107
-				unset( $dbconfig[$rname] );
106
+			if (strncmp($rname, 'db', 2) !== 0) {
107
+				unset($dbconfig[$rname]);
108 108
 			}
109 109
 		}
110 110
 
@@ -119,12 +119,12 @@  discard block
 block discarded – undo
119 119
 	 * @param array Associative list of database configurations
120 120
 	 * @throws \RuntimeException If the format of the options is invalid
121 121
 	 */
122
-	protected function setOptions( \Aimeos\MW\Config\Iface $conf )
122
+	protected function setOptions(\Aimeos\MW\Config\Iface $conf)
123 123
 	{
124
-		foreach( (array) $this->option( 'option' ) as $option )
124
+		foreach ((array) $this->option('option') as $option)
125 125
 		{
126
-			list( $name, $value ) = explode( ':', $option );
127
-			$conf->set( $name, $value );
126
+			list($name, $value) = explode(':', $option);
127
+			$conf->set($name, $value);
128 128
 		}
129 129
 	}
130 130
 }
Please login to merge, or discard this patch.
src/Aimeos/Shop/Command/AccountCommand.php 1 patch
Spacing   +54 added lines, -54 removed lines patch added patch discarded remove patch
@@ -39,21 +39,21 @@  discard block
 block discarded – undo
39 39
 	 */
40 40
 	public function fire()
41 41
 	{
42
-		$code = $this->argument( 'email' );
43
-		if( ( $password = $this->option( 'password' ) ) === null ) {
44
-			$password = $this->secret( 'Password' );
42
+		$code = $this->argument('email');
43
+		if (($password = $this->option('password')) === null) {
44
+			$password = $this->secret('Password');
45 45
 		}
46 46
 
47
-		$context = $this->getLaravel()->make( 'Aimeos\Shop\Base\Context' )->get( false );
48
-		$context->setEditor( 'aimeos:account' );
47
+		$context = $this->getLaravel()->make('Aimeos\Shop\Base\Context')->get(false);
48
+		$context->setEditor('aimeos:account');
49 49
 
50
-		$localeManager = \Aimeos\MShop\Locale\Manager\Factory::createManager( $context );
51
-		$context->setLocale( $localeManager->createItem() );
50
+		$localeManager = \Aimeos\MShop\Locale\Manager\Factory::createManager($context);
51
+		$context->setLocale($localeManager->createItem());
52 52
 
53
-		$user = $this->createCustomerItem( $context, $code, $password );
53
+		$user = $this->createCustomerItem($context, $code, $password);
54 54
 
55
-		if( $this->option( 'admin' ) ) {
56
-			$this->addPrivilege( $context, $user, 'admin' );
55
+		if ($this->option('admin')) {
56
+			$this->addPrivilege($context, $user, 'admin');
57 57
 		}
58 58
 	}
59 59
 
@@ -65,31 +65,31 @@  discard block
 block discarded – undo
65 65
 	 * @param string $userid Unique user ID
66 66
 	 * @param string $groupid Unique group ID
67 67
 	 */
68
-	protected function addListItem( \Aimeos\MShop\Context\Item\Iface $context, $userid, $groupid )
68
+	protected function addListItem(\Aimeos\MShop\Context\Item\Iface $context, $userid, $groupid)
69 69
 	{
70
-		$manager = \Aimeos\MShop\Customer\Manager\Factory::createManager( $context )->getSubmanager( 'lists' );
71
-		$typeid = $manager->getSubmanager( 'type' )->findItem( 'default', array(), 'customer/group' )->getId();
70
+		$manager = \Aimeos\MShop\Customer\Manager\Factory::createManager($context)->getSubmanager('lists');
71
+		$typeid = $manager->getSubmanager('type')->findItem('default', array(), 'customer/group')->getId();
72 72
 
73 73
 		$search = $manager->createSearch();
74 74
 		$expr = array(
75
-			$search->compare( '==', 'customer.lists.parentid', $userid ),
76
-			$search->compare( '==', 'customer.lists.refid', $groupid ),
77
-			$search->compare( '==', 'customer.lists.domain', 'customer/group' ),
78
-			$search->compare( '==', 'customer.lists.typeid', $typeid ),
75
+			$search->compare('==', 'customer.lists.parentid', $userid),
76
+			$search->compare('==', 'customer.lists.refid', $groupid),
77
+			$search->compare('==', 'customer.lists.domain', 'customer/group'),
78
+			$search->compare('==', 'customer.lists.typeid', $typeid),
79 79
 		);
80
-		$search->setConditions( $search->combine( '&&', $expr ) );
81
-		$search->setSlice( 0, 1 );
80
+		$search->setConditions($search->combine('&&', $expr));
81
+		$search->setSlice(0, 1);
82 82
 
83
-		if( count( $manager->searchItems( $search ) ) === 0 )
83
+		if (count($manager->searchItems($search)) === 0)
84 84
 		{
85 85
 			$item = $manager->createItem();
86
-			$item->setDomain( 'customer/group' );
87
-			$item->setParentId( $userid );
88
-			$item->setTypeId( $typeid );
89
-			$item->setRefId( $groupid );
90
-			$item->setStatus( 1 );
86
+			$item->setDomain('customer/group');
87
+			$item->setParentId($userid);
88
+			$item->setTypeId($typeid);
89
+			$item->setRefId($groupid);
90
+			$item->setStatus(1);
91 91
 
92
-			$manager->saveItem( $item, false );
92
+			$manager->saveItem($item, false);
93 93
 		}
94 94
 	}
95 95
 
@@ -101,23 +101,23 @@  discard block
 block discarded – undo
101 101
 	 * @param \Aimeos\MShop\Customer\Item\Iface $user Aimeos customer object
102 102
 	 * @param string $privilege Unique customer group code
103 103
 	 */
104
-	protected function addPrivilege( \Aimeos\MShop\Context\Item\Iface $context, \Aimeos\MShop\Customer\Item\Iface $user, $privilege )
104
+	protected function addPrivilege(\Aimeos\MShop\Context\Item\Iface $context, \Aimeos\MShop\Customer\Item\Iface $user, $privilege)
105 105
 	{
106
-		$this->info( sprintf( 'Add "%1$s" privilege to user "%2$s" for sites', $privilege, $user->getCode() ) );
106
+		$this->info(sprintf('Add "%1$s" privilege to user "%2$s" for sites', $privilege, $user->getCode()));
107 107
 
108
-		$localeManager = \Aimeos\MShop\Locale\Manager\Factory::createManager( $context );
108
+		$localeManager = \Aimeos\MShop\Locale\Manager\Factory::createManager($context);
109 109
 
110
-		foreach( $this->getSiteItems( $context, $this->argument( 'site' ) ) as $siteItem )
110
+		foreach ($this->getSiteItems($context, $this->argument('site')) as $siteItem)
111 111
 		{
112
-			$localeItem = $localeManager->bootstrap( $siteItem->getCode(), '', '', false );
112
+			$localeItem = $localeManager->bootstrap($siteItem->getCode(), '', '', false);
113 113
 
114 114
 			$lcontext = clone $context;
115
-			$lcontext->setLocale( $localeItem );
115
+			$lcontext->setLocale($localeItem);
116 116
 
117
-			$this->info( '- ' . $siteItem->getCode() );
117
+			$this->info('- ' . $siteItem->getCode());
118 118
 
119
-			$groupItem = $this->getGroupItem( $lcontext, $privilege );
120
-			$this->addListItem( $lcontext, $user->getId(), $groupItem->getId() );
119
+			$groupItem = $this->getGroupItem($lcontext, $privilege);
120
+			$this->addListItem($lcontext, $user->getId(), $groupItem->getId());
121 121
 		}
122 122
 	}
123 123
 
@@ -132,21 +132,21 @@  discard block
 block discarded – undo
132 132
 	 * @param string $password New user password
133 133
 	 * @return \Aimeos\MShop\Customer\Item\Iface Aimeos customer item object
134 134
 	 */
135
-	protected function createCustomerItem( \Aimeos\MShop\Context\Item\Iface $context, $email, $password )
135
+	protected function createCustomerItem(\Aimeos\MShop\Context\Item\Iface $context, $email, $password)
136 136
 	{
137
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'customer' );
137
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'customer');
138 138
 
139 139
 		try {
140
-			$item = $manager->findItem( $email );
141
-		} catch( \Aimeos\MShop\Exception $e ) {
140
+			$item = $manager->findItem($email);
141
+		} catch (\Aimeos\MShop\Exception $e) {
142 142
 			$item = $manager->createItem();
143 143
 		}
144 144
 
145
-		$item->setCode( $email );
146
-		$item->getPaymentAddress()->setEmail( $email );
147
-		$item->setPassword( $password );
145
+		$item->setCode($email);
146
+		$item->getPaymentAddress()->setEmail($email);
147
+		$item->setPassword($password);
148 148
 
149
-		$manager->saveItem( $item );
149
+		$manager->saveItem($item);
150 150
 
151 151
 		return $item;
152 152
 	}
@@ -160,8 +160,8 @@  discard block
 block discarded – undo
160 160
 	protected function getArguments()
161 161
 	{
162 162
 		return array(
163
-			array( 'email', InputArgument::REQUIRED, 'E-mail address of the account that should be created' ),
164
-			array( 'site', InputArgument::OPTIONAL, 'Site codes to create accounts for like "default unittest" (none for all)' ),
163
+			array('email', InputArgument::REQUIRED, 'E-mail address of the account that should be created'),
164
+			array('site', InputArgument::OPTIONAL, 'Site codes to create accounts for like "default unittest" (none for all)'),
165 165
 		);
166 166
 	}
167 167
 
@@ -173,21 +173,21 @@  discard block
 block discarded – undo
173 173
 	 * @param string $code Unique customer group code
174 174
 	 * @return \Aimeos\MShop\Customer\Item\Group\Iface Aimeos customer group item object
175 175
 	 */
176
-	protected function getGroupItem( \Aimeos\MShop\Context\Item\Iface $context, $code )
176
+	protected function getGroupItem(\Aimeos\MShop\Context\Item\Iface $context, $code)
177 177
 	{
178
-		$manager = \Aimeos\MShop\Customer\Manager\Factory::createManager( $context )->getSubmanager( 'group' );
178
+		$manager = \Aimeos\MShop\Customer\Manager\Factory::createManager($context)->getSubmanager('group');
179 179
 
180 180
 		try
181 181
 		{
182
-			$item = $manager->findItem( $code );
182
+			$item = $manager->findItem($code);
183 183
 		}
184
-		catch( \Aimeos\MShop\Exception $e )
184
+		catch (\Aimeos\MShop\Exception $e)
185 185
 		{
186 186
 			$item = $manager->createItem();
187
-			$item->setLabel( $code );
188
-			$item->setCode( $code );
187
+			$item->setLabel($code);
188
+			$item->setCode($code);
189 189
 
190
-			$manager->saveItem( $item );
190
+			$manager->saveItem($item);
191 191
 		}
192 192
 
193 193
 		return $item;
@@ -202,8 +202,8 @@  discard block
 block discarded – undo
202 202
 	protected function getOptions()
203 203
 	{
204 204
 		return array(
205
-				array( 'password', null, InputOption::VALUE_REQUIRED, 'Optional password for the account (will ask for if not given)' ),
206
-				array( 'admin', null, InputOption::VALUE_NONE, 'If account should have administrator privileges' ),
205
+				array('password', null, InputOption::VALUE_REQUIRED, 'Optional password for the account (will ask for if not given)'),
206
+				array('admin', null, InputOption::VALUE_NONE, 'If account should have administrator privileges'),
207 207
 		);
208 208
 	}
209 209
 }
Please login to merge, or discard this patch.