@@ -19,50 +19,50 @@ |
||
19 | 19 | |
20 | 20 | public function testGetId() |
21 | 21 | { |
22 | - $this->assertEquals( null, $this->object->getId() ); |
|
22 | + $this->assertEquals(null, $this->object->getId()); |
|
23 | 23 | } |
24 | 24 | |
25 | 25 | |
26 | 26 | public function testGetUsername() |
27 | 27 | { |
28 | - $this->assertEquals( null, $this->object->getUsername() ); |
|
28 | + $this->assertEquals(null, $this->object->getUsername()); |
|
29 | 29 | } |
30 | 30 | |
31 | 31 | |
32 | 32 | public function testGetPassword() |
33 | 33 | { |
34 | - $this->assertEquals( null, $this->object->getPassword() ); |
|
34 | + $this->assertEquals(null, $this->object->getPassword()); |
|
35 | 35 | } |
36 | 36 | |
37 | 37 | |
38 | 38 | public function testGetSalt() |
39 | 39 | { |
40 | - $this->assertEquals( 'mshop', $this->object->getSalt() ); |
|
40 | + $this->assertEquals('mshop', $this->object->getSalt()); |
|
41 | 41 | } |
42 | 42 | |
43 | 43 | |
44 | 44 | public function testGetRoles() |
45 | 45 | { |
46 | - $this->assertEquals( array( 'ROLE_USER' ), $this->object->getRoles() ); |
|
46 | + $this->assertEquals(array('ROLE_USER'), $this->object->getRoles()); |
|
47 | 47 | } |
48 | 48 | |
49 | 49 | |
50 | 50 | public function testEraseCredentials() |
51 | 51 | { |
52 | 52 | $this->object->eraseCredentials(); |
53 | - $this->assertNull( $this->object->getPassword() ); |
|
53 | + $this->assertNull($this->object->getPassword()); |
|
54 | 54 | } |
55 | 55 | |
56 | 56 | |
57 | 57 | public function testSerialize() |
58 | 58 | { |
59 | - $this->assertEquals( 'a:3:{i:0;N;i:1;N;i:2;N;}', $this->object->serialize() ); |
|
59 | + $this->assertEquals('a:3:{i:0;N;i:1;N;i:2;N;}', $this->object->serialize()); |
|
60 | 60 | } |
61 | 61 | |
62 | 62 | |
63 | 63 | public function testUnserialize() |
64 | 64 | { |
65 | - $this->object->unserialize( 'a:3:{i:0;N;i:1;N;i:2;N;}' ); |
|
66 | - $this->assertNull( $this->object->getId() ); |
|
65 | + $this->object->unserialize('a:3:{i:0;N;i:1;N;i:2;N;}'); |
|
66 | + $this->assertNull($this->object->getId()); |
|
67 | 67 | } |
68 | 68 | } |
@@ -28,8 +28,8 @@ discard block |
||
28 | 28 | */ |
29 | 29 | public function indexAction() |
30 | 30 | { |
31 | - $params = $this->get( 'aimeos_page' )->getSections( 'basket-index' ); |
|
32 | - $response = $this->render( 'AimeosShopBundle:Basket:index.html.twig', $params ); |
|
31 | + $params = $this->get('aimeos_page')->getSections('basket-index'); |
|
32 | + $response = $this->render('AimeosShopBundle:Basket:index.html.twig', $params); |
|
33 | 33 | $response->headers->set('Cache-Control', 'no-store'); |
34 | 34 | return $response; |
35 | 35 | } |
@@ -41,7 +41,7 @@ discard block |
||
41 | 41 | */ |
42 | 42 | public function miniComponentAction() |
43 | 43 | { |
44 | - $response = $this->getOutput( 'basket/mini' ); |
|
44 | + $response = $this->getOutput('basket/mini'); |
|
45 | 45 | $response->headers->set('Cache-Control', 'no-store'); |
46 | 46 | return $response; |
47 | 47 | } |
@@ -54,7 +54,7 @@ discard block |
||
54 | 54 | */ |
55 | 55 | public function relatedComponentAction() |
56 | 56 | { |
57 | - $response = $this->getOutput( 'basket/related' ); |
|
57 | + $response = $this->getOutput('basket/related'); |
|
58 | 58 | $response->headers->set('Cache-Control', 'no-store'); |
59 | 59 | return $response; |
60 | 60 | } |
@@ -67,7 +67,7 @@ discard block |
||
67 | 67 | */ |
68 | 68 | public function standardComponentAction() |
69 | 69 | { |
70 | - $response = $this->getOutput( 'basket/standard' ); |
|
70 | + $response = $this->getOutput('basket/standard'); |
|
71 | 71 | $response->headers->set('Cache-Control', 'no-store'); |
72 | 72 | return $response; |
73 | 73 | } |
@@ -28,8 +28,8 @@ discard block |
||
28 | 28 | */ |
29 | 29 | public function confirmAction() |
30 | 30 | { |
31 | - $params = $this->get( 'aimeos_page' )->getSections( 'checkout-confirm' ); |
|
32 | - $response = $this->render( 'AimeosShopBundle:Checkout:confirm.html.twig', $params ); |
|
31 | + $params = $this->get('aimeos_page')->getSections('checkout-confirm'); |
|
32 | + $response = $this->render('AimeosShopBundle:Checkout:confirm.html.twig', $params); |
|
33 | 33 | $response->headers->set('Cache-Control', 'no-store'); |
34 | 34 | return $response; |
35 | 35 | } |
@@ -42,8 +42,8 @@ discard block |
||
42 | 42 | */ |
43 | 43 | public function indexAction() |
44 | 44 | { |
45 | - $params = $this->get( 'aimeos_page' )->getSections( 'checkout-index' ); |
|
46 | - $response = $this->render( 'AimeosShopBundle:Checkout:index.html.twig', $params ); |
|
45 | + $params = $this->get('aimeos_page')->getSections('checkout-index'); |
|
46 | + $response = $this->render('AimeosShopBundle:Checkout:index.html.twig', $params); |
|
47 | 47 | $response->headers->set('Cache-Control', 'no-store'); |
48 | 48 | return $response; |
49 | 49 | } |
@@ -56,8 +56,8 @@ discard block |
||
56 | 56 | */ |
57 | 57 | public function updateAction() |
58 | 58 | { |
59 | - $params = $this->get( 'aimeos_page' )->getSections( 'checkout-update' ); |
|
60 | - $response = $this->render( 'AimeosShopBundle:Checkout:update.html.twig', $params ); |
|
59 | + $params = $this->get('aimeos_page')->getSections('checkout-update'); |
|
60 | + $response = $this->render('AimeosShopBundle:Checkout:update.html.twig', $params); |
|
61 | 61 | $response->headers->set('Cache-Control', 'no-store'); |
62 | 62 | return $response; |
63 | 63 | } |
@@ -70,7 +70,7 @@ discard block |
||
70 | 70 | */ |
71 | 71 | public function confirmComponentAction() |
72 | 72 | { |
73 | - $response = $this->getOutput( 'checkout/confirm' ); |
|
73 | + $response = $this->getOutput('checkout/confirm'); |
|
74 | 74 | $response->headers->set('Cache-Control', 'no-store'); |
75 | 75 | return $response; |
76 | 76 | } |
@@ -83,7 +83,7 @@ discard block |
||
83 | 83 | */ |
84 | 84 | public function standardComponentAction() |
85 | 85 | { |
86 | - $response = $this->getOutput( 'checkout/standard' ); |
|
86 | + $response = $this->getOutput('checkout/standard'); |
|
87 | 87 | $response->headers->set('Cache-Control', 'no-store'); |
88 | 88 | return $response; |
89 | 89 | } |
@@ -96,7 +96,7 @@ discard block |
||
96 | 96 | */ |
97 | 97 | public function updateComponentAction() |
98 | 98 | { |
99 | - $response = $this->getOutput( 'checkout/update' ); |
|
99 | + $response = $this->getOutput('checkout/update'); |
|
100 | 100 | $response->headers->set('Cache-Control', 'no-store'); |
101 | 101 | return $response; |
102 | 102 | } |
@@ -10,14 +10,14 @@ |
||
10 | 10 | { |
11 | 11 | public function testSelectComponent() |
12 | 12 | { |
13 | - $mock = $this->getMockBuilder( 'Aimeos\ShopBundle\Controller\LocaleController' ) |
|
14 | - ->setMethods( array( 'getOutput' ) ) |
|
13 | + $mock = $this->getMockBuilder('Aimeos\ShopBundle\Controller\LocaleController') |
|
14 | + ->setMethods(array('getOutput')) |
|
15 | 15 | ->disableOriginalConstructor() |
16 | 16 | ->getMock(); |
17 | 17 | |
18 | - $response = Response::create( 'test' ); |
|
19 | - $mock->expects( $this->once() )->method( 'getOutput' )->will( $this->returnValue( $response ) ); |
|
18 | + $response = Response::create('test'); |
|
19 | + $mock->expects($this->once())->method('getOutput')->will($this->returnValue($response)); |
|
20 | 20 | |
21 | - $this->assertSame( $response, $mock->selectComponentAction() ); |
|
21 | + $this->assertSame($response, $mock->selectComponentAction()); |
|
22 | 22 | } |
23 | 23 | } |
@@ -28,9 +28,9 @@ discard block |
||
28 | 28 | */ |
29 | 29 | public function countAction() |
30 | 30 | { |
31 | - $params = $this->get( 'aimeos_page' )->getSections( 'catalog-count' ); |
|
32 | - $response = $this->render( 'AimeosShopBundle:Catalog:count.html.twig', $params )->setMaxAge( 300 ); |
|
33 | - $response->headers->set( 'Content-Type', 'application/javascript' ); |
|
31 | + $params = $this->get('aimeos_page')->getSections('catalog-count'); |
|
32 | + $response = $this->render('AimeosShopBundle:Catalog:count.html.twig', $params)->setMaxAge(300); |
|
33 | + $response->headers->set('Content-Type', 'application/javascript'); |
|
34 | 34 | return $response; |
35 | 35 | } |
36 | 36 | |
@@ -42,8 +42,8 @@ discard block |
||
42 | 42 | */ |
43 | 43 | public function detailAction() |
44 | 44 | { |
45 | - $params = $this->get( 'aimeos_page' )->getSections( 'catalog-detail' ); |
|
46 | - return $this->render( 'AimeosShopBundle:Catalog:detail.html.twig', $params ); |
|
45 | + $params = $this->get('aimeos_page')->getSections('catalog-detail'); |
|
46 | + return $this->render('AimeosShopBundle:Catalog:detail.html.twig', $params); |
|
47 | 47 | } |
48 | 48 | |
49 | 49 | |
@@ -54,8 +54,8 @@ discard block |
||
54 | 54 | */ |
55 | 55 | public function listAction() |
56 | 56 | { |
57 | - $params = $this->get( 'aimeos_page' )->getSections( 'catalog-list' ); |
|
58 | - return $this->render( 'AimeosShopBundle:Catalog:list.html.twig', $params ); |
|
57 | + $params = $this->get('aimeos_page')->getSections('catalog-list'); |
|
58 | + return $this->render('AimeosShopBundle:Catalog:list.html.twig', $params); |
|
59 | 59 | } |
60 | 60 | |
61 | 61 | |
@@ -66,9 +66,9 @@ discard block |
||
66 | 66 | */ |
67 | 67 | public function stockAction() |
68 | 68 | { |
69 | - $params = $this->get( 'aimeos_page' )->getSections( 'catalog-stock' ); |
|
70 | - $response = $this->render( 'AimeosShopBundle:Catalog:stock.html.twig', $params )->setMaxAge( 30 ); |
|
71 | - $response->headers->set( 'Content-Type', 'application/javascript' ); |
|
69 | + $params = $this->get('aimeos_page')->getSections('catalog-stock'); |
|
70 | + $response = $this->render('AimeosShopBundle:Catalog:stock.html.twig', $params)->setMaxAge(30); |
|
71 | + $response->headers->set('Content-Type', 'application/javascript'); |
|
72 | 72 | return $response; |
73 | 73 | } |
74 | 74 | |
@@ -80,9 +80,9 @@ discard block |
||
80 | 80 | */ |
81 | 81 | public function suggestAction() |
82 | 82 | { |
83 | - $params = $this->get( 'aimeos_page' )->getSections( 'catalog-suggest' ); |
|
84 | - $response = $this->render( 'AimeosShopBundle:Catalog:suggest.html.twig', $params ); |
|
85 | - $response->headers->set( 'Content-Type', 'application/json' ); |
|
83 | + $params = $this->get('aimeos_page')->getSections('catalog-suggest'); |
|
84 | + $response = $this->render('AimeosShopBundle:Catalog:suggest.html.twig', $params); |
|
85 | + $response->headers->set('Content-Type', 'application/json'); |
|
86 | 86 | return $response; |
87 | 87 | } |
88 | 88 | |
@@ -94,8 +94,8 @@ discard block |
||
94 | 94 | */ |
95 | 95 | public function countComponentAction() |
96 | 96 | { |
97 | - $response = $this->getOutput( 'catalog/count' )->setMaxAge( 300 ); |
|
98 | - $response->headers->set( 'Content-Type', 'application/javascript' ); |
|
97 | + $response = $this->getOutput('catalog/count')->setMaxAge(300); |
|
98 | + $response->headers->set('Content-Type', 'application/javascript'); |
|
99 | 99 | return $response; |
100 | 100 | } |
101 | 101 | |
@@ -107,7 +107,7 @@ discard block |
||
107 | 107 | */ |
108 | 108 | public function detailComponentAction() |
109 | 109 | { |
110 | - return $this->getOutput( 'catalog/detail' ); |
|
110 | + return $this->getOutput('catalog/detail'); |
|
111 | 111 | } |
112 | 112 | |
113 | 113 | |
@@ -118,7 +118,7 @@ discard block |
||
118 | 118 | */ |
119 | 119 | public function filterComponentAction() |
120 | 120 | { |
121 | - return $this->getOutput( 'catalog/filter' ); |
|
121 | + return $this->getOutput('catalog/filter'); |
|
122 | 122 | } |
123 | 123 | |
124 | 124 | |
@@ -129,7 +129,7 @@ discard block |
||
129 | 129 | */ |
130 | 130 | public function listComponentAction() |
131 | 131 | { |
132 | - return $this->getOutput( 'catalog/lists' ); |
|
132 | + return $this->getOutput('catalog/lists'); |
|
133 | 133 | } |
134 | 134 | |
135 | 135 | |
@@ -140,7 +140,7 @@ discard block |
||
140 | 140 | */ |
141 | 141 | public function sessionComponentAction() |
142 | 142 | { |
143 | - return $this->getOutput( 'catalog/session' ); |
|
143 | + return $this->getOutput('catalog/session'); |
|
144 | 144 | } |
145 | 145 | |
146 | 146 | |
@@ -151,7 +151,7 @@ discard block |
||
151 | 151 | */ |
152 | 152 | public function stageComponentAction() |
153 | 153 | { |
154 | - return $this->getOutput( 'catalog/stage' ); |
|
154 | + return $this->getOutput('catalog/stage'); |
|
155 | 155 | } |
156 | 156 | |
157 | 157 | |
@@ -162,8 +162,8 @@ discard block |
||
162 | 162 | */ |
163 | 163 | public function stockComponentAction() |
164 | 164 | { |
165 | - $response = $this->getOutput( 'catalog/stock' )->setMaxAge( 30 ); |
|
166 | - $response->headers->set( 'Content-Type', 'application/javascript' ); |
|
165 | + $response = $this->getOutput('catalog/stock')->setMaxAge(30); |
|
166 | + $response->headers->set('Content-Type', 'application/javascript'); |
|
167 | 167 | return $response; |
168 | 168 | } |
169 | 169 | |
@@ -175,8 +175,8 @@ discard block |
||
175 | 175 | */ |
176 | 176 | public function suggestComponentAction() |
177 | 177 | { |
178 | - $response = $this->getOutput( 'catalog/suggest' ); |
|
179 | - $response->headers->set( 'Content-Type', 'application/json' ); |
|
178 | + $response = $this->getOutput('catalog/suggest'); |
|
179 | + $response->headers->set('Content-Type', 'application/json'); |
|
180 | 180 | return $response; |
181 | 181 | } |
182 | 182 | } |
@@ -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\Log\Manager\Factory::createManager( $context ); |
|
134 | + $logger = \Aimeos\MAdmin\Log\Manager\Factory::createManager($context); |
|
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\Factory::createManager( $context, 'customer' ); |
|
222 | - return $manager->getItem( $userid, array( 'customer/group' ) )->getGroups(); |
|
221 | + $manager = \Aimeos\MShop\Factory::createManager($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 | } |
@@ -11,10 +11,10 @@ |
||
11 | 11 | { |
12 | 12 | $client = static::createClient(); |
13 | 13 | |
14 | - $client->request( 'GET', '/admin' ); |
|
14 | + $client->request('GET', '/admin'); |
|
15 | 15 | $response = $client->getResponse(); |
16 | 16 | |
17 | - $this->assertEquals( 200, $response->getStatusCode() ); |
|
18 | - $this->assertContains( '<form class="login"', $response->getContent() ); |
|
17 | + $this->assertEquals(200, $response->getStatusCode()); |
|
18 | + $this->assertContains('<form class="login"', $response->getContent()); |
|
19 | 19 | } |
20 | 20 | } |
@@ -11,72 +11,72 @@ |
||
11 | 11 | public function testAccount() |
12 | 12 | { |
13 | 13 | $client = static::createClient(); |
14 | - $client->request( 'GET', '/unittest/de/EUR/myaccount/' ); |
|
14 | + $client->request('GET', '/unittest/de/EUR/myaccount/'); |
|
15 | 15 | |
16 | - $this->assertContains( 'aimeos account-profile', $client->getResponse()->getContent() ); |
|
17 | - $this->assertContains( 'aimeos account-history', $client->getResponse()->getContent() ); |
|
18 | - $this->assertContains( 'aimeos account-favorite', $client->getResponse()->getContent() ); |
|
19 | - $this->assertContains( 'aimeos account-watch', $client->getResponse()->getContent() ); |
|
16 | + $this->assertContains('aimeos account-profile', $client->getResponse()->getContent()); |
|
17 | + $this->assertContains('aimeos account-history', $client->getResponse()->getContent()); |
|
18 | + $this->assertContains('aimeos account-favorite', $client->getResponse()->getContent()); |
|
19 | + $this->assertContains('aimeos account-watch', $client->getResponse()->getContent()); |
|
20 | 20 | } |
21 | 21 | |
22 | 22 | |
23 | 23 | public function testDownload() |
24 | 24 | { |
25 | 25 | $client = static::createClient(); |
26 | - $client->request( 'GET', '/unittest/de/EUR/myaccount/download/0' ); |
|
26 | + $client->request('GET', '/unittest/de/EUR/myaccount/download/0'); |
|
27 | 27 | |
28 | - $this->assertEquals( 401, $client->getResponse()->getStatusCode() ); |
|
28 | + $this->assertEquals(401, $client->getResponse()->getStatusCode()); |
|
29 | 29 | } |
30 | 30 | |
31 | 31 | |
32 | 32 | public function testFavoriteComponent() |
33 | 33 | { |
34 | 34 | $client = static::createClient(); |
35 | - $client->request( 'GET', '/unittest/de/EUR/test/favoritecomponent' ); |
|
35 | + $client->request('GET', '/unittest/de/EUR/test/favoritecomponent'); |
|
36 | 36 | |
37 | - $this->assertEquals( 200, $client->getResponse()->getStatusCode() ); |
|
38 | - $this->assertContains( 'aimeos account-favorite', $client->getResponse()->getContent() ); |
|
37 | + $this->assertEquals(200, $client->getResponse()->getStatusCode()); |
|
38 | + $this->assertContains('aimeos account-favorite', $client->getResponse()->getContent()); |
|
39 | 39 | } |
40 | 40 | |
41 | 41 | |
42 | 42 | public function testHistoryComponent() |
43 | 43 | { |
44 | - $mock = $this->getMockBuilder( 'Aimeos\ShopBundle\Controller\AccountController' ) |
|
45 | - ->setMethods( array( 'getOutput' ) ) |
|
44 | + $mock = $this->getMockBuilder('Aimeos\ShopBundle\Controller\AccountController') |
|
45 | + ->setMethods(array('getOutput')) |
|
46 | 46 | ->disableOriginalConstructor() |
47 | 47 | ->getMock(); |
48 | 48 | |
49 | - $response = Response::create( 'test' ); |
|
50 | - $mock->expects( $this->once() )->method( 'getOutput' )->will( $this->returnValue( $response ) ); |
|
49 | + $response = Response::create('test'); |
|
50 | + $mock->expects($this->once())->method('getOutput')->will($this->returnValue($response)); |
|
51 | 51 | |
52 | - $this->assertSame( $response, $mock->historyComponentAction() ); |
|
52 | + $this->assertSame($response, $mock->historyComponentAction()); |
|
53 | 53 | } |
54 | 54 | |
55 | 55 | |
56 | 56 | public function testProfileComponent() |
57 | 57 | { |
58 | - $mock = $this->getMockBuilder( 'Aimeos\ShopBundle\Controller\AccountController' ) |
|
59 | - ->setMethods( array( 'getOutput' ) ) |
|
58 | + $mock = $this->getMockBuilder('Aimeos\ShopBundle\Controller\AccountController') |
|
59 | + ->setMethods(array('getOutput')) |
|
60 | 60 | ->disableOriginalConstructor() |
61 | 61 | ->getMock(); |
62 | 62 | |
63 | - $response = Response::create( 'test' ); |
|
64 | - $mock->expects( $this->once() )->method( 'getOutput' )->will( $this->returnValue( $response ) ); |
|
63 | + $response = Response::create('test'); |
|
64 | + $mock->expects($this->once())->method('getOutput')->will($this->returnValue($response)); |
|
65 | 65 | |
66 | - $this->assertSame( $response, $mock->profileComponentAction() ); |
|
66 | + $this->assertSame($response, $mock->profileComponentAction()); |
|
67 | 67 | } |
68 | 68 | |
69 | 69 | |
70 | 70 | public function testWatchComponent() |
71 | 71 | { |
72 | - $mock = $this->getMockBuilder( 'Aimeos\ShopBundle\Controller\AccountController' ) |
|
73 | - ->setMethods( array( 'getOutput' ) ) |
|
72 | + $mock = $this->getMockBuilder('Aimeos\ShopBundle\Controller\AccountController') |
|
73 | + ->setMethods(array('getOutput')) |
|
74 | 74 | ->disableOriginalConstructor() |
75 | 75 | ->getMock(); |
76 | 76 | |
77 | - $response = Response::create( 'test' ); |
|
78 | - $mock->expects( $this->once() )->method( 'getOutput' )->will( $this->returnValue( $response ) ); |
|
77 | + $response = Response::create('test'); |
|
78 | + $mock->expects($this->once())->method('getOutput')->will($this->returnValue($response)); |
|
79 | 79 | |
80 | - $this->assertSame( $response, $mock->watchComponentAction() ); |
|
80 | + $this->assertSame($response, $mock->watchComponentAction()); |
|
81 | 81 | } |
82 | 82 | } |
@@ -12,12 +12,12 @@ discard block |
||
12 | 12 | $client = static::createClient(array(), array( |
13 | 13 | 'PHP_AUTH_USER' => 'admin', |
14 | 14 | 'PHP_AUTH_PW' => 'adminpass', |
15 | - ) ); |
|
15 | + )); |
|
16 | 16 | |
17 | - $client->request( 'GET', '/unittest/jqadm/file/css' ); |
|
17 | + $client->request('GET', '/unittest/jqadm/file/css'); |
|
18 | 18 | |
19 | - $this->assertEquals( 200, $client->getResponse()->getStatusCode() ); |
|
20 | - $this->assertContains( '.aimeos', $client->getResponse()->getContent() ); |
|
19 | + $this->assertEquals(200, $client->getResponse()->getStatusCode()); |
|
20 | + $this->assertContains('.aimeos', $client->getResponse()->getContent()); |
|
21 | 21 | } |
22 | 22 | |
23 | 23 | |
@@ -26,12 +26,12 @@ discard block |
||
26 | 26 | $client = static::createClient(array(), array( |
27 | 27 | 'PHP_AUTH_USER' => 'admin', |
28 | 28 | 'PHP_AUTH_PW' => 'adminpass', |
29 | - ) ); |
|
29 | + )); |
|
30 | 30 | |
31 | - $client->request( 'GET', '/unittest/jqadm/file/js' ); |
|
31 | + $client->request('GET', '/unittest/jqadm/file/js'); |
|
32 | 32 | |
33 | - $this->assertEquals( 200, $client->getResponse()->getStatusCode() ); |
|
34 | - $this->assertContains( 'Aimeos = {', $client->getResponse()->getContent() ); |
|
33 | + $this->assertEquals(200, $client->getResponse()->getStatusCode()); |
|
34 | + $this->assertContains('Aimeos = {', $client->getResponse()->getContent()); |
|
35 | 35 | } |
36 | 36 | |
37 | 37 | |
@@ -40,13 +40,13 @@ discard block |
||
40 | 40 | $client = static::createClient(array(), array( |
41 | 41 | 'PHP_AUTH_USER' => 'admin', |
42 | 42 | 'PHP_AUTH_PW' => 'adminpass', |
43 | - ) ); |
|
43 | + )); |
|
44 | 44 | |
45 | - $client->request( 'GET', '/unittest/jqadm/copy/product/0' ); |
|
45 | + $client->request('GET', '/unittest/jqadm/copy/product/0'); |
|
46 | 46 | $response = $client->getResponse(); |
47 | 47 | |
48 | - $this->assertEquals( 200, $response->getStatusCode() ); |
|
49 | - $this->assertContains( 'item-product', $response->getContent() ); |
|
48 | + $this->assertEquals(200, $response->getStatusCode()); |
|
49 | + $this->assertContains('item-product', $response->getContent()); |
|
50 | 50 | } |
51 | 51 | |
52 | 52 | |
@@ -55,13 +55,13 @@ discard block |
||
55 | 55 | $client = static::createClient(array(), array( |
56 | 56 | 'PHP_AUTH_USER' => 'admin', |
57 | 57 | 'PHP_AUTH_PW' => 'adminpass', |
58 | - ) ); |
|
58 | + )); |
|
59 | 59 | |
60 | - $client->request( 'GET', '/unittest/jqadm/create/product' ); |
|
60 | + $client->request('GET', '/unittest/jqadm/create/product'); |
|
61 | 61 | $response = $client->getResponse(); |
62 | 62 | |
63 | - $this->assertEquals( 200, $response->getStatusCode() ); |
|
64 | - $this->assertContains( 'item-product', $response->getContent() ); |
|
63 | + $this->assertEquals(200, $response->getStatusCode()); |
|
64 | + $this->assertContains('item-product', $response->getContent()); |
|
65 | 65 | } |
66 | 66 | |
67 | 67 | |
@@ -70,13 +70,13 @@ discard block |
||
70 | 70 | $client = static::createClient(array(), array( |
71 | 71 | 'PHP_AUTH_USER' => 'admin', |
72 | 72 | 'PHP_AUTH_PW' => 'adminpass', |
73 | - ) ); |
|
73 | + )); |
|
74 | 74 | |
75 | - $client->request( 'GET', '/unittest/jqadm/delete/product/0' ); |
|
75 | + $client->request('GET', '/unittest/jqadm/delete/product/0'); |
|
76 | 76 | $response = $client->getResponse(); |
77 | 77 | |
78 | - $this->assertEquals( 200, $response->getStatusCode() ); |
|
79 | - $this->assertContains( 'list-items', $response->getContent() ); |
|
78 | + $this->assertEquals(200, $response->getStatusCode()); |
|
79 | + $this->assertContains('list-items', $response->getContent()); |
|
80 | 80 | } |
81 | 81 | |
82 | 82 | |
@@ -85,13 +85,13 @@ discard block |
||
85 | 85 | $client = static::createClient(array(), array( |
86 | 86 | 'PHP_AUTH_USER' => 'admin', |
87 | 87 | 'PHP_AUTH_PW' => 'adminpass', |
88 | - ) ); |
|
88 | + )); |
|
89 | 89 | |
90 | - $client->request( 'GET', '/unittest/jqadm/export/order' ); |
|
90 | + $client->request('GET', '/unittest/jqadm/export/order'); |
|
91 | 91 | $response = $client->getResponse(); |
92 | 92 | |
93 | - $this->assertEquals( 200, $response->getStatusCode() ); |
|
94 | - $this->assertContains( 'list-items', $response->getContent() ); |
|
93 | + $this->assertEquals(200, $response->getStatusCode()); |
|
94 | + $this->assertContains('list-items', $response->getContent()); |
|
95 | 95 | } |
96 | 96 | |
97 | 97 | |
@@ -100,13 +100,13 @@ discard block |
||
100 | 100 | $client = static::createClient(array(), array( |
101 | 101 | 'PHP_AUTH_USER' => 'admin', |
102 | 102 | 'PHP_AUTH_PW' => 'adminpass', |
103 | - ) ); |
|
103 | + )); |
|
104 | 104 | |
105 | - $client->request( 'GET', '/unittest/jqadm/get/product/0' ); |
|
105 | + $client->request('GET', '/unittest/jqadm/get/product/0'); |
|
106 | 106 | $response = $client->getResponse(); |
107 | 107 | |
108 | - $this->assertEquals( 200, $response->getStatusCode() ); |
|
109 | - $this->assertContains( 'item-product', $response->getContent() ); |
|
108 | + $this->assertEquals(200, $response->getStatusCode()); |
|
109 | + $this->assertContains('item-product', $response->getContent()); |
|
110 | 110 | } |
111 | 111 | |
112 | 112 | |
@@ -115,13 +115,13 @@ discard block |
||
115 | 115 | $client = static::createClient(array(), array( |
116 | 116 | 'PHP_AUTH_USER' => 'admin', |
117 | 117 | 'PHP_AUTH_PW' => 'adminpass', |
118 | - ) ); |
|
118 | + )); |
|
119 | 119 | |
120 | - $client->request( 'POST', '/unittest/jqadm/save/product' ); |
|
120 | + $client->request('POST', '/unittest/jqadm/save/product'); |
|
121 | 121 | $response = $client->getResponse(); |
122 | 122 | |
123 | - $this->assertEquals( 200, $response->getStatusCode() ); |
|
124 | - $this->assertContains( 'item-product', $response->getContent() ); |
|
123 | + $this->assertEquals(200, $response->getStatusCode()); |
|
124 | + $this->assertContains('item-product', $response->getContent()); |
|
125 | 125 | } |
126 | 126 | |
127 | 127 | |
@@ -130,13 +130,13 @@ discard block |
||
130 | 130 | $client = static::createClient(array(), array( |
131 | 131 | 'PHP_AUTH_USER' => 'admin', |
132 | 132 | 'PHP_AUTH_PW' => 'adminpass', |
133 | - ) ); |
|
133 | + )); |
|
134 | 134 | |
135 | - $client->request( 'GET', '/unittest/jqadm/search/product' ); |
|
135 | + $client->request('GET', '/unittest/jqadm/search/product'); |
|
136 | 136 | $response = $client->getResponse(); |
137 | 137 | |
138 | - $this->assertEquals( 200, $response->getStatusCode() ); |
|
139 | - $this->assertContains( 'list-items', $response->getContent() ); |
|
138 | + $this->assertEquals(200, $response->getStatusCode()); |
|
139 | + $this->assertContains('list-items', $response->getContent()); |
|
140 | 140 | } |
141 | 141 | |
142 | 142 | |
@@ -145,11 +145,11 @@ discard block |
||
145 | 145 | $client = static::createClient(array(), array( |
146 | 146 | 'PHP_AUTH_USER' => 'admin', |
147 | 147 | 'PHP_AUTH_PW' => 'adminpass', |
148 | - ) ); |
|
148 | + )); |
|
149 | 149 | |
150 | - $client->request( 'GET', '/invalid/jqadm/search/product' ); |
|
150 | + $client->request('GET', '/invalid/jqadm/search/product'); |
|
151 | 151 | $response = $client->getResponse(); |
152 | 152 | |
153 | - $this->assertEquals( 500, $response->getStatusCode() ); |
|
153 | + $this->assertEquals(500, $response->getStatusCode()); |
|
154 | 154 | } |
155 | 155 | } |