@@ -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_ADMIN', (array) $token->getUser()->getRoles() ) ) |
|
88 | + if (is_object($token) && is_object($token->getUser()) |
|
89 | + && in_array('ROLE_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, array( 'admin', 'client' ) ); |
|
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, array('admin', 'client')); |
|
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 | } |