@@ -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 | } |
@@ -75,9 +75,12 @@ |
||
75 | 75 | { |
76 | 76 | $localeManager = \Aimeos\MShop::create( $context, 'locale' ); |
77 | 77 | |
78 | - try { |
|
78 | + try |
|
79 | + { |
|
79 | 80 | $localeItem = $localeManager->bootstrap( $site, '', '', false, null, true ); |
80 | - } catch( \Aimeos\MShop\Exception $e ) { |
|
81 | + } |
|
82 | + catch( \Aimeos\MShop\Exception $e ) |
|
83 | + { |
|
81 | 84 | $localeItem = $localeManager->createItem(); |
82 | 85 | } |
83 | 86 |
@@ -209,7 +209,7 @@ discard block |
||
209 | 209 | * |
210 | 210 | * @param string $company New company name |
211 | 211 | */ |
212 | - public function setCompany($company) |
|
212 | + public function setCompany( $company ) |
|
213 | 213 | { |
214 | 214 | $this->company = (string) $company; |
215 | 215 | } |
@@ -231,7 +231,7 @@ discard block |
||
231 | 231 | * |
232 | 232 | * @param string $vatid New vatid |
233 | 233 | */ |
234 | - public function setVatID($vatid) |
|
234 | + public function setVatID( $vatid ) |
|
235 | 235 | { |
236 | 236 | $this->vatid = (string) $vatid; |
237 | 237 | } |
@@ -253,7 +253,7 @@ discard block |
||
253 | 253 | * |
254 | 254 | * @param string $salutation Salutation constant defined in \Aimeos\MShop\Common\Item\Address\Base |
255 | 255 | */ |
256 | - public function setSalutation($salutation) |
|
256 | + public function setSalutation( $salutation ) |
|
257 | 257 | { |
258 | 258 | switch( $salutation ) |
259 | 259 | { |
@@ -287,7 +287,7 @@ discard block |
||
287 | 287 | * |
288 | 288 | * @param string $title New title of the person |
289 | 289 | */ |
290 | - public function setTitle($title) |
|
290 | + public function setTitle( $title ) |
|
291 | 291 | { |
292 | 292 | $this->title = (string) $title; |
293 | 293 | } |
@@ -309,7 +309,7 @@ discard block |
||
309 | 309 | * |
310 | 310 | * @param string $firstname New first name of the person |
311 | 311 | */ |
312 | - public function setFirstname($firstname) |
|
312 | + public function setFirstname( $firstname ) |
|
313 | 313 | { |
314 | 314 | $this->firstname = (string) $firstname; |
315 | 315 | } |
@@ -331,7 +331,7 @@ discard block |
||
331 | 331 | * |
332 | 332 | * @param string $lastname New last name of the person |
333 | 333 | */ |
334 | - public function setLastname($lastname) |
|
334 | + public function setLastname( $lastname ) |
|
335 | 335 | { |
336 | 336 | $this->lastname = (string) $lastname; |
337 | 337 | } |
@@ -353,7 +353,7 @@ discard block |
||
353 | 353 | * |
354 | 354 | * @param string $address1 New first address part |
355 | 355 | */ |
356 | - public function setAddress1($address1) |
|
356 | + public function setAddress1( $address1 ) |
|
357 | 357 | { |
358 | 358 | $this->address1 = (string) $address1; |
359 | 359 | } |
@@ -375,7 +375,7 @@ discard block |
||
375 | 375 | * |
376 | 376 | * @param string $address2 New second address part |
377 | 377 | */ |
378 | - public function setAddress2($address2) |
|
378 | + public function setAddress2( $address2 ) |
|
379 | 379 | { |
380 | 380 | $this->address2 = (string) $address2; |
381 | 381 | } |
@@ -397,7 +397,7 @@ discard block |
||
397 | 397 | * |
398 | 398 | * @param string $address3 New third address part |
399 | 399 | */ |
400 | - public function setAddress3($address3) |
|
400 | + public function setAddress3( $address3 ) |
|
401 | 401 | { |
402 | 402 | $this->address3 = (string) $address3; |
403 | 403 | } |
@@ -419,7 +419,7 @@ discard block |
||
419 | 419 | * |
420 | 420 | * @param string $postal New postal code |
421 | 421 | */ |
422 | - public function setPostal($postal) |
|
422 | + public function setPostal( $postal ) |
|
423 | 423 | { |
424 | 424 | $this->postal = (string) $postal; |
425 | 425 | } |
@@ -441,7 +441,7 @@ discard block |
||
441 | 441 | * |
442 | 442 | * @param string $city New city name |
443 | 443 | */ |
444 | - public function setCity($city) |
|
444 | + public function setCity( $city ) |
|
445 | 445 | { |
446 | 446 | $this->city = (string) $city; |
447 | 447 | } |
@@ -463,7 +463,7 @@ discard block |
||
463 | 463 | * |
464 | 464 | * @param string $state New state name |
465 | 465 | */ |
466 | - public function setState($state) |
|
466 | + public function setState( $state ) |
|
467 | 467 | { |
468 | 468 | $this->state = (string) $state; |
469 | 469 | } |
@@ -474,7 +474,7 @@ discard block |
||
474 | 474 | * |
475 | 475 | * @param string $countryid Unique ID of the country |
476 | 476 | */ |
477 | - public function setCountryId($countryid) |
|
477 | + public function setCountryId( $countryid ) |
|
478 | 478 | { |
479 | 479 | $this->countryid = strtoupper( (string) $countryid ); |
480 | 480 | } |
@@ -496,7 +496,7 @@ discard block |
||
496 | 496 | * |
497 | 497 | * @param string $langid Unique ID of the language |
498 | 498 | */ |
499 | - public function setLanguageId($langid) |
|
499 | + public function setLanguageId( $langid ) |
|
500 | 500 | { |
501 | 501 | $this->langid = strtolower( (string) $langid ); |
502 | 502 | } |
@@ -529,7 +529,7 @@ discard block |
||
529 | 529 | * |
530 | 530 | * @param string $telephone New telephone number |
531 | 531 | */ |
532 | - public function setTelephone($telephone) |
|
532 | + public function setTelephone( $telephone ) |
|
533 | 533 | { |
534 | 534 | $this->telephone = (string) $telephone; |
535 | 535 | } |
@@ -551,7 +551,7 @@ discard block |
||
551 | 551 | * |
552 | 552 | * @param string $telefax New telefax number |
553 | 553 | */ |
554 | - public function setTelefax($telefax) |
|
554 | + public function setTelefax( $telefax ) |
|
555 | 555 | { |
556 | 556 | $this->telefax = (string) $telefax; |
557 | 557 | } |
@@ -573,7 +573,7 @@ discard block |
||
573 | 573 | * |
574 | 574 | * @param string $website New website URL |
575 | 575 | */ |
576 | - public function setWebsite($website) |
|
576 | + public function setWebsite( $website ) |
|
577 | 577 | { |
578 | 578 | $pattern = '#^([a-z]+://)?[a-zA-Z0-9\-]+(\.[a-zA-Z0-9\-]+)+(:[0-9]+)?(/.*)?$#'; |
579 | 579 | |
@@ -601,7 +601,7 @@ discard block |
||
601 | 601 | * |
602 | 602 | * @param float $value New longitude value |
603 | 603 | */ |
604 | - public function setLongitude($value) |
|
604 | + public function setLongitude( $value ) |
|
605 | 605 | { |
606 | 606 | $this->longitude = (float) $value; |
607 | 607 | } |
@@ -623,7 +623,7 @@ discard block |
||
623 | 623 | * |
624 | 624 | * @param float $value New latitude value |
625 | 625 | */ |
626 | - public function setLatitude($value) |
|
626 | + public function setLatitude( $value ) |
|
627 | 627 | { |
628 | 628 | $this->latitude = (float) $value; |
629 | 629 | } |
@@ -118,12 +118,12 @@ |
||
118 | 118 | protected function getContext() |
119 | 119 | { |
120 | 120 | $container = $this->getContainer(); |
121 | - $aimeos = $container->get('aimeos')->get(); |
|
121 | + $aimeos = $container->get( 'aimeos' )->get(); |
|
122 | 122 | $context = $container->get( 'aimeos.context' )->get( false, 'command' ); |
123 | 123 | |
124 | 124 | $tmplPaths = $aimeos->getCustomPaths( 'controller/jobs/templates' ); |
125 | 125 | $tmplPaths = array_merge( $tmplPaths, $aimeos->getCustomPaths( 'client/html/templates' ) ); |
126 | - $view = $container->get('aimeos.view')->create( $context, $tmplPaths ); |
|
126 | + $view = $container->get( 'aimeos.view' )->create( $context, $tmplPaths ); |
|
127 | 127 | |
128 | 128 | $langManager = \Aimeos\MShop::create( $context, 'locale/language' ); |
129 | 129 | $langids = array_keys( $langManager->searchItems( $langManager->createSearch( true ) ) ); |
@@ -33,22 +33,22 @@ |
||
33 | 33 | |
34 | 34 | $rootNode |
35 | 35 | ->children() |
36 | - ->booleanNode('disable_sites')->defaultValue( true )->end() |
|
37 | - ->booleanNode('apc_enable')->defaultValue( false )->end() |
|
38 | - ->scalarNode('apc_prefix')->defaultValue( 'sf2:' )->end() |
|
39 | - ->scalarNode('extdir')->end() |
|
40 | - ->scalarNode('uploaddir')->end() |
|
41 | - ->variableNode('admin')->defaultValue( array() )->end() |
|
42 | - ->variableNode('client')->defaultValue( array() )->end() |
|
43 | - ->variableNode('controller')->defaultValue( array() )->end() |
|
44 | - ->variableNode('i18n')->defaultValue( array() )->end() |
|
45 | - ->variableNode('madmin')->defaultValue( array() )->end() |
|
46 | - ->variableNode('mshop')->defaultValue( array() )->end() |
|
47 | - ->variableNode('resource')->defaultValue( array() )->end() |
|
48 | - ->variableNode('page')->defaultValue( array() )->end() |
|
49 | - ->variableNode('backend')->defaultValue( array() )->end() |
|
50 | - ->variableNode('frontend')->defaultValue( array() )->end() |
|
51 | - ->variableNode('command')->defaultValue( array() )->end() |
|
36 | + ->booleanNode( 'disable_sites' )->defaultValue( true )->end() |
|
37 | + ->booleanNode( 'apc_enable' )->defaultValue( false )->end() |
|
38 | + ->scalarNode( 'apc_prefix' )->defaultValue( 'sf2:' )->end() |
|
39 | + ->scalarNode( 'extdir' )->end() |
|
40 | + ->scalarNode( 'uploaddir' )->end() |
|
41 | + ->variableNode( 'admin' )->defaultValue( array() )->end() |
|
42 | + ->variableNode( 'client' )->defaultValue( array() )->end() |
|
43 | + ->variableNode( 'controller' )->defaultValue( array() )->end() |
|
44 | + ->variableNode( 'i18n' )->defaultValue( array() )->end() |
|
45 | + ->variableNode( 'madmin' )->defaultValue( array() )->end() |
|
46 | + ->variableNode( 'mshop' )->defaultValue( array() )->end() |
|
47 | + ->variableNode( 'resource' )->defaultValue( array() )->end() |
|
48 | + ->variableNode( 'page' )->defaultValue( array() )->end() |
|
49 | + ->variableNode( 'backend' )->defaultValue( array() )->end() |
|
50 | + ->variableNode( 'frontend' )->defaultValue( array() )->end() |
|
51 | + ->variableNode( 'command' )->defaultValue( array() )->end() |
|
52 | 52 | ->end() |
53 | 53 | ; |
54 | 54 |
@@ -127,10 +127,10 @@ |
||
127 | 127 | $templatePaths = $aimeos->getCustomPaths( 'admin/jsonadm/templates' ); |
128 | 128 | |
129 | 129 | $context = $this->get( 'aimeos.context' )->get( false, 'backend' ); |
130 | - $context->setI18n( $this->get('aimeos.i18n')->get( array( $lang, 'en' ) ) ); |
|
131 | - $context->setLocale( $this->get('aimeos.locale')->getBackend( $context, $site ) ); |
|
130 | + $context->setI18n( $this->get( 'aimeos.i18n' )->get( array( $lang, 'en' ) ) ); |
|
131 | + $context->setLocale( $this->get( 'aimeos.locale' )->getBackend( $context, $site ) ); |
|
132 | 132 | |
133 | - $view = $this->get('aimeos.view')->create( $context, $templatePaths, $lang ); |
|
133 | + $view = $this->get( 'aimeos.view' )->create( $context, $templatePaths, $lang ); |
|
134 | 134 | $context->setView( $view ); |
135 | 135 | |
136 | 136 | return \Aimeos\Admin\JsonAdm::create( $context, $aimeos, $resource ); |
@@ -41,7 +41,7 @@ |
||
41 | 41 | |
42 | 42 | |
43 | 43 | public function testFilterTree() |
44 | - { |
|
44 | + { |
|
45 | 45 | $client = static::createClient(); |
46 | 46 | $crawler = $client->request( 'GET', '/unittest/de/EUR/shop/' ); |
47 | 47 |
@@ -39,7 +39,7 @@ discard block |
||
39 | 39 | } |
40 | 40 | |
41 | 41 | $response = $this->render( '@AimeosShop/Checkout/confirm.html.twig', $params ); |
42 | - $response->headers->set('Cache-Control', 'no-store'); |
|
42 | + $response->headers->set( 'Cache-Control', 'no-store' ); |
|
43 | 43 | return $response; |
44 | 44 | } |
45 | 45 | |
@@ -61,7 +61,7 @@ discard block |
||
61 | 61 | } |
62 | 62 | |
63 | 63 | $response = $this->render( '@AimeosShop/Checkout/index.html.twig', $params ); |
64 | - $response->headers->set('Cache-Control', 'no-store'); |
|
64 | + $response->headers->set( 'Cache-Control', 'no-store' ); |
|
65 | 65 | return $response; |
66 | 66 | } |
67 | 67 | |
@@ -83,7 +83,7 @@ discard block |
||
83 | 83 | } |
84 | 84 | |
85 | 85 | $response = $this->render( '@AimeosShop/Checkout/update.html.twig', $params ); |
86 | - $response->headers->set('Cache-Control', 'no-store'); |
|
86 | + $response->headers->set( 'Cache-Control', 'no-store' ); |
|
87 | 87 | return $response; |
88 | 88 | } |
89 | 89 | |
@@ -99,7 +99,7 @@ discard block |
||
99 | 99 | $this->container->get( 'twig' )->addGlobal( 'aiheader', (string) $client->getHeader() ); |
100 | 100 | |
101 | 101 | $response = new Response( (string) $client->getBody() ); |
102 | - $response->headers->set('Cache-Control', 'no-store'); |
|
102 | + $response->headers->set( 'Cache-Control', 'no-store' ); |
|
103 | 103 | return $response; |
104 | 104 | } |
105 | 105 | |
@@ -115,7 +115,7 @@ discard block |
||
115 | 115 | $this->container->get( 'twig' )->addGlobal( 'aiheader', (string) $client->getHeader() ); |
116 | 116 | |
117 | 117 | $response = new Response( (string) $client->getBody() ); |
118 | - $response->headers->set('Cache-Control', 'no-store'); |
|
118 | + $response->headers->set( 'Cache-Control', 'no-store' ); |
|
119 | 119 | return $response; |
120 | 120 | } |
121 | 121 | |
@@ -131,7 +131,7 @@ discard block |
||
131 | 131 | $this->container->get( 'twig' )->addGlobal( 'aiheader', (string) $client->getHeader() ); |
132 | 132 | |
133 | 133 | $response = new Response( (string) $client->getBody() ); |
134 | - $response->headers->set('Cache-Control', 'no-store'); |
|
134 | + $response->headers->set( 'Cache-Control', 'no-store' ); |
|
135 | 135 | return $response; |
136 | 136 | } |
137 | 137 | } |
@@ -38,8 +38,8 @@ discard block |
||
38 | 38 | $params['aibody'][$name] = $shop->get( $name )->getBody(); |
39 | 39 | } |
40 | 40 | |
41 | - $response = $this->render( '@AimeosShop/Basket/index.html.twig', $params ); |
|
42 | - $response->headers->set('Cache-Control', 'no-store'); |
|
41 | + $response = $this->render( '@AimeosShop/Basket/index.html.twig', $params ); |
|
42 | + $response->headers->set( 'Cache-Control', 'no-store' ); |
|
43 | 43 | return $response; |
44 | 44 | } |
45 | 45 | |
@@ -54,7 +54,7 @@ discard block |
||
54 | 54 | $this->container->get( 'twig' )->addGlobal( 'aiheader', (string) $client->getHeader() ); |
55 | 55 | |
56 | 56 | $response = new Response( (string) $client->getBody() ); |
57 | - $response->headers->set('Cache-Control', 'no-store'); |
|
57 | + $response->headers->set( 'Cache-Control', 'no-store' ); |
|
58 | 58 | return $response; |
59 | 59 | } |
60 | 60 | |
@@ -70,7 +70,7 @@ discard block |
||
70 | 70 | $this->container->get( 'twig' )->addGlobal( 'aiheader', (string) $client->getHeader() ); |
71 | 71 | |
72 | 72 | $response = new Response( (string) $client->getBody() ); |
73 | - $response->headers->set('Cache-Control', 'no-store'); |
|
73 | + $response->headers->set( 'Cache-Control', 'no-store' ); |
|
74 | 74 | return $response; |
75 | 75 | } |
76 | 76 | |
@@ -86,7 +86,7 @@ discard block |
||
86 | 86 | $this->container->get( 'twig' )->addGlobal( 'aiheader', (string) $client->getHeader() ); |
87 | 87 | |
88 | 88 | $response = new Response( (string) $client->getBody() ); |
89 | - $response->headers->set('Cache-Control', 'no-store'); |
|
89 | + $response->headers->set( 'Cache-Control', 'no-store' ); |
|
90 | 90 | return $response; |
91 | 91 | } |
92 | 92 | } |