@@ -43,34 +43,34 @@ discard block |
||
43 | 43 | */ |
44 | 44 | public function handle() |
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 | } |
@@ -42,24 +42,24 @@ discard block |
||
42 | 42 | */ |
43 | 43 | public function handle() |
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 |
@@ -43,30 +43,30 @@ discard block |
||
43 | 43 | */ |
44 | 44 | public function handle() |
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 | 49 | $process = $context->getProcess(); |
50 | - $jobs = explode( ' ', $this->argument( 'jobs' ) ); |
|
51 | - $localeManager = \Aimeos\MShop\Locale\Manager\Factory::createManager( $context ); |
|
50 | + $jobs = explode(' ', $this->argument('jobs')); |
|
51 | + $localeManager = \Aimeos\MShop\Locale\Manager\Factory::createManager($context); |
|
52 | 52 | |
53 | - foreach( $this->getSiteItems( $context, $this->argument( 'site' ) ) as $siteItem ) |
|
53 | + foreach ($this->getSiteItems($context, $this->argument('site')) as $siteItem) |
|
54 | 54 | { |
55 | - $localeItem = $localeManager->bootstrap( $siteItem->getCode(), '', '', false ); |
|
56 | - $localeItem->setLanguageId( null ); |
|
57 | - $localeItem->setCurrencyId( null ); |
|
55 | + $localeItem = $localeManager->bootstrap($siteItem->getCode(), '', '', false); |
|
56 | + $localeItem->setLanguageId(null); |
|
57 | + $localeItem->setCurrencyId(null); |
|
58 | 58 | |
59 | - $context->setLocale( $localeItem ); |
|
59 | + $context->setLocale($localeItem); |
|
60 | 60 | |
61 | - $this->info( sprintf( 'Executing the Aimeos jobs for "%s"', $siteItem->getCode() ) ); |
|
61 | + $this->info(sprintf('Executing the Aimeos jobs for "%s"', $siteItem->getCode())); |
|
62 | 62 | |
63 | - foreach( $jobs as $jobname ) |
|
63 | + foreach ($jobs as $jobname) |
|
64 | 64 | { |
65 | - $fcn = function( $context, $aimeos, $jobname ) { |
|
66 | - \Aimeos\Controller\Jobs\Factory::createController( $context, $aimeos, $jobname )->run(); |
|
65 | + $fcn = function($context, $aimeos, $jobname) { |
|
66 | + \Aimeos\Controller\Jobs\Factory::createController($context, $aimeos, $jobname)->run(); |
|
67 | 67 | }; |
68 | 68 | |
69 | - $process->start( $fcn, [$context, $aimeos, $jobname], true ); |
|
69 | + $process->start($fcn, [$context, $aimeos, $jobname], true); |
|
70 | 70 | } |
71 | 71 | } |
72 | 72 | |
@@ -82,8 +82,8 @@ discard block |
||
82 | 82 | protected function getArguments() |
83 | 83 | { |
84 | 84 | return array( |
85 | - array( 'jobs', InputArgument::REQUIRED, 'One or more job controller names like "admin/job customer/email/watch"' ), |
|
86 | - array( 'site', InputArgument::OPTIONAL, 'Site codes to execute the jobs for like "default unittest" (none for all)' ), |
|
85 | + array('jobs', InputArgument::REQUIRED, 'One or more job controller names like "admin/job customer/email/watch"'), |
|
86 | + array('site', InputArgument::OPTIONAL, 'Site codes to execute the jobs for like "default unittest" (none for all)'), |
|
87 | 87 | ); |
88 | 88 | } |
89 | 89 | |
@@ -106,19 +106,19 @@ discard block |
||
106 | 106 | protected function getContext() |
107 | 107 | { |
108 | 108 | $lv = $this->getLaravel(); |
109 | - $aimeos = $lv->make( '\Aimeos\Shop\Base\Aimeos' )->get(); |
|
110 | - $context = $lv->make( '\Aimeos\Shop\Base\Context' )->get( false, 'command' ); |
|
109 | + $aimeos = $lv->make('\Aimeos\Shop\Base\Aimeos')->get(); |
|
110 | + $context = $lv->make('\Aimeos\Shop\Base\Context')->get(false, 'command'); |
|
111 | 111 | |
112 | - $tmplPaths = $aimeos->getCustomPaths( 'controller/jobs/templates' ); |
|
113 | - $view = $lv->make( '\Aimeos\Shop\Base\View' )->create( $context, $tmplPaths ); |
|
112 | + $tmplPaths = $aimeos->getCustomPaths('controller/jobs/templates'); |
|
113 | + $view = $lv->make('\Aimeos\Shop\Base\View')->create($context, $tmplPaths); |
|
114 | 114 | |
115 | - $langManager = \Aimeos\MShop\Locale\Manager\Factory::createManager( $context )->getSubManager( 'language' ); |
|
116 | - $langids = array_keys( $langManager->searchItems( $langManager->createSearch( true ) ) ); |
|
117 | - $i18n = $lv->make( '\Aimeos\Shop\Base\I18n' )->get( $langids ); |
|
115 | + $langManager = \Aimeos\MShop\Locale\Manager\Factory::createManager($context)->getSubManager('language'); |
|
116 | + $langids = array_keys($langManager->searchItems($langManager->createSearch(true))); |
|
117 | + $i18n = $lv->make('\Aimeos\Shop\Base\I18n')->get($langids); |
|
118 | 118 | |
119 | - $context->setEditor( 'aimeos:jobs' ); |
|
120 | - $context->setView( $view ); |
|
121 | - $context->setI18n( $i18n ); |
|
119 | + $context->setEditor('aimeos:jobs'); |
|
120 | + $context->setView($view); |
|
121 | + $context->setI18n($i18n); |
|
122 | 122 | |
123 | 123 | return $context; |
124 | 124 | } |
@@ -43,39 +43,39 @@ discard block |
||
43 | 43 | */ |
44 | 44 | public function handle() |
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 | } |
@@ -47,8 +47,8 @@ discard block |
||
47 | 47 | * @param \Aimeos\Shop\Base\I18n $i18n I18n object |
48 | 48 | * @param \Aimeos\Shop\Base\Support $support Support object |
49 | 49 | */ |
50 | - public function __construct( \Illuminate\Contracts\Config\Repository $config, |
|
51 | - \Aimeos\Shop\Base\I18n $i18n, \Aimeos\Shop\Base\Support $support ) |
|
50 | + public function __construct(\Illuminate\Contracts\Config\Repository $config, |
|
51 | + \Aimeos\Shop\Base\I18n $i18n, \Aimeos\Shop\Base\Support $support) |
|
52 | 52 | { |
53 | 53 | $this->i18n = $i18n; |
54 | 54 | $this->config = $config; |
@@ -64,24 +64,24 @@ discard block |
||
64 | 64 | * @param string|null $locale Code of the current language or null for no translation |
65 | 65 | * @return \Aimeos\MW\View\Iface View object |
66 | 66 | */ |
67 | - public function create( \Aimeos\MShop\Context\Item\Iface $context, array $templatePaths, $locale = null ) |
|
67 | + public function create(\Aimeos\MShop\Context\Item\Iface $context, array $templatePaths, $locale = null) |
|
68 | 68 | { |
69 | - $engine = new \Aimeos\MW\View\Engine\Blade( app( 'Illuminate\Contracts\View\Factory' ) ); |
|
70 | - $view = new \Aimeos\MW\View\Standard( $templatePaths, array( '.blade.php' => $engine ) ); |
|
69 | + $engine = new \Aimeos\MW\View\Engine\Blade(app('Illuminate\Contracts\View\Factory')); |
|
70 | + $view = new \Aimeos\MW\View\Standard($templatePaths, array('.blade.php' => $engine)); |
|
71 | 71 | |
72 | 72 | $config = $context->getConfig(); |
73 | 73 | $session = $context->getSession(); |
74 | 74 | |
75 | - $this->addCsrf( $view ); |
|
76 | - $this->addAccess( $view, $context ); |
|
77 | - $this->addConfig( $view, $config ); |
|
78 | - $this->addNumber( $view, $config ); |
|
79 | - $this->addParam( $view ); |
|
80 | - $this->addRequest( $view ); |
|
81 | - $this->addResponse( $view ); |
|
82 | - $this->addSession( $view, $session ); |
|
83 | - $this->addTranslate( $view, $locale ); |
|
84 | - $this->addUrl( $view ); |
|
75 | + $this->addCsrf($view); |
|
76 | + $this->addAccess($view, $context); |
|
77 | + $this->addConfig($view, $config); |
|
78 | + $this->addNumber($view, $config); |
|
79 | + $this->addParam($view); |
|
80 | + $this->addRequest($view); |
|
81 | + $this->addResponse($view); |
|
82 | + $this->addSession($view, $session); |
|
83 | + $this->addTranslate($view, $locale); |
|
84 | + $this->addUrl($view); |
|
85 | 85 | |
86 | 86 | return $view; |
87 | 87 | } |
@@ -94,24 +94,24 @@ discard block |
||
94 | 94 | * @param \Aimeos\MShop\Context\Item\Iface $context Context object |
95 | 95 | * @return \Aimeos\MW\View\Iface Modified view object |
96 | 96 | */ |
97 | - protected function addAccess( \Aimeos\MW\View\Iface $view, \Aimeos\MShop\Context\Item\Iface $context ) |
|
97 | + protected function addAccess(\Aimeos\MW\View\Iface $view, \Aimeos\MShop\Context\Item\Iface $context) |
|
98 | 98 | { |
99 | - if( $this->config->get( 'shop.accessControl', true ) !== false ) |
|
99 | + if ($this->config->get('shop.accessControl', true) !== false) |
|
100 | 100 | { |
101 | 101 | $support = $this->support; |
102 | 102 | |
103 | - $fcn = function() use ( $support, $context ) { |
|
104 | - return $support->getGroups( $context ); |
|
103 | + $fcn = function() use ($support, $context) { |
|
104 | + return $support->getGroups($context); |
|
105 | 105 | }; |
106 | 106 | |
107 | - $helper = new \Aimeos\MW\View\Helper\Access\Standard( $view, $fcn ); |
|
107 | + $helper = new \Aimeos\MW\View\Helper\Access\Standard($view, $fcn); |
|
108 | 108 | } |
109 | 109 | else |
110 | 110 | { |
111 | - $helper = new \Aimeos\MW\View\Helper\Access\All( $view ); |
|
111 | + $helper = new \Aimeos\MW\View\Helper\Access\All($view); |
|
112 | 112 | } |
113 | 113 | |
114 | - $view->addHelper( 'access', $helper ); |
|
114 | + $view->addHelper('access', $helper); |
|
115 | 115 | |
116 | 116 | return $view; |
117 | 117 | } |
@@ -124,11 +124,11 @@ discard block |
||
124 | 124 | * @param \Aimeos\MW\Config\Iface $config Configuration object |
125 | 125 | * @return \Aimeos\MW\View\Iface Modified view object |
126 | 126 | */ |
127 | - protected function addConfig( \Aimeos\MW\View\Iface $view, \Aimeos\MW\Config\Iface $config ) |
|
127 | + protected function addConfig(\Aimeos\MW\View\Iface $view, \Aimeos\MW\Config\Iface $config) |
|
128 | 128 | { |
129 | - $config = new \Aimeos\MW\Config\Decorator\Protect( clone $config, array( 'admin', 'client' ) ); |
|
130 | - $helper = new \Aimeos\MW\View\Helper\Config\Standard( $view, $config ); |
|
131 | - $view->addHelper( 'config', $helper ); |
|
129 | + $config = new \Aimeos\MW\Config\Decorator\Protect(clone $config, array('admin', 'client')); |
|
130 | + $helper = new \Aimeos\MW\View\Helper\Config\Standard($view, $config); |
|
131 | + $view->addHelper('config', $helper); |
|
132 | 132 | |
133 | 133 | return $view; |
134 | 134 | } |
@@ -140,10 +140,10 @@ discard block |
||
140 | 140 | * @param \Aimeos\MW\View\Iface $view View object |
141 | 141 | * @return \Aimeos\MW\View\Iface Modified view object |
142 | 142 | */ |
143 | - protected function addCsrf( \Aimeos\MW\View\Iface $view ) |
|
143 | + protected function addCsrf(\Aimeos\MW\View\Iface $view) |
|
144 | 144 | { |
145 | - $helper = new \Aimeos\MW\View\Helper\Csrf\Standard( $view, '_token', csrf_token() ); |
|
146 | - $view->addHelper( 'csrf', $helper ); |
|
145 | + $helper = new \Aimeos\MW\View\Helper\Csrf\Standard($view, '_token', csrf_token()); |
|
146 | + $view->addHelper('csrf', $helper); |
|
147 | 147 | |
148 | 148 | return $view; |
149 | 149 | } |
@@ -156,14 +156,14 @@ discard block |
||
156 | 156 | * @param \Aimeos\MW\Config\Iface $config Configuration object |
157 | 157 | * @return \Aimeos\MW\View\Iface Modified view object |
158 | 158 | */ |
159 | - protected function addNumber( \Aimeos\MW\View\Iface $view, \Aimeos\MW\Config\Iface $config ) |
|
159 | + protected function addNumber(\Aimeos\MW\View\Iface $view, \Aimeos\MW\Config\Iface $config) |
|
160 | 160 | { |
161 | - $sepDec = $config->get( 'client/html/common/format/separatorDecimal', '.' ); |
|
162 | - $sep1000 = $config->get( 'client/html/common/format/separator1000', ' ' ); |
|
163 | - $decimals = $config->get( 'client/html/common/format/decimals', 2 ); |
|
161 | + $sepDec = $config->get('client/html/common/format/separatorDecimal', '.'); |
|
162 | + $sep1000 = $config->get('client/html/common/format/separator1000', ' '); |
|
163 | + $decimals = $config->get('client/html/common/format/decimals', 2); |
|
164 | 164 | |
165 | - $helper = new \Aimeos\MW\View\Helper\Number\Standard( $view, $sepDec, $sep1000, $decimals ); |
|
166 | - $view->addHelper( 'number', $helper ); |
|
165 | + $helper = new \Aimeos\MW\View\Helper\Number\Standard($view, $sepDec, $sep1000, $decimals); |
|
166 | + $view->addHelper('number', $helper); |
|
167 | 167 | |
168 | 168 | return $view; |
169 | 169 | } |
@@ -175,11 +175,11 @@ discard block |
||
175 | 175 | * @param \Aimeos\MW\View\Iface $view View object |
176 | 176 | * @return \Aimeos\MW\View\Iface Modified view object |
177 | 177 | */ |
178 | - protected function addParam( \Aimeos\MW\View\Iface $view ) |
|
178 | + protected function addParam(\Aimeos\MW\View\Iface $view) |
|
179 | 179 | { |
180 | - $params = ( Route::current() ? Route::current()->parameters() : array() ) + Input::all(); |
|
181 | - $helper = new \Aimeos\MW\View\Helper\Param\Standard( $view, $params ); |
|
182 | - $view->addHelper( 'param', $helper ); |
|
180 | + $params = (Route::current() ? Route::current()->parameters() : array()) + Input::all(); |
|
181 | + $helper = new \Aimeos\MW\View\Helper\Param\Standard($view, $params); |
|
182 | + $view->addHelper('param', $helper); |
|
183 | 183 | |
184 | 184 | return $view; |
185 | 185 | } |
@@ -191,10 +191,10 @@ discard block |
||
191 | 191 | * @param \Aimeos\MW\View\Iface $view View object |
192 | 192 | * @return \Aimeos\MW\View\Iface Modified view object |
193 | 193 | */ |
194 | - protected function addRequest( \Aimeos\MW\View\Iface $view ) |
|
194 | + protected function addRequest(\Aimeos\MW\View\Iface $view) |
|
195 | 195 | { |
196 | - $helper = new \Aimeos\MW\View\Helper\Request\Laravel5( $view, Request::instance() ); |
|
197 | - $view->addHelper( 'request', $helper ); |
|
196 | + $helper = new \Aimeos\MW\View\Helper\Request\Laravel5($view, Request::instance()); |
|
197 | + $view->addHelper('request', $helper); |
|
198 | 198 | |
199 | 199 | return $view; |
200 | 200 | } |
@@ -206,10 +206,10 @@ discard block |
||
206 | 206 | * @param \Aimeos\MW\View\Iface $view View object |
207 | 207 | * @return \Aimeos\MW\View\Iface Modified view object |
208 | 208 | */ |
209 | - protected function addResponse( \Aimeos\MW\View\Iface $view ) |
|
209 | + protected function addResponse(\Aimeos\MW\View\Iface $view) |
|
210 | 210 | { |
211 | - $helper = new \Aimeos\MW\View\Helper\Response\Laravel5( $view ); |
|
212 | - $view->addHelper( 'response', $helper ); |
|
211 | + $helper = new \Aimeos\MW\View\Helper\Response\Laravel5($view); |
|
212 | + $view->addHelper('response', $helper); |
|
213 | 213 | |
214 | 214 | return $view; |
215 | 215 | } |
@@ -222,10 +222,10 @@ discard block |
||
222 | 222 | * @param \Aimeos\MW\Session\Iface $session Session object |
223 | 223 | * @return \Aimeos\MW\View\Iface Modified view object |
224 | 224 | */ |
225 | - protected function addSession( \Aimeos\MW\View\Iface $view, \Aimeos\MW\Session\Iface $session ) |
|
225 | + protected function addSession(\Aimeos\MW\View\Iface $view, \Aimeos\MW\Session\Iface $session) |
|
226 | 226 | { |
227 | - $helper = new \Aimeos\MW\View\Helper\Session\Standard( $view, $session ); |
|
228 | - $view->addHelper( 'session', $helper ); |
|
227 | + $helper = new \Aimeos\MW\View\Helper\Session\Standard($view, $session); |
|
228 | + $view->addHelper('session', $helper); |
|
229 | 229 | |
230 | 230 | return $view; |
231 | 231 | } |
@@ -238,20 +238,20 @@ discard block |
||
238 | 238 | * @param string|null $locale ISO language code, e.g. "de" or "de_CH" |
239 | 239 | * @return \Aimeos\MW\View\Iface Modified view object |
240 | 240 | */ |
241 | - protected function addTranslate( \Aimeos\MW\View\Iface $view, $locale ) |
|
241 | + protected function addTranslate(\Aimeos\MW\View\Iface $view, $locale) |
|
242 | 242 | { |
243 | - if( $locale !== null ) |
|
243 | + if ($locale !== null) |
|
244 | 244 | { |
245 | - $i18n = $this->i18n->get( array( $locale ) ); |
|
245 | + $i18n = $this->i18n->get(array($locale)); |
|
246 | 246 | $translation = $i18n[$locale]; |
247 | 247 | } |
248 | 248 | else |
249 | 249 | { |
250 | - $translation = new \Aimeos\MW\Translation\None( 'en' ); |
|
250 | + $translation = new \Aimeos\MW\Translation\None('en'); |
|
251 | 251 | } |
252 | 252 | |
253 | - $helper = new \Aimeos\MW\View\Helper\Translate\Standard( $view, $translation ); |
|
254 | - $view->addHelper( 'translate', $helper ); |
|
253 | + $helper = new \Aimeos\MW\View\Helper\Translate\Standard($view, $translation); |
|
254 | + $view->addHelper('translate', $helper); |
|
255 | 255 | |
256 | 256 | return $view; |
257 | 257 | } |
@@ -263,27 +263,27 @@ discard block |
||
263 | 263 | * @param \Aimeos\MW\View\Iface $view View object |
264 | 264 | * @return \Aimeos\MW\View\Iface Modified view object |
265 | 265 | */ |
266 | - protected function addUrl( \Aimeos\MW\View\Iface $view ) |
|
266 | + protected function addUrl(\Aimeos\MW\View\Iface $view) |
|
267 | 267 | { |
268 | 268 | $fixed = array(); |
269 | 269 | |
270 | - if( Route::current() ) |
|
270 | + if (Route::current()) |
|
271 | 271 | { |
272 | - if( ( $value = Route::input( 'site' ) ) !== null ) { |
|
272 | + if (($value = Route::input('site')) !== null) { |
|
273 | 273 | $fixed['site'] = $value; |
274 | 274 | } |
275 | 275 | |
276 | - if( ( $value = Route::input( 'locale' ) ) !== null ) { |
|
276 | + if (($value = Route::input('locale')) !== null) { |
|
277 | 277 | $fixed['locale'] = $value; |
278 | 278 | } |
279 | 279 | |
280 | - if( ( $value = Route::input( 'currency' ) ) !== null ) { |
|
280 | + if (($value = Route::input('currency')) !== null) { |
|
281 | 281 | $fixed['currency'] = $value; |
282 | 282 | } |
283 | 283 | } |
284 | 284 | |
285 | - $helper = new \Aimeos\MW\View\Helper\Url\Laravel5( $view, app('url'), $fixed ); |
|
286 | - $view->addHelper( 'url', $helper ); |
|
285 | + $helper = new \Aimeos\MW\View\Helper\Url\Laravel5($view, app('url'), $fixed); |
|
286 | + $view->addHelper('url', $helper); |
|
287 | 287 | |
288 | 288 | return $view; |
289 | 289 | } |