Completed
Push — master ( 866fb8...8bb600 )
by Aimeos
03:28
created
controller/frontend/tests/Controller/Frontend/Catalog/StandardTest.php 1 patch
Spacing   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -19,13 +19,13 @@  discard block
 block discarded – undo
19 19
 	protected function setUp()
20 20
 	{
21 21
 		$this->context = \TestHelperFrontend::getContext();
22
-		$this->object = new \Aimeos\Controller\Frontend\Catalog\Standard( $this->context );
22
+		$this->object = new \Aimeos\Controller\Frontend\Catalog\Standard($this->context);
23 23
 	}
24 24
 
25 25
 
26 26
 	protected function tearDown()
27 27
 	{
28
-		unset( $this->object, $this->context );
28
+		unset($this->object, $this->context);
29 29
 	}
30 30
 
31 31
 
@@ -33,19 +33,19 @@  discard block
 block discarded – undo
33 33
 	{
34 34
 		$filter = $this->object->createFilter();
35 35
 
36
-		$this->assertInstanceOf( '\\Aimeos\\MW\\Criteria\\Iface', $filter );
36
+		$this->assertInstanceOf('\\Aimeos\\MW\\Criteria\\Iface', $filter);
37 37
 	}
38 38
 
39 39
 
40 40
 	public function testGetPath()
41 41
 	{
42
-		$manager = \Aimeos\MShop\Factory::createManager( $this->context, 'catalog' );
43
-		$items = $this->object->getPath( $manager->findItem( 'cafe' )->getId() );
42
+		$manager = \Aimeos\MShop\Factory::createManager($this->context, 'catalog');
43
+		$items = $this->object->getPath($manager->findItem('cafe')->getId());
44 44
 
45
-		$this->assertEquals( 3, count( $items ) );
45
+		$this->assertEquals(3, count($items));
46 46
 
47
-		foreach( $items as $item ) {
48
-			$this->assertInstanceOf( '\\Aimeos\\MShop\\Catalog\\Item\\Iface', $item );
47
+		foreach ($items as $item) {
48
+			$this->assertInstanceOf('\\Aimeos\\MShop\\Catalog\\Item\\Iface', $item);
49 49
 		}
50 50
 	}
51 51
 
@@ -54,10 +54,10 @@  discard block
 block discarded – undo
54 54
 	{
55 55
 		$tree = $this->object->getTree();
56 56
 
57
-		$this->assertEquals( 2, count( $tree->getChildren() ) );
57
+		$this->assertEquals(2, count($tree->getChildren()));
58 58
 
59
-		foreach( $tree->getChildren() as $item ) {
60
-			$this->assertInstanceOf( '\\Aimeos\\MShop\\Catalog\\Item\\Iface', $item );
59
+		foreach ($tree->getChildren() as $item) {
60
+			$this->assertInstanceOf('\\Aimeos\\MShop\\Catalog\\Item\\Iface', $item);
61 61
 		}
62 62
 	}
63 63
 }
Please login to merge, or discard this patch.
controller/frontend/src/Controller/Frontend/Catalog/Iface.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -37,7 +37,7 @@  discard block
 block discarded – undo
37 37
 	 * @return array Associative list of items implementing \Aimeos\MShop\Catalog\Item\Iface with their IDs as keys
38 38
 	 * @since 2017.03
39 39
 	 */
40
-	public function getPath( $id, array $domains = array( 'text', 'media' ) );
40
+	public function getPath($id, array $domains = array('text', 'media'));
41 41
 
42 42
 
43 43
 	/**
@@ -51,6 +51,6 @@  discard block
 block discarded – undo
51 51
 	 * @return \Aimeos\MShop\Catalog\Item\Iface Catalog node, maybe with children depending on the level constant
52 52
 	 * @since 2017.03
53 53
 	 */
54
-	public function getTree( $id = null, array $domains = array( 'text', 'media' ),
55
-		$level = \Aimeos\MW\Tree\Manager\Base::LEVEL_TREE, \Aimeos\MW\Criteria\Iface $search = null );
54
+	public function getTree($id = null, array $domains = array('text', 'media'),
55
+		$level = \Aimeos\MW\Tree\Manager\Base::LEVEL_TREE, \Aimeos\MW\Criteria\Iface $search = null);
56 56
 }
Please login to merge, or discard this patch.
controller/frontend/src/Controller/Frontend/Catalog/Standard.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -30,7 +30,7 @@  discard block
 block discarded – undo
30 30
 	 */
31 31
 	public function createFilter()
32 32
 	{
33
-		return \Aimeos\MShop\Factory::createManager( $this->getContext(), 'catalog' )->createSearch( true );
33
+		return \Aimeos\MShop\Factory::createManager($this->getContext(), 'catalog')->createSearch(true);
34 34
 	}
35 35
 
36 36
 
@@ -42,9 +42,9 @@  discard block
 block discarded – undo
42 42
 	 * @return array Associative list of items implementing \Aimeos\MShop\Catalog\Item\Iface with their IDs as keys
43 43
 	 * @since 2017.03
44 44
 	 */
45
-	public function getPath( $id, array $domains = array( 'text', 'media' ) )
45
+	public function getPath($id, array $domains = array('text', 'media'))
46 46
 	{
47
-		return \Aimeos\MShop\Factory::createManager( $this->getContext(), 'catalog' )->getPath( $id, $domains );
47
+		return \Aimeos\MShop\Factory::createManager($this->getContext(), 'catalog')->getPath($id, $domains);
48 48
 	}
49 49
 
50 50
 
@@ -59,9 +59,9 @@  discard block
 block discarded – undo
59 59
 	 * @return \Aimeos\MShop\Catalog\Item\Iface Catalog node, maybe with children depending on the level constant
60 60
 	 * @since 2017.03
61 61
 	 */
62
-	public function getTree( $id = null, array $domains = array( 'text', 'media' ),
63
-		$level = \Aimeos\MW\Tree\Manager\Base::LEVEL_TREE, \Aimeos\MW\Criteria\Iface $search = null )
62
+	public function getTree($id = null, array $domains = array('text', 'media'),
63
+		$level = \Aimeos\MW\Tree\Manager\Base::LEVEL_TREE, \Aimeos\MW\Criteria\Iface $search = null)
64 64
 	{
65
-		return \Aimeos\MShop\Factory::createManager( $this->getContext(), 'catalog' )->getTree( $id, $domains, $level, $search );
65
+		return \Aimeos\MShop\Factory::createManager($this->getContext(), 'catalog')->getTree($id, $domains, $level, $search);
66 66
 	}
67 67
 }
Please login to merge, or discard this patch.
controller/frontend/tests/Controller/Frontend/Basket/BaseTest.php 1 patch
Spacing   +138 added lines, -138 removed lines patch added patch discarded remove patch
@@ -16,53 +16,53 @@  discard block
 block discarded – undo
16 16
 	protected function setUp()
17 17
 	{
18 18
 		$this->context = \TestHelperFrontend::getContext();
19
-		\Aimeos\MShop\Factory::setCache( true );
19
+		\Aimeos\MShop\Factory::setCache(true);
20 20
 	}
21 21
 
22 22
 
23 23
 	protected function tearDown()
24 24
 	{
25
-		\Aimeos\MShop\Factory::setCache( false );
26
-		$this->context->getSession()->set( 'aimeos', [] );
25
+		\Aimeos\MShop\Factory::setCache(false);
26
+		$this->context->getSession()->set('aimeos', []);
27 27
 
28
-		unset( $this->context );
28
+		unset($this->context);
29 29
 	}
30 30
 
31 31
 
32 32
 	public function testCheckLocale()
33 33
 	{
34
-		$object = $this->getMockBuilder( '\Aimeos\Controller\Frontend\Basket\Standard' )
35
-			->setConstructorArgs( [$this->context] )
36
-			->setMethods( null )
34
+		$object = $this->getMockBuilder('\Aimeos\Controller\Frontend\Basket\Standard')
35
+			->setConstructorArgs([$this->context])
36
+			->setMethods(null)
37 37
 			->getMock();
38 38
 
39
-		$this->context->getSession()->set( 'aimeos/basket/locale', 'unittest|en|EUR' );
40
-		$this->access( 'checkLocale' )->invokeArgs( $object, [$this->context->getLocale(), 'unittest'] );
39
+		$this->context->getSession()->set('aimeos/basket/locale', 'unittest|en|EUR');
40
+		$this->access('checkLocale')->invokeArgs($object, [$this->context->getLocale(), 'unittest']);
41 41
 	}
42 42
 
43 43
 
44 44
 	public function testCopyAddresses()
45 45
 	{
46
-		$manager = \Aimeos\MShop\Factory::createManager( \TestHelperFrontend::getContext(), 'order/base' );
46
+		$manager = \Aimeos\MShop\Factory::createManager(\TestHelperFrontend::getContext(), 'order/base');
47 47
 		$ordBaseItem = $manager->createItem();
48 48
 
49
-		$address = $this->getAddress( 'Example company' );
50
-		$ordBaseItem->setAddress( $address, \Aimeos\MShop\Order\Item\Base\Address\Base::TYPE_PAYMENT );
49
+		$address = $this->getAddress('Example company');
50
+		$ordBaseItem->setAddress($address, \Aimeos\MShop\Order\Item\Base\Address\Base::TYPE_PAYMENT);
51 51
 
52 52
 
53
-		$object = $this->getMockBuilder( '\Aimeos\Controller\Frontend\Basket\Standard' )
54
-			->setConstructorArgs( [$this->context] )
55
-			->setMethods( null )
53
+		$object = $this->getMockBuilder('\Aimeos\Controller\Frontend\Basket\Standard')
54
+			->setConstructorArgs([$this->context])
55
+			->setMethods(null)
56 56
 			->getMock();
57 57
 
58
-		$result = $this->access( 'copyAddresses' )->invokeArgs( $object, [$ordBaseItem, ['test'], 'unittest|en|EUR'] );
58
+		$result = $this->access('copyAddresses')->invokeArgs($object, [$ordBaseItem, ['test'], 'unittest|en|EUR']);
59 59
 
60 60
 
61
-		$this->assertEquals( ['test'], $result );
62
-		$this->assertEquals( 1, count( $object->get()->getAddresses() ) );
61
+		$this->assertEquals(['test'], $result);
62
+		$this->assertEquals(1, count($object->get()->getAddresses()));
63 63
 
64
-		$addr = $object->get()->getAddress( \Aimeos\MShop\Order\Item\Base\Address\Base::TYPE_PAYMENT );
65
-		$this->assertInstanceOf( '\Aimeos\MShop\Order\Item\Base\Address\Iface', $addr );
64
+		$addr = $object->get()->getAddress(\Aimeos\MShop\Order\Item\Base\Address\Base::TYPE_PAYMENT);
65
+		$this->assertInstanceOf('\Aimeos\MShop\Order\Item\Base\Address\Iface', $addr);
66 66
 
67 67
 		$object->clear();
68 68
 	}
@@ -70,54 +70,54 @@  discard block
 block discarded – undo
70 70
 
71 71
 	public function testCopyAddressesException()
72 72
 	{
73
-		$manager = \Aimeos\MShop\Factory::createManager( \TestHelperFrontend::getContext(), 'order/base' );
73
+		$manager = \Aimeos\MShop\Factory::createManager(\TestHelperFrontend::getContext(), 'order/base');
74 74
 		$ordBaseItem = $manager->createItem();
75 75
 
76
-		$address = $this->getAddress( 'Example company' );
77
-		$ordBaseItem->setAddress( $address, \Aimeos\MShop\Order\Item\Base\Address\Base::TYPE_PAYMENT );
76
+		$address = $this->getAddress('Example company');
77
+		$ordBaseItem->setAddress($address, \Aimeos\MShop\Order\Item\Base\Address\Base::TYPE_PAYMENT);
78 78
 
79 79
 
80
-		$object = $this->getMockBuilder( '\Aimeos\Controller\Frontend\Basket\Standard' )
81
-			->setConstructorArgs( [$this->context] )
82
-			->setMethods( ['setAddress'] )
80
+		$object = $this->getMockBuilder('\Aimeos\Controller\Frontend\Basket\Standard')
81
+			->setConstructorArgs([$this->context])
82
+			->setMethods(['setAddress'])
83 83
 			->getMock();
84 84
 
85
-		$object->expects( $this->once() )->method( 'setAddress' )->will( $this->throwException( new \Exception() ) );
85
+		$object->expects($this->once())->method('setAddress')->will($this->throwException(new \Exception()));
86 86
 
87
-		$result = $this->access( 'copyAddresses' )->invokeArgs( $object, [$ordBaseItem, [], 'unittest|en|EUR'] );
87
+		$result = $this->access('copyAddresses')->invokeArgs($object, [$ordBaseItem, [], 'unittest|en|EUR']);
88 88
 
89
-		$this->assertEquals( 1, count( $result ) );
90
-		$this->assertArrayHasKey( 'address', $result );
89
+		$this->assertEquals(1, count($result));
90
+		$this->assertArrayHasKey('address', $result);
91 91
 	}
92 92
 
93 93
 
94 94
 	public function testCopyCoupon()
95 95
 	{
96
-		$manager = \Aimeos\MShop\Factory::createManager( \TestHelperFrontend::getContext(), 'order/base' );
96
+		$manager = \Aimeos\MShop\Factory::createManager(\TestHelperFrontend::getContext(), 'order/base');
97 97
 		$ordBaseItem = $manager->createItem();
98 98
 
99
-		$product = \Aimeos\MShop\Factory::createManager( $this->context, 'product' )->findItem( 'CNC', ['price'] );
100
-		$ordProdManager = \Aimeos\MShop\Factory::createManager( $this->context, 'order/base/product' );
101
-		$ordProdItem = $ordProdManager->createItem()->copyFrom( $product );
99
+		$product = \Aimeos\MShop\Factory::createManager($this->context, 'product')->findItem('CNC', ['price']);
100
+		$ordProdManager = \Aimeos\MShop\Factory::createManager($this->context, 'order/base/product');
101
+		$ordProdItem = $ordProdManager->createItem()->copyFrom($product);
102 102
 
103
-		$priceItems = $product->getRefItems( 'price' );
104
-		$ordProdItem->setPrice( reset( $priceItems ) );
103
+		$priceItems = $product->getRefItems('price');
104
+		$ordProdItem->setPrice(reset($priceItems));
105 105
 
106
-		$ordBaseItem->addProduct( $ordProdItem );
107
-		$ordBaseItem->addCoupon( 'OPQR', [] );
106
+		$ordBaseItem->addProduct($ordProdItem);
107
+		$ordBaseItem->addCoupon('OPQR', []);
108 108
 
109 109
 
110
-		$object = $this->getMockBuilder( '\Aimeos\Controller\Frontend\Basket\Standard' )
111
-			->setConstructorArgs( [$this->context] )
112
-			->setMethods( null )
110
+		$object = $this->getMockBuilder('\Aimeos\Controller\Frontend\Basket\Standard')
111
+			->setConstructorArgs([$this->context])
112
+			->setMethods(null)
113 113
 			->getMock();
114 114
 
115
-		$object->addProduct( $product->getId() );
115
+		$object->addProduct($product->getId());
116 116
 
117
-		$result = $this->access( 'copyCoupons' )->invokeArgs( $object, [$ordBaseItem, ['test'], 'unittest|en|EUR'] );
117
+		$result = $this->access('copyCoupons')->invokeArgs($object, [$ordBaseItem, ['test'], 'unittest|en|EUR']);
118 118
 
119 119
 
120
-		$this->assertEquals( ['test'], $result );
120
+		$this->assertEquals(['test'], $result);
121 121
 
122 122
 		$object->clear();
123 123
 	}
@@ -125,48 +125,48 @@  discard block
 block discarded – undo
125 125
 
126 126
 	public function testCopyCouponException()
127 127
 	{
128
-		$manager = \Aimeos\MShop\Factory::createManager( \TestHelperFrontend::getContext(), 'order/base' );
128
+		$manager = \Aimeos\MShop\Factory::createManager(\TestHelperFrontend::getContext(), 'order/base');
129 129
 		$ordBaseItem = $manager->createItem();
130 130
 
131
-		$ordBaseItem->addCoupon( '90AB', [] );
131
+		$ordBaseItem->addCoupon('90AB', []);
132 132
 
133 133
 
134
-		$object = $this->getMockBuilder( '\Aimeos\Controller\Frontend\Basket\Standard' )
135
-			->setConstructorArgs( [$this->context] )
136
-			->setMethods( ['addCoupon'] )
134
+		$object = $this->getMockBuilder('\Aimeos\Controller\Frontend\Basket\Standard')
135
+			->setConstructorArgs([$this->context])
136
+			->setMethods(['addCoupon'])
137 137
 			->getMock();
138 138
 
139
-		$object->expects( $this->once() )->method( 'addCoupon' )->will( $this->throwException( new \Exception() ) );
139
+		$object->expects($this->once())->method('addCoupon')->will($this->throwException(new \Exception()));
140 140
 
141
-		$result = $this->access( 'copyCoupons' )->invokeArgs( $object, [$ordBaseItem, [], 'unittest|en|EUR'] );
141
+		$result = $this->access('copyCoupons')->invokeArgs($object, [$ordBaseItem, [], 'unittest|en|EUR']);
142 142
 
143
-		$this->assertEquals( 1, count( $result ) );
144
-		$this->assertArrayHasKey( 'coupon', $result );
143
+		$this->assertEquals(1, count($result));
144
+		$this->assertArrayHasKey('coupon', $result);
145 145
 	}
146 146
 
147 147
 
148 148
 	public function testCopyProduct()
149 149
 	{
150
-		$manager = \Aimeos\MShop\Factory::createManager( \TestHelperFrontend::getContext(), 'order/base' );
150
+		$manager = \Aimeos\MShop\Factory::createManager(\TestHelperFrontend::getContext(), 'order/base');
151 151
 		$ordBaseItem = $manager->createItem();
152 152
 
153
-		$product = \Aimeos\MShop\Factory::createManager( $this->context, 'product' )->findItem( 'CNC' );
154
-		$ordProdManager = \Aimeos\MShop\Factory::createManager( $this->context, 'order/base/product' );
155
-		$ordProdItem = $ordProdManager->createItem()->copyFrom( $product );
156
-		$ordBaseItem->addProduct( $ordProdItem );
153
+		$product = \Aimeos\MShop\Factory::createManager($this->context, 'product')->findItem('CNC');
154
+		$ordProdManager = \Aimeos\MShop\Factory::createManager($this->context, 'order/base/product');
155
+		$ordProdItem = $ordProdManager->createItem()->copyFrom($product);
156
+		$ordBaseItem->addProduct($ordProdItem);
157 157
 
158 158
 
159
-		$object = $this->getMockBuilder( '\Aimeos\Controller\Frontend\Basket\Standard' )
160
-			->setConstructorArgs( [$this->context] )
161
-			->setMethods( null )
159
+		$object = $this->getMockBuilder('\Aimeos\Controller\Frontend\Basket\Standard')
160
+			->setConstructorArgs([$this->context])
161
+			->setMethods(null)
162 162
 			->getMock();
163 163
 
164
-		$result = $this->access( 'copyProducts' )->invokeArgs( $object, [$ordBaseItem, ['test'], 'unittest|en|EUR'] );
164
+		$result = $this->access('copyProducts')->invokeArgs($object, [$ordBaseItem, ['test'], 'unittest|en|EUR']);
165 165
 
166 166
 
167
-		$this->assertEquals( ['test'], $result );
168
-		$this->assertEquals( 1, count( $object->get()->getProducts() ) );
169
-		$this->assertInstanceOf( '\Aimeos\MShop\Order\Item\Base\Product\Iface', $object->get()->getProduct( 0 ) );
167
+		$this->assertEquals(['test'], $result);
168
+		$this->assertEquals(1, count($object->get()->getProducts()));
169
+		$this->assertInstanceOf('\Aimeos\MShop\Order\Item\Base\Product\Iface', $object->get()->getProduct(0));
170 170
 
171 171
 		$object->clear();
172 172
 	}
@@ -174,58 +174,58 @@  discard block
 block discarded – undo
174 174
 
175 175
 	public function testCopyProductException()
176 176
 	{
177
-		$manager = \Aimeos\MShop\Factory::createManager( \TestHelperFrontend::getContext(), 'order/base' );
177
+		$manager = \Aimeos\MShop\Factory::createManager(\TestHelperFrontend::getContext(), 'order/base');
178 178
 		$ordBaseItem = $manager->createItem();
179 179
 
180
-		$product = \Aimeos\MShop\Factory::createManager( $this->context, 'product' )->findItem( 'CNC' );
181
-		$ordProdManager = \Aimeos\MShop\Factory::createManager( $this->context, 'order/base/product' );
182
-		$ordProdItem = $ordProdManager->createItem()->copyFrom( $product );
183
-		$ordBaseItem->addProduct( $ordProdItem );
180
+		$product = \Aimeos\MShop\Factory::createManager($this->context, 'product')->findItem('CNC');
181
+		$ordProdManager = \Aimeos\MShop\Factory::createManager($this->context, 'order/base/product');
182
+		$ordProdItem = $ordProdManager->createItem()->copyFrom($product);
183
+		$ordBaseItem->addProduct($ordProdItem);
184 184
 
185 185
 
186
-		$object = $this->getMockBuilder( '\Aimeos\Controller\Frontend\Basket\Standard' )
187
-			->setConstructorArgs( [$this->context] )
188
-			->setMethods( ['addProduct'] )
186
+		$object = $this->getMockBuilder('\Aimeos\Controller\Frontend\Basket\Standard')
187
+			->setConstructorArgs([$this->context])
188
+			->setMethods(['addProduct'])
189 189
 			->getMock();
190 190
 
191
-		$object->expects( $this->once() )->method( 'addProduct' )->will( $this->throwException( new \Exception() ) );
191
+		$object->expects($this->once())->method('addProduct')->will($this->throwException(new \Exception()));
192 192
 
193
-		$result = $this->access( 'copyProducts' )->invokeArgs( $object, [$ordBaseItem, [], 'unittest|en|EUR'] );
193
+		$result = $this->access('copyProducts')->invokeArgs($object, [$ordBaseItem, [], 'unittest|en|EUR']);
194 194
 
195
-		$this->assertEquals( 1, count( $result ) );
196
-		$this->assertArrayHasKey( 'product', $result );
195
+		$this->assertEquals(1, count($result));
196
+		$this->assertArrayHasKey('product', $result);
197 197
 	}
198 198
 
199 199
 
200 200
 	public function testCopyServices()
201 201
 	{
202
-		$manager = \Aimeos\MShop\Factory::createManager( \TestHelperFrontend::getContext(), 'order/base' );
202
+		$manager = \Aimeos\MShop\Factory::createManager(\TestHelperFrontend::getContext(), 'order/base');
203 203
 		$ordBaseItem = $manager->createItem();
204 204
 
205
-		$serviceManager = \Aimeos\MShop\Factory::createManager( $this->context, 'service' );
206
-		$ordServManager = \Aimeos\MShop\Factory::createManager( $this->context, 'order/base/service' );
205
+		$serviceManager = \Aimeos\MShop\Factory::createManager($this->context, 'service');
206
+		$ordServManager = \Aimeos\MShop\Factory::createManager($this->context, 'order/base/service');
207 207
 
208
-		$serviceItem = $serviceManager->findItem( 'unitcode', [], 'service', 'delivery' );
209
-		$ordServItem = $ordServManager->createItem()->copyFrom( $serviceItem );
208
+		$serviceItem = $serviceManager->findItem('unitcode', [], 'service', 'delivery');
209
+		$ordServItem = $ordServManager->createItem()->copyFrom($serviceItem);
210 210
 
211
-		$ordBaseItem->addService( $ordServItem, \Aimeos\MShop\Order\Item\Base\Service\Base::TYPE_DELIVERY );
211
+		$ordBaseItem->addService($ordServItem, \Aimeos\MShop\Order\Item\Base\Service\Base::TYPE_DELIVERY);
212 212
 
213 213
 
214
-		$object = $this->getMockBuilder( '\Aimeos\Controller\Frontend\Basket\Standard' )
215
-			->setConstructorArgs( [$this->context] )
216
-			->setMethods( null )
214
+		$object = $this->getMockBuilder('\Aimeos\Controller\Frontend\Basket\Standard')
215
+			->setConstructorArgs([$this->context])
216
+			->setMethods(null)
217 217
 			->getMock();
218 218
 
219
-		$result = $this->access( 'copyServices' )->invokeArgs( $object, [$ordBaseItem, ['test'], 'unittest|en|EUR'] );
219
+		$result = $this->access('copyServices')->invokeArgs($object, [$ordBaseItem, ['test'], 'unittest|en|EUR']);
220 220
 
221 221
 
222
-		$this->assertEquals( ['test'], $result );
223
-		$this->assertEquals( 1, count( $object->get()->getServices() ) );
222
+		$this->assertEquals(['test'], $result);
223
+		$this->assertEquals(1, count($object->get()->getServices()));
224 224
 
225
-		$services = $object->get()->getService( \Aimeos\MShop\Order\Item\Base\Service\Base::TYPE_DELIVERY );
225
+		$services = $object->get()->getService(\Aimeos\MShop\Order\Item\Base\Service\Base::TYPE_DELIVERY);
226 226
 
227
-		foreach( $services as $service ) {
228
-			$this->assertInstanceOf( '\Aimeos\MShop\Order\Item\Base\Service\Iface', $service );
227
+		foreach ($services as $service) {
228
+			$this->assertInstanceOf('\Aimeos\MShop\Order\Item\Base\Service\Iface', $service);
229 229
 		}
230 230
 
231 231
 		$object->clear();
@@ -234,106 +234,106 @@  discard block
 block discarded – undo
234 234
 
235 235
 	public function testCopyServicesException()
236 236
 	{
237
-		$manager = \Aimeos\MShop\Factory::createManager( \TestHelperFrontend::getContext(), 'order/base' );
237
+		$manager = \Aimeos\MShop\Factory::createManager(\TestHelperFrontend::getContext(), 'order/base');
238 238
 		$ordBaseItem = $manager->createItem();
239 239
 
240
-		$serviceManager = \Aimeos\MShop\Factory::createManager( $this->context, 'service' );
241
-		$ordServManager = \Aimeos\MShop\Factory::createManager( $this->context, 'order/base/service' );
240
+		$serviceManager = \Aimeos\MShop\Factory::createManager($this->context, 'service');
241
+		$ordServManager = \Aimeos\MShop\Factory::createManager($this->context, 'order/base/service');
242 242
 
243
-		$serviceItem = $serviceManager->findItem( 'unitcode', [], 'service', 'delivery' );
244
-		$ordServItem = $ordServManager->createItem()->copyFrom( $serviceItem );
243
+		$serviceItem = $serviceManager->findItem('unitcode', [], 'service', 'delivery');
244
+		$ordServItem = $ordServManager->createItem()->copyFrom($serviceItem);
245 245
 
246
-		$ordBaseItem->addService( $ordServItem, \Aimeos\MShop\Order\Item\Base\Service\Base::TYPE_DELIVERY );
246
+		$ordBaseItem->addService($ordServItem, \Aimeos\MShop\Order\Item\Base\Service\Base::TYPE_DELIVERY);
247 247
 
248 248
 
249
-		$object = $this->getMockBuilder( '\Aimeos\Controller\Frontend\Basket\Standard' )
250
-			->setConstructorArgs( [$this->context] )
251
-			->setMethods( ['addService'] )
249
+		$object = $this->getMockBuilder('\Aimeos\Controller\Frontend\Basket\Standard')
250
+			->setConstructorArgs([$this->context])
251
+			->setMethods(['addService'])
252 252
 			->getMock();
253 253
 
254
-		$object->expects( $this->once() )->method( 'addService' )->will( $this->throwException( new \Exception() ) );
254
+		$object->expects($this->once())->method('addService')->will($this->throwException(new \Exception()));
255 255
 
256
-		$result = $this->access( 'copyServices' )->invokeArgs( $object, [$ordBaseItem, [], 'unittest|en|EUR'] );
256
+		$result = $this->access('copyServices')->invokeArgs($object, [$ordBaseItem, [], 'unittest|en|EUR']);
257 257
 
258
-		$this->assertEquals( 0, count( $result ) );
258
+		$this->assertEquals(0, count($result));
259 259
 	}
260 260
 
261 261
 
262 262
 	public function testCreateSubscriptions()
263 263
 	{
264
-		$baseManager = \Aimeos\MShop\Factory::createManager( $this->context, 'order/base' );
264
+		$baseManager = \Aimeos\MShop\Factory::createManager($this->context, 'order/base');
265 265
 
266 266
 		$search = $baseManager->createSearch();
267
-		$search->setConditions( $search->compare( '==', 'order.base.price', '53.50' ) );
267
+		$search->setConditions($search->compare('==', 'order.base.price', '53.50'));
268 268
 
269
-		$items = $baseManager->searchItems( $search, ['order/base/product'] );
269
+		$items = $baseManager->searchItems($search, ['order/base/product']);
270 270
 
271
-		if( ( $basket = reset( $items ) ) === false ) {
272
-			throw new \Exception( sprintf( 'No order base item found for price "%1$s"', '53,50' ) );
271
+		if (($basket = reset($items)) === false) {
272
+			throw new \Exception(sprintf('No order base item found for price "%1$s"', '53,50'));
273 273
 		}
274 274
 
275
-		$object = $this->getMockBuilder( '\Aimeos\Controller\Frontend\Basket\Standard' )
276
-			->setConstructorArgs( [$this->context] )
277
-			->setMethods( ['getAttributes'] )
275
+		$object = $this->getMockBuilder('\Aimeos\Controller\Frontend\Basket\Standard')
276
+			->setConstructorArgs([$this->context])
277
+			->setMethods(['getAttributes'])
278 278
 			->getMock();
279 279
 
280
-		$stub = $this->getMockBuilder( '\Aimeos\MShop\Subscription\Manager\Standard' )
281
-			->setConstructorArgs( [$this->context] )
282
-			->setMethods( ['saveItem'] )
280
+		$stub = $this->getMockBuilder('\Aimeos\MShop\Subscription\Manager\Standard')
281
+			->setConstructorArgs([$this->context])
282
+			->setMethods(['saveItem'])
283 283
 			->getMock();
284 284
 
285
-		\Aimeos\MShop\Factory::injectManager( $this->context, 'subscription', $stub );
285
+		\Aimeos\MShop\Factory::injectManager($this->context, 'subscription', $stub);
286 286
 
287
-		$stub->expects( $this->exactly( 2 ) )->method( 'saveItem' );
287
+		$stub->expects($this->exactly(2))->method('saveItem');
288 288
 
289
-		$this->access( 'createSubscriptions' )->invokeArgs( $object, [$basket] );
289
+		$this->access('createSubscriptions')->invokeArgs($object, [$basket]);
290 290
 	}
291 291
 
292 292
 
293 293
 	public function testGetOrderProductAttributes()
294 294
 	{
295
-		$object = $this->getMockBuilder( '\Aimeos\Controller\Frontend\Basket\Standard' )
296
-			->setConstructorArgs( [$this->context] )
297
-			->setMethods( ['getAttributes'] )
295
+		$object = $this->getMockBuilder('\Aimeos\Controller\Frontend\Basket\Standard')
296
+			->setConstructorArgs([$this->context])
297
+			->setMethods(['getAttributes'])
298 298
 			->getMock();
299 299
 
300
-		$list = [1 => new \Aimeos\MShop\Attribute\Item\Standard( ['attribute.code' => 'special_instructions'] )];
301
-		$object->expects( $this->once() )->method( 'getAttributes' )->will( $this->returnValue( $list ) );
300
+		$list = [1 => new \Aimeos\MShop\Attribute\Item\Standard(['attribute.code' => 'special_instructions'])];
301
+		$object->expects($this->once())->method('getAttributes')->will($this->returnValue($list));
302 302
 
303
-		$result = $this->access( 'getOrderProductAttributes' )->invokeArgs( $object, ['test', ['1'], ['1' => 'test']] );
303
+		$result = $this->access('getOrderProductAttributes')->invokeArgs($object, ['test', ['1'], ['1' => 'test']]);
304 304
 
305
-		$this->assertEquals( 1, count( $result ) );
306
-		$this->assertEquals( 'test', $result[0]->getValue() );
305
+		$this->assertEquals(1, count($result));
306
+		$this->assertEquals('test', $result[0]->getValue());
307 307
 	}
308 308
 
309 309
 
310 310
 	/**
311 311
 	 * @param string $company
312 312
 	 */
313
-	protected function getAddress( $company )
313
+	protected function getAddress($company)
314 314
 	{
315
-		$manager = \Aimeos\MShop\Factory::createManager( \TestHelperFrontend::getContext(), 'customer/address' );
315
+		$manager = \Aimeos\MShop\Factory::createManager(\TestHelperFrontend::getContext(), 'customer/address');
316 316
 
317 317
 		$search = $manager->createSearch();
318
-		$search->setConditions( $search->compare( '==', 'customer.address.company', $company ) );
319
-		$items = $manager->searchItems( $search );
318
+		$search->setConditions($search->compare('==', 'customer.address.company', $company));
319
+		$items = $manager->searchItems($search);
320 320
 
321
-		if( ( $item = reset( $items ) ) === false ) {
322
-			throw new \RuntimeException( sprintf( 'No address item with company "%1$s" found', $company ) );
321
+		if (($item = reset($items)) === false) {
322
+			throw new \RuntimeException(sprintf('No address item with company "%1$s" found', $company));
323 323
 		}
324 324
 
325
-		$ordAddrManager = \Aimeos\MShop\Factory::createManager( \TestHelperFrontend::getContext(), 'order/base/address' );
326
-		$ordAddrItem = $ordAddrManager->createItem()->copyFrom( $item );
325
+		$ordAddrManager = \Aimeos\MShop\Factory::createManager(\TestHelperFrontend::getContext(), 'order/base/address');
326
+		$ordAddrItem = $ordAddrManager->createItem()->copyFrom($item);
327 327
 
328 328
 		return $ordAddrItem;
329 329
 	}
330 330
 
331 331
 
332
-	protected function access( $name )
332
+	protected function access($name)
333 333
 	{
334
-		$class = new \ReflectionClass( '\Aimeos\Controller\Frontend\Basket\Base' );
335
-		$method = $class->getMethod( $name );
336
-		$method->setAccessible( true );
334
+		$class = new \ReflectionClass('\Aimeos\Controller\Frontend\Basket\Base');
335
+		$method = $class->getMethod($name);
336
+		$method->setAccessible(true);
337 337
 
338 338
 		return $method;
339 339
 	}
Please login to merge, or discard this patch.
controller/frontend/src/Controller/Frontend/Basket/Decorator/Category.php 1 patch
Spacing   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -36,27 +36,27 @@
 block discarded – undo
36 36
 	 * @param string $stocktype Unique code of the stock type to deliver the products from
37 37
 	 * @throws \Aimeos\Controller\Frontend\Basket\Exception If the product isn't available
38 38
 	 */
39
-	public function addProduct( $prodid, $quantity = 1, $stocktype = 'default', array $variantAttributeIds = [],
40
-		array $configAttributeIds = [], array $hiddenAttributeIds = [], array $customAttributeValues = [] )
39
+	public function addProduct($prodid, $quantity = 1, $stocktype = 'default', array $variantAttributeIds = [],
40
+		array $configAttributeIds = [], array $hiddenAttributeIds = [], array $customAttributeValues = [])
41 41
 	{
42 42
 		$context = $this->getContext();
43
-		$catalogListManager = \Aimeos\MShop\Factory::createManager( $context, 'catalog/lists' );
43
+		$catalogListManager = \Aimeos\MShop\Factory::createManager($context, 'catalog/lists');
44 44
 
45
-		$search = $catalogListManager->createSearch( true );
45
+		$search = $catalogListManager->createSearch(true);
46 46
 		$expr = array(
47
-			$search->compare( '==', 'catalog.lists.domain', 'product' ),
48
-			$search->compare( '==', 'catalog.lists.refid', $prodid ),
47
+			$search->compare('==', 'catalog.lists.domain', 'product'),
48
+			$search->compare('==', 'catalog.lists.refid', $prodid),
49 49
 			$search->getConditions()
50 50
 		);
51
-		$search->setConditions( $search->combine( '&&', $expr ) );
52
-		$search->setSlice( 0, 1 );
51
+		$search->setConditions($search->combine('&&', $expr));
52
+		$search->setSlice(0, 1);
53 53
 
54
-		$result = $catalogListManager->searchItems( $search );
54
+		$result = $catalogListManager->searchItems($search);
55 55
 
56
-		if( reset( $result ) === false )
56
+		if (reset($result) === false)
57 57
 		{
58
-			$msg = $context->getI18n()->dt( 'controller/frontend', 'Adding product with ID "%1$s" is not allowed' );
59
-			throw new \Aimeos\Controller\Frontend\Basket\Exception( sprintf( $msg, $prodid ) );
58
+			$msg = $context->getI18n()->dt('controller/frontend', 'Adding product with ID "%1$s" is not allowed');
59
+			throw new \Aimeos\Controller\Frontend\Basket\Exception(sprintf($msg, $prodid));
60 60
 		}
61 61
 
62 62
 		$this->getController()->addProduct(
Please login to merge, or discard this patch.
controller/frontend/src/Controller/Frontend/Subscription/Iface.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -25,7 +25,7 @@  discard block
 block discarded – undo
25 25
 	 * @param string $id Unique subscription ID
26 26
 	 * @return \Aimeos\MShop\Subscription\Item\Iface Canceled subscription item
27 27
 	 */
28
-	public function cancel( $id );
28
+	public function cancel($id);
29 29
 
30 30
 	/**
31 31
 	 * Returns the filter for searching items
@@ -47,7 +47,7 @@  discard block
 block discarded – undo
47 47
 	 * @param string $id Unique subscription ID
48 48
 	 * @return \Aimeos\MShop\Subscription\Item\Iface Subscription object
49 49
 	 */
50
-	public function getItem( $id );
50
+	public function getItem($id);
51 51
 
52 52
 	/**
53 53
 	 * Saves the modified subscription item
@@ -55,7 +55,7 @@  discard block
 block discarded – undo
55 55
 	 * @param \Aimeos\MShop\Subscription\Item\Iface $item Subscription object
56 56
 	 * @return \Aimeos\MShop\Subscription\Item\Iface Saved subscription item
57 57
 	 */
58
-	public function saveItem( \Aimeos\MShop\Subscription\Item\Iface $item );
58
+	public function saveItem(\Aimeos\MShop\Subscription\Item\Iface $item);
59 59
 
60 60
 	/**
61 61
 	 * Returns the subscription items based on the given filter that belong to the current user
@@ -64,5 +64,5 @@  discard block
 block discarded – undo
64 64
 	 * @param integer &$total|null Variable that will contain the total number of available items
65 65
 	 * @return \Aimeos\MShop\Subscription\Item\Iface[] Associative list of IDs as keys and subscription objects as values
66 66
 	 */
67
-	public function searchItems( \Aimeos\MW\Criteria\Iface $filter, &$total = null );
67
+	public function searchItems(\Aimeos\MW\Criteria\Iface $filter, &$total = null);
68 68
 }
Please login to merge, or discard this patch.
controller/frontend/src/Controller/Frontend/Subscription/Factory.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -28,7 +28,7 @@  discard block
 block discarded – undo
28 28
 	 * @param string|null $name Name of the controller implementaton (default: "Standard")
29 29
 	 * @return \Aimeos\Controller\Frontend\Subscription\Iface Controller object
30 30
 	 */
31
-	public static function createController( \Aimeos\MShop\Context\Item\Iface $context, $name = null )
31
+	public static function createController(\Aimeos\MShop\Context\Item\Iface $context, $name = null)
32 32
 	{
33 33
 		/** controller/frontend/subscription/name
34 34
 		 * Class name of the used subscription frontend controller implementation
@@ -63,19 +63,19 @@  discard block
 block discarded – undo
63 63
 		 * @since 2018.04
64 64
 		 * @category Developer
65 65
 		 */
66
-		if( $name === null ) {
67
-			$name = $context->getConfig()->get( 'controller/frontend/subscription/name', 'Standard' );
66
+		if ($name === null) {
67
+			$name = $context->getConfig()->get('controller/frontend/subscription/name', 'Standard');
68 68
 		}
69 69
 
70
-		if( ctype_alnum( $name ) === false ) {
71
-			$classname = is_string( $name ) ? '\\Aimeos\\Controller\\Frontend\\Subscription\\' . $name : '<not a string>';
72
-			throw new \Aimeos\Controller\Frontend\Exception( sprintf( 'Invalid characters in class name "%1$s"', $classname ) );
70
+		if (ctype_alnum($name) === false) {
71
+			$classname = is_string($name) ? '\\Aimeos\\Controller\\Frontend\\Subscription\\' . $name : '<not a string>';
72
+			throw new \Aimeos\Controller\Frontend\Exception(sprintf('Invalid characters in class name "%1$s"', $classname));
73 73
 		}
74 74
 
75 75
 		$iface = '\\Aimeos\\Controller\\Frontend\\Subscription\\Iface';
76 76
 		$classname = '\\Aimeos\\Controller\\Frontend\\Subscription\\' . $name;
77 77
 
78
-		$manager = self::createControllerBase( $context, $classname, $iface );
78
+		$manager = self::createControllerBase($context, $classname, $iface);
79 79
 
80 80
 		/** controller/frontend/subscription/decorators/excludes
81 81
 		 * Excludes decorators added by the "common" option from the subscription frontend controllers
@@ -151,6 +151,6 @@  discard block
 block discarded – undo
151 151
 		 * @see controller/frontend/subscription/decorators/excludes
152 152
 		 * @see controller/frontend/subscription/decorators/global
153 153
 		 */
154
-		return self::addControllerDecorators( $context, $manager, 'subscription' );
154
+		return self::addControllerDecorators($context, $manager, 'subscription');
155 155
 	}
156 156
 }
Please login to merge, or discard this patch.
controller/frontend/tests/Controller/Frontend/Subscription/StandardTest.php 1 patch
Spacing   +33 added lines, -33 removed lines patch added patch discarded remove patch
@@ -17,104 +17,104 @@
 block discarded – undo
17 17
 
18 18
 	protected function setUp()
19 19
 	{
20
-		\Aimeos\MShop\Factory::setCache( true );
20
+		\Aimeos\MShop\Factory::setCache(true);
21 21
 
22 22
 		$this->context = \TestHelperFrontend::getContext();
23
-		$this->object = new \Aimeos\Controller\Frontend\Subscription\Standard( $this->context );
23
+		$this->object = new \Aimeos\Controller\Frontend\Subscription\Standard($this->context);
24 24
 	}
25 25
 
26 26
 
27 27
 	protected function tearDown()
28 28
 	{
29
-		unset( $this->object, $this->context );
29
+		unset($this->object, $this->context);
30 30
 
31
-		\Aimeos\MShop\Factory::setCache( false );
31
+		\Aimeos\MShop\Factory::setCache(false);
32 32
 		\Aimeos\MShop\Factory::clear();
33 33
 	}
34 34
 
35 35
 
36 36
 	public function testCancel()
37 37
 	{
38
-		$this->context->setUserId( $this->getCustomerId() );
39
-		$item = \Aimeos\MShop\Factory::createManager( $this->context, 'subscription' )->createItem();
38
+		$this->context->setUserId($this->getCustomerId());
39
+		$item = \Aimeos\MShop\Factory::createManager($this->context, 'subscription')->createItem();
40 40
 
41
-		$cntl = $this->getMockBuilder( '\Aimeos\Controller\Frontend\Subscription\Standard' )
42
-			->setConstructorArgs( [$this->context] )
43
-			->setMethods( ['saveItem'] )
41
+		$cntl = $this->getMockBuilder('\Aimeos\Controller\Frontend\Subscription\Standard')
42
+			->setConstructorArgs([$this->context])
43
+			->setMethods(['saveItem'])
44 44
 			->getMock();
45 45
 
46
-		$cntl->expects( $this->once() )->method( 'saveItem' )
47
-			->will( $this->returnValue( $item ) );
46
+		$cntl->expects($this->once())->method('saveItem')
47
+			->will($this->returnValue($item));
48 48
 
49
-		$this->assertInstanceOf( '\Aimeos\MShop\Subscription\Item\Iface', $cntl->cancel( $this->getSubscriptionId() ) );
49
+		$this->assertInstanceOf('\Aimeos\MShop\Subscription\Item\Iface', $cntl->cancel($this->getSubscriptionId()));
50 50
 	}
51 51
 
52 52
 
53 53
 	public function testCreateFilter()
54 54
 	{
55
-		$this->assertInstanceOf( '\Aimeos\MW\Criteria\Iface', $this->object->createFilter() );
55
+		$this->assertInstanceOf('\Aimeos\MW\Criteria\Iface', $this->object->createFilter());
56 56
 	}
57 57
 
58 58
 
59 59
 	public function testGetIntervals()
60 60
 	{
61
-		$this->assertGreaterThan( 0, count( $this->object->getIntervals() ) );
61
+		$this->assertGreaterThan(0, count($this->object->getIntervals()));
62 62
 	}
63 63
 
64 64
 
65 65
 	public function testGetItem()
66 66
 	{
67 67
 		$id = $this->getSubscriptionId();
68
-		$this->context->setUserId( $this->getCustomerId() );
68
+		$this->context->setUserId($this->getCustomerId());
69 69
 
70
-		$this->assertInstanceOf( '\Aimeos\MShop\Subscription\Item\Iface', $this->object->getItem( $id ) );
70
+		$this->assertInstanceOf('\Aimeos\MShop\Subscription\Item\Iface', $this->object->getItem($id));
71 71
 	}
72 72
 
73 73
 
74 74
 	public function testGetItemException()
75 75
 	{
76
-		$this->setExpectedException( '\Aimeos\Controller\Frontend\Subscription\Exception' );
76
+		$this->setExpectedException('\Aimeos\Controller\Frontend\Subscription\Exception');
77 77
 		$this->object->getItem( -1 );
78 78
 	}
79 79
 
80 80
 
81 81
 	public function testSaveItem()
82 82
 	{
83
-		$manager = $this->getMockBuilder( '\\Aimeos\\MShop\\Subscription\\Manager\\Standard' )
84
-			->setConstructorArgs( [$this->context] )
85
-			->setMethods( ['saveItem'] )
83
+		$manager = $this->getMockBuilder('\\Aimeos\\MShop\\Subscription\\Manager\\Standard')
84
+			->setConstructorArgs([$this->context])
85
+			->setMethods(['saveItem'])
86 86
 			->getMock();
87 87
 
88
-		\Aimeos\MShop\Factory::injectManager( $this->context, 'subscription', $manager );
88
+		\Aimeos\MShop\Factory::injectManager($this->context, 'subscription', $manager);
89 89
 
90
-		$manager->expects( $this->once() )->method( 'saveItem' )
91
-			->will( $this->returnValue( $manager->createItem() ) );
90
+		$manager->expects($this->once())->method('saveItem')
91
+			->will($this->returnValue($manager->createItem()));
92 92
 
93
-		$this->assertInstanceOf( '\Aimeos\MShop\Subscription\Item\Iface', $this->object->saveItem( $manager->createItem() ) );
93
+		$this->assertInstanceOf('\Aimeos\MShop\Subscription\Item\Iface', $this->object->saveItem($manager->createItem()));
94 94
 	}
95 95
 
96 96
 
97 97
 	public function testSearchItems()
98 98
 	{
99
-		$this->assertGreaterThan( 1, $this->object->searchItems( $this->object->createFilter() ) );
99
+		$this->assertGreaterThan(1, $this->object->searchItems($this->object->createFilter()));
100 100
 	}
101 101
 
102 102
 	protected function getCustomerId()
103 103
 	{
104
-		$manager = \Aimeos\MShop\Factory::createManager( $this->context, 'customer' );
105
-		return $manager->findItem( 'UTC001' )->getId();
104
+		$manager = \Aimeos\MShop\Factory::createManager($this->context, 'customer');
105
+		return $manager->findItem('UTC001')->getId();
106 106
 	}
107 107
 
108 108
 
109 109
 	protected function getSubscriptionId()
110 110
 	{
111
-		$manager = \Aimeos\MShop\Factory::createManager( $this->context, 'subscription' );
112
-		$search = $manager->createSearch()->setSlice( 0, 1 );
113
-		$search->setConditions( $search->compare( '==', 'order.base.customerid', $this->getCustomerId() ) );
114
-		$result = $manager->searchItems( $search );
111
+		$manager = \Aimeos\MShop\Factory::createManager($this->context, 'subscription');
112
+		$search = $manager->createSearch()->setSlice(0, 1);
113
+		$search->setConditions($search->compare('==', 'order.base.customerid', $this->getCustomerId()));
114
+		$result = $manager->searchItems($search);
115 115
 
116
-		if( ( $item = reset( $result ) ) === false ) {
117
-			throw new \RuntimeException( 'No subscription item found' );
116
+		if (($item = reset($result)) === false) {
117
+			throw new \RuntimeException('No subscription item found');
118 118
 		}
119 119
 
120 120
 		return $item->getId();
Please login to merge, or discard this patch.
controller/frontend/src/Controller/Frontend/Basket/Base.php 1 patch
Spacing   +150 added lines, -150 removed lines patch added patch discarded remove patch
@@ -31,52 +31,52 @@  discard block
 block discarded – undo
31 31
 	 * @param integer $quantity New product quantity
32 32
 	 * @return \Aimeos\MShop\Price\Item\Iface Price item with calculated price
33 33
 	 */
34
-	protected function calcPrice( \Aimeos\MShop\Order\Item\Base\Product\Iface $product, array $prices, $quantity )
34
+	protected function calcPrice(\Aimeos\MShop\Order\Item\Base\Product\Iface $product, array $prices, $quantity)
35 35
 	{
36 36
 		$context = $this->getContext();
37 37
 
38
-		if( empty( $prices ) )
38
+		if (empty($prices))
39 39
 		{
40
-			$manager = \Aimeos\MShop\Factory::createManager( $context, 'product' );
41
-			$prices = $manager->getItem( $product->getProductId(), array( 'price' ) )->getRefItems( 'price', 'default' );
40
+			$manager = \Aimeos\MShop\Factory::createManager($context, 'product');
41
+			$prices = $manager->getItem($product->getProductId(), array('price'))->getRefItems('price', 'default');
42 42
 		}
43 43
 
44 44
 
45
-		$priceManager = \Aimeos\MShop\Factory::createManager( $context, 'price' );
46
-		$price = $priceManager->getLowestPrice( $prices, $quantity );
45
+		$priceManager = \Aimeos\MShop\Factory::createManager($context, 'price');
46
+		$price = $priceManager->getLowestPrice($prices, $quantity);
47 47
 
48 48
 		// customers can pay what they would like to pay
49
-		if( ( $attr = $product->getAttributeItem( 'price', 'custom' ) ) !== null )
49
+		if (($attr = $product->getAttributeItem('price', 'custom')) !== null)
50 50
 		{
51 51
 			$amount = $attr->getValue();
52 52
 
53
-			if( preg_match( '/^[0-9]*(\.[0-9]+)?$/', $amount ) !== 1 || ((double) $amount) < 0.01 )
53
+			if (preg_match('/^[0-9]*(\.[0-9]+)?$/', $amount) !== 1 || ((double) $amount) < 0.01)
54 54
 			{
55
-				$msg = $context->getI18n()->dt( 'controller/frontend', 'Invalid price value "%1$s"' );
56
-				throw new \Aimeos\Controller\Frontend\Basket\Exception( sprintf( $msg, $amount ) );
55
+				$msg = $context->getI18n()->dt('controller/frontend', 'Invalid price value "%1$s"');
56
+				throw new \Aimeos\Controller\Frontend\Basket\Exception(sprintf($msg, $amount));
57 57
 			}
58 58
 
59
-			$price->setValue( $amount );
59
+			$price->setValue($amount);
60 60
 		}
61 61
 
62 62
 		$orderAttributes = $product->getAttributes();
63
-		$attrItems = $this->getAttributeItems( $orderAttributes );
63
+		$attrItems = $this->getAttributeItems($orderAttributes);
64 64
 
65 65
 		// add prices of (optional) attributes
66
-		foreach( $orderAttributes as $orderAttrItem )
66
+		foreach ($orderAttributes as $orderAttrItem)
67 67
 		{
68 68
 			$attrId = $orderAttrItem->getAttributeId();
69 69
 
70
-			if( isset( $attrItems[$attrId] )
71
-				&& ( $prices = $attrItems[$attrId]->getRefItems( 'price', 'default' ) ) !== []
70
+			if (isset($attrItems[$attrId])
71
+				&& ($prices = $attrItems[$attrId]->getRefItems('price', 'default')) !== []
72 72
 			) {
73
-				$attrPrice = $priceManager->getLowestPrice( $prices, $orderAttrItem->getQuantity() );
74
-				$price->addItem( $attrPrice, $orderAttrItem->getQuantity() );
73
+				$attrPrice = $priceManager->getLowestPrice($prices, $orderAttrItem->getQuantity());
74
+				$price->addItem($attrPrice, $orderAttrItem->getQuantity());
75 75
 			}
76 76
 		}
77 77
 
78 78
 		// remove product rebate of original price in favor to rebates granted for the order
79
-		$price->setRebate( '0.00' );
79
+		$price->setRebate('0.00');
80 80
 
81 81
 		return $price;
82 82
 	}
@@ -90,43 +90,43 @@  discard block
 block discarded – undo
90 90
 	 * @param array $refMap Associative list of list type codes as keys and lists of reference IDs as values
91 91
 	 * @throws \Aimeos\Controller\Frontend\Basket\Exception If one or more of the IDs are not associated
92 92
 	 */
93
-	protected function checkListRef( $prodId, $domain, array $refMap )
93
+	protected function checkListRef($prodId, $domain, array $refMap)
94 94
 	{
95
-		if( empty( $refMap ) ) {
95
+		if (empty($refMap)) {
96 96
 			return;
97 97
 		}
98 98
 
99 99
 		$context = $this->getContext();
100
-		$productManager = \Aimeos\MShop\Factory::createManager( $context, 'product' );
101
-		$search = $productManager->createSearch( true );
100
+		$productManager = \Aimeos\MShop\Factory::createManager($context, 'product');
101
+		$search = $productManager->createSearch(true);
102 102
 
103 103
 		$expr = array(
104
-			$search->compare( '==', 'product.id', $prodId ),
104
+			$search->compare('==', 'product.id', $prodId),
105 105
 			$search->getConditions(),
106 106
 		);
107 107
 
108
-		foreach( $refMap as $listType => $refIds )
108
+		foreach ($refMap as $listType => $refIds)
109 109
 		{
110
-			if( empty( $refIds ) ) {
110
+			if (empty($refIds)) {
111 111
 				continue;
112 112
 			}
113 113
 
114
-			foreach( $refIds as $key => $refId ) {
114
+			foreach ($refIds as $key => $refId) {
115 115
 				$refIds[$key] = (string) $refId;
116 116
 			}
117 117
 
118
-			$param = array( $domain, $this->getProductListTypeItem( $domain, $listType )->getId(), $refIds );
119
-			$cmpfunc = $search->createFunction( 'product.contains', $param );
118
+			$param = array($domain, $this->getProductListTypeItem($domain, $listType)->getId(), $refIds);
119
+			$cmpfunc = $search->createFunction('product.contains', $param);
120 120
 
121
-			$expr[] = $search->compare( '==', $cmpfunc, count( $refIds ) );
121
+			$expr[] = $search->compare('==', $cmpfunc, count($refIds));
122 122
 		}
123 123
 
124
-		$search->setConditions( $search->combine( '&&', $expr ) );
124
+		$search->setConditions($search->combine('&&', $expr));
125 125
 
126
-		if( count( $productManager->searchItems( $search, [] ) ) === 0 )
126
+		if (count($productManager->searchItems($search, [])) === 0)
127 127
 		{
128
-			$msg = $context->getI18n()->dt( 'controller/frontend', 'Invalid "%1$s" references for product with ID %2$s' );
129
-			throw new \Aimeos\Controller\Frontend\Basket\Exception( sprintf( $msg, $domain, json_encode( $prodId ) ) );
128
+			$msg = $context->getI18n()->dt('controller/frontend', 'Invalid "%1$s" references for product with ID %2$s');
129
+			throw new \Aimeos\Controller\Frontend\Basket\Exception(sprintf($msg, $domain, json_encode($prodId)));
130 130
 		}
131 131
 	}
132 132
 
@@ -137,40 +137,40 @@  discard block
 block discarded – undo
137 137
 	 * @param \Aimeos\MShop\Locale\Item\Iface $locale Locale object from current basket
138 138
 	 * @param string $type Basket type
139 139
 	 */
140
-	protected function checkLocale( \Aimeos\MShop\Locale\Item\Iface $locale, $type )
140
+	protected function checkLocale(\Aimeos\MShop\Locale\Item\Iface $locale, $type)
141 141
 	{
142 142
 		$errors = [];
143 143
 		$context = $this->getContext();
144 144
 		$session = $context->getSession();
145 145
 
146
-		$localeStr = $session->get( 'aimeos/basket/locale' );
146
+		$localeStr = $session->get('aimeos/basket/locale');
147 147
 		$localeKey = $locale->getSite()->getCode() . '|' . $locale->getLanguageId() . '|' . $locale->getCurrencyId();
148 148
 
149
-		if( $localeStr !== null && $localeStr !== $localeKey )
149
+		if ($localeStr !== null && $localeStr !== $localeKey)
150 150
 		{
151
-			$locParts = explode( '|', $localeStr );
152
-			$locSite = ( isset( $locParts[0] ) ? $locParts[0] : '' );
153
-			$locLanguage = ( isset( $locParts[1] ) ? $locParts[1] : '' );
154
-			$locCurrency = ( isset( $locParts[2] ) ? $locParts[2] : '' );
151
+			$locParts = explode('|', $localeStr);
152
+			$locSite = (isset($locParts[0]) ? $locParts[0] : '');
153
+			$locLanguage = (isset($locParts[1]) ? $locParts[1] : '');
154
+			$locCurrency = (isset($locParts[2]) ? $locParts[2] : '');
155 155
 
156
-			$localeManager = \Aimeos\MShop\Factory::createManager( $context, 'locale' );
157
-			$locale = $localeManager->bootstrap( $locSite, $locLanguage, $locCurrency, false );
156
+			$localeManager = \Aimeos\MShop\Factory::createManager($context, 'locale');
157
+			$locale = $localeManager->bootstrap($locSite, $locLanguage, $locCurrency, false);
158 158
 
159 159
 			$context = clone $context;
160
-			$context->setLocale( $locale );
160
+			$context->setLocale($locale);
161 161
 
162
-			$manager = \Aimeos\MShop\Factory::createManager( $context, 'order/base' );
163
-			$basket = $manager->getSession( $type );
162
+			$manager = \Aimeos\MShop\Factory::createManager($context, 'order/base');
163
+			$basket = $manager->getSession($type);
164 164
 
165
-			$this->copyAddresses( $basket, $errors, $localeKey );
166
-			$this->copyServices( $basket, $errors );
167
-			$this->copyProducts( $basket, $errors, $localeKey );
168
-			$this->copyCoupons( $basket, $errors, $localeKey );
165
+			$this->copyAddresses($basket, $errors, $localeKey);
166
+			$this->copyServices($basket, $errors);
167
+			$this->copyProducts($basket, $errors, $localeKey);
168
+			$this->copyCoupons($basket, $errors, $localeKey);
169 169
 
170
-			$manager->setSession( $basket, $type );
170
+			$manager->setSession($basket, $type);
171 171
 		}
172 172
 
173
-		$session->set( 'aimeos/basket/locale', $localeKey );
173
+		$session->set('aimeos/basket/locale', $localeKey);
174 174
 	}
175 175
 
176 176
 
@@ -182,22 +182,22 @@  discard block
 block discarded – undo
182 182
 	 * @param string $localeKey Unique identifier of the site, language and currency
183 183
 	 * @return array Associative list of errors occured
184 184
 	 */
185
-	protected function copyAddresses( \Aimeos\MShop\Order\Item\Base\Iface $basket, array $errors, $localeKey )
185
+	protected function copyAddresses(\Aimeos\MShop\Order\Item\Base\Iface $basket, array $errors, $localeKey)
186 186
 	{
187
-		foreach( $basket->getAddresses() as $type => $item )
187
+		foreach ($basket->getAddresses() as $type => $item)
188 188
 		{
189 189
 			try
190 190
 			{
191
-				$this->setAddress( $type, $item->toArray() );
192
-				$basket->deleteAddress( $type );
191
+				$this->setAddress($type, $item->toArray());
192
+				$basket->deleteAddress($type);
193 193
 			}
194
-			catch( \Exception $e )
194
+			catch (\Exception $e)
195 195
 			{
196 196
 				$logger = $this->getContext()->getLogger();
197 197
 				$errors['address'][$type] = $e->getMessage();
198 198
 
199 199
 				$str = 'Error migrating address with type "%1$s" in basket to locale "%2$s": %3$s';
200
-				$logger->log( sprintf( $str, $type, $localeKey, $e->getMessage() ), \Aimeos\MW\Logger\Base::INFO );
200
+				$logger->log(sprintf($str, $type, $localeKey, $e->getMessage()), \Aimeos\MW\Logger\Base::INFO);
201 201
 			}
202 202
 		}
203 203
 
@@ -213,22 +213,22 @@  discard block
 block discarded – undo
213 213
 	 * @param string $localeKey Unique identifier of the site, language and currency
214 214
 	 * @return array Associative list of errors occured
215 215
 	 */
216
-	protected function copyCoupons( \Aimeos\MShop\Order\Item\Base\Iface $basket, array $errors, $localeKey )
216
+	protected function copyCoupons(\Aimeos\MShop\Order\Item\Base\Iface $basket, array $errors, $localeKey)
217 217
 	{
218
-		foreach( $basket->getCoupons() as $code => $list )
218
+		foreach ($basket->getCoupons() as $code => $list)
219 219
 		{
220 220
 			try
221 221
 			{
222
-				$this->addCoupon( $code );
223
-				$basket->deleteCoupon( $code, true );
222
+				$this->addCoupon($code);
223
+				$basket->deleteCoupon($code, true);
224 224
 			}
225
-			catch( \Exception $e )
225
+			catch (\Exception $e)
226 226
 			{
227 227
 				$logger = $this->getContext()->getLogger();
228 228
 				$errors['coupon'][$code] = $e->getMessage();
229 229
 
230 230
 				$str = 'Error migrating coupon with code "%1$s" in basket to locale "%2$s": %3$s';
231
-				$logger->log( sprintf( $str, $code, $localeKey, $e->getMessage() ), \Aimeos\MW\Logger\Base::INFO );
231
+				$logger->log(sprintf($str, $code, $localeKey, $e->getMessage()), \Aimeos\MW\Logger\Base::INFO);
232 232
 			}
233 233
 		}
234 234
 
@@ -244,11 +244,11 @@  discard block
 block discarded – undo
244 244
 	 * @param string $localeKey Unique identifier of the site, language and currency
245 245
 	 * @return array Associative list of errors occured
246 246
 	 */
247
-	protected function copyProducts( \Aimeos\MShop\Order\Item\Base\Iface $basket, array $errors, $localeKey )
247
+	protected function copyProducts(\Aimeos\MShop\Order\Item\Base\Iface $basket, array $errors, $localeKey)
248 248
 	{
249
-		foreach( $basket->getProducts() as $pos => $product )
249
+		foreach ($basket->getProducts() as $pos => $product)
250 250
 		{
251
-			if( $product->getFlags() & \Aimeos\MShop\Order\Item\Base\Product\Base::FLAG_IMMUTABLE ) {
251
+			if ($product->getFlags() & \Aimeos\MShop\Order\Item\Base\Product\Base::FLAG_IMMUTABLE) {
252 252
 				continue;
253 253
 			}
254 254
 
@@ -256,7 +256,7 @@  discard block
 block discarded – undo
256 256
 			{
257 257
 				$attrIds = [];
258 258
 
259
-				foreach( $product->getAttributes() as $attrItem ) {
259
+				foreach ($product->getAttributes() as $attrItem) {
260 260
 					$attrIds[$attrItem->getType()][] = $attrItem->getAttributeId();
261 261
 				}
262 262
 
@@ -264,22 +264,22 @@  discard block
 block discarded – undo
264 264
 					$product->getProductId(),
265 265
 					$product->getQuantity(),
266 266
 					$product->getStockType(),
267
-					$this->getValue( $attrIds, 'variant', [] ),
268
-					$this->getValue( $attrIds, 'config', [] ),
269
-					$this->getValue( $attrIds, 'hidden', [] ),
270
-					$this->getValue( $attrIds, 'custom', [] )
267
+					$this->getValue($attrIds, 'variant', []),
268
+					$this->getValue($attrIds, 'config', []),
269
+					$this->getValue($attrIds, 'hidden', []),
270
+					$this->getValue($attrIds, 'custom', [])
271 271
 				);
272 272
 
273
-				$basket->deleteProduct( $pos );
273
+				$basket->deleteProduct($pos);
274 274
 			}
275
-			catch( \Exception $e )
275
+			catch (\Exception $e)
276 276
 			{
277 277
 				$code = $product->getProductCode();
278 278
 				$logger = $this->getContext()->getLogger();
279 279
 				$errors['product'][$pos] = $e->getMessage();
280 280
 
281 281
 				$str = 'Error migrating product with code "%1$s" in basket to locale "%2$s": %3$s';
282
-				$logger->log( sprintf( $str, $code, $localeKey, $e->getMessage() ), \Aimeos\MW\Logger\Base::INFO );
282
+				$logger->log(sprintf($str, $code, $localeKey, $e->getMessage()), \Aimeos\MW\Logger\Base::INFO);
283 283
 			}
284 284
 		}
285 285
 
@@ -294,24 +294,24 @@  discard block
 block discarded – undo
294 294
 	 * @param array $errors Associative list of previous errors
295 295
 	 * @return array Associative list of errors occured
296 296
 	 */
297
-	protected function copyServices( \Aimeos\MShop\Order\Item\Base\Iface $basket, array $errors )
297
+	protected function copyServices(\Aimeos\MShop\Order\Item\Base\Iface $basket, array $errors)
298 298
 	{
299
-		foreach( $basket->getServices() as $type => $list )
299
+		foreach ($basket->getServices() as $type => $list)
300 300
 		{
301
-			foreach( $list as $item )
301
+			foreach ($list as $item)
302 302
 			{
303 303
 				try
304 304
 				{
305 305
 					$attributes = [];
306 306
 
307
-					foreach( $item->getAttributes() as $attrItem ) {
307
+					foreach ($item->getAttributes() as $attrItem) {
308 308
 						$attributes[$attrItem->getCode()] = $attrItem->getValue();
309 309
 					}
310 310
 
311
-					$this->addService( $type, $item->getServiceId(), $attributes );
312
-					$basket->deleteService( $type );
311
+					$this->addService($type, $item->getServiceId(), $attributes);
312
+					$basket->deleteService($type);
313 313
 				}
314
-				catch( \Exception $e ) { ; } // Don't notify the user as appropriate services can be added automatically
314
+				catch (\Exception $e) {; } // Don't notify the user as appropriate services can be added automatically
315 315
 			}
316 316
 		}
317 317
 
@@ -324,21 +324,21 @@  discard block
 block discarded – undo
324 324
 	 *
325 325
 	 * @param \Aimeos\MShop\Order\Item\Base\Iface $basket Basket object
326 326
 	 */
327
-	protected function createSubscriptions( \Aimeos\MShop\Order\Item\Base\Iface $basket )
327
+	protected function createSubscriptions(\Aimeos\MShop\Order\Item\Base\Iface $basket)
328 328
 	{
329
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'subscription' );
329
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'subscription');
330 330
 
331
-		foreach( $basket->getProducts() as $orderProduct )
331
+		foreach ($basket->getProducts() as $orderProduct)
332 332
 		{
333
-			if( ( $interval = $orderProduct->getAttribute( 'interval', 'config' ) ) !== null )
333
+			if (($interval = $orderProduct->getAttribute('interval', 'config')) !== null)
334 334
 			{
335 335
 				$item = $manager->createItem();
336
-				$item->setOrderBaseId( $basket->getId() );
337
-				$item->setOrderProductId( $orderProduct->getId() );
338
-				$item->setInterval( $interval );
339
-				$item->setStatus( 1 );
336
+				$item->setOrderBaseId($basket->getId());
337
+				$item->setOrderProductId($orderProduct->getId());
338
+				$item->setInterval($interval);
339
+				$item->setStatus(1);
340 340
 
341
-				$manager->saveItem( $item, false );
341
+				$manager->saveItem($item, false);
342 342
 			}
343 343
 		}
344 344
 	}
@@ -352,32 +352,32 @@  discard block
 block discarded – undo
352 352
 	 * @return array List of items implementing \Aimeos\MShop\Attribute\Item\Iface
353 353
 	 * @throws \Aimeos\Controller\Frontend\Basket\Exception If the actual attribute number doesn't match the expected one
354 354
 	 */
355
-	protected function getAttributes( array $attributeIds, array $domains = array( 'price', 'text' ) )
355
+	protected function getAttributes(array $attributeIds, array $domains = array('price', 'text'))
356 356
 	{
357
-		if( empty( $attributeIds ) ) {
357
+		if (empty($attributeIds)) {
358 358
 			return [];
359 359
 		}
360 360
 
361
-		$attributeManager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'attribute' );
361
+		$attributeManager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'attribute');
362 362
 
363
-		$search = $attributeManager->createSearch( true );
363
+		$search = $attributeManager->createSearch(true);
364 364
 		$expr = array(
365
-			$search->compare( '==', 'attribute.id', $attributeIds ),
365
+			$search->compare('==', 'attribute.id', $attributeIds),
366 366
 			$search->getConditions(),
367 367
 		);
368
-		$search->setConditions( $search->combine( '&&', $expr ) );
369
-		$search->setSlice( 0, 0x7fffffff );
368
+		$search->setConditions($search->combine('&&', $expr));
369
+		$search->setSlice(0, 0x7fffffff);
370 370
 
371
-		$attrItems = $attributeManager->searchItems( $search, $domains );
371
+		$attrItems = $attributeManager->searchItems($search, $domains);
372 372
 
373
-		if( count( $attrItems ) !== count( $attributeIds ) )
373
+		if (count($attrItems) !== count($attributeIds))
374 374
 		{
375 375
 			$i18n = $this->getContext()->getI18n();
376
-			$expected = implode( ',', $attributeIds );
377
-			$actual = implode( ',', array_keys( $attrItems ) );
378
-			$msg = $i18n->dt( 'controller/frontend', 'Available attribute IDs "%1$s" do not match the given attribute IDs "%2$s"' );
376
+			$expected = implode(',', $attributeIds);
377
+			$actual = implode(',', array_keys($attrItems));
378
+			$msg = $i18n->dt('controller/frontend', 'Available attribute IDs "%1$s" do not match the given attribute IDs "%2$s"');
379 379
 
380
-			throw new \Aimeos\Controller\Frontend\Basket\Exception( sprintf( $msg, $actual, $expected ) );
380
+			throw new \Aimeos\Controller\Frontend\Basket\Exception(sprintf($msg, $actual, $expected));
381 381
 		}
382 382
 
383 383
 		return $attrItems;
@@ -390,31 +390,31 @@  discard block
 block discarded – undo
390 390
 	 * @param \Aimeos\MShop\Order\Item\Base\Product\Attribute\Item[] $orderAttributes List of order product attribute items
391 391
 	 * @return \Aimeos\MShop\Attribute\Item\Iface[] Associative list of attribute IDs as key and attribute items as values
392 392
 	 */
393
-	protected function getAttributeItems( array $orderAttributes )
393
+	protected function getAttributeItems(array $orderAttributes)
394 394
 	{
395
-		if( empty( $orderAttributes ) ) {
395
+		if (empty($orderAttributes)) {
396 396
 			return [];
397 397
 		}
398 398
 
399
-		$attributeManager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'attribute' );
400
-		$search = $attributeManager->createSearch( true );
399
+		$attributeManager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'attribute');
400
+		$search = $attributeManager->createSearch(true);
401 401
 		$expr = [];
402 402
 
403
-		foreach( $orderAttributes as $item )
403
+		foreach ($orderAttributes as $item)
404 404
 		{
405 405
 			$tmp = array(
406
-				$search->compare( '==', 'attribute.domain', 'product' ),
407
-				$search->compare( '==', 'attribute.code', $item->getValue() ),
408
-				$search->compare( '==', 'attribute.type.domain', 'product' ),
409
-				$search->compare( '==', 'attribute.type.code', $item->getCode() ),
410
-				$search->compare( '>', 'attribute.type.status', 0 ),
406
+				$search->compare('==', 'attribute.domain', 'product'),
407
+				$search->compare('==', 'attribute.code', $item->getValue()),
408
+				$search->compare('==', 'attribute.type.domain', 'product'),
409
+				$search->compare('==', 'attribute.type.code', $item->getCode()),
410
+				$search->compare('>', 'attribute.type.status', 0),
411 411
 				$search->getConditions(),
412 412
 			);
413
-			$expr[] = $search->combine( '&&', $tmp );
413
+			$expr[] = $search->combine('&&', $tmp);
414 414
 		}
415 415
 
416
-		$search->setConditions( $search->combine( '||', $expr ) );
417
-		return $attributeManager->searchItems( $search, array( 'price' ) );
416
+		$search->setConditions($search->combine('||', $expr));
417
+		return $attributeManager->searchItems($search, array('price'));
418 418
 	}
419 419
 
420 420
 
@@ -427,24 +427,24 @@  discard block
 block discarded – undo
427 427
 	 * @param array $quantities Associative list of attribute IDs as keys and their quantities as values
428 428
 	 * @return array List of items implementing \Aimeos\MShop\Order\Item\Product\Attribute\Iface
429 429
 	 */
430
-	protected function getOrderProductAttributes( $type, array $ids, array $values = [], array $quantities = [] )
430
+	protected function getOrderProductAttributes($type, array $ids, array $values = [], array $quantities = [])
431 431
 	{
432
-		if( empty( $ids ) ) {
432
+		if (empty($ids)) {
433 433
 			return [];
434 434
 		}
435 435
 
436 436
 		$list = [];
437
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'order/base/product/attribute' );
437
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'order/base/product/attribute');
438 438
 
439
-		foreach( $this->getAttributes( $ids ) as $id => $attrItem )
439
+		foreach ($this->getAttributes($ids) as $id => $attrItem)
440 440
 		{
441 441
 			$item = $manager->createItem();
442
-			$item->copyFrom( $attrItem );
443
-			$item->setType( $type );
444
-			$item->setQuantity( isset( $quantities[$id] ) ? $quantities[$id] : 1 );
442
+			$item->copyFrom($attrItem);
443
+			$item->setType($type);
444
+			$item->setQuantity(isset($quantities[$id]) ? $quantities[$id] : 1);
445 445
 
446
-			if( isset( $values[$id] ) ) {
447
-				$item->setValue( $values[$id] );
446
+			if (isset($values[$id])) {
447
+				$item->setValue($values[$id]);
448 448
 			}
449 449
 
450 450
 			$list[] = $item;
@@ -461,23 +461,23 @@  discard block
 block discarded – undo
461 461
 	 * @param string $code Code of the list type
462 462
 	 * @return \Aimeos\MShop\Common\Item\Type\Iface List type item
463 463
 	 */
464
-	protected function getProductListTypeItem( $domain, $code )
464
+	protected function getProductListTypeItem($domain, $code)
465 465
 	{
466 466
 		$context = $this->getContext();
467 467
 
468
-		if( empty( $this->listTypeItems ) )
468
+		if (empty($this->listTypeItems))
469 469
 		{
470
-			$manager = \Aimeos\MShop\Factory::createManager( $context, 'product/lists/type' );
470
+			$manager = \Aimeos\MShop\Factory::createManager($context, 'product/lists/type');
471 471
 
472
-			foreach( $manager->searchItems( $manager->createSearch( true ) ) as $item ) {
473
-				$this->listTypeItems[ $item->getDomain() ][ $item->getCode() ] = $item;
472
+			foreach ($manager->searchItems($manager->createSearch(true)) as $item) {
473
+				$this->listTypeItems[$item->getDomain()][$item->getCode()] = $item;
474 474
 			}
475 475
 		}
476 476
 
477
-		if( !isset( $this->listTypeItems[$domain][$code] ) )
477
+		if (!isset($this->listTypeItems[$domain][$code]))
478 478
 		{
479
-			$msg = $context->getI18n()->dt( 'controller/frontend', 'List type for domain "%1$s" and code "%2$s" not found' );
480
-			throw new \Aimeos\Controller\Frontend\Basket\Exception( sprintf( $msg, $domain, $code ) );
479
+			$msg = $context->getI18n()->dt('controller/frontend', 'List type for domain "%1$s" and code "%2$s" not found');
480
+			throw new \Aimeos\Controller\Frontend\Basket\Exception(sprintf($msg, $domain, $code));
481 481
 		}
482 482
 
483 483
 		return $this->listTypeItems[$domain][$code];
@@ -492,43 +492,43 @@  discard block
 block discarded – undo
492 492
 	 * @param array $domains Names of the domain items that should be fetched too
493 493
 	 * @return array List of products matching the given attributes
494 494
 	 */
495
-	protected function getProductVariants( \Aimeos\MShop\Product\Item\Iface $productItem, array $variantAttributeIds,
496
-			array $domains = array( 'attribute', 'media', 'price', 'text' ) )
495
+	protected function getProductVariants(\Aimeos\MShop\Product\Item\Iface $productItem, array $variantAttributeIds,
496
+			array $domains = array('attribute', 'media', 'price', 'text'))
497 497
 	{
498 498
 		$subProductIds = [];
499
-		foreach( $productItem->getRefItems( 'product', 'default', 'default' ) as $item ) {
499
+		foreach ($productItem->getRefItems('product', 'default', 'default') as $item) {
500 500
 			$subProductIds[] = $item->getId();
501 501
 		}
502 502
 
503
-		if( count( $subProductIds ) === 0 ) {
503
+		if (count($subProductIds) === 0) {
504 504
 			return [];
505 505
 		}
506 506
 
507
-		$productManager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'product' );
508
-		$search = $productManager->createSearch( true );
507
+		$productManager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'product');
508
+		$search = $productManager->createSearch(true);
509 509
 
510 510
 		$expr = array(
511
-			$search->compare( '==', 'product.id', $subProductIds ),
511
+			$search->compare('==', 'product.id', $subProductIds),
512 512
 			$search->getConditions(),
513 513
 		);
514 514
 
515
-		if( count( $variantAttributeIds ) > 0 )
515
+		if (count($variantAttributeIds) > 0)
516 516
 		{
517
-			foreach( $variantAttributeIds as $key => $id ) {
517
+			foreach ($variantAttributeIds as $key => $id) {
518 518
 				$variantAttributeIds[$key] = (string) $id;
519 519
 			}
520 520
 
521
-			$listTypeItem = $this->getProductListTypeItem( 'attribute', 'variant' );
521
+			$listTypeItem = $this->getProductListTypeItem('attribute', 'variant');
522 522
 
523
-			$param = array( 'attribute', $listTypeItem->getId(), $variantAttributeIds );
524
-			$cmpfunc = $search->createFunction( 'product.contains', $param );
523
+			$param = array('attribute', $listTypeItem->getId(), $variantAttributeIds);
524
+			$cmpfunc = $search->createFunction('product.contains', $param);
525 525
 
526
-			$expr[] = $search->compare( '==', $cmpfunc, count( $variantAttributeIds ) );
526
+			$expr[] = $search->compare('==', $cmpfunc, count($variantAttributeIds));
527 527
 		}
528 528
 
529
-		$search->setConditions( $search->combine( '&&', $expr ) );
529
+		$search->setConditions($search->combine('&&', $expr));
530 530
 
531
-		return $productManager->searchItems( $search, $domains );
531
+		return $productManager->searchItems($search, $domains);
532 532
 	}
533 533
 
534 534
 
@@ -540,9 +540,9 @@  discard block
 block discarded – undo
540 540
 	 * @param mixed $default Default value if no value is available for the given name
541 541
 	 * @return mixed Value from the array or default value
542 542
 	 */
543
-	protected function getValue( array $values, $name, $default = null )
543
+	protected function getValue(array $values, $name, $default = null)
544 544
 	{
545
-		if( isset( $values[$name] ) ) {
545
+		if (isset($values[$name])) {
546 546
 			return $values[$name];
547 547
 		}
548 548
 
Please login to merge, or discard this patch.