@@ -30,15 +30,15 @@ discard block |
||
30 | 30 | public function indexAction() |
31 | 31 | { |
32 | 32 | $params = []; |
33 | - $shop = $this->container->get( 'shop' ); |
|
33 | + $shop = $this->container->get('shop'); |
|
34 | 34 | |
35 | - foreach( $this->container->getParameter( 'aimeos_shop.page' )['basket-index'] as $name ) |
|
35 | + foreach ($this->container->getParameter('aimeos_shop.page')['basket-index'] as $name) |
|
36 | 36 | { |
37 | - $params['aiheader'][$name] = $shop->get( $name )->getHeader(); |
|
38 | - $params['aibody'][$name] = $shop->get( $name )->getBody(); |
|
37 | + $params['aiheader'][$name] = $shop->get($name)->getHeader(); |
|
38 | + $params['aibody'][$name] = $shop->get($name)->getBody(); |
|
39 | 39 | } |
40 | 40 | |
41 | - $response = $this->render( 'AimeosShopBundle:Basket:index.html.twig', $params ); |
|
41 | + $response = $this->render('AimeosShopBundle:Basket:index.html.twig', $params); |
|
42 | 42 | $response->headers->set('Cache-Control', 'no-store'); |
43 | 43 | return $response; |
44 | 44 | } |
@@ -50,10 +50,10 @@ discard block |
||
50 | 50 | */ |
51 | 51 | public function miniComponentAction() |
52 | 52 | { |
53 | - $client = $this->container->get( 'shop' )->get( 'basket/mini' ); |
|
54 | - $this->container->get( 'twig' )->addGlobal( 'aiheader', (string) $client->getHeader() ); |
|
53 | + $client = $this->container->get('shop')->get('basket/mini'); |
|
54 | + $this->container->get('twig')->addGlobal('aiheader', (string) $client->getHeader()); |
|
55 | 55 | |
56 | - $response = new Response( (string) $client->getBody() ); |
|
56 | + $response = new Response((string) $client->getBody()); |
|
57 | 57 | $response->headers->set('Cache-Control', 'no-store'); |
58 | 58 | return $response; |
59 | 59 | } |
@@ -66,10 +66,10 @@ discard block |
||
66 | 66 | */ |
67 | 67 | public function relatedComponentAction() |
68 | 68 | { |
69 | - $client = $this->container->get( 'shop' )->get( 'basket/related' ); |
|
70 | - $this->container->get( 'twig' )->addGlobal( 'aiheader', (string) $client->getHeader() ); |
|
69 | + $client = $this->container->get('shop')->get('basket/related'); |
|
70 | + $this->container->get('twig')->addGlobal('aiheader', (string) $client->getHeader()); |
|
71 | 71 | |
72 | - $response = new Response( (string) $client->getBody() ); |
|
72 | + $response = new Response((string) $client->getBody()); |
|
73 | 73 | $response->headers->set('Cache-Control', 'no-store'); |
74 | 74 | return $response; |
75 | 75 | } |
@@ -82,10 +82,10 @@ discard block |
||
82 | 82 | */ |
83 | 83 | public function standardComponentAction() |
84 | 84 | { |
85 | - $client = $this->container->get( 'shop' )->get( 'basket/standard' ); |
|
86 | - $this->container->get( 'twig' )->addGlobal( 'aiheader', (string) $client->getHeader() ); |
|
85 | + $client = $this->container->get('shop')->get('basket/standard'); |
|
86 | + $this->container->get('twig')->addGlobal('aiheader', (string) $client->getHeader()); |
|
87 | 87 | |
88 | - $response = new Response( (string) $client->getBody() ); |
|
88 | + $response = new Response((string) $client->getBody()); |
|
89 | 89 | $response->headers->set('Cache-Control', 'no-store'); |
90 | 90 | return $response; |
91 | 91 | } |
@@ -29,10 +29,10 @@ |
||
29 | 29 | */ |
30 | 30 | public function selectComponentAction() |
31 | 31 | { |
32 | - $shop = $this->container->get( 'shop' ); |
|
33 | - $client = $shop->get( 'locale/select' ); |
|
34 | - $this->container->get( 'twig' )->addGlobal( 'aiheader', (string) $client->getHeader() ); |
|
32 | + $shop = $this->container->get('shop'); |
|
33 | + $client = $shop->get('locale/select'); |
|
34 | + $this->container->get('twig')->addGlobal('aiheader', (string) $client->getHeader()); |
|
35 | 35 | |
36 | - return new Response( (string) $client->getBody() ); |
|
36 | + return new Response((string) $client->getBody()); |
|
37 | 37 | } |
38 | 38 | } |
@@ -31,7 +31,7 @@ discard block |
||
31 | 31 | * |
32 | 32 | * @param Container $container Container object to access parameters |
33 | 33 | */ |
34 | - public function __construct( Container $container ) |
|
34 | + public function __construct(Container $container) |
|
35 | 35 | { |
36 | 36 | $this->container = $container; |
37 | 37 | } |
@@ -44,38 +44,38 @@ discard block |
||
44 | 44 | * @param string $type Configuration type ("frontend" or "backend") |
45 | 45 | * @return \Aimeos\MShop\Context\Item\Iface Context object |
46 | 46 | */ |
47 | - public function get( $locale = true, $type = 'frontend' ) |
|
47 | + public function get($locale = true, $type = 'frontend') |
|
48 | 48 | { |
49 | - $config = $this->container->get( 'aimeos.config' )->get( $type ); |
|
49 | + $config = $this->container->get('aimeos.config')->get($type); |
|
50 | 50 | |
51 | - if( self::$context === null ) |
|
51 | + if (self::$context === null) |
|
52 | 52 | { |
53 | 53 | $context = new \Aimeos\MShop\Context\Item\Standard(); |
54 | - $context->setConfig( $config ); |
|
54 | + $context->setConfig($config); |
|
55 | 55 | |
56 | - $this->addDataBaseManager( $context ); |
|
57 | - $this->addFilesystemManager( $context ); |
|
58 | - $this->addMessageQueueManager( $context ); |
|
59 | - $this->addLogger( $context ); |
|
60 | - $this->addCache( $context ); |
|
61 | - $this->addMailer( $context); |
|
62 | - $this->addProcess( $context); |
|
56 | + $this->addDataBaseManager($context); |
|
57 | + $this->addFilesystemManager($context); |
|
58 | + $this->addMessageQueueManager($context); |
|
59 | + $this->addLogger($context); |
|
60 | + $this->addCache($context); |
|
61 | + $this->addMailer($context); |
|
62 | + $this->addProcess($context); |
|
63 | 63 | |
64 | 64 | self::$context = $context; |
65 | 65 | } |
66 | 66 | |
67 | 67 | $context = self::$context; |
68 | - $context->setConfig( $config ); |
|
68 | + $context->setConfig($config); |
|
69 | 69 | |
70 | - if( $locale === true ) |
|
70 | + if ($locale === true) |
|
71 | 71 | { |
72 | - $localeItem = $this->container->get('aimeos.locale')->get( $context ); |
|
73 | - $context->setI18n( $this->container->get('aimeos.i18n')->get( array( $localeItem->getLanguageId() ) ) ); |
|
74 | - $context->setLocale( $localeItem ); |
|
72 | + $localeItem = $this->container->get('aimeos.locale')->get($context); |
|
73 | + $context->setI18n($this->container->get('aimeos.i18n')->get(array($localeItem->getLanguageId()))); |
|
74 | + $context->setLocale($localeItem); |
|
75 | 75 | } |
76 | 76 | |
77 | - $this->addSession( $context ); |
|
78 | - $this->addUserGroups( $context); |
|
77 | + $this->addSession($context); |
|
78 | + $this->addUserGroups($context); |
|
79 | 79 | |
80 | 80 | return $context; |
81 | 81 | } |
@@ -87,11 +87,11 @@ discard block |
||
87 | 87 | * @param \Aimeos\MShop\Context\Item\Iface $context Context object including config |
88 | 88 | * @return \Aimeos\MShop\Context\Item\Iface Modified context object |
89 | 89 | */ |
90 | - protected function addCache( \Aimeos\MShop\Context\Item\Iface $context ) |
|
90 | + protected function addCache(\Aimeos\MShop\Context\Item\Iface $context) |
|
91 | 91 | { |
92 | - $cache = new \Aimeos\MAdmin\Cache\Proxy\Standard( $context ); |
|
92 | + $cache = new \Aimeos\MAdmin\Cache\Proxy\Standard($context); |
|
93 | 93 | |
94 | - return $context->setCache( $cache ); |
|
94 | + return $context->setCache($cache); |
|
95 | 95 | } |
96 | 96 | |
97 | 97 | |
@@ -101,11 +101,11 @@ discard block |
||
101 | 101 | * @param \Aimeos\MShop\Context\Item\Iface $context Context object |
102 | 102 | * @return \Aimeos\MShop\Context\Item\Iface Modified context object |
103 | 103 | */ |
104 | - protected function addDatabaseManager( \Aimeos\MShop\Context\Item\Iface $context ) |
|
104 | + protected function addDatabaseManager(\Aimeos\MShop\Context\Item\Iface $context) |
|
105 | 105 | { |
106 | - $dbm = new \Aimeos\MW\DB\Manager\DBAL( $context->getConfig() ); |
|
106 | + $dbm = new \Aimeos\MW\DB\Manager\DBAL($context->getConfig()); |
|
107 | 107 | |
108 | - return $context->setDatabaseManager( $dbm ); |
|
108 | + return $context->setDatabaseManager($dbm); |
|
109 | 109 | } |
110 | 110 | |
111 | 111 | |
@@ -115,11 +115,11 @@ discard block |
||
115 | 115 | * @param \Aimeos\MShop\Context\Item\Iface $context Context object |
116 | 116 | * @return \Aimeos\MShop\Context\Item\Iface Modified context object |
117 | 117 | */ |
118 | - protected function addFilesystemManager( \Aimeos\MShop\Context\Item\Iface $context ) |
|
118 | + protected function addFilesystemManager(\Aimeos\MShop\Context\Item\Iface $context) |
|
119 | 119 | { |
120 | - $fs = new \Aimeos\MW\Filesystem\Manager\Standard( $context->getConfig() ); |
|
120 | + $fs = new \Aimeos\MW\Filesystem\Manager\Standard($context->getConfig()); |
|
121 | 121 | |
122 | - return $context->setFilesystemManager( $fs ); |
|
122 | + return $context->setFilesystemManager($fs); |
|
123 | 123 | } |
124 | 124 | |
125 | 125 | |
@@ -129,11 +129,11 @@ discard block |
||
129 | 129 | * @param \Aimeos\MShop\Context\Item\Iface $context Context object |
130 | 130 | * @return \Aimeos\MShop\Context\Item\Iface Modified context object |
131 | 131 | */ |
132 | - protected function addLogger( \Aimeos\MShop\Context\Item\Iface $context ) |
|
132 | + protected function addLogger(\Aimeos\MShop\Context\Item\Iface $context) |
|
133 | 133 | { |
134 | - $logger = \Aimeos\MAdmin::create( $context, 'log' ); |
|
134 | + $logger = \Aimeos\MAdmin::create($context, 'log'); |
|
135 | 135 | |
136 | - return $context->setLogger( $logger ); |
|
136 | + return $context->setLogger($logger); |
|
137 | 137 | } |
138 | 138 | |
139 | 139 | |
@@ -144,12 +144,12 @@ discard block |
||
144 | 144 | * @param \Aimeos\MShop\Context\Item\Iface $context Context object |
145 | 145 | * @return \Aimeos\MShop\Context\Item\Iface Modified context object |
146 | 146 | */ |
147 | - protected function addMailer( \Aimeos\MShop\Context\Item\Iface $context ) |
|
147 | + protected function addMailer(\Aimeos\MShop\Context\Item\Iface $context) |
|
148 | 148 | { |
149 | 149 | $container = $this->container; |
150 | - $mail = new \Aimeos\MW\Mail\Swift( function() use ( $container) { return $container->get( 'mailer' ); } ); |
|
150 | + $mail = new \Aimeos\MW\Mail\Swift(function() use ($container) { return $container->get('mailer'); } ); |
|
151 | 151 | |
152 | - return $context->setMail( $mail ); |
|
152 | + return $context->setMail($mail); |
|
153 | 153 | } |
154 | 154 | |
155 | 155 | |
@@ -159,11 +159,11 @@ discard block |
||
159 | 159 | * @param \Aimeos\MShop\Context\Item\Iface $context Context object |
160 | 160 | * @return \Aimeos\MShop\Context\Item\Iface Modified context object |
161 | 161 | */ |
162 | - protected function addMessageQueueManager( \Aimeos\MShop\Context\Item\Iface $context ) |
|
162 | + protected function addMessageQueueManager(\Aimeos\MShop\Context\Item\Iface $context) |
|
163 | 163 | { |
164 | - $mq = new \Aimeos\MW\MQueue\Manager\Standard( $context->getConfig() ); |
|
164 | + $mq = new \Aimeos\MW\MQueue\Manager\Standard($context->getConfig()); |
|
165 | 165 | |
166 | - return $context->setMessageQueueManager( $mq ); |
|
166 | + return $context->setMessageQueueManager($mq); |
|
167 | 167 | } |
168 | 168 | |
169 | 169 | |
@@ -173,16 +173,16 @@ discard block |
||
173 | 173 | * @param \Aimeos\MShop\Context\Item\Iface $context Context object |
174 | 174 | * @return \Aimeos\MShop\Context\Item\Iface Modified context object |
175 | 175 | */ |
176 | - protected function addProcess( \Aimeos\MShop\Context\Item\Iface $context ) |
|
176 | + protected function addProcess(\Aimeos\MShop\Context\Item\Iface $context) |
|
177 | 177 | { |
178 | 178 | $config = $context->getConfig(); |
179 | - $max = $config->get( 'pcntl_max', 4 ); |
|
180 | - $prio = $config->get( 'pcntl_priority', 19 ); |
|
179 | + $max = $config->get('pcntl_max', 4); |
|
180 | + $prio = $config->get('pcntl_priority', 19); |
|
181 | 181 | |
182 | - $process = new \Aimeos\MW\Process\Pcntl( $max, $prio ); |
|
183 | - $process = new \Aimeos\MW\Process\Decorator\Check( $process ); |
|
182 | + $process = new \Aimeos\MW\Process\Pcntl($max, $prio); |
|
183 | + $process = new \Aimeos\MW\Process\Decorator\Check($process); |
|
184 | 184 | |
185 | - return $context->setProcess( $process ); |
|
185 | + return $context->setProcess($process); |
|
186 | 186 | } |
187 | 187 | |
188 | 188 | |
@@ -192,11 +192,11 @@ discard block |
||
192 | 192 | * @param \Aimeos\MShop\Context\Item\Iface $context Context object |
193 | 193 | * @return \Aimeos\MShop\Context\Item\Iface Modified context object |
194 | 194 | */ |
195 | - protected function addSession( \Aimeos\MShop\Context\Item\Iface $context ) |
|
195 | + protected function addSession(\Aimeos\MShop\Context\Item\Iface $context) |
|
196 | 196 | { |
197 | - $session = new \Aimeos\MW\Session\Symfony2( $this->container->get( 'session' ) ); |
|
197 | + $session = new \Aimeos\MW\Session\Symfony2($this->container->get('session')); |
|
198 | 198 | |
199 | - return $context->setSession( $session ); |
|
199 | + return $context->setSession($session); |
|
200 | 200 | } |
201 | 201 | |
202 | 202 | |
@@ -206,29 +206,29 @@ discard block |
||
206 | 206 | * @param \Aimeos\MShop\Context\Item\Iface $context Context object |
207 | 207 | * @return \Aimeos\MShop\Context\Item\Iface Modified context object |
208 | 208 | */ |
209 | - protected function addUserGroups( \Aimeos\MShop\Context\Item\Iface $context ) |
|
209 | + protected function addUserGroups(\Aimeos\MShop\Context\Item\Iface $context) |
|
210 | 210 | { |
211 | 211 | $username = ''; |
212 | - $token = $this->container->get( 'security.token_storage' )->getToken(); |
|
212 | + $token = $this->container->get('security.token_storage')->getToken(); |
|
213 | 213 | |
214 | - if( is_object( $token ) && is_object( $token->getUser() ) && method_exists( $token->getUser(), 'getId' ) ) |
|
214 | + if (is_object($token) && is_object($token->getUser()) && method_exists($token->getUser(), 'getId')) |
|
215 | 215 | { |
216 | - $username = $token->getUser()->getUsername(); |
|
216 | + $username = $token->getUser()->getUsername(); |
|
217 | 217 | $userid = $token->getUser()->getId(); |
218 | - $context->setUserId( $userid ); |
|
219 | - $context->setGroupIds( function() use ( $context, $userid ) |
|
218 | + $context->setUserId($userid); |
|
219 | + $context->setGroupIds(function() use ($context, $userid) |
|
220 | 220 | { |
221 | - $manager = \Aimeos\MShop::create( $context, 'customer' ); |
|
222 | - return $manager->getItem( $userid, array( 'customer/group' ) )->getGroups(); |
|
221 | + $manager = \Aimeos\MShop::create($context, 'customer'); |
|
222 | + return $manager->getItem($userid, array('customer/group'))->getGroups(); |
|
223 | 223 | } ); |
224 | 224 | } |
225 | 225 | |
226 | - if( $username === '' && $this->container->has( 'request_stack' ) |
|
227 | - && ( $request = $this->container->get('request_stack')->getMasterRequest() ) !== null |
|
226 | + if ($username === '' && $this->container->has('request_stack') |
|
227 | + && ($request = $this->container->get('request_stack')->getMasterRequest()) !== null |
|
228 | 228 | ) { |
229 | 229 | $username = $request->getClientIp(); |
230 | 230 | } |
231 | 231 | |
232 | - return $context->setEditor( $username ); |
|
232 | + return $context->setEditor($username); |
|
233 | 233 | } |
234 | 234 | } |
@@ -32,7 +32,7 @@ discard block |
||
32 | 32 | * @param RequestStack $requestStack Current request stack |
33 | 33 | * @param Container $container Container object to access parameters |
34 | 34 | */ |
35 | - public function __construct( RequestStack $requestStack, Container $container ) |
|
35 | + public function __construct(RequestStack $requestStack, Container $container) |
|
36 | 36 | { |
37 | 37 | $this->requestStack = $requestStack; |
38 | 38 | $this->container = $container; |
@@ -47,27 +47,27 @@ discard block |
||
47 | 47 | * @param string|null $locale Code of the current language or null for no translation |
48 | 48 | * @return \Aimeos\MW\View\Iface View object |
49 | 49 | */ |
50 | - public function create( \Aimeos\MShop\Context\Item\Iface $context, array $templatePaths, $locale = null ) |
|
50 | + public function create(\Aimeos\MShop\Context\Item\Iface $context, array $templatePaths, $locale = null) |
|
51 | 51 | { |
52 | - $twig = $this->container->get( 'twig' ); |
|
53 | - $engine = new \Aimeos\MW\View\Engine\Twig( $twig ); |
|
54 | - $view = new \Aimeos\MW\View\Standard( $templatePaths, array( '.html.twig' => $engine ) ); |
|
52 | + $twig = $this->container->get('twig'); |
|
53 | + $engine = new \Aimeos\MW\View\Engine\Twig($twig); |
|
54 | + $view = new \Aimeos\MW\View\Standard($templatePaths, array('.html.twig' => $engine)); |
|
55 | 55 | |
56 | 56 | $config = $context->getConfig(); |
57 | 57 | $session = $context->getSession(); |
58 | 58 | |
59 | - $this->addCsrf( $view ); |
|
60 | - $this->addAccess( $view, $context ); |
|
61 | - $this->addConfig( $view, $config ); |
|
62 | - $this->addNumber( $view, $config ); |
|
63 | - $this->addParam( $view ); |
|
64 | - $this->addRequest( $view ); |
|
65 | - $this->addResponse( $view ); |
|
66 | - $this->addSession( $view, $session ); |
|
67 | - $this->addTranslate( $view, $locale ); |
|
68 | - $this->addUrl( $view ); |
|
59 | + $this->addCsrf($view); |
|
60 | + $this->addAccess($view, $context); |
|
61 | + $this->addConfig($view, $config); |
|
62 | + $this->addNumber($view, $config); |
|
63 | + $this->addParam($view); |
|
64 | + $this->addRequest($view); |
|
65 | + $this->addResponse($view); |
|
66 | + $this->addSession($view, $session); |
|
67 | + $this->addTranslate($view, $locale); |
|
68 | + $this->addUrl($view); |
|
69 | 69 | |
70 | - $this->initTwig( $view, $twig ); |
|
70 | + $this->initTwig($view, $twig); |
|
71 | 71 | |
72 | 72 | return $view; |
73 | 73 | } |
@@ -80,26 +80,26 @@ discard block |
||
80 | 80 | * @param \Aimeos\MShop\Context\Item\Iface $context Context object |
81 | 81 | * @return \Aimeos\MW\View\Iface Modified view object |
82 | 82 | */ |
83 | - protected function addAccess( \Aimeos\MW\View\Iface $view, \Aimeos\MShop\Context\Item\Iface $context ) |
|
83 | + protected function addAccess(\Aimeos\MW\View\Iface $view, \Aimeos\MShop\Context\Item\Iface $context) |
|
84 | 84 | { |
85 | 85 | $container = $this->container; |
86 | - $token = $this->container->get( 'security.token_storage' )->getToken(); |
|
86 | + $token = $this->container->get('security.token_storage')->getToken(); |
|
87 | 87 | |
88 | - if( is_object( $token ) && is_object( $token->getUser() ) |
|
89 | - && in_array( 'ROLE_SUPER_ADMIN', (array) $token->getUser()->getRoles() ) ) |
|
88 | + if (is_object($token) && is_object($token->getUser()) |
|
89 | + && in_array('ROLE_SUPER_ADMIN', (array) $token->getUser()->getRoles())) |
|
90 | 90 | { |
91 | - $helper = new \Aimeos\MW\View\Helper\Access\All( $view ); |
|
91 | + $helper = new \Aimeos\MW\View\Helper\Access\All($view); |
|
92 | 92 | } |
93 | 93 | else |
94 | 94 | { |
95 | - $fcn = function() use ( $container, $context ) { |
|
96 | - return $container->get( 'aimeos.support' )->getGroups( $context ); |
|
95 | + $fcn = function() use ($container, $context) { |
|
96 | + return $container->get('aimeos.support')->getGroups($context); |
|
97 | 97 | }; |
98 | 98 | |
99 | - $helper = new \Aimeos\MW\View\Helper\Access\Standard( $view, $fcn ); |
|
99 | + $helper = new \Aimeos\MW\View\Helper\Access\Standard($view, $fcn); |
|
100 | 100 | } |
101 | 101 | |
102 | - $view->addHelper( 'access', $helper ); |
|
102 | + $view->addHelper('access', $helper); |
|
103 | 103 | |
104 | 104 | return $view; |
105 | 105 | } |
@@ -112,11 +112,11 @@ discard block |
||
112 | 112 | * @param \Aimeos\MW\Config\Iface $config Configuration object |
113 | 113 | * @return \Aimeos\MW\View\Iface Modified view object |
114 | 114 | */ |
115 | - protected function addConfig( \Aimeos\MW\View\Iface $view, \Aimeos\MW\Config\Iface $config ) |
|
115 | + protected function addConfig(\Aimeos\MW\View\Iface $view, \Aimeos\MW\Config\Iface $config) |
|
116 | 116 | { |
117 | - $config = new \Aimeos\MW\Config\Decorator\Protect( clone $config, ['admin', 'client', 'resource/fs/baseurl'] ); |
|
118 | - $helper = new \Aimeos\MW\View\Helper\Config\Standard( $view, $config ); |
|
119 | - $view->addHelper( 'config', $helper ); |
|
117 | + $config = new \Aimeos\MW\Config\Decorator\Protect(clone $config, ['admin', 'client', 'resource/fs/baseurl']); |
|
118 | + $helper = new \Aimeos\MW\View\Helper\Config\Standard($view, $config); |
|
119 | + $view->addHelper('config', $helper); |
|
120 | 120 | |
121 | 121 | return $view; |
122 | 122 | } |
@@ -128,11 +128,11 @@ discard block |
||
128 | 128 | * @param \Aimeos\MW\View\Iface $view View object |
129 | 129 | * @return \Aimeos\MW\View\Iface Modified view object |
130 | 130 | */ |
131 | - protected function addCsrf( \Aimeos\MW\View\Iface $view ) |
|
131 | + protected function addCsrf(\Aimeos\MW\View\Iface $view) |
|
132 | 132 | { |
133 | - $token = $this->container->get( 'security.csrf.token_manager' )->getToken( '_token' ); |
|
134 | - $helper = new \Aimeos\MW\View\Helper\Csrf\Standard( $view, '_token', $token->getValue() ); |
|
135 | - $view->addHelper( 'csrf', $helper ); |
|
133 | + $token = $this->container->get('security.csrf.token_manager')->getToken('_token'); |
|
134 | + $helper = new \Aimeos\MW\View\Helper\Csrf\Standard($view, '_token', $token->getValue()); |
|
135 | + $view->addHelper('csrf', $helper); |
|
136 | 136 | |
137 | 137 | return $view; |
138 | 138 | } |
@@ -145,14 +145,14 @@ discard block |
||
145 | 145 | * @param \Aimeos\MW\Config\Iface $config Configuration object |
146 | 146 | * @return \Aimeos\MW\View\Iface Modified view object |
147 | 147 | */ |
148 | - protected function addNumber( \Aimeos\MW\View\Iface $view, \Aimeos\MW\Config\Iface $config ) |
|
148 | + protected function addNumber(\Aimeos\MW\View\Iface $view, \Aimeos\MW\Config\Iface $config) |
|
149 | 149 | { |
150 | - $sepDec = $config->get( 'client/html/common/format/separatorDecimal', '.' ); |
|
151 | - $sep1000 = $config->get( 'client/html/common/format/separator1000', ' ' ); |
|
152 | - $decimals = $config->get( 'client/html/common/format/decimals', 2 ); |
|
150 | + $sepDec = $config->get('client/html/common/format/separatorDecimal', '.'); |
|
151 | + $sep1000 = $config->get('client/html/common/format/separator1000', ' '); |
|
152 | + $decimals = $config->get('client/html/common/format/decimals', 2); |
|
153 | 153 | |
154 | - $helper = new \Aimeos\MW\View\Helper\Number\Standard( $view, $sepDec, $sep1000, $decimals ); |
|
155 | - $view->addHelper( 'number', $helper ); |
|
154 | + $helper = new \Aimeos\MW\View\Helper\Number\Standard($view, $sepDec, $sep1000, $decimals); |
|
155 | + $view->addHelper('number', $helper); |
|
156 | 156 | |
157 | 157 | return $view; |
158 | 158 | } |
@@ -164,17 +164,17 @@ discard block |
||
164 | 164 | * @param \Aimeos\MW\View\Iface $view View object |
165 | 165 | * @return \Aimeos\MW\View\Iface Modified view object |
166 | 166 | */ |
167 | - protected function addParam( \Aimeos\MW\View\Iface $view ) |
|
167 | + protected function addParam(\Aimeos\MW\View\Iface $view) |
|
168 | 168 | { |
169 | 169 | $params = array(); |
170 | 170 | $request = $this->requestStack->getMasterRequest(); |
171 | 171 | |
172 | - if( $request !== null ) { |
|
173 | - $params = $request->request->all() + $request->query->all() + $request->attributes->get( '_route_params' ); |
|
172 | + if ($request !== null) { |
|
173 | + $params = $request->request->all() + $request->query->all() + $request->attributes->get('_route_params'); |
|
174 | 174 | } |
175 | 175 | |
176 | - $helper = new \Aimeos\MW\View\Helper\Param\Standard( $view, $params ); |
|
177 | - $view->addHelper( 'param', $helper ); |
|
176 | + $helper = new \Aimeos\MW\View\Helper\Param\Standard($view, $params); |
|
177 | + $view->addHelper('param', $helper); |
|
178 | 178 | |
179 | 179 | return $view; |
180 | 180 | } |
@@ -186,14 +186,14 @@ discard block |
||
186 | 186 | * @param \Aimeos\MW\View\Iface $view View object |
187 | 187 | * @return \Aimeos\MW\View\Iface Modified view object |
188 | 188 | */ |
189 | - protected function addRequest( \Aimeos\MW\View\Iface $view ) |
|
189 | + protected function addRequest(\Aimeos\MW\View\Iface $view) |
|
190 | 190 | { |
191 | 191 | $request = $this->requestStack->getMasterRequest(); |
192 | 192 | |
193 | - if( $request !== null ) |
|
193 | + if ($request !== null) |
|
194 | 194 | { |
195 | - $helper = new \Aimeos\MW\View\Helper\Request\Symfony2( $view, $request ); |
|
196 | - $view->addHelper( 'request', $helper ); |
|
195 | + $helper = new \Aimeos\MW\View\Helper\Request\Symfony2($view, $request); |
|
196 | + $view->addHelper('request', $helper); |
|
197 | 197 | } |
198 | 198 | |
199 | 199 | return $view; |
@@ -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\Symfony2( $view ); |
|
212 | - $view->addHelper( 'response', $helper ); |
|
211 | + $helper = new \Aimeos\MW\View\Helper\Response\Symfony2($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->container->get( 'aimeos.i18n' )->get( array( $locale ) ); |
|
245 | + $i18n = $this->container->get('aimeos.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,30 +263,30 @@ 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 | $request = $this->requestStack->getMasterRequest(); |
270 | 270 | |
271 | - if( $request !== null ) |
|
271 | + if ($request !== null) |
|
272 | 272 | { |
273 | 273 | $attr = $request->attributes; |
274 | 274 | |
275 | - if( ( $site = $attr->get( 'site' ) ) !== null ) { |
|
275 | + if (($site = $attr->get('site')) !== null) { |
|
276 | 276 | $fixed['site'] = $site; |
277 | 277 | } |
278 | 278 | |
279 | - if( ( $lang = $attr->get( 'locale' ) ) !== null ) { |
|
279 | + if (($lang = $attr->get('locale')) !== null) { |
|
280 | 280 | $fixed['locale'] = $lang; |
281 | 281 | } |
282 | 282 | |
283 | - if( ( $currency = $attr->get( 'currency' ) ) !== null ) { |
|
283 | + if (($currency = $attr->get('currency')) !== null) { |
|
284 | 284 | $fixed['currency'] = $currency; |
285 | 285 | } |
286 | 286 | } |
287 | 287 | |
288 | - $helper = new \Aimeos\MW\View\Helper\Url\Symfony2( $view, $this->container->get( 'router' ), $fixed ); |
|
289 | - $view->addHelper( 'url', $helper ); |
|
288 | + $helper = new \Aimeos\MW\View\Helper\Url\Symfony2($view, $this->container->get('router'), $fixed); |
|
289 | + $view->addHelper('url', $helper); |
|
290 | 290 | |
291 | 291 | return $view; |
292 | 292 | } |
@@ -298,21 +298,21 @@ discard block |
||
298 | 298 | * @param \Aimeos\MW\View\Iface $view View object |
299 | 299 | * @param \Twig_Environment $twig Twig environment object |
300 | 300 | */ |
301 | - protected function initTwig( \Aimeos\MW\View\Iface $view, \Twig_Environment $twig ) |
|
301 | + protected function initTwig(\Aimeos\MW\View\Iface $view, \Twig_Environment $twig) |
|
302 | 302 | { |
303 | - $fcn = function( $key, $default = null ) use ( $view ) { |
|
304 | - return $view->config( $key, $default ); |
|
303 | + $fcn = function($key, $default = null) use ($view) { |
|
304 | + return $view->config($key, $default); |
|
305 | 305 | }; |
306 | - $twig->addFunction( new \Twig_SimpleFunction( 'aiconfig', $fcn ) ); |
|
306 | + $twig->addFunction(new \Twig_SimpleFunction('aiconfig', $fcn)); |
|
307 | 307 | |
308 | - $fcn = function( $singular, array $values = array(), $domain = 'client' ) use ( $view ) { |
|
309 | - return vsprintf( $view->translate( $domain, $singular ), $values ); |
|
308 | + $fcn = function($singular, array $values = array(), $domain = 'client') use ($view) { |
|
309 | + return vsprintf($view->translate($domain, $singular), $values); |
|
310 | 310 | }; |
311 | - $twig->addFunction( new \Twig_SimpleFunction( 'aitrans', $fcn ) ); |
|
311 | + $twig->addFunction(new \Twig_SimpleFunction('aitrans', $fcn)); |
|
312 | 312 | |
313 | - $fcn = function( $singular, $plural, $number, array $values = array(), $domain = 'client' ) use ( $view ) { |
|
314 | - return vsprintf( $view->translate( $domain, $singular, $plural, $number ), $values ); |
|
313 | + $fcn = function($singular, $plural, $number, array $values = array(), $domain = 'client') use ($view) { |
|
314 | + return vsprintf($view->translate($domain, $singular, $plural, $number), $values); |
|
315 | 315 | }; |
316 | - $twig->addFunction( new \Twig_SimpleFunction( 'aitransplural', $fcn ) ); |
|
316 | + $twig->addFunction(new \Twig_SimpleFunction('aitransplural', $fcn)); |
|
317 | 317 | } |
318 | 318 | } |
@@ -89,8 +89,7 @@ discard block |
||
89 | 89 | && in_array( 'ROLE_SUPER_ADMIN', (array) $token->getUser()->getRoles() ) ) |
90 | 90 | { |
91 | 91 | $helper = new \Aimeos\MW\View\Helper\Access\All( $view ); |
92 | - } |
|
93 | - else |
|
92 | + } else |
|
94 | 93 | { |
95 | 94 | $fcn = function() use ( $container, $context ) { |
96 | 95 | return $container->get( 'aimeos.support' )->getGroups( $context ); |
@@ -244,8 +243,7 @@ discard block |
||
244 | 243 | { |
245 | 244 | $i18n = $this->container->get( 'aimeos.i18n' )->get( array( $locale ) ); |
246 | 245 | $translation = $i18n[$locale]; |
247 | - } |
|
248 | - else |
|
246 | + } else |
|
249 | 247 | { |
250 | 248 | $translation = new \Aimeos\MW\Translation\None( 'en' ); |
251 | 249 | } |
@@ -30,15 +30,15 @@ discard block |
||
30 | 30 | * |
31 | 31 | * @param Container $container Container object to access parameters |
32 | 32 | */ |
33 | - public function __construct( Container $container ) |
|
33 | + public function __construct(Container $container) |
|
34 | 34 | { |
35 | - $this->context = $container->get( 'aimeos.context' )->get(); |
|
35 | + $this->context = $container->get('aimeos.context')->get(); |
|
36 | 36 | |
37 | 37 | $langid = $this->context->getLocale()->getLanguageId(); |
38 | - $tmplPaths = $container->get( 'aimeos' )->get()->getCustomPaths( 'client/html/templates' ); |
|
38 | + $tmplPaths = $container->get('aimeos')->get()->getCustomPaths('client/html/templates'); |
|
39 | 39 | |
40 | - $view = $container->get( 'aimeos.view' )->create( $this->context, $tmplPaths, $langid ); |
|
41 | - $this->context->setView( $view ); |
|
40 | + $view = $container->get('aimeos.view')->create($this->context, $tmplPaths, $langid); |
|
41 | + $this->context->setView($view); |
|
42 | 42 | } |
43 | 43 | |
44 | 44 | |
@@ -48,12 +48,12 @@ discard block |
||
48 | 48 | * @param string $name Name of the shop component |
49 | 49 | * @return \Aimeos\Client\Html\Iface HTML client |
50 | 50 | */ |
51 | - public function get( $name ) |
|
51 | + public function get($name) |
|
52 | 52 | { |
53 | - if( !isset( $this->objects[$name] ) ) |
|
53 | + if (!isset($this->objects[$name])) |
|
54 | 54 | { |
55 | - $client = \Aimeos\Client\Html::create( $this->context, $name ); |
|
56 | - $client->setView( $this->context->getView() ); |
|
55 | + $client = \Aimeos\Client\Html::create($this->context, $name); |
|
56 | + $client->setView($this->context->getView()); |
|
57 | 57 | $client->process(); |
58 | 58 | |
59 | 59 | $this->objects[$name] = $client; |
@@ -32,19 +32,19 @@ discard block |
||
32 | 32 | protected function configure() |
33 | 33 | { |
34 | 34 | $names = ''; |
35 | - $aimeos = new \Aimeos\Bootstrap( array() ); |
|
36 | - $cntlPaths = $aimeos->getCustomPaths( 'controller/jobs' ); |
|
37 | - $controllers = \Aimeos\Controller\Jobs::get( $this->getBareContext(), $aimeos, $cntlPaths ); |
|
35 | + $aimeos = new \Aimeos\Bootstrap(array()); |
|
36 | + $cntlPaths = $aimeos->getCustomPaths('controller/jobs'); |
|
37 | + $controllers = \Aimeos\Controller\Jobs::get($this->getBareContext(), $aimeos, $cntlPaths); |
|
38 | 38 | |
39 | - foreach( $controllers as $key => $controller ) { |
|
40 | - $names .= str_pad( $key, 30 ) . $controller->getName() . PHP_EOL; |
|
39 | + foreach ($controllers as $key => $controller) { |
|
40 | + $names .= str_pad($key, 30).$controller->getName().PHP_EOL; |
|
41 | 41 | } |
42 | 42 | |
43 | - $this->setName( self::$defaultName ); |
|
44 | - $this->setDescription( 'Executes the job controllers' ); |
|
45 | - $this->addArgument( 'jobs', InputArgument::REQUIRED, 'One or more job controller names like "admin/job customer/email/watch"' ); |
|
46 | - $this->addArgument( 'site', InputArgument::OPTIONAL, 'Site codes to execute the jobs for like "default unittest" (none for all)' ); |
|
47 | - $this->setHelp( "Available jobs are:\n" . $names ); |
|
43 | + $this->setName(self::$defaultName); |
|
44 | + $this->setDescription('Executes the job controllers'); |
|
45 | + $this->addArgument('jobs', InputArgument::REQUIRED, 'One or more job controller names like "admin/job customer/email/watch"'); |
|
46 | + $this->addArgument('site', InputArgument::OPTIONAL, 'Site codes to execute the jobs for like "default unittest" (none for all)'); |
|
47 | + $this->setHelp("Available jobs are:\n".$names); |
|
48 | 48 | } |
49 | 49 | |
50 | 50 | |
@@ -54,32 +54,32 @@ discard block |
||
54 | 54 | * @param InputInterface $input Input object |
55 | 55 | * @param OutputInterface $output Output object |
56 | 56 | */ |
57 | - protected function execute( InputInterface $input, OutputInterface $output ) |
|
57 | + protected function execute(InputInterface $input, OutputInterface $output) |
|
58 | 58 | { |
59 | 59 | $context = $this->getContext(); |
60 | 60 | $process = $context->getProcess(); |
61 | - $aimeos = $this->getContainer()->get( 'aimeos' )->get(); |
|
61 | + $aimeos = $this->getContainer()->get('aimeos')->get(); |
|
62 | 62 | |
63 | - $jobs = explode( ' ', $input->getArgument( 'jobs' ) ); |
|
64 | - $localeManager = \Aimeos\MShop::create( $context, 'locale' ); |
|
63 | + $jobs = explode(' ', $input->getArgument('jobs')); |
|
64 | + $localeManager = \Aimeos\MShop::create($context, 'locale'); |
|
65 | 65 | |
66 | - foreach( $this->getSiteItems( $context, $input ) as $siteItem ) |
|
66 | + foreach ($this->getSiteItems($context, $input) as $siteItem) |
|
67 | 67 | { |
68 | - $localeItem = $localeManager->bootstrap( $siteItem->getCode(), '', '', false ); |
|
69 | - $localeItem->setLanguageId( null ); |
|
70 | - $localeItem->setCurrencyId( null ); |
|
68 | + $localeItem = $localeManager->bootstrap($siteItem->getCode(), '', '', false); |
|
69 | + $localeItem->setLanguageId(null); |
|
70 | + $localeItem->setCurrencyId(null); |
|
71 | 71 | |
72 | - $context->setLocale( $localeItem ); |
|
72 | + $context->setLocale($localeItem); |
|
73 | 73 | |
74 | - $output->writeln( sprintf( 'Executing the Aimeos jobs for "<info>%s</info>"', $siteItem->getCode() ) ); |
|
74 | + $output->writeln(sprintf('Executing the Aimeos jobs for "<info>%s</info>"', $siteItem->getCode())); |
|
75 | 75 | |
76 | - foreach( $jobs as $jobname ) |
|
76 | + foreach ($jobs as $jobname) |
|
77 | 77 | { |
78 | - $fcn = function( $context, $aimeos, $jobname ) { |
|
79 | - \Aimeos\Controller\Jobs::create( $context, $aimeos, $jobname )->run(); |
|
78 | + $fcn = function($context, $aimeos, $jobname) { |
|
79 | + \Aimeos\Controller\Jobs::create($context, $aimeos, $jobname)->run(); |
|
80 | 80 | }; |
81 | 81 | |
82 | - $process->start( $fcn, [$context, $aimeos, $jobname], true ); |
|
82 | + $process->start($fcn, [$context, $aimeos, $jobname], true); |
|
83 | 83 | } |
84 | 84 | } |
85 | 85 | |
@@ -96,15 +96,15 @@ discard block |
||
96 | 96 | { |
97 | 97 | $ctx = new \Aimeos\MShop\Context\Item\Standard(); |
98 | 98 | |
99 | - $conf = new \Aimeos\MW\Config\PHPArray( array(), array() ); |
|
100 | - $ctx->setConfig( $conf ); |
|
99 | + $conf = new \Aimeos\MW\Config\PHPArray(array(), array()); |
|
100 | + $ctx->setConfig($conf); |
|
101 | 101 | |
102 | - $locale = \Aimeos\MShop::create( $ctx, 'locale' )->createItem(); |
|
103 | - $locale->setLanguageId( 'en' ); |
|
104 | - $ctx->setLocale( $locale ); |
|
102 | + $locale = \Aimeos\MShop::create($ctx, 'locale')->createItem(); |
|
103 | + $locale->setLanguageId('en'); |
|
104 | + $ctx->setLocale($locale); |
|
105 | 105 | |
106 | - $i18n = new \Aimeos\MW\Translation\None( 'en' ); |
|
107 | - $ctx->setI18n( array( 'en' => $i18n ) ); |
|
106 | + $i18n = new \Aimeos\MW\Translation\None('en'); |
|
107 | + $ctx->setI18n(array('en' => $i18n)); |
|
108 | 108 | |
109 | 109 | return $ctx; |
110 | 110 | } |
@@ -119,19 +119,19 @@ discard block |
||
119 | 119 | { |
120 | 120 | $container = $this->getContainer(); |
121 | 121 | $aimeos = $container->get('aimeos')->get(); |
122 | - $context = $container->get( 'aimeos.context' )->get( false, 'command' ); |
|
122 | + $context = $container->get('aimeos.context')->get(false, 'command'); |
|
123 | 123 | |
124 | - $tmplPaths = $aimeos->getCustomPaths( 'controller/jobs/templates' ); |
|
125 | - $tmplPaths = array_merge( $tmplPaths, $aimeos->getCustomPaths( 'client/html/templates' ) ); |
|
126 | - $view = $container->get('aimeos.view')->create( $context, $tmplPaths ); |
|
124 | + $tmplPaths = $aimeos->getCustomPaths('controller/jobs/templates'); |
|
125 | + $tmplPaths = array_merge($tmplPaths, $aimeos->getCustomPaths('client/html/templates')); |
|
126 | + $view = $container->get('aimeos.view')->create($context, $tmplPaths); |
|
127 | 127 | |
128 | - $langManager = \Aimeos\MShop::create( $context, 'locale/language' ); |
|
129 | - $langids = array_keys( $langManager->searchItems( $langManager->createSearch( true ) ) ); |
|
130 | - $i18n = $this->getContainer()->get( 'aimeos.i18n' )->get( $langids ); |
|
128 | + $langManager = \Aimeos\MShop::create($context, 'locale/language'); |
|
129 | + $langids = array_keys($langManager->searchItems($langManager->createSearch(true))); |
|
130 | + $i18n = $this->getContainer()->get('aimeos.i18n')->get($langids); |
|
131 | 131 | |
132 | - $context->setEditor( 'aimeos:jobs' ); |
|
133 | - $context->setView( $view ); |
|
134 | - $context->setI18n( $i18n ); |
|
132 | + $context->setEditor('aimeos:jobs'); |
|
133 | + $context->setView($view); |
|
134 | + $context->setI18n($i18n); |
|
135 | 135 | |
136 | 136 | return $context; |
137 | 137 | } |
@@ -32,13 +32,13 @@ discard block |
||
32 | 32 | */ |
33 | 33 | protected function configure() |
34 | 34 | { |
35 | - $this->setName( self::$defaultName ); |
|
36 | - $this->setDescription( 'Initialize or update the Aimeos database tables' ); |
|
37 | - $this->addArgument( 'site', InputArgument::OPTIONAL, 'Site for updating database entries', 'default' ); |
|
38 | - $this->addArgument( 'tplsite', InputArgument::OPTIONAL, 'Template site for creating or updating database entries', 'default' ); |
|
39 | - $this->addOption( 'option', null, InputOption::VALUE_REQUIRED, 'Optional setup configuration, name and value are separated by ":" like "setup/default/demo:1"', array() ); |
|
40 | - $this->addOption( 'action', null, InputOption::VALUE_REQUIRED, 'Action name that should be executed, i.e. "migrate", "rollback", "clean"', 'migrate' ); |
|
41 | - $this->addOption( 'task', null, InputOption::VALUE_REQUIRED, 'Name of the setup task that should be executed', null ); |
|
35 | + $this->setName(self::$defaultName); |
|
36 | + $this->setDescription('Initialize or update the Aimeos database tables'); |
|
37 | + $this->addArgument('site', InputArgument::OPTIONAL, 'Site for updating database entries', 'default'); |
|
38 | + $this->addArgument('tplsite', InputArgument::OPTIONAL, 'Template site for creating or updating database entries', 'default'); |
|
39 | + $this->addOption('option', null, InputOption::VALUE_REQUIRED, 'Optional setup configuration, name and value are separated by ":" like "setup/default/demo:1"', array()); |
|
40 | + $this->addOption('action', null, InputOption::VALUE_REQUIRED, 'Action name that should be executed, i.e. "migrate", "rollback", "clean"', 'migrate'); |
|
41 | + $this->addOption('task', null, InputOption::VALUE_REQUIRED, 'Name of the setup task that should be executed', null); |
|
42 | 42 | } |
43 | 43 | |
44 | 44 | |
@@ -48,44 +48,44 @@ discard block |
||
48 | 48 | * @param InputInterface $input Input object |
49 | 49 | * @param OutputInterface $output Output object |
50 | 50 | */ |
51 | - protected function execute( InputInterface $input, OutputInterface $output ) |
|
51 | + protected function execute(InputInterface $input, OutputInterface $output) |
|
52 | 52 | { |
53 | - $ctx = $this->getContainer()->get( 'aimeos.context' )->get( false, 'command' ); |
|
54 | - $ctx->setEditor( 'aimeos:setup' ); |
|
53 | + $ctx = $this->getContainer()->get('aimeos.context')->get(false, 'command'); |
|
54 | + $ctx->setEditor('aimeos:setup'); |
|
55 | 55 | |
56 | 56 | $config = $ctx->getConfig(); |
57 | - $site = $input->getArgument( 'site' ); |
|
58 | - $tplsite = $input->getArgument( 'tplsite' ); |
|
57 | + $site = $input->getArgument('site'); |
|
58 | + $tplsite = $input->getArgument('tplsite'); |
|
59 | 59 | |
60 | - $config->set( 'setup/site', $site ); |
|
61 | - $dbconfig = $this->getDbConfig( $config ); |
|
62 | - $this->setOptions( $config, $input ); |
|
60 | + $config->set('setup/site', $site); |
|
61 | + $dbconfig = $this->getDbConfig($config); |
|
62 | + $this->setOptions($config, $input); |
|
63 | 63 | |
64 | - \Aimeos\MShop::cache( false ); |
|
65 | - \Aimeos\MAdmin::cache( false ); |
|
64 | + \Aimeos\MShop::cache(false); |
|
65 | + \Aimeos\MAdmin::cache(false); |
|
66 | 66 | |
67 | - $taskPaths = $this->getContainer()->get( 'aimeos' )->get()->getSetupPaths( $tplsite ); |
|
68 | - $manager = new \Aimeos\MW\Setup\Manager\Multiple( $ctx->getDatabaseManager(), $dbconfig, $taskPaths, $ctx ); |
|
67 | + $taskPaths = $this->getContainer()->get('aimeos')->get()->getSetupPaths($tplsite); |
|
68 | + $manager = new \Aimeos\MW\Setup\Manager\Multiple($ctx->getDatabaseManager(), $dbconfig, $taskPaths, $ctx); |
|
69 | 69 | |
70 | - $output->writeln( sprintf( 'Initializing or updating the Aimeos database tables for site <info>%1$s</info>', $site ) ); |
|
70 | + $output->writeln(sprintf('Initializing or updating the Aimeos database tables for site <info>%1$s</info>', $site)); |
|
71 | 71 | |
72 | - if( ( $task = $input->getOption( 'task' ) ) && is_array( $task ) ) { |
|
73 | - $task = reset( $task ); |
|
72 | + if (($task = $input->getOption('task')) && is_array($task)) { |
|
73 | + $task = reset($task); |
|
74 | 74 | } |
75 | 75 | |
76 | - switch( $input->getOption( 'action' ) ) |
|
76 | + switch ($input->getOption('action')) |
|
77 | 77 | { |
78 | 78 | case 'migrate': |
79 | - $manager->migrate( $task ); |
|
79 | + $manager->migrate($task); |
|
80 | 80 | break; |
81 | 81 | case 'rollback': |
82 | - $manager->rollback( $task ); |
|
82 | + $manager->rollback($task); |
|
83 | 83 | break; |
84 | 84 | case 'clean': |
85 | - $manager->clean( $task ); |
|
85 | + $manager->clean($task); |
|
86 | 86 | break; |
87 | 87 | default: |
88 | - throw new \Exception( sprintf( 'Invalid setup action "%1$s"', $input->getOption( 'action' ) ) ); |
|
88 | + throw new \Exception(sprintf('Invalid setup action "%1$s"', $input->getOption('action'))); |
|
89 | 89 | } |
90 | 90 | } |
91 | 91 | |
@@ -96,14 +96,14 @@ discard block |
||
96 | 96 | * @param \Aimeos\MW\Config\Iface $conf Config object |
97 | 97 | * @return array Multi-dimensional associative list of database configuration parameters |
98 | 98 | */ |
99 | - protected function getDbConfig( \Aimeos\MW\Config\Iface $conf ) |
|
99 | + protected function getDbConfig(\Aimeos\MW\Config\Iface $conf) |
|
100 | 100 | { |
101 | - $dbconfig = $conf->get( 'resource', array() ); |
|
101 | + $dbconfig = $conf->get('resource', array()); |
|
102 | 102 | |
103 | - foreach( $dbconfig as $rname => $dbconf ) |
|
103 | + foreach ($dbconfig as $rname => $dbconf) |
|
104 | 104 | { |
105 | - if( strncmp( $rname, 'db', 2 ) !== 0 ) { |
|
106 | - unset( $dbconfig[$rname] ); |
|
105 | + if (strncmp($rname, 'db', 2) !== 0) { |
|
106 | + unset($dbconfig[$rname]); |
|
107 | 107 | } |
108 | 108 | } |
109 | 109 | |
@@ -119,12 +119,12 @@ discard block |
||
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, InputInterface $input ) |
|
122 | + protected function setOptions(\Aimeos\MW\Config\Iface $conf, InputInterface $input) |
|
123 | 123 | { |
124 | - foreach( (array) $input->getOption( 'option' ) as $option ) |
|
124 | + foreach ((array) $input->getOption('option') as $option) |
|
125 | 125 | { |
126 | - list( $name, $value ) = explode( ':', $option ); |
|
127 | - $conf->set( str_replace( '\\', '/', $name ), $value ); |
|
126 | + list($name, $value) = explode(':', $option); |
|
127 | + $conf->set(str_replace('\\', '/', $name), $value); |
|
128 | 128 | } |
129 | 129 | } |
130 | 130 | } |
@@ -31,9 +31,9 @@ discard block |
||
31 | 31 | */ |
32 | 32 | protected function configure() |
33 | 33 | { |
34 | - $this->setName( self::$defaultName ); |
|
35 | - $this->setDescription( 'Clears the content cache' ); |
|
36 | - $this->addArgument( 'site', InputArgument::OPTIONAL, 'Site codes to clear the cache like "default unittest" (none for all)' ); |
|
34 | + $this->setName(self::$defaultName); |
|
35 | + $this->setDescription('Clears the content cache'); |
|
36 | + $this->addArgument('site', InputArgument::OPTIONAL, 'Site codes to clear the cache like "default unittest" (none for all)'); |
|
37 | 37 | } |
38 | 38 | |
39 | 39 | |
@@ -43,26 +43,26 @@ discard block |
||
43 | 43 | * @param InputInterface $input Input object |
44 | 44 | * @param OutputInterface $output Output object |
45 | 45 | */ |
46 | - protected function execute( InputInterface $input, OutputInterface $output ) |
|
46 | + protected function execute(InputInterface $input, OutputInterface $output) |
|
47 | 47 | { |
48 | - $context = $this->getContainer()->get( 'aimeos.context' )->get( false, 'command' ); |
|
49 | - $context->setEditor( 'aimeos:cache' ); |
|
48 | + $context = $this->getContainer()->get('aimeos.context')->get(false, 'command'); |
|
49 | + $context->setEditor('aimeos:cache'); |
|
50 | 50 | |
51 | - $localeManager = \Aimeos\MShop::create( $context, 'locale' ); |
|
51 | + $localeManager = \Aimeos\MShop::create($context, 'locale'); |
|
52 | 52 | |
53 | - foreach( $this->getSiteItems( $context, $input ) as $siteItem ) |
|
53 | + foreach ($this->getSiteItems($context, $input) as $siteItem) |
|
54 | 54 | { |
55 | - $localeItem = $localeManager->bootstrap( $siteItem->getCode(), '', '', false ); |
|
55 | + $localeItem = $localeManager->bootstrap($siteItem->getCode(), '', '', false); |
|
56 | 56 | |
57 | 57 | $lcontext = clone $context; |
58 | - $lcontext->setLocale( $localeItem ); |
|
58 | + $lcontext->setLocale($localeItem); |
|
59 | 59 | |
60 | - $cache = new \Aimeos\MAdmin\Cache\Proxy\Standard( $lcontext ); |
|
61 | - $lcontext->setCache( $cache ); |
|
60 | + $cache = new \Aimeos\MAdmin\Cache\Proxy\Standard($lcontext); |
|
61 | + $lcontext->setCache($cache); |
|
62 | 62 | |
63 | - $output->writeln( sprintf( 'Clearing the Aimeos cache for site <info>%1$s</info>', $siteItem->getCode() ) ); |
|
63 | + $output->writeln(sprintf('Clearing the Aimeos cache for site <info>%1$s</info>', $siteItem->getCode())); |
|
64 | 64 | |
65 | - \Aimeos\MAdmin::create( $lcontext, 'cache' )->getCache()->clear(); |
|
65 | + \Aimeos\MAdmin::create($lcontext, 'cache')->getCache()->clear(); |
|
66 | 66 | } |
67 | 67 | } |
68 | 68 | } |
@@ -32,14 +32,14 @@ discard block |
||
32 | 32 | */ |
33 | 33 | protected function configure() |
34 | 34 | { |
35 | - $this->setName( self::$defaultName ); |
|
36 | - $this->setDescription( 'Creates new (admin) accounts' ); |
|
37 | - $this->addArgument( 'email', InputArgument::REQUIRED, 'E-mail address of the account that should be created' ); |
|
38 | - $this->addArgument( 'site', InputArgument::OPTIONAL, 'Site codes to create accounts for like "default"', 'default' ); |
|
39 | - $this->addOption( 'password', null, InputOption::VALUE_REQUIRED, 'Optional password for the account (will ask for if not given)' ); |
|
40 | - $this->addOption( 'super', null, InputOption::VALUE_NONE, 'If account should have super user privileges' ); |
|
41 | - $this->addOption( 'admin', null, InputOption::VALUE_NONE, 'If account should have administrator privileges' ); |
|
42 | - $this->addOption( 'editor', null, InputOption::VALUE_NONE, 'If account should have limited editor privileges' ); |
|
35 | + $this->setName(self::$defaultName); |
|
36 | + $this->setDescription('Creates new (admin) accounts'); |
|
37 | + $this->addArgument('email', InputArgument::REQUIRED, 'E-mail address of the account that should be created'); |
|
38 | + $this->addArgument('site', InputArgument::OPTIONAL, 'Site codes to create accounts for like "default"', 'default'); |
|
39 | + $this->addOption('password', null, InputOption::VALUE_REQUIRED, 'Optional password for the account (will ask for if not given)'); |
|
40 | + $this->addOption('super', null, InputOption::VALUE_NONE, 'If account should have super user privileges'); |
|
41 | + $this->addOption('admin', null, InputOption::VALUE_NONE, 'If account should have administrator privileges'); |
|
42 | + $this->addOption('editor', null, InputOption::VALUE_NONE, 'If account should have limited editor privileges'); |
|
43 | 43 | } |
44 | 44 | |
45 | 45 | |
@@ -49,54 +49,54 @@ discard block |
||
49 | 49 | * @param InputInterface $input Input object |
50 | 50 | * @param OutputInterface $output Output object |
51 | 51 | */ |
52 | - protected function execute( InputInterface $input, OutputInterface $output ) |
|
52 | + protected function execute(InputInterface $input, OutputInterface $output) |
|
53 | 53 | { |
54 | - $code = $input->getArgument( 'email' ); |
|
55 | - if( ( $password = $input->getOption( 'password' ) ) === null ) |
|
54 | + $code = $input->getArgument('email'); |
|
55 | + if (($password = $input->getOption('password')) === null) |
|
56 | 56 | { |
57 | - $helper = $this->getHelper( 'question' ); |
|
58 | - $question = new Question( 'Password' ); |
|
59 | - $question->setHidden( true ); |
|
57 | + $helper = $this->getHelper('question'); |
|
58 | + $question = new Question('Password'); |
|
59 | + $question->setHidden(true); |
|
60 | 60 | |
61 | - $password = $helper->ask( $input, $output, $question ); |
|
61 | + $password = $helper->ask($input, $output, $question); |
|
62 | 62 | } |
63 | 63 | |
64 | - $context = $this->getContainer()->get( 'aimeos.context' )->get( false, 'command' ); |
|
65 | - $context->setEditor( 'aimeos:account' ); |
|
64 | + $context = $this->getContainer()->get('aimeos.context')->get(false, 'command'); |
|
65 | + $context->setEditor('aimeos:account'); |
|
66 | 66 | |
67 | - $localeManager = \Aimeos\MShop::create( $context, 'locale' ); |
|
68 | - $localeItem = $localeManager->bootstrap( $input->getArgument( 'site' ), '', '', false ); |
|
69 | - $context->setLocale( $localeItem ); |
|
67 | + $localeManager = \Aimeos\MShop::create($context, 'locale'); |
|
68 | + $localeItem = $localeManager->bootstrap($input->getArgument('site'), '', '', false); |
|
69 | + $context->setLocale($localeItem); |
|
70 | 70 | |
71 | - $user = $this->createCustomerItem( $context, $code, $password ); |
|
71 | + $user = $this->createCustomerItem($context, $code, $password); |
|
72 | 72 | |
73 | - if( $input->getOption( 'admin' ) ) { |
|
74 | - $this->addGroup( $input, $output, $context, $user, 'admin' ); |
|
73 | + if ($input->getOption('admin')) { |
|
74 | + $this->addGroup($input, $output, $context, $user, 'admin'); |
|
75 | 75 | } |
76 | 76 | |
77 | - if( $input->getOption( 'editor' ) ) { |
|
78 | - $this->addGroup( $input, $output, $context, $user, 'editor' ); |
|
77 | + if ($input->getOption('editor')) { |
|
78 | + $this->addGroup($input, $output, $context, $user, 'editor'); |
|
79 | 79 | } |
80 | 80 | |
81 | - if( $this->getContainer()->has( 'fos_user.user_manager' ) ) |
|
81 | + if ($this->getContainer()->has('fos_user.user_manager')) |
|
82 | 82 | { |
83 | - $userManager = $this->getContainer()->get( 'fos_user.user_manager' ); |
|
83 | + $userManager = $this->getContainer()->get('fos_user.user_manager'); |
|
84 | 84 | |
85 | - if( ( $fosUser = $userManager->findUserByUsername( $code ) ) === null ) { |
|
86 | - throw new \RuntimeException( 'No user created' ); |
|
85 | + if (($fosUser = $userManager->findUserByUsername($code)) === null) { |
|
86 | + throw new \RuntimeException('No user created'); |
|
87 | 87 | } |
88 | 88 | |
89 | - $fosUser->setSuperAdmin( false ); |
|
89 | + $fosUser->setSuperAdmin(false); |
|
90 | 90 | |
91 | - if( $input->getOption( 'super' ) ) { |
|
92 | - $fosUser->setSuperAdmin( true ); |
|
91 | + if ($input->getOption('super')) { |
|
92 | + $fosUser->setSuperAdmin(true); |
|
93 | 93 | } |
94 | 94 | |
95 | - if( $input->getOption( 'admin' ) || $input->getOption( 'editor' ) ) { |
|
96 | - $fosUser->addRole( 'ROLE_ADMIN' ); |
|
95 | + if ($input->getOption('admin') || $input->getOption('editor')) { |
|
96 | + $fosUser->addRole('ROLE_ADMIN'); |
|
97 | 97 | } |
98 | 98 | |
99 | - $userManager->updateUser( $fosUser ); |
|
99 | + $userManager->updateUser($fosUser); |
|
100 | 100 | } |
101 | 101 | } |
102 | 102 | |
@@ -110,24 +110,24 @@ discard block |
||
110 | 110 | * @param \Aimeos\MShop\Customer\Item\Iface $user Aimeos customer object |
111 | 111 | * @param string $group Unique customer group code |
112 | 112 | */ |
113 | - protected function addGroup( InputInterface $input, OutputInterface $output, |
|
114 | - \Aimeos\MShop\Context\Item\Iface $context, \Aimeos\MShop\Customer\Item\Iface $user, $group ) |
|
113 | + protected function addGroup(InputInterface $input, OutputInterface $output, |
|
114 | + \Aimeos\MShop\Context\Item\Iface $context, \Aimeos\MShop\Customer\Item\Iface $user, $group) |
|
115 | 115 | { |
116 | - $output->writeln( sprintf( 'Add "%1$s" group to user "%2$s" for sites', $group, $user->getCode() ) ); |
|
116 | + $output->writeln(sprintf('Add "%1$s" group to user "%2$s" for sites', $group, $user->getCode())); |
|
117 | 117 | |
118 | - $localeManager = \Aimeos\MShop::create( $context, 'locale' ); |
|
118 | + $localeManager = \Aimeos\MShop::create($context, 'locale'); |
|
119 | 119 | |
120 | - foreach( $this->getSiteItems( $context, $input ) as $siteItem ) |
|
120 | + foreach ($this->getSiteItems($context, $input) as $siteItem) |
|
121 | 121 | { |
122 | - $localeItem = $localeManager->bootstrap( $siteItem->getCode(), '', '', false ); |
|
122 | + $localeItem = $localeManager->bootstrap($siteItem->getCode(), '', '', false); |
|
123 | 123 | |
124 | 124 | $lcontext = clone $context; |
125 | - $lcontext->setLocale( $localeItem ); |
|
125 | + $lcontext->setLocale($localeItem); |
|
126 | 126 | |
127 | - $output->writeln( '- ' . $siteItem->getCode() ); |
|
127 | + $output->writeln('- '.$siteItem->getCode()); |
|
128 | 128 | |
129 | - $groupItem = $this->getGroupItem( $lcontext, $group ); |
|
130 | - $this->addListItem( $lcontext, $user->getId(), $groupItem->getId() ); |
|
129 | + $groupItem = $this->getGroupItem($lcontext, $group); |
|
130 | + $this->addListItem($lcontext, $user->getId(), $groupItem->getId()); |
|
131 | 131 | } |
132 | 132 | } |
133 | 133 | |
@@ -139,30 +139,30 @@ discard block |
||
139 | 139 | * @param string $userid Unique user ID |
140 | 140 | * @param string $groupid Unique group ID |
141 | 141 | */ |
142 | - protected function addListItem( \Aimeos\MShop\Context\Item\Iface $context, $userid, $groupid ) |
|
142 | + protected function addListItem(\Aimeos\MShop\Context\Item\Iface $context, $userid, $groupid) |
|
143 | 143 | { |
144 | - $manager = \Aimeos\MShop::create( $context, 'customer/lists' ); |
|
144 | + $manager = \Aimeos\MShop::create($context, 'customer/lists'); |
|
145 | 145 | |
146 | 146 | $search = $manager->createSearch(); |
147 | 147 | $expr = array( |
148 | - $search->compare( '==', 'customer.lists.parentid', $userid ), |
|
149 | - $search->compare( '==', 'customer.lists.refid', $groupid ), |
|
150 | - $search->compare( '==', 'customer.lists.type', 'default' ), |
|
151 | - $search->compare( '==', 'customer.lists.domain', 'customer/group' ), |
|
148 | + $search->compare('==', 'customer.lists.parentid', $userid), |
|
149 | + $search->compare('==', 'customer.lists.refid', $groupid), |
|
150 | + $search->compare('==', 'customer.lists.type', 'default'), |
|
151 | + $search->compare('==', 'customer.lists.domain', 'customer/group'), |
|
152 | 152 | ); |
153 | - $search->setConditions( $search->combine( '&&', $expr ) ); |
|
154 | - $search->setSlice( 0, 1 ); |
|
153 | + $search->setConditions($search->combine('&&', $expr)); |
|
154 | + $search->setSlice(0, 1); |
|
155 | 155 | |
156 | - if( count( $manager->searchItems( $search ) ) === 0 ) |
|
156 | + if (count($manager->searchItems($search)) === 0) |
|
157 | 157 | { |
158 | 158 | $item = $manager->createItem(); |
159 | - $item->setDomain( 'customer/group' ); |
|
160 | - $item->setParentId( $userid ); |
|
161 | - $item->setRefId( $groupid ); |
|
162 | - $item->setType( 'default' ); |
|
163 | - $item->setStatus( 1 ); |
|
159 | + $item->setDomain('customer/group'); |
|
160 | + $item->setParentId($userid); |
|
161 | + $item->setRefId($groupid); |
|
162 | + $item->setType('default'); |
|
163 | + $item->setStatus(1); |
|
164 | 164 | |
165 | - $manager->saveItem( $item, false ); |
|
165 | + $manager->saveItem($item, false); |
|
166 | 166 | } |
167 | 167 | } |
168 | 168 | |
@@ -177,23 +177,23 @@ discard block |
||
177 | 177 | * @param string $password New user password |
178 | 178 | * @return \Aimeos\MShop\Customer\Item\Iface Aimeos customer item object |
179 | 179 | */ |
180 | - protected function createCustomerItem( \Aimeos\MShop\Context\Item\Iface $context, $email, $password ) |
|
180 | + protected function createCustomerItem(\Aimeos\MShop\Context\Item\Iface $context, $email, $password) |
|
181 | 181 | { |
182 | - $manager = \Aimeos\MShop::create( $context, 'customer' ); |
|
182 | + $manager = \Aimeos\MShop::create($context, 'customer'); |
|
183 | 183 | |
184 | 184 | try { |
185 | - $item = $manager->findItem( $email ); |
|
186 | - } catch( \Aimeos\MShop\Exception $e ) { |
|
185 | + $item = $manager->findItem($email); |
|
186 | + } catch (\Aimeos\MShop\Exception $e) { |
|
187 | 187 | $item = $manager->createItem(); |
188 | 188 | } |
189 | 189 | |
190 | - $item->setCode( $email ); |
|
191 | - $item->setLabel( $email ); |
|
192 | - $item->getPaymentAddress()->setEmail( $email ); |
|
193 | - $item->setPassword( $password ); |
|
194 | - $item->setStatus( 1 ); |
|
190 | + $item->setCode($email); |
|
191 | + $item->setLabel($email); |
|
192 | + $item->getPaymentAddress()->setEmail($email); |
|
193 | + $item->setPassword($password); |
|
194 | + $item->setStatus(1); |
|
195 | 195 | |
196 | - $manager->saveItem( $item ); |
|
196 | + $manager->saveItem($item); |
|
197 | 197 | |
198 | 198 | return $item; |
199 | 199 | } |
@@ -206,21 +206,21 @@ discard block |
||
206 | 206 | * @param string $code Unique customer group code |
207 | 207 | * @return \Aimeos\MShop\Customer\Item\Group\Iface Aimeos customer group item object |
208 | 208 | */ |
209 | - protected function getGroupItem( \Aimeos\MShop\Context\Item\Iface $context, $code ) |
|
209 | + protected function getGroupItem(\Aimeos\MShop\Context\Item\Iface $context, $code) |
|
210 | 210 | { |
211 | - $manager = \Aimeos\MShop::create( $context, 'customer/group' ); |
|
211 | + $manager = \Aimeos\MShop::create($context, 'customer/group'); |
|
212 | 212 | |
213 | 213 | try |
214 | 214 | { |
215 | - $item = $manager->findItem( $code ); |
|
215 | + $item = $manager->findItem($code); |
|
216 | 216 | } |
217 | - catch( \Aimeos\MShop\Exception $e ) |
|
217 | + catch (\Aimeos\MShop\Exception $e) |
|
218 | 218 | { |
219 | 219 | $item = $manager->createItem(); |
220 | - $item->setLabel( $code ); |
|
221 | - $item->setCode( $code ); |
|
220 | + $item->setLabel($code); |
|
221 | + $item->setCode($code); |
|
222 | 222 | |
223 | - $manager->saveItem( $item ); |
|
223 | + $manager->saveItem($item); |
|
224 | 224 | } |
225 | 225 | |
226 | 226 | return $item; |