@@ -22,19 +22,19 @@ |
||
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 |
@@ -39,7 +39,7 @@ discard block |
||
39 | 39 | * @param \Aimeos\Shop\Base\Context $context Context provider |
40 | 40 | * @param \Aimeos\Shop\Base\Locale $locale Locale provider |
41 | 41 | */ |
42 | - public function __construct( \Aimeos\Shop\Base\Context $context, \Aimeos\Shop\Base\Locale $locale ) |
|
42 | + public function __construct(\Aimeos\Shop\Base\Context $context, \Aimeos\Shop\Base\Locale $locale) |
|
43 | 43 | { |
44 | 44 | $this->context = $context; |
45 | 45 | $this->locale = $locale; |
@@ -53,45 +53,45 @@ discard block |
||
53 | 53 | * @param string|array $groupcodes Unique user/customer group codes that are allowed |
54 | 54 | * @return boolean True if user is part of the group, false if not |
55 | 55 | */ |
56 | - public function checkGroup( $userid, $groupcodes ) |
|
56 | + public function checkGroup($userid, $groupcodes) |
|
57 | 57 | { |
58 | - $site = ( Route::current() ? Route::input( 'site', Input::get( 'site', 'default' ) ) : 'default' ); |
|
58 | + $site = (Route::current() ? Route::input('site', Input::get('site', 'default')) : 'default'); |
|
59 | 59 | |
60 | - $context = $this->context->get( false ); |
|
61 | - $context->setLocale( $this->locale->getBackend( $context, $site ) ); |
|
60 | + $context = $this->context->get(false); |
|
61 | + $context->setLocale($this->locale->getBackend($context, $site)); |
|
62 | 62 | |
63 | 63 | |
64 | - $manager = \Aimeos\MShop\Factory::createManager( $context, 'customer/group' ); |
|
64 | + $manager = \Aimeos\MShop\Factory::createManager($context, 'customer/group'); |
|
65 | 65 | |
66 | 66 | $search = $manager->createSearch(); |
67 | - $search->setConditions( $search->compare( '==', 'customer.group.code', (array) $groupcodes ) ); |
|
68 | - $groupItems = $manager->searchItems( $search ); |
|
67 | + $search->setConditions($search->compare('==', 'customer.group.code', (array) $groupcodes)); |
|
68 | + $groupItems = $manager->searchItems($search); |
|
69 | 69 | |
70 | 70 | |
71 | - $manager = \Aimeos\MShop\Factory::createManager( $context, 'customer/lists' ); |
|
71 | + $manager = \Aimeos\MShop\Factory::createManager($context, 'customer/lists'); |
|
72 | 72 | |
73 | 73 | $search = $manager->createSearch(); |
74 | 74 | $expr = array( |
75 | - $search->compare( '==', 'customer.lists.parentid', $userid ), |
|
76 | - $search->compare( '==', 'customer.lists.refid', array_keys( $groupItems ) ), |
|
77 | - $search->compare( '==', 'customer.lists.domain', 'customer/group' ), |
|
75 | + $search->compare('==', 'customer.lists.parentid', $userid), |
|
76 | + $search->compare('==', 'customer.lists.refid', array_keys($groupItems)), |
|
77 | + $search->compare('==', 'customer.lists.domain', 'customer/group'), |
|
78 | 78 | ); |
79 | - $search->setConditions( $search->combine( '&&', $expr ) ); |
|
80 | - $search->setSlice( 0, 1 ); |
|
79 | + $search->setConditions($search->combine('&&', $expr)); |
|
80 | + $search->setSlice(0, 1); |
|
81 | 81 | |
82 | - return (bool) count( $manager->searchItems( $search ) ); |
|
82 | + return (bool) count($manager->searchItems($search)); |
|
83 | 83 | } |
84 | 84 | |
85 | 85 | |
86 | - public function getGroups( \Aimeos\MShop\Context\Item\Iface $context ) |
|
86 | + public function getGroups(\Aimeos\MShop\Context\Item\Iface $context) |
|
87 | 87 | { |
88 | 88 | $list = array(); |
89 | - $manager = \Aimeos\MShop\Factory::createManager( $context, 'customer/group' ); |
|
89 | + $manager = \Aimeos\MShop\Factory::createManager($context, 'customer/group'); |
|
90 | 90 | |
91 | 91 | $search = $manager->createSearch(); |
92 | - $search->setConditions( $search->compare( '==', 'customer.group.id', $context->getGroupIds() ) ); |
|
92 | + $search->setConditions($search->compare('==', 'customer.group.id', $context->getGroupIds())); |
|
93 | 93 | |
94 | - foreach( $manager->searchItems( $search ) as $item ) { |
|
94 | + foreach ($manager->searchItems($search) as $item) { |
|
95 | 95 | $list[] = $item->getCode(); |
96 | 96 | } |
97 | 97 |
@@ -43,29 +43,29 @@ discard block |
||
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\Locale\Manager\Factory::createManager( $context ); |
|
55 | - $context->setLocale( $localeManager->createItem() ); |
|
54 | + $localeManager = \Aimeos\MShop\Locale\Manager\Factory::createManager($context); |
|
55 | + $context->setLocale($localeManager->createItem()); |
|
56 | 56 | |
57 | - $user = $this->createCustomerItem( $context, $code, $password ); |
|
57 | + $user = $this->createCustomerItem($context, $code, $password); |
|
58 | 58 | |
59 | - if( $this->option( 'admin' ) ) { |
|
60 | - $this->addGroup( $context, $user, 'admin' ); |
|
59 | + if ($this->option('admin')) { |
|
60 | + $this->addGroup($context, $user, 'admin'); |
|
61 | 61 | } |
62 | 62 | |
63 | - if( $this->option( 'api' ) ) { |
|
64 | - $this->addGroup( $context, $user, 'api' ); |
|
63 | + if ($this->option('api')) { |
|
64 | + $this->addGroup($context, $user, 'api'); |
|
65 | 65 | } |
66 | 66 | |
67 | - if( $this->option( 'editor' ) ) { |
|
68 | - $this->addGroup( $context, $user, 'editor' ); |
|
67 | + if ($this->option('editor')) { |
|
68 | + $this->addGroup($context, $user, 'editor'); |
|
69 | 69 | } |
70 | 70 | } |
71 | 71 | |
@@ -77,33 +77,33 @@ discard block |
||
77 | 77 | * @param string $userid Unique user ID |
78 | 78 | * @param string $groupid Unique group ID |
79 | 79 | */ |
80 | - protected function addListItem( \Aimeos\MShop\Context\Item\Iface $context, $userid, $groupid ) |
|
80 | + protected function addListItem(\Aimeos\MShop\Context\Item\Iface $context, $userid, $groupid) |
|
81 | 81 | { |
82 | - $manager = \Aimeos\MShop\Factory::createManager( $context, 'customer/lists' ); |
|
83 | - $typeManager = \Aimeos\MShop\Factory::createManager( $context, 'customer/lists/type' ); |
|
82 | + $manager = \Aimeos\MShop\Factory::createManager($context, 'customer/lists'); |
|
83 | + $typeManager = \Aimeos\MShop\Factory::createManager($context, 'customer/lists/type'); |
|
84 | 84 | |
85 | - $typeid = $typeManager->findItem( 'default', array(), 'customer/group' )->getId(); |
|
85 | + $typeid = $typeManager->findItem('default', array(), 'customer/group')->getId(); |
|
86 | 86 | |
87 | 87 | $search = $manager->createSearch(); |
88 | 88 | $expr = array( |
89 | - $search->compare( '==', 'customer.lists.parentid', $userid ), |
|
90 | - $search->compare( '==', 'customer.lists.refid', $groupid ), |
|
91 | - $search->compare( '==', 'customer.lists.domain', 'customer/group' ), |
|
92 | - $search->compare( '==', 'customer.lists.typeid', $typeid ), |
|
89 | + $search->compare('==', 'customer.lists.parentid', $userid), |
|
90 | + $search->compare('==', 'customer.lists.refid', $groupid), |
|
91 | + $search->compare('==', 'customer.lists.domain', 'customer/group'), |
|
92 | + $search->compare('==', 'customer.lists.typeid', $typeid), |
|
93 | 93 | ); |
94 | - $search->setConditions( $search->combine( '&&', $expr ) ); |
|
95 | - $search->setSlice( 0, 1 ); |
|
94 | + $search->setConditions($search->combine('&&', $expr)); |
|
95 | + $search->setSlice(0, 1); |
|
96 | 96 | |
97 | - if( count( $manager->searchItems( $search ) ) === 0 ) |
|
97 | + if (count($manager->searchItems($search)) === 0) |
|
98 | 98 | { |
99 | 99 | $item = $manager->createItem(); |
100 | - $item->setDomain( 'customer/group' ); |
|
101 | - $item->setParentId( $userid ); |
|
102 | - $item->setTypeId( $typeid ); |
|
103 | - $item->setRefId( $groupid ); |
|
104 | - $item->setStatus( 1 ); |
|
100 | + $item->setDomain('customer/group'); |
|
101 | + $item->setParentId($userid); |
|
102 | + $item->setTypeId($typeid); |
|
103 | + $item->setRefId($groupid); |
|
104 | + $item->setStatus(1); |
|
105 | 105 | |
106 | - $manager->saveItem( $item, false ); |
|
106 | + $manager->saveItem($item, false); |
|
107 | 107 | } |
108 | 108 | } |
109 | 109 | |
@@ -115,23 +115,23 @@ discard block |
||
115 | 115 | * @param \Aimeos\MShop\Customer\Item\Iface $user Aimeos customer object |
116 | 116 | * @param string $group Unique customer group code |
117 | 117 | */ |
118 | - protected function addGroup( \Aimeos\MShop\Context\Item\Iface $context, \Aimeos\MShop\Customer\Item\Iface $user, $group ) |
|
118 | + protected function addGroup(\Aimeos\MShop\Context\Item\Iface $context, \Aimeos\MShop\Customer\Item\Iface $user, $group) |
|
119 | 119 | { |
120 | - $this->info( sprintf( 'Add "%1$s" group to user "%2$s" for sites', $group, $user->getCode() ) ); |
|
120 | + $this->info(sprintf('Add "%1$s" group to user "%2$s" for sites', $group, $user->getCode())); |
|
121 | 121 | |
122 | - $localeManager = \Aimeos\MShop\Locale\Manager\Factory::createManager( $context ); |
|
122 | + $localeManager = \Aimeos\MShop\Locale\Manager\Factory::createManager($context); |
|
123 | 123 | |
124 | - foreach( $this->getSiteItems( $context, $this->argument( 'site' ) ) as $siteItem ) |
|
124 | + foreach ($this->getSiteItems($context, $this->argument('site')) as $siteItem) |
|
125 | 125 | { |
126 | - $localeItem = $localeManager->bootstrap( $siteItem->getCode(), '', '', false ); |
|
126 | + $localeItem = $localeManager->bootstrap($siteItem->getCode(), '', '', false); |
|
127 | 127 | |
128 | 128 | $lcontext = clone $context; |
129 | - $lcontext->setLocale( $localeItem ); |
|
129 | + $lcontext->setLocale($localeItem); |
|
130 | 130 | |
131 | - $this->info( '- ' . $siteItem->getCode() ); |
|
131 | + $this->info('- '.$siteItem->getCode()); |
|
132 | 132 | |
133 | - $groupItem = $this->getGroupItem( $lcontext, $group ); |
|
134 | - $this->addListItem( $lcontext, $user->getId(), $groupItem->getId() ); |
|
133 | + $groupItem = $this->getGroupItem($lcontext, $group); |
|
134 | + $this->addListItem($lcontext, $user->getId(), $groupItem->getId()); |
|
135 | 135 | } |
136 | 136 | } |
137 | 137 | |
@@ -146,23 +146,23 @@ discard block |
||
146 | 146 | * @param string $password New user password |
147 | 147 | * @return \Aimeos\MShop\Customer\Item\Iface Aimeos customer item object |
148 | 148 | */ |
149 | - protected function createCustomerItem( \Aimeos\MShop\Context\Item\Iface $context, $email, $password ) |
|
149 | + protected function createCustomerItem(\Aimeos\MShop\Context\Item\Iface $context, $email, $password) |
|
150 | 150 | { |
151 | - $manager = \Aimeos\MShop\Factory::createManager( $context, 'customer' ); |
|
151 | + $manager = \Aimeos\MShop\Factory::createManager($context, 'customer'); |
|
152 | 152 | |
153 | 153 | try { |
154 | - $item = $manager->findItem( $email ); |
|
155 | - } catch( \Aimeos\MShop\Exception $e ) { |
|
154 | + $item = $manager->findItem($email); |
|
155 | + } catch (\Aimeos\MShop\Exception $e) { |
|
156 | 156 | $item = $manager->createItem(); |
157 | 157 | } |
158 | 158 | |
159 | - $item->setCode( $email ); |
|
160 | - $item->setLabel( $email ); |
|
161 | - $item->getPaymentAddress()->setEmail( $email ); |
|
162 | - $item->setPassword( $password ); |
|
163 | - $item->setStatus( 1 ); |
|
159 | + $item->setCode($email); |
|
160 | + $item->setLabel($email); |
|
161 | + $item->getPaymentAddress()->setEmail($email); |
|
162 | + $item->setPassword($password); |
|
163 | + $item->setStatus(1); |
|
164 | 164 | |
165 | - $manager->saveItem( $item ); |
|
165 | + $manager->saveItem($item); |
|
166 | 166 | |
167 | 167 | return $item; |
168 | 168 | } |
@@ -176,8 +176,8 @@ discard block |
||
176 | 176 | protected function getArguments() |
177 | 177 | { |
178 | 178 | return array( |
179 | - array( 'email', InputArgument::REQUIRED, 'E-mail address of the account that should be created' ), |
|
180 | - array( 'site', InputArgument::OPTIONAL, 'Site codes to create accounts for like "default unittest" (none for all)' ), |
|
179 | + array('email', InputArgument::REQUIRED, 'E-mail address of the account that should be created'), |
|
180 | + array('site', InputArgument::OPTIONAL, 'Site codes to create accounts for like "default unittest" (none for all)'), |
|
181 | 181 | ); |
182 | 182 | } |
183 | 183 | |
@@ -189,21 +189,21 @@ discard block |
||
189 | 189 | * @param string $code Unique customer group code |
190 | 190 | * @return \Aimeos\MShop\Customer\Item\Group\Iface Aimeos customer group item object |
191 | 191 | */ |
192 | - protected function getGroupItem( \Aimeos\MShop\Context\Item\Iface $context, $code ) |
|
192 | + protected function getGroupItem(\Aimeos\MShop\Context\Item\Iface $context, $code) |
|
193 | 193 | { |
194 | - $manager = \Aimeos\MShop\Customer\Manager\Factory::createManager( $context )->getSubmanager( 'group' ); |
|
194 | + $manager = \Aimeos\MShop\Customer\Manager\Factory::createManager($context)->getSubmanager('group'); |
|
195 | 195 | |
196 | 196 | try |
197 | 197 | { |
198 | - $item = $manager->findItem( $code ); |
|
198 | + $item = $manager->findItem($code); |
|
199 | 199 | } |
200 | - catch( \Aimeos\MShop\Exception $e ) |
|
200 | + catch (\Aimeos\MShop\Exception $e) |
|
201 | 201 | { |
202 | 202 | $item = $manager->createItem(); |
203 | - $item->setLabel( $code ); |
|
204 | - $item->setCode( $code ); |
|
203 | + $item->setLabel($code); |
|
204 | + $item->setCode($code); |
|
205 | 205 | |
206 | - $manager->saveItem( $item ); |
|
206 | + $manager->saveItem($item); |
|
207 | 207 | } |
208 | 208 | |
209 | 209 | return $item; |
@@ -218,10 +218,10 @@ discard block |
||
218 | 218 | protected function getOptions() |
219 | 219 | { |
220 | 220 | return array( |
221 | - array( 'password', null, InputOption::VALUE_REQUIRED, 'Optional password for the account (will ask for if not given)' ), |
|
222 | - array( 'admin', null, InputOption::VALUE_NONE, 'If account should have administrator privileges' ), |
|
223 | - array( 'api', null, InputOption::VALUE_NONE, 'If account should be able to access the APIs' ), |
|
224 | - array( 'editor', null, InputOption::VALUE_NONE, 'If account should have limited editor privileges' ), |
|
221 | + array('password', null, InputOption::VALUE_REQUIRED, 'Optional password for the account (will ask for if not given)'), |
|
222 | + array('admin', null, InputOption::VALUE_NONE, 'If account should have administrator privileges'), |
|
223 | + array('api', null, InputOption::VALUE_NONE, 'If account should be able to access the APIs'), |
|
224 | + array('editor', null, InputOption::VALUE_NONE, 'If account should have limited editor privileges'), |
|
225 | 225 | ); |
226 | 226 | } |
227 | 227 | } |
@@ -43,24 +43,24 @@ discard block |
||
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 |
||
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 |
||
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 | } |
@@ -43,39 +43,39 @@ discard block |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 | } |
@@ -42,24 +42,24 @@ discard block |
||
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 |
||
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 |
@@ -38,7 +38,7 @@ discard block |
||
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 |
||
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 |
||
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 | } |
@@ -7,7 +7,7 @@ discard block |
||
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 |
||
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 |
||
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 |
||
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 | } |
@@ -106,12 +106,12 @@ |
||
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 |