Completed
Push — master ( f32c43...c49afe )
by Aimeos
02:42
created
controller/frontend/src/Controller/Frontend/Basket/Iface.php 1 patch
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -50,7 +50,7 @@  discard block
 block discarded – undo
50 50
 	 * @param string $type Basket type
51 51
 	 * @return \Aimeos\Controller\Frontend\Basket\Iface Basket frontend object
52 52
 	 */
53
-	public function setType( $type );
53
+	public function setType($type);
54 54
 
55 55
 
56 56
 	/**
@@ -69,7 +69,7 @@  discard block
 block discarded – undo
69 69
 	 * @param boolean $default True to add default criteria (user logged in), false if not
70 70
 	 * @return \Aimeos\MShop\Order\Item\Base\Iface Order base object including the given parts
71 71
 	 */
72
-	public function load( $id, $parts = \Aimeos\MShop\Order\Manager\Base\Base::PARTS_ALL, $default = true );
72
+	public function load($id, $parts = \Aimeos\MShop\Order\Manager\Base\Base::PARTS_ALL, $default = true);
73 73
 
74 74
 
75 75
 	/**
@@ -89,9 +89,9 @@  discard block
 block discarded – undo
89 89
 	 * @throws \Aimeos\Controller\Frontend\Basket\Exception If the product isn't available
90 90
 	 * @return void
91 91
 	 */
92
-	public function addProduct( $prodid, $quantity = 1, array $options = [], array $variantAttributeIds = [],
92
+	public function addProduct($prodid, $quantity = 1, array $options = [], array $variantAttributeIds = [],
93 93
 		array $configAttributeIds = [], array $hiddenAttributeIds = [], array $customAttributeValues = [],
94
-		$stocktype = 'default' );
94
+		$stocktype = 'default');
95 95
 
96 96
 
97 97
 	/**
@@ -100,7 +100,7 @@  discard block
 block discarded – undo
100 100
 	 * @param integer $position Position number (key) of the order product item
101 101
 	 * @return void
102 102
 	 */
103
-	public function deleteProduct( $position );
103
+	public function deleteProduct($position);
104 104
 
105 105
 
106 106
 	/**
@@ -111,7 +111,7 @@  discard block
 block discarded – undo
111 111
 	 * @param array $configAttributeCodes Codes of the product config attributes that should be REMOVED
112 112
 	 * @return void
113 113
 	 */
114
-	public function editProduct( $position, $quantity, array $configAttributeCodes = [] );
114
+	public function editProduct($position, $quantity, array $configAttributeCodes = []);
115 115
 
116 116
 
117 117
 	/**
@@ -121,7 +121,7 @@  discard block
 block discarded – undo
121 121
 	 * @throws \Aimeos\Controller\Frontend\Basket\Exception if the coupon code is invalid or not allowed
122 122
 	 * @return void
123 123
 	 */
124
-	public function addCoupon( $code );
124
+	public function addCoupon($code);
125 125
 
126 126
 
127 127
 	/**
@@ -131,7 +131,7 @@  discard block
 block discarded – undo
131 131
 	 * @throws \Aimeos\Controller\Frontend\Basket\Exception if the coupon code is invalid
132 132
 	 * @return void
133 133
 	 */
134
-	public function deleteCoupon( $code );
134
+	public function deleteCoupon($code);
135 135
 
136 136
 
137 137
 	/**
@@ -143,7 +143,7 @@  discard block
 block discarded – undo
143 143
 	 * 	if one of the keys is invalid when using an array with key/value pairs
144 144
 	 * @return void
145 145
 	 */
146
-	public function setAddress( $type, $value );
146
+	public function setAddress($type, $value);
147 147
 
148 148
 
149 149
 	/**
@@ -156,5 +156,5 @@  discard block
 block discarded – undo
156 156
 	 * @throws \Aimeos\Controller\Frontend\Basket\Exception If there is no price to the service item attached
157 157
 	 * @return void
158 158
 	 */
159
-	public function setService( $type, $id, array $attributes = [] );
159
+	public function setService($type, $id, array $attributes = []);
160 160
 }
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,32 +31,32 @@  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( $this->getContext(), 'product' );
41
-			$prices = $manager->getItem( $product->getProductId(), array( 'price' ) )->getRefItems( 'price', 'default' );
40
+			$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'product');
41
+			$prices = $manager->getItem($product->getProductId(), array('price'))->getRefItems('price', 'default');
42 42
 		}
43 43
 
44
-		$priceManager = \Aimeos\MShop\Factory::createManager( $context, 'price' );
45
-		$price = $priceManager->getLowestPrice( $prices, $quantity );
44
+		$priceManager = \Aimeos\MShop\Factory::createManager($context, 'price');
45
+		$price = $priceManager->getLowestPrice($prices, $quantity);
46 46
 
47
-		foreach( $this->getAttributeItems( $product->getAttributes() ) as $attrItem )
47
+		foreach ($this->getAttributeItems($product->getAttributes()) as $attrItem)
48 48
 		{
49
-			$prices = $attrItem->getRefItems( 'price', 'default' );
49
+			$prices = $attrItem->getRefItems('price', 'default');
50 50
 
51
-			if( count( $prices ) > 0 )
51
+			if (count($prices) > 0)
52 52
 			{
53
-				$attrPrice = $priceManager->getLowestPrice( $prices, $quantity );
54
-				$price->addItem( $attrPrice );
53
+				$attrPrice = $priceManager->getLowestPrice($prices, $quantity);
54
+				$price->addItem($attrPrice);
55 55
 			}
56 56
 		}
57 57
 
58 58
 		// remove product rebate of original price in favor to rebates granted for the order
59
-		$price->setRebate( '0.00' );
59
+		$price->setRebate('0.00');
60 60
 
61 61
 		return $price;
62 62
 	}
@@ -71,34 +71,34 @@  discard block
 block discarded – undo
71 71
 	 * @param array $refIds List of IDs that must be associated to the product
72 72
 	 * @throws \Aimeos\Controller\Frontend\Basket\Exception If one or more of the IDs are not associated
73 73
 	 */
74
-	protected function checkReferences( $prodId, $domain, $listTypeId, array $refIds )
74
+	protected function checkReferences($prodId, $domain, $listTypeId, array $refIds)
75 75
 	{
76
-		$productManager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'product' );
77
-		$search = $productManager->createSearch( true );
76
+		$productManager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'product');
77
+		$search = $productManager->createSearch(true);
78 78
 
79 79
 		$expr = array(
80
-			$search->compare( '==', 'product.id', $prodId ),
80
+			$search->compare('==', 'product.id', $prodId),
81 81
 			$search->getConditions(),
82 82
 		);
83 83
 
84
-		if( count( $refIds ) > 0 )
84
+		if (count($refIds) > 0)
85 85
 		{
86
-			foreach( $refIds as $key => $refId ) {
86
+			foreach ($refIds as $key => $refId) {
87 87
 				$refIds[$key] = (string) $refId;
88 88
 			}
89 89
 
90
-			$param = array( $domain, $listTypeId, $refIds );
91
-			$cmpfunc = $search->createFunction( 'product.contains', $param );
90
+			$param = array($domain, $listTypeId, $refIds);
91
+			$cmpfunc = $search->createFunction('product.contains', $param);
92 92
 
93
-			$expr[] = $search->compare( '==', $cmpfunc, count( $refIds ) );
93
+			$expr[] = $search->compare('==', $cmpfunc, count($refIds));
94 94
 		}
95 95
 
96
-		$search->setConditions( $search->combine( '&&', $expr ) );
96
+		$search->setConditions($search->combine('&&', $expr));
97 97
 
98
-		if( count( $productManager->searchItems( $search, [] ) ) === 0 )
98
+		if (count($productManager->searchItems($search, [])) === 0)
99 99
 		{
100
-			$msg = sprintf( 'Invalid "%1$s" references for product with ID %2$s', $domain, json_encode( $prodId ) );
101
-			throw new \Aimeos\Controller\Frontend\Basket\Exception( $msg );
100
+			$msg = sprintf('Invalid "%1$s" references for product with ID %2$s', $domain, json_encode($prodId));
101
+			throw new \Aimeos\Controller\Frontend\Basket\Exception($msg);
102 102
 		}
103 103
 	}
104 104
 
@@ -108,41 +108,41 @@  discard block
 block discarded – undo
108 108
 	 *
109 109
 	 * @param string $type Basket type
110 110
 	 */
111
-	protected function checkLocale( $type )
111
+	protected function checkLocale($type)
112 112
 	{
113 113
 		$errors = [];
114 114
 		$context = $this->getContext();
115 115
 		$session = $context->getSession();
116 116
 		$locale = $this->get()->getLocale();
117 117
 
118
-		$localeStr = $session->get( 'aimeos/basket/locale' );
118
+		$localeStr = $session->get('aimeos/basket/locale');
119 119
 		$localeKey = $locale->getSite()->getCode() . '|' . $locale->getLanguageId() . '|' . $locale->getCurrencyId();
120 120
 
121
-		if( $localeStr !== null && $localeStr !== $localeKey )
121
+		if ($localeStr !== null && $localeStr !== $localeKey)
122 122
 		{
123
-			$locParts = explode( '|', $localeStr );
124
-			$locSite = ( isset( $locParts[0] ) ? $locParts[0] : '' );
125
-			$locLanguage = ( isset( $locParts[1] ) ? $locParts[1] : '' );
126
-			$locCurrency = ( isset( $locParts[2] ) ? $locParts[2] : '' );
123
+			$locParts = explode('|', $localeStr);
124
+			$locSite = (isset($locParts[0]) ? $locParts[0] : '');
125
+			$locLanguage = (isset($locParts[1]) ? $locParts[1] : '');
126
+			$locCurrency = (isset($locParts[2]) ? $locParts[2] : '');
127 127
 
128
-			$localeManager = \Aimeos\MShop\Factory::createManager( $context, 'locale' );
129
-			$locale = $localeManager->bootstrap( $locSite, $locLanguage, $locCurrency, false );
128
+			$localeManager = \Aimeos\MShop\Factory::createManager($context, 'locale');
129
+			$locale = $localeManager->bootstrap($locSite, $locLanguage, $locCurrency, false);
130 130
 
131 131
 			$context = clone $context;
132
-			$context->setLocale( $locale );
132
+			$context->setLocale($locale);
133 133
 
134
-			$manager = \Aimeos\MShop\Order\Manager\Factory::createManager( $context )->getSubManager( 'base' );
135
-			$basket = $manager->getSession( $type );
134
+			$manager = \Aimeos\MShop\Order\Manager\Factory::createManager($context)->getSubManager('base');
135
+			$basket = $manager->getSession($type);
136 136
 
137
-			$this->copyAddresses( $basket, $errors, $localeKey );
138
-			$this->copyServices( $basket, $errors );
139
-			$this->copyProducts( $basket, $errors, $localeKey );
140
-			$this->copyCoupons( $basket, $errors, $localeKey );
137
+			$this->copyAddresses($basket, $errors, $localeKey);
138
+			$this->copyServices($basket, $errors);
139
+			$this->copyProducts($basket, $errors, $localeKey);
140
+			$this->copyCoupons($basket, $errors, $localeKey);
141 141
 
142
-			$manager->setSession( $basket, $type );
142
+			$manager->setSession($basket, $type);
143 143
 		}
144 144
 
145
-		$session->set( 'aimeos/basket/locale', $localeKey );
145
+		$session->set('aimeos/basket/locale', $localeKey);
146 146
 	}
147 147
 
148 148
 
@@ -154,20 +154,20 @@  discard block
 block discarded – undo
154 154
 	 * @param string $localeKey Unique identifier of the site, language and currency
155 155
 	 * @return array Associative list of errors occured
156 156
 	 */
157
-	protected function copyAddresses( \Aimeos\MShop\Order\Item\Base\Iface $basket, array $errors, $localeKey )
157
+	protected function copyAddresses(\Aimeos\MShop\Order\Item\Base\Iface $basket, array $errors, $localeKey)
158 158
 	{
159
-		foreach( $basket->getAddresses() as $type => $item )
159
+		foreach ($basket->getAddresses() as $type => $item)
160 160
 		{
161 161
 			try
162 162
 			{
163
-				$this->setAddress( $type, $item->toArray() );
164
-				$basket->deleteAddress( $type );
163
+				$this->setAddress($type, $item->toArray());
164
+				$basket->deleteAddress($type);
165 165
 			}
166
-			catch( \Exception $e )
166
+			catch (\Exception $e)
167 167
 			{
168 168
 				$logger = $this->getContext()->getLogger();
169 169
 				$str = 'Error migrating address with type "%1$s" in basket to locale "%2$s": %3$s';
170
-				$logger->log( sprintf( $str, $type, $localeKey, $e->getMessage() ), \Aimeos\MW\Logger\Base::INFO );
170
+				$logger->log(sprintf($str, $type, $localeKey, $e->getMessage()), \Aimeos\MW\Logger\Base::INFO);
171 171
 				$errors['address'][$type] = $e->getMessage();
172 172
 			}
173 173
 		}
@@ -184,20 +184,20 @@  discard block
 block discarded – undo
184 184
 	 * @param string $localeKey Unique identifier of the site, language and currency
185 185
 	 * @return array Associative list of errors occured
186 186
 	 */
187
-	protected function copyCoupons( \Aimeos\MShop\Order\Item\Base\Iface $basket, array $errors, $localeKey )
187
+	protected function copyCoupons(\Aimeos\MShop\Order\Item\Base\Iface $basket, array $errors, $localeKey)
188 188
 	{
189
-		foreach( $basket->getCoupons() as $code => $list )
189
+		foreach ($basket->getCoupons() as $code => $list)
190 190
 		{
191 191
 			try
192 192
 			{
193
-				$this->addCoupon( $code );
194
-				$basket->deleteCoupon( $code, true );
193
+				$this->addCoupon($code);
194
+				$basket->deleteCoupon($code, true);
195 195
 			}
196
-			catch( \Exception $e )
196
+			catch (\Exception $e)
197 197
 			{
198 198
 				$logger = $this->getContext()->getLogger();
199 199
 				$str = 'Error migrating coupon with code "%1$s" in basket to locale "%2$s": %3$s';
200
-				$logger->log( sprintf( $str, $code, $localeKey, $e->getMessage() ), \Aimeos\MW\Logger\Base::INFO );
200
+				$logger->log(sprintf($str, $code, $localeKey, $e->getMessage()), \Aimeos\MW\Logger\Base::INFO);
201 201
 				$errors['coupon'][$code] = $e->getMessage();
202 202
 			}
203 203
 		}
@@ -214,11 +214,11 @@  discard block
 block discarded – undo
214 214
 	 * @param string $localeKey Unique identifier of the site, language and currency
215 215
 	 * @return array Associative list of errors occured
216 216
 	 */
217
-	protected function copyProducts( \Aimeos\MShop\Order\Item\Base\Iface $basket, array $errors, $localeKey )
217
+	protected function copyProducts(\Aimeos\MShop\Order\Item\Base\Iface $basket, array $errors, $localeKey)
218 218
 	{
219
-		foreach( $basket->getProducts() as $pos => $product )
219
+		foreach ($basket->getProducts() as $pos => $product)
220 220
 		{
221
-			if( $product->getFlags() & \Aimeos\MShop\Order\Item\Base\Product\Base::FLAG_IMMUTABLE ) {
221
+			if ($product->getFlags() & \Aimeos\MShop\Order\Item\Base\Product\Base::FLAG_IMMUTABLE) {
222 222
 				continue;
223 223
 			}
224 224
 
@@ -226,7 +226,7 @@  discard block
 block discarded – undo
226 226
 			{
227 227
 				$attrIds = [];
228 228
 
229
-				foreach( $product->getAttributes() as $attrItem ) {
229
+				foreach ($product->getAttributes() as $attrItem) {
230 230
 					$attrIds[$attrItem->getType()][] = $attrItem->getAttributeId();
231 231
 				}
232 232
 
@@ -234,23 +234,23 @@  discard block
 block discarded – undo
234 234
 					$product->getProductId(),
235 235
 					$product->getQuantity(),
236 236
 					[],
237
-					$this->getValue( $attrIds, 'variant', [] ),
238
-					$this->getValue( $attrIds, 'config', [] ),
239
-					$this->getValue( $attrIds, 'hidden', [] ),
240
-					$this->getValue( $attrIds, 'custom', [] ),
237
+					$this->getValue($attrIds, 'variant', []),
238
+					$this->getValue($attrIds, 'config', []),
239
+					$this->getValue($attrIds, 'hidden', []),
240
+					$this->getValue($attrIds, 'custom', []),
241 241
 					$product->getStockType()
242 242
 				);
243 243
 
244
-				$basket->deleteProduct( $pos );
244
+				$basket->deleteProduct($pos);
245 245
 			}
246
-			catch( \Exception $e )
246
+			catch (\Exception $e)
247 247
 			{
248 248
 				$code = $product->getProductCode();
249 249
 				$logger = $this->getContext()->getLogger();
250 250
 				$errors['product'][$pos] = $e->getMessage();
251 251
 
252 252
 				$str = 'Error migrating product with code "%1$s" in basket to locale "%2$s": %3$s';
253
-				$logger->log( sprintf( $str, $code, $localeKey, $e->getMessage() ), \Aimeos\MW\Logger\Base::INFO );
253
+				$logger->log(sprintf($str, $code, $localeKey, $e->getMessage()), \Aimeos\MW\Logger\Base::INFO);
254 254
 			}
255 255
 		}
256 256
 
@@ -265,22 +265,22 @@  discard block
 block discarded – undo
265 265
 	 * @param array $errors Associative list of previous errors
266 266
 	 * @return array Associative list of errors occured
267 267
 	 */
268
-	protected function copyServices( \Aimeos\MShop\Order\Item\Base\Iface $basket, array $errors )
268
+	protected function copyServices(\Aimeos\MShop\Order\Item\Base\Iface $basket, array $errors)
269 269
 	{
270
-		foreach( $basket->getServices() as $type => $item )
270
+		foreach ($basket->getServices() as $type => $item)
271 271
 		{
272 272
 			try
273 273
 			{
274 274
 				$attributes = [];
275 275
 
276
-				foreach( $item->getAttributes() as $attrItem ) {
276
+				foreach ($item->getAttributes() as $attrItem) {
277 277
 					$attributes[$attrItem->getCode()] = $attrItem->getValue();
278 278
 				}
279 279
 
280
-				$this->setService( $type, $item->getServiceId(), $attributes );
281
-				$basket->deleteService( $type );
280
+				$this->setService($type, $item->getServiceId(), $attributes);
281
+				$basket->deleteService($type);
282 282
 			}
283
-			catch( \Exception $e ) { ; } // Don't notify the user as appropriate services can be added automatically
283
+			catch (\Exception $e) {; } // Don't notify the user as appropriate services can be added automatically
284 284
 		}
285 285
 
286 286
 		return $errors;
@@ -298,36 +298,36 @@  discard block
 block discarded – undo
298 298
 	 * @param array $attributeValues Associative list of attribute IDs as keys and their codes as values
299 299
 	 * @return array List of items implementing \Aimeos\MShop\Order\Item\Product\Attribute\Iface
300 300
 	 */
301
-	protected function createOrderProductAttributes( \Aimeos\MShop\Price\Item\Iface $price, $prodid, $quantity,
302
-			array $attributeIds, $type, array $attributeValues = [] )
301
+	protected function createOrderProductAttributes(\Aimeos\MShop\Price\Item\Iface $price, $prodid, $quantity,
302
+			array $attributeIds, $type, array $attributeValues = [])
303 303
 	{
304
-		if( empty( $attributeIds ) ) {
304
+		if (empty($attributeIds)) {
305 305
 			return [];
306 306
 		}
307 307
 
308
-		$attrTypeId = $this->getProductListTypeItem( 'attribute', $type )->getId();
309
-		$this->checkReferences( $prodid, 'attribute', $attrTypeId, $attributeIds );
308
+		$attrTypeId = $this->getProductListTypeItem('attribute', $type)->getId();
309
+		$this->checkReferences($prodid, 'attribute', $attrTypeId, $attributeIds);
310 310
 
311 311
 		$list = [];
312 312
 		$context = $this->getContext();
313 313
 
314
-		$priceManager = \Aimeos\MShop\Factory::createManager( $context, 'price' );
315
-		$orderProductAttributeManager = \Aimeos\MShop\Factory::createManager( $context, 'order/base/product/attribute' );
314
+		$priceManager = \Aimeos\MShop\Factory::createManager($context, 'price');
315
+		$orderProductAttributeManager = \Aimeos\MShop\Factory::createManager($context, 'order/base/product/attribute');
316 316
 
317
-		foreach( $this->getAttributes( $attributeIds ) as $id => $attrItem )
317
+		foreach ($this->getAttributes($attributeIds) as $id => $attrItem)
318 318
 		{
319
-			$prices = $attrItem->getRefItems( 'price', 'default', 'default' );
319
+			$prices = $attrItem->getRefItems('price', 'default', 'default');
320 320
 
321
-			if( !empty( $prices ) ) {
322
-				$price->addItem( $priceManager->getLowestPrice( $prices, $quantity ) );
321
+			if (!empty($prices)) {
322
+				$price->addItem($priceManager->getLowestPrice($prices, $quantity));
323 323
 			}
324 324
 
325 325
 			$item = $orderProductAttributeManager->createItem();
326
-			$item->copyFrom( $attrItem );
327
-			$item->setType( $type );
326
+			$item->copyFrom($attrItem);
327
+			$item->setType($type);
328 328
 
329
-			if( isset( $attributeValues[$id] ) ) {
330
-				$item->setValue( $attributeValues[$id] );
329
+			if (isset($attributeValues[$id])) {
330
+				$item->setValue($attributeValues[$id]);
331 331
 			}
332 332
 
333 333
 			$list[] = $item;
@@ -345,31 +345,31 @@  discard block
 block discarded – undo
345 345
 	 * @return array List of items implementing \Aimeos\MShop\Attribute\Item\Iface
346 346
 	 * @throws \Aimeos\Controller\Frontend\Basket\Exception If the actual attribute number doesn't match the expected one
347 347
 	 */
348
-	protected function getAttributes( array $attributeIds, array $domains = array( 'price', 'text' ) )
348
+	protected function getAttributes(array $attributeIds, array $domains = array('price', 'text'))
349 349
 	{
350
-		if( empty( $attributeIds ) ) {
350
+		if (empty($attributeIds)) {
351 351
 			return [];
352 352
 		}
353 353
 
354
-		$attributeManager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'attribute' );
354
+		$attributeManager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'attribute');
355 355
 
356
-		$search = $attributeManager->createSearch( true );
356
+		$search = $attributeManager->createSearch(true);
357 357
 		$expr = array(
358
-				$search->compare( '==', 'attribute.id', $attributeIds ),
358
+				$search->compare('==', 'attribute.id', $attributeIds),
359 359
 				$search->getConditions(),
360 360
 		);
361
-		$search->setConditions( $search->combine( '&&', $expr ) );
362
-		$search->setSlice( 0, 0x7fffffff );
361
+		$search->setConditions($search->combine('&&', $expr));
362
+		$search->setSlice(0, 0x7fffffff);
363 363
 
364
-		$attrItems = $attributeManager->searchItems( $search, $domains );
364
+		$attrItems = $attributeManager->searchItems($search, $domains);
365 365
 
366
-		if( count( $attrItems ) !== count( $attributeIds ) )
366
+		if (count($attrItems) !== count($attributeIds))
367 367
 		{
368
-			$expected = implode( ',', $attributeIds );
369
-			$actual = implode( ',', array_keys( $attrItems ) );
370
-			$msg = sprintf( 'Available attribute IDs "%1$s" do not match the given attribute IDs "%2$s"', $actual, $expected );
368
+			$expected = implode(',', $attributeIds);
369
+			$actual = implode(',', array_keys($attrItems));
370
+			$msg = sprintf('Available attribute IDs "%1$s" do not match the given attribute IDs "%2$s"', $actual, $expected);
371 371
 
372
-			throw new \Aimeos\Controller\Frontend\Basket\Exception( $msg );
372
+			throw new \Aimeos\Controller\Frontend\Basket\Exception($msg);
373 373
 		}
374 374
 
375 375
 		return $attrItems;
@@ -382,31 +382,31 @@  discard block
 block discarded – undo
382 382
 	 * @param \Aimeos\MShop\Order\Item\Base\Product\Attribute\Item[] $orderAttributes List of order product attribute items
383 383
 	 * @return \Aimeos\MShop\Attribute\Item\Iface[] Associative list of attribute IDs as key and attribute items as values
384 384
 	 */
385
-	protected function getAttributeItems( array $orderAttributes )
385
+	protected function getAttributeItems(array $orderAttributes)
386 386
 	{
387
-		if( empty( $orderAttributes ) ) {
387
+		if (empty($orderAttributes)) {
388 388
 			return [];
389 389
 		}
390 390
 
391
-		$attributeManager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'attribute' );
392
-		$search = $attributeManager->createSearch( true );
391
+		$attributeManager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'attribute');
392
+		$search = $attributeManager->createSearch(true);
393 393
 		$expr = [];
394 394
 
395
-		foreach( $orderAttributes as $item )
395
+		foreach ($orderAttributes as $item)
396 396
 		{
397 397
 			$tmp = array(
398
-				$search->compare( '==', 'attribute.domain', 'product' ),
399
-				$search->compare( '==', 'attribute.code', $item->getValue() ),
400
-				$search->compare( '==', 'attribute.type.domain', 'product' ),
401
-				$search->compare( '==', 'attribute.type.code', $item->getCode() ),
402
-				$search->compare( '>', 'attribute.type.status', 0 ),
398
+				$search->compare('==', 'attribute.domain', 'product'),
399
+				$search->compare('==', 'attribute.code', $item->getValue()),
400
+				$search->compare('==', 'attribute.type.domain', 'product'),
401
+				$search->compare('==', 'attribute.type.code', $item->getCode()),
402
+				$search->compare('>', 'attribute.type.status', 0),
403 403
 				$search->getConditions(),
404 404
 			);
405
-			$expr[] = $search->combine( '&&', $tmp );
405
+			$expr[] = $search->combine('&&', $tmp);
406 406
 		}
407 407
 
408
-		$search->setConditions( $search->combine( '||', $expr ) );
409
-		return $attributeManager->searchItems( $search, array( 'price' ) );
408
+		$search->setConditions($search->combine('||', $expr));
409
+		return $attributeManager->searchItems($search, array('price'));
410 410
 	}
411 411
 
412 412
 
@@ -420,23 +420,23 @@  discard block
 block discarded – undo
420 420
 	 * @return \Aimeos\MShop\Common\Item\Iface Domain item object
421 421
 	 * @throws \Aimeos\Controller\Frontend\Basket\Exception
422 422
 	 */
423
-	protected function getDomainItem( $domain, $key, $value, array $ref )
423
+	protected function getDomainItem($domain, $key, $value, array $ref)
424 424
 	{
425
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), $domain );
425
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), $domain);
426 426
 
427
-		$search = $manager->createSearch( true );
427
+		$search = $manager->createSearch(true);
428 428
 		$expr = array(
429
-			$search->compare( '==', $key, $value ),
429
+			$search->compare('==', $key, $value),
430 430
 			$search->getConditions(),
431 431
 		);
432
-		$search->setConditions( $search->combine( '&&', $expr ) );
432
+		$search->setConditions($search->combine('&&', $expr));
433 433
 
434
-		$result = $manager->searchItems( $search, $ref );
434
+		$result = $manager->searchItems($search, $ref);
435 435
 
436
-		if( ( $item = reset( $result ) ) === false )
436
+		if (($item = reset($result)) === false)
437 437
 		{
438
-			$msg = sprintf( 'No item for "%1$s" (%2$s) found', $value, $key );
439
-			throw new \Aimeos\Controller\Frontend\Basket\Exception( $msg );
438
+			$msg = sprintf('No item for "%1$s" (%2$s) found', $value, $key);
439
+			throw new \Aimeos\Controller\Frontend\Basket\Exception($msg);
440 440
 		}
441 441
 
442 442
 		return $item;
@@ -450,26 +450,26 @@  discard block
 block discarded – undo
450 450
 	 * @param string $code Code of the list type
451 451
 	 * @return \Aimeos\MShop\Common\Item\Type\Iface List type item
452 452
 	 */
453
-	protected function getProductListTypeItem( $domain, $code )
453
+	protected function getProductListTypeItem($domain, $code)
454 454
 	{
455
-		if( !isset( $this->listTypeAttributes[$domain][$code] ) )
455
+		if (!isset($this->listTypeAttributes[$domain][$code]))
456 456
 		{
457
-			$listTypeManager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'product/lists/type' );
457
+			$listTypeManager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'product/lists/type');
458 458
 
459
-			$listTypeSearch = $listTypeManager->createSearch( true );
459
+			$listTypeSearch = $listTypeManager->createSearch(true);
460 460
 			$expr = array(
461
-				$listTypeSearch->compare( '==', 'product.lists.type.domain', $domain ),
462
-				$listTypeSearch->compare( '==', 'product.lists.type.code', $code ),
461
+				$listTypeSearch->compare('==', 'product.lists.type.domain', $domain),
462
+				$listTypeSearch->compare('==', 'product.lists.type.code', $code),
463 463
 				$listTypeSearch->getConditions(),
464 464
 			);
465
-			$listTypeSearch->setConditions( $listTypeSearch->combine( '&&', $expr ) );
465
+			$listTypeSearch->setConditions($listTypeSearch->combine('&&', $expr));
466 466
 
467
-			$listTypeItems = $listTypeManager->searchItems( $listTypeSearch );
467
+			$listTypeItems = $listTypeManager->searchItems($listTypeSearch);
468 468
 
469
-			if( ( $listTypeItem = reset( $listTypeItems ) ) === false )
469
+			if (($listTypeItem = reset($listTypeItems)) === false)
470 470
 			{
471
-				$msg = sprintf( 'List type for domain "%1$s" and code "%2$s" not found', $domain, $code );
472
-				throw new \Aimeos\Controller\Frontend\Basket\Exception( $msg );
471
+				$msg = sprintf('List type for domain "%1$s" and code "%2$s" not found', $domain, $code);
472
+				throw new \Aimeos\Controller\Frontend\Basket\Exception($msg);
473 473
 			}
474 474
 
475 475
 			$this->listTypeAttributes[$domain][$code] = $listTypeItem;
@@ -487,43 +487,43 @@  discard block
 block discarded – undo
487 487
 	 * @param array $domains Names of the domain items that should be fetched too
488 488
 	 * @return array List of products matching the given attributes
489 489
 	 */
490
-	protected function getProductVariants( \Aimeos\MShop\Product\Item\Iface $productItem, array $variantAttributeIds,
491
-			array $domains = array( 'attribute', 'media', 'price', 'text' ) )
490
+	protected function getProductVariants(\Aimeos\MShop\Product\Item\Iface $productItem, array $variantAttributeIds,
491
+			array $domains = array('attribute', 'media', 'price', 'text'))
492 492
 	{
493 493
 		$subProductIds = [];
494
-		foreach( $productItem->getRefItems( 'product', 'default', 'default' ) as $item ) {
494
+		foreach ($productItem->getRefItems('product', 'default', 'default') as $item) {
495 495
 			$subProductIds[] = $item->getId();
496 496
 		}
497 497
 
498
-		if( count( $subProductIds ) === 0 ) {
498
+		if (count($subProductIds) === 0) {
499 499
 			return [];
500 500
 		}
501 501
 
502
-		$productManager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'product' );
503
-		$search = $productManager->createSearch( true );
502
+		$productManager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'product');
503
+		$search = $productManager->createSearch(true);
504 504
 
505 505
 		$expr = array(
506
-			$search->compare( '==', 'product.id', $subProductIds ),
506
+			$search->compare('==', 'product.id', $subProductIds),
507 507
 			$search->getConditions(),
508 508
 		);
509 509
 
510
-		if( count( $variantAttributeIds ) > 0 )
510
+		if (count($variantAttributeIds) > 0)
511 511
 		{
512
-			foreach( $variantAttributeIds as $key => $id ) {
512
+			foreach ($variantAttributeIds as $key => $id) {
513 513
 				$variantAttributeIds[$key] = (string) $id;
514 514
 			}
515 515
 
516
-			$listTypeItem = $this->getProductListTypeItem( 'attribute', 'variant' );
516
+			$listTypeItem = $this->getProductListTypeItem('attribute', 'variant');
517 517
 
518
-			$param = array( 'attribute', $listTypeItem->getId(), $variantAttributeIds );
519
-			$cmpfunc = $search->createFunction( 'product.contains', $param );
518
+			$param = array('attribute', $listTypeItem->getId(), $variantAttributeIds);
519
+			$cmpfunc = $search->createFunction('product.contains', $param);
520 520
 
521
-			$expr[] = $search->compare( '==', $cmpfunc, count( $variantAttributeIds ) );
521
+			$expr[] = $search->compare('==', $cmpfunc, count($variantAttributeIds));
522 522
 		}
523 523
 
524
-		$search->setConditions( $search->combine( '&&', $expr ) );
524
+		$search->setConditions($search->combine('&&', $expr));
525 525
 
526
-		return $productManager->searchItems( $search, $domains );
526
+		return $productManager->searchItems($search, $domains);
527 527
 	}
528 528
 
529 529
 
@@ -535,9 +535,9 @@  discard block
 block discarded – undo
535 535
 	 * @param mixed $default Default value if no value is available for the given name
536 536
 	 * @return mixed Value from the array or default value
537 537
 	 */
538
-	protected function getValue( array $values, $name, $default = null )
538
+	protected function getValue(array $values, $name, $default = null)
539 539
 	{
540
-		if( isset( $values[$name] ) ) {
540
+		if (isset($values[$name])) {
541 541
 			return $values[$name];
542 542
 		}
543 543
 
Please login to merge, or discard this patch.
controller/frontend/src/Controller/Frontend/Basket/Decorator/Bundle.php 1 patch
Spacing   +37 added lines, -37 removed lines patch added patch discarded remove patch
@@ -41,15 +41,15 @@  discard block
 block discarded – undo
41 41
 	 * @param string $stocktype Unique code of the stock type to deliver the products from
42 42
 	 * @throws \Aimeos\Controller\Frontend\Basket\Exception If the product isn't available
43 43
 	 */
44
-	public function addProduct( $prodid, $quantity = 1, array $options = [], array $variantAttributeIds = [],
44
+	public function addProduct($prodid, $quantity = 1, array $options = [], array $variantAttributeIds = [],
45 45
 		array $configAttributeIds = [], array $hiddenAttributeIds = [], array $customAttributeValues = [],
46
-		$stocktype = 'default' )
46
+		$stocktype = 'default')
47 47
 	{
48 48
 		$context = $this->getContext();
49
-		$productManager = \Aimeos\MShop\Factory::createManager( $context, 'product' );
50
-		$productItem = $productManager->getItem( $prodid, [], true );
49
+		$productManager = \Aimeos\MShop\Factory::createManager($context, 'product');
50
+		$productItem = $productManager->getItem($prodid, [], true);
51 51
 
52
-		if( $productItem->getType() !== 'bundle' )
52
+		if ($productItem->getType() !== 'bundle')
53 53
 		{
54 54
 			return $this->getController()->addProduct(
55 55
 				$prodid, $quantity, $options, $variantAttributeIds, $configAttributeIds,
@@ -57,30 +57,30 @@  discard block
 block discarded – undo
57 57
 			);
58 58
 		}
59 59
 
60
-		$productItem = $productManager->getItem( $prodid, array( 'media', 'supplier', 'price', 'product', 'text' ), true );
60
+		$productItem = $productManager->getItem($prodid, array('media', 'supplier', 'price', 'product', 'text'), true);
61 61
 
62
-		$orderBaseProductItem = \Aimeos\MShop\Factory::createManager( $context, 'order/base/product' )->createItem();
63
-		$orderBaseProductItem->copyFrom( $productItem );
64
-		$orderBaseProductItem->setQuantity( $quantity );
65
-		$orderBaseProductItem->setStockType( $stocktype );
62
+		$orderBaseProductItem = \Aimeos\MShop\Factory::createManager($context, 'order/base/product')->createItem();
63
+		$orderBaseProductItem->copyFrom($productItem);
64
+		$orderBaseProductItem->setQuantity($quantity);
65
+		$orderBaseProductItem->setStockType($stocktype);
66 66
 
67
-		$prices = $productItem->getRefItems( 'price', 'default', 'default' );
68
-		$this->addBundleProducts( $orderBaseProductItem, $productItem, $variantAttributeIds, $stocktype );
67
+		$prices = $productItem->getRefItems('price', 'default', 'default');
68
+		$this->addBundleProducts($orderBaseProductItem, $productItem, $variantAttributeIds, $stocktype);
69 69
 
70
-		$priceManager = \Aimeos\MShop\Factory::createManager( $context, 'price' );
71
-		$price = $priceManager->getLowestPrice( $prices, $quantity );
70
+		$priceManager = \Aimeos\MShop\Factory::createManager($context, 'price');
71
+		$price = $priceManager->getLowestPrice($prices, $quantity);
72 72
 
73
-		$attr = $this->createOrderProductAttributes( $price, $prodid, $quantity, $configAttributeIds, 'config' );
74
-		$attr = array_merge( $attr, $this->createOrderProductAttributes( $price, $prodid, $quantity, $hiddenAttributeIds, 'hidden' ) );
75
-		$attr = array_merge( $attr, $this->createOrderProductAttributes( $price, $prodid, $quantity, array_keys( $customAttributeValues ), 'custom', $customAttributeValues ) );
73
+		$attr = $this->createOrderProductAttributes($price, $prodid, $quantity, $configAttributeIds, 'config');
74
+		$attr = array_merge($attr, $this->createOrderProductAttributes($price, $prodid, $quantity, $hiddenAttributeIds, 'hidden'));
75
+		$attr = array_merge($attr, $this->createOrderProductAttributes($price, $prodid, $quantity, array_keys($customAttributeValues), 'custom', $customAttributeValues));
76 76
 
77 77
 		// remove product rebate of original price in favor to rebates granted for the order
78
-		$price->setRebate( '0.00' );
78
+		$price->setRebate('0.00');
79 79
 
80
-		$orderBaseProductItem->setPrice( $price );
81
-		$orderBaseProductItem->setAttributes( $attr );
80
+		$orderBaseProductItem->setPrice($price);
81
+		$orderBaseProductItem->setAttributes($attr);
82 82
 
83
-		$this->getController()->get()->addProduct( $orderBaseProductItem );
83
+		$this->getController()->get()->addProduct($orderBaseProductItem);
84 84
 		$this->getController()->save();
85 85
 	}
86 86
 
@@ -93,43 +93,43 @@  discard block
 block discarded – undo
93 93
 	 * @param array $variantAttributeIds List of product variant attribute IDs
94 94
 	 * @param string $stocktype
95 95
 	 */
96
-	protected function addBundleProducts( \Aimeos\MShop\Order\Item\Base\Product\Iface $orderBaseProductItem,
97
-		\Aimeos\MShop\Product\Item\Iface $productItem, array $variantAttributeIds, $stocktype )
96
+	protected function addBundleProducts(\Aimeos\MShop\Order\Item\Base\Product\Iface $orderBaseProductItem,
97
+		\Aimeos\MShop\Product\Item\Iface $productItem, array $variantAttributeIds, $stocktype)
98 98
 	{
99 99
 		$quantity = $orderBaseProductItem->getQuantity();
100 100
 		$products = $subProductIds = $orderProducts = [];
101
-		$orderProductManager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'order/base/product' );
101
+		$orderProductManager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'order/base/product');
102 102
 
103
-		foreach( $productItem->getRefItems( 'product', null, 'default' ) as $item ) {
103
+		foreach ($productItem->getRefItems('product', null, 'default') as $item) {
104 104
 			$subProductIds[] = $item->getId();
105 105
 		}
106 106
 
107
-		if( count( $subProductIds ) > 0 )
107
+		if (count($subProductIds) > 0)
108 108
 		{
109
-			$productManager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'product' );
109
+			$productManager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'product');
110 110
 
111
-			$search = $productManager->createSearch( true );
111
+			$search = $productManager->createSearch(true);
112 112
 			$expr = array(
113
-				$search->compare( '==', 'product.id', $subProductIds ),
113
+				$search->compare('==', 'product.id', $subProductIds),
114 114
 				$search->getConditions(),
115 115
 			);
116
-			$search->setConditions( $search->combine( '&&', $expr ) );
116
+			$search->setConditions($search->combine('&&', $expr));
117 117
 
118
-			$products = $productManager->searchItems( $search, array( 'attribute', 'media', 'price', 'text' ) );
118
+			$products = $productManager->searchItems($search, array('attribute', 'media', 'price', 'text'));
119 119
 		}
120 120
 
121
-		foreach( $products as $product )
121
+		foreach ($products as $product)
122 122
 		{
123
-			$prices = $product->getRefItems( 'price', 'default', 'default' );
123
+			$prices = $product->getRefItems('price', 'default', 'default');
124 124
 
125 125
 			$orderProduct = $orderProductManager->createItem();
126
-			$orderProduct->copyFrom( $product );
127
-			$orderProduct->setStockType( $stocktype );
128
-			$orderProduct->setPrice( $this->calcPrice( $orderProduct, $prices, $quantity ) );
126
+			$orderProduct->copyFrom($product);
127
+			$orderProduct->setStockType($stocktype);
128
+			$orderProduct->setPrice($this->calcPrice($orderProduct, $prices, $quantity));
129 129
 
130 130
 			$orderProducts[] = $orderProduct;
131 131
 		}
132 132
 
133
-		$orderBaseProductItem->setProducts( $orderProducts );
133
+		$orderBaseProductItem->setProducts($orderProducts);
134 134
 	}
135 135
 }
Please login to merge, or discard this patch.
controller/frontend/src/Controller/Frontend/Basket/Decorator/Select.php 1 patch
Spacing   +43 added lines, -43 removed lines patch added patch discarded remove patch
@@ -41,15 +41,15 @@  discard block
 block discarded – undo
41 41
 	 * @param string $stocktype Unique code of the stock type to deliver the products from
42 42
 	 * @throws \Aimeos\Controller\Frontend\Basket\Exception If the product isn't available
43 43
 	 */
44
-	public function addProduct( $prodid, $quantity = 1, array $options = [], array $variantAttributeIds = [],
44
+	public function addProduct($prodid, $quantity = 1, array $options = [], array $variantAttributeIds = [],
45 45
 		array $configAttributeIds = [], array $hiddenAttributeIds = [], array $customAttributeValues = [],
46
-		$stocktype = 'default' )
46
+		$stocktype = 'default')
47 47
 	{
48 48
 		$context = $this->getContext();
49
-		$productManager = \Aimeos\MShop\Factory::createManager( $context, 'product' );
50
-		$productItem = $productManager->getItem( $prodid, [], true );
49
+		$productManager = \Aimeos\MShop\Factory::createManager($context, 'product');
50
+		$productItem = $productManager->getItem($prodid, [], true);
51 51
 
52
-		if( $productItem->getType() !== 'select' )
52
+		if ($productItem->getType() !== 'select')
53 53
 		{
54 54
 			return $this->getController()->addProduct(
55 55
 				$prodid, $quantity, $options, $variantAttributeIds, $configAttributeIds,
@@ -57,31 +57,31 @@  discard block
 block discarded – undo
57 57
 			);
58 58
 		}
59 59
 
60
-		$productItem = $productManager->getItem( $prodid, array( 'media', 'supplier', 'price', 'product', 'text' ), true );
60
+		$productItem = $productManager->getItem($prodid, array('media', 'supplier', 'price', 'product', 'text'), true);
61 61
 
62
-		$orderBaseProductItem = \Aimeos\MShop\Factory::createManager( $context, 'order/base/product' )->createItem();
63
-		$orderBaseProductItem->copyFrom( $productItem );
64
-		$orderBaseProductItem->setQuantity( $quantity );
65
-		$orderBaseProductItem->setStockType( $stocktype );
62
+		$orderBaseProductItem = \Aimeos\MShop\Factory::createManager($context, 'order/base/product')->createItem();
63
+		$orderBaseProductItem->copyFrom($productItem);
64
+		$orderBaseProductItem->setQuantity($quantity);
65
+		$orderBaseProductItem->setStockType($stocktype);
66 66
 
67
-		$prices = $productItem->getRefItems( 'price', 'default', 'default' );
68
-		$attr = $this->getVariantDetails( $orderBaseProductItem, $productItem, $prices, $variantAttributeIds, $options );
69
-		$prodIds = array( $prodid, $productItem->getId() );
67
+		$prices = $productItem->getRefItems('price', 'default', 'default');
68
+		$attr = $this->getVariantDetails($orderBaseProductItem, $productItem, $prices, $variantAttributeIds, $options);
69
+		$prodIds = array($prodid, $productItem->getId());
70 70
 
71
-		$priceManager = \Aimeos\MShop\Factory::createManager( $context, 'price' );
72
-		$price = $priceManager->getLowestPrice( $prices, $quantity );
71
+		$priceManager = \Aimeos\MShop\Factory::createManager($context, 'price');
72
+		$price = $priceManager->getLowestPrice($prices, $quantity);
73 73
 
74
-		$attr = array_merge( $attr, $this->createOrderProductAttributes( $price, $prodIds, $quantity, $configAttributeIds, 'config' ) );
75
-		$attr = array_merge( $attr, $this->createOrderProductAttributes( $price, $prodIds, $quantity, $hiddenAttributeIds, 'hidden' ) );
76
-		$attr = array_merge( $attr, $this->createOrderProductAttributes( $price, $prodIds, $quantity, array_keys( $customAttributeValues ), 'custom', $customAttributeValues ) );
74
+		$attr = array_merge($attr, $this->createOrderProductAttributes($price, $prodIds, $quantity, $configAttributeIds, 'config'));
75
+		$attr = array_merge($attr, $this->createOrderProductAttributes($price, $prodIds, $quantity, $hiddenAttributeIds, 'hidden'));
76
+		$attr = array_merge($attr, $this->createOrderProductAttributes($price, $prodIds, $quantity, array_keys($customAttributeValues), 'custom', $customAttributeValues));
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
-		$orderBaseProductItem->setPrice( $price );
82
-		$orderBaseProductItem->setAttributes( $attr );
81
+		$orderBaseProductItem->setPrice($price);
82
+		$orderBaseProductItem->setAttributes($attr);
83 83
 
84
-		$this->getController()->get()->addProduct( $orderBaseProductItem );
84
+		$this->getController()->get()->addProduct($orderBaseProductItem);
85 85
 		$this->getController()->save();
86 86
 	}
87 87
 
@@ -97,50 +97,50 @@  discard block
 block discarded – undo
97 97
 	 * @return \Aimeos\MShop\Order\Item\Base\Product\Attribute\Iface[] List of order product attributes
98 98
 	 * @throws \Aimeos\Controller\Frontend\Basket\Exception If no product variant is found
99 99
 	 */
100
-	protected function getVariantDetails( \Aimeos\MShop\Order\Item\Base\Product\Iface $orderBaseProductItem,
101
-		\Aimeos\MShop\Product\Item\Iface &$productItem, array &$prices, array $variantAttributeIds, array $options )
100
+	protected function getVariantDetails(\Aimeos\MShop\Order\Item\Base\Product\Iface $orderBaseProductItem,
101
+		\Aimeos\MShop\Product\Item\Iface & $productItem, array &$prices, array $variantAttributeIds, array $options)
102 102
 	{
103 103
 		$attr = [];
104
-		$productItems = $this->getProductVariants( $productItem, $variantAttributeIds );
104
+		$productItems = $this->getProductVariants($productItem, $variantAttributeIds);
105 105
 
106
-		if( count( $productItems ) > 1 )
106
+		if (count($productItems) > 1)
107 107
 		{
108
-			$msg = sprintf( 'No unique article found for selected attributes and product ID "%1$s"', $productItem->getId() );
109
-			throw new \Aimeos\Controller\Frontend\Basket\Exception( $msg );
108
+			$msg = sprintf('No unique article found for selected attributes and product ID "%1$s"', $productItem->getId());
109
+			throw new \Aimeos\Controller\Frontend\Basket\Exception($msg);
110 110
 		}
111
-		else if( ( $result = reset( $productItems ) ) !== false ) // count == 1
111
+		else if (($result = reset($productItems)) !== false) // count == 1
112 112
 		{
113 113
 			$productItem = $result;
114
-			$orderBaseProductItem->setProductCode( $productItem->getCode() );
114
+			$orderBaseProductItem->setProductCode($productItem->getCode());
115 115
 
116
-			$subprices = $productItem->getRefItems( 'price', 'default', 'default' );
116
+			$subprices = $productItem->getRefItems('price', 'default', 'default');
117 117
 
118
-			if( !empty( $subprices ) ) {
118
+			if (!empty($subprices)) {
119 119
 				$prices = $subprices;
120 120
 			}
121 121
 
122
-			$submedia = $productItem->getRefItems( 'media', 'default', 'default' );
122
+			$submedia = $productItem->getRefItems('media', 'default', 'default');
123 123
 
124
-			if( ( $mediaItem = reset( $submedia ) ) !== false ) {
125
-				$orderBaseProductItem->setMediaUrl( $mediaItem->getPreview() );
124
+			if (($mediaItem = reset($submedia)) !== false) {
125
+				$orderBaseProductItem->setMediaUrl($mediaItem->getPreview());
126 126
 			}
127 127
 
128
-			$orderProductAttrManager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'order/base/product/attribute' );
129
-			$variantAttributes = $productItem->getRefItems( 'attribute', null, 'variant' );
128
+			$orderProductAttrManager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'order/base/product/attribute');
129
+			$variantAttributes = $productItem->getRefItems('attribute', null, 'variant');
130 130
 
131
-			foreach( $this->getAttributes( array_keys( $variantAttributes ), array( 'text' ) ) as $attrItem )
131
+			foreach ($this->getAttributes(array_keys($variantAttributes), array('text')) as $attrItem)
132 132
 			{
133 133
 				$orderAttributeItem = $orderProductAttrManager->createItem();
134
-				$orderAttributeItem->copyFrom( $attrItem );
135
-				$orderAttributeItem->setType( 'variant' );
134
+				$orderAttributeItem->copyFrom($attrItem);
135
+				$orderAttributeItem->setType('variant');
136 136
 
137 137
 				$attr[] = $orderAttributeItem;
138 138
 			}
139 139
 		}
140
-		else if( !isset( $options['variant'] ) || $options['variant'] != false ) // count == 0
140
+		else if (!isset($options['variant']) || $options['variant'] != false) // count == 0
141 141
 		{
142
-			$msg = sprintf( 'No article found for selected attributes and product ID "%1$s"', $productItem->getId() );
143
-			throw new \Aimeos\Controller\Frontend\Basket\Exception( $msg );
142
+			$msg = sprintf('No article found for selected attributes and product ID "%1$s"', $productItem->getId());
143
+			throw new \Aimeos\Controller\Frontend\Basket\Exception($msg);
144 144
 		}
145 145
 
146 146
 		return $attr;
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
@@ -41,27 +41,27 @@
 block discarded – undo
41 41
 	 * @param string $stocktype Unique code of the stock type to deliver the products from
42 42
 	 * @throws \Aimeos\Controller\Frontend\Basket\Exception If the product isn't available
43 43
 	 */
44
-	public function addProduct( $prodid, $quantity = 1, array $options = [], array $variantAttributeIds = [],
44
+	public function addProduct($prodid, $quantity = 1, array $options = [], array $variantAttributeIds = [],
45 45
 		array $configAttributeIds = [], array $hiddenAttributeIds = [], array $customAttributeValues = [],
46
-		$stocktype = 'default' )
46
+		$stocktype = 'default')
47 47
 	{
48
-		$catalogListManager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'catalog/lists' );
48
+		$catalogListManager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'catalog/lists');
49 49
 
50
-		$search = $catalogListManager->createSearch( true );
50
+		$search = $catalogListManager->createSearch(true);
51 51
 		$expr = array(
52
-			$search->compare( '==', 'catalog.lists.domain', 'product' ),
53
-			$search->compare( '==', 'catalog.lists.refid', $prodid ),
52
+			$search->compare('==', 'catalog.lists.domain', 'product'),
53
+			$search->compare('==', 'catalog.lists.refid', $prodid),
54 54
 			$search->getConditions()
55 55
 		);
56
-		$search->setConditions( $search->combine( '&&', $expr ) );
57
-		$search->setSlice( 0, 1 );
56
+		$search->setConditions($search->combine('&&', $expr));
57
+		$search->setSlice(0, 1);
58 58
 
59
-		$result = $catalogListManager->searchItems( $search );
59
+		$result = $catalogListManager->searchItems($search);
60 60
 
61
-		if( reset( $result ) === false )
61
+		if (reset($result) === false)
62 62
 		{
63
-			$msg = sprintf( 'Adding product with ID "%1$s" is not allowed', $prodid );
64
-			throw new \Aimeos\Controller\Frontend\Basket\Exception( $msg );
63
+			$msg = sprintf('Adding product with ID "%1$s" is not allowed', $prodid);
64
+			throw new \Aimeos\Controller\Frontend\Basket\Exception($msg);
65 65
 		}
66 66
 
67 67
 		$this->getController()->addProduct(
Please login to merge, or discard this patch.
controller/frontend/src/Controller/Frontend/Basket/Decorator/Base.php 1 patch
Spacing   +25 added lines, -25 removed lines patch added patch discarded remove patch
@@ -30,18 +30,18 @@  discard block
 block discarded – undo
30 30
 	 * @param \Aimeos\Controller\Frontend\Iface $controller Controller object
31 31
 	 * @param \Aimeos\MShop\Context\Item\Iface $context Context object with required objects
32 32
 	 */
33
-	public function __construct( \Aimeos\Controller\Frontend\Iface $controller, \Aimeos\MShop\Context\Item\Iface $context )
33
+	public function __construct(\Aimeos\Controller\Frontend\Iface $controller, \Aimeos\MShop\Context\Item\Iface $context)
34 34
 	{
35 35
 		$iface = '\Aimeos\Controller\Frontend\Basket\Iface';
36
-		if( !( $controller instanceof $iface ) )
36
+		if (!($controller instanceof $iface))
37 37
 		{
38
-			$msg = sprintf( 'Class "%1$s" does not implement interface "%2$s"', get_class( $controller ), $iface );
39
-			throw new \Aimeos\Controller\Frontend\Exception( $msg );
38
+			$msg = sprintf('Class "%1$s" does not implement interface "%2$s"', get_class($controller), $iface);
39
+			throw new \Aimeos\Controller\Frontend\Exception($msg);
40 40
 		}
41 41
 
42 42
 		$this->controller = $controller;
43 43
 
44
-		parent::__construct( $context );
44
+		parent::__construct($context);
45 45
 	}
46 46
 
47 47
 
@@ -53,9 +53,9 @@  discard block
 block discarded – undo
53 53
 	 * @return mixed Returns the value of the called method
54 54
 	 * @throws \Aimeos\Controller\Frontend\Exception If method call failed
55 55
 	 */
56
-	public function __call( $name, array $param )
56
+	public function __call($name, array $param)
57 57
 	{
58
-		return @call_user_func_array( array( $this->controller, $name ), $param );
58
+		return @call_user_func_array(array($this->controller, $name), $param);
59 59
 	}
60 60
 
61 61
 
@@ -97,9 +97,9 @@  discard block
 block discarded – undo
97 97
 	 * @param string $type Basket type
98 98
 	 * @return \Aimeos\Controller\Frontend\Basket\Iface Basket frontend object
99 99
 	 */
100
-	public function setType( $type )
100
+	public function setType($type)
101 101
 	{
102
-		$this->controller->setType( $type );
102
+		$this->controller->setType($type);
103 103
 		return $this;
104 104
 	}
105 105
 
@@ -123,9 +123,9 @@  discard block
 block discarded – undo
123 123
 	 * @param boolean $default True to add default criteria (user logged in), false if not
124 124
 	 * @return \Aimeos\MShop\Order\Item\Base\Iface Order base object including the given parts
125 125
 	 */
126
-	public function load( $id, $parts = \Aimeos\MShop\Order\Manager\Base\Base::PARTS_ALL, $default = true )
126
+	public function load($id, $parts = \Aimeos\MShop\Order\Manager\Base\Base::PARTS_ALL, $default = true)
127 127
 	{
128
-		return $this->controller->load( $id, $parts, $default );
128
+		return $this->controller->load($id, $parts, $default);
129 129
 	}
130 130
 
131 131
 
@@ -150,9 +150,9 @@  discard block
 block discarded – undo
150 150
 	 * @throws \Aimeos\Controller\Frontend\Basket\Exception If the product isn't available
151 151
 	 * @return void
152 152
 	 */
153
-	public function addProduct( $prodid, $quantity = 1, array $options = [], array $variantAttributeIds = [],
153
+	public function addProduct($prodid, $quantity = 1, array $options = [], array $variantAttributeIds = [],
154 154
 		array $configAttributeIds = [], array $hiddenAttributeIds = [], array $customAttributeValues = [],
155
-		$stocktype = 'default' )
155
+		$stocktype = 'default')
156 156
 	{
157 157
 		$this->controller->addProduct(
158 158
 			$prodid, $quantity, $options, $variantAttributeIds, $configAttributeIds,
@@ -167,9 +167,9 @@  discard block
 block discarded – undo
167 167
 	 * @param integer $position Position number (key) of the order product item
168 168
 	 * @return void
169 169
 	 */
170
-	public function deleteProduct( $position )
170
+	public function deleteProduct($position)
171 171
 	{
172
-		$this->controller->deleteProduct( $position );
172
+		$this->controller->deleteProduct($position);
173 173
 	}
174 174
 
175 175
 
@@ -182,9 +182,9 @@  discard block
 block discarded – undo
182 182
 	 * @param array $configAttributeCodes Codes of the product config attributes that should be REMOVED
183 183
 	 * @return void
184 184
 	 */
185
-	public function editProduct( $position, $quantity, array $options = [], array $configAttributeCodes = [] )
185
+	public function editProduct($position, $quantity, array $options = [], array $configAttributeCodes = [])
186 186
 	{
187
-		$this->controller->editProduct( $position, $quantity, $options, $configAttributeCodes );
187
+		$this->controller->editProduct($position, $quantity, $options, $configAttributeCodes);
188 188
 	}
189 189
 
190 190
 
@@ -195,9 +195,9 @@  discard block
 block discarded – undo
195 195
 	 * @throws \Aimeos\Controller\Frontend\Basket\Exception if the coupon code is invalid or not allowed
196 196
 	 * @return void
197 197
 	 */
198
-	public function addCoupon( $code )
198
+	public function addCoupon($code)
199 199
 	{
200
-		$this->controller->addCoupon( $code );
200
+		$this->controller->addCoupon($code);
201 201
 	}
202 202
 
203 203
 
@@ -208,9 +208,9 @@  discard block
 block discarded – undo
208 208
 	 * @throws \Aimeos\Controller\Frontend\Basket\Exception if the coupon code is invalid
209 209
 	 * @return void
210 210
 	 */
211
-	public function deleteCoupon( $code )
211
+	public function deleteCoupon($code)
212 212
 	{
213
-		$this->controller->deleteCoupon( $code );
213
+		$this->controller->deleteCoupon($code);
214 214
 	}
215 215
 
216 216
 
@@ -223,9 +223,9 @@  discard block
 block discarded – undo
223 223
 	 * 	if one of the keys is invalid when using an array with key/value pairs
224 224
 	 * @return void
225 225
 	 */
226
-	public function setAddress( $type, $value )
226
+	public function setAddress($type, $value)
227 227
 	{
228
-		$this->controller->setAddress( $type, $value );
228
+		$this->controller->setAddress($type, $value);
229 229
 	}
230 230
 
231 231
 
@@ -239,9 +239,9 @@  discard block
 block discarded – undo
239 239
 	 * @throws \Aimeos\Controller\Frontend\Basket\Exception If there is no price to the service item attached
240 240
 	 * @return void
241 241
 	 */
242
-	public function setService( $type, $id, array $attributes = [] )
242
+	public function setService($type, $id, array $attributes = [])
243 243
 	{
244
-		$this->controller->setService( $type, $id, $attributes );
244
+		$this->controller->setService($type, $id, $attributes);
245 245
 	}
246 246
 
247 247
 
Please login to merge, or discard this patch.
controller/frontend/src/Controller/Frontend/Basket/Standard.php 1 patch
Spacing   +122 added lines, -122 removed lines patch added patch discarded remove patch
@@ -33,11 +33,11 @@  discard block
 block discarded – undo
33 33
 	 * @param \Aimeos\MShop\Context\Item\Iface $context Object storing the required instances for manaing databases
34 34
 	 *  connections, logger, session, etc.
35 35
 	 */
36
-	public function __construct( \Aimeos\MShop\Context\Item\Iface $context )
36
+	public function __construct(\Aimeos\MShop\Context\Item\Iface $context)
37 37
 	{
38
-		parent::__construct( $context );
38
+		parent::__construct($context);
39 39
 
40
-		$this->domainManager = \Aimeos\MShop\Factory::createManager( $context, 'order/base' );
40
+		$this->domainManager = \Aimeos\MShop\Factory::createManager($context, 'order/base');
41 41
 	}
42 42
 
43 43
 
@@ -49,7 +49,7 @@  discard block
 block discarded – undo
49 49
 	public function clear()
50 50
 	{
51 51
 		$this->baskets[$this->type] = $this->domainManager->createItem();
52
-		$this->domainManager->setSession( $this->baskets[$this->type], $this->type );
52
+		$this->domainManager->setSession($this->baskets[$this->type], $this->type);
53 53
 
54 54
 		return $this;
55 55
 	}
@@ -62,10 +62,10 @@  discard block
 block discarded – undo
62 62
 	 */
63 63
 	public function get()
64 64
 	{
65
-		if( !isset( $this->baskets[$this->type] ) )
65
+		if (!isset($this->baskets[$this->type]))
66 66
 		{
67
-			$this->baskets[$this->type] = $this->domainManager->getSession( $this->type );
68
-			$this->checkLocale( $this->type );
67
+			$this->baskets[$this->type] = $this->domainManager->getSession($this->type);
68
+			$this->checkLocale($this->type);
69 69
 		}
70 70
 
71 71
 		return $this->baskets[$this->type];
@@ -79,8 +79,8 @@  discard block
 block discarded – undo
79 79
 	 */
80 80
 	public function save()
81 81
 	{
82
-		if( isset( $this->baskets[$this->type] ) && $this->baskets[$this->type]->isModified() ) {
83
-			$this->domainManager->setSession( $this->baskets[$this->type], $this->type );
82
+		if (isset($this->baskets[$this->type]) && $this->baskets[$this->type]->isModified()) {
83
+			$this->domainManager->setSession($this->baskets[$this->type], $this->type);
84 84
 		}
85 85
 
86 86
 		return $this;
@@ -93,7 +93,7 @@  discard block
 block discarded – undo
93 93
 	 * @param string $type Basket type
94 94
 	 * @return \Aimeos\Controller\Frontend\Basket\Iface Basket frontend object
95 95
 	 */
96
-	public function setType( $type )
96
+	public function setType($type)
97 97
 	{
98 98
 		$this->type = $type;
99 99
 		return $this;
@@ -107,10 +107,10 @@  discard block
 block discarded – undo
107 107
 	 */
108 108
 	public function store()
109 109
 	{
110
-		$basket = $this->get()->finish()->setStatus( 1 );
110
+		$basket = $this->get()->finish()->setStatus(1);
111 111
 
112 112
 		$this->domainManager->begin();
113
-		$this->domainManager->store( $basket );
113
+		$this->domainManager->store($basket);
114 114
 		$this->domainManager->commit();
115 115
 
116 116
 		return $basket;
@@ -125,9 +125,9 @@  discard block
 block discarded – undo
125 125
 	 * @param boolean $default True to add default criteria (user logged in), false if not
126 126
 	 * @return \Aimeos\MShop\Order\Item\Base\Iface Order base object including the given parts
127 127
 	 */
128
-	public function load( $id, $parts = \Aimeos\MShop\Order\Manager\Base\Base::PARTS_ALL, $default = true )
128
+	public function load($id, $parts = \Aimeos\MShop\Order\Manager\Base\Base::PARTS_ALL, $default = true)
129 129
 	{
130
-		return $this->domainManager->load( $id, $parts, false, $default );
130
+		return $this->domainManager->load($id, $parts, false, $default);
131 131
 	}
132 132
 
133 133
 
@@ -147,36 +147,36 @@  discard block
 block discarded – undo
147 147
 	 * @param string $stocktype Unique code of the stock type to deliver the products from
148 148
 	 * @throws \Aimeos\Controller\Frontend\Basket\Exception If the product isn't available
149 149
 	 */
150
-	public function addProduct( $prodid, $quantity = 1, array $options = [], array $variantAttributeIds = [],
150
+	public function addProduct($prodid, $quantity = 1, array $options = [], array $variantAttributeIds = [],
151 151
 		array $configAttributeIds = [], array $hiddenAttributeIds = [], array $customAttributeValues = [],
152
-		$stocktype = 'default' )
152
+		$stocktype = 'default')
153 153
 	{
154 154
 		$context = $this->getContext();
155
-		$productManager = \Aimeos\MShop\Factory::createManager( $context, 'product' );
156
-		$productItem = $productManager->getItem( $prodid, array( 'media', 'supplier', 'price', 'product', 'text' ), true );
155
+		$productManager = \Aimeos\MShop\Factory::createManager($context, 'product');
156
+		$productItem = $productManager->getItem($prodid, array('media', 'supplier', 'price', 'product', 'text'), true);
157 157
 
158
-		$orderBaseProductItem = \Aimeos\MShop\Factory::createManager( $context, 'order/base/product' )->createItem();
159
-		$orderBaseProductItem->copyFrom( $productItem );
160
-		$orderBaseProductItem->setQuantity( $quantity );
161
-		$orderBaseProductItem->setStockType( $stocktype );
158
+		$orderBaseProductItem = \Aimeos\MShop\Factory::createManager($context, 'order/base/product')->createItem();
159
+		$orderBaseProductItem->copyFrom($productItem);
160
+		$orderBaseProductItem->setQuantity($quantity);
161
+		$orderBaseProductItem->setStockType($stocktype);
162 162
 
163 163
 		$attr = [];
164
-		$prices = $productItem->getRefItems( 'price', 'default', 'default' );
164
+		$prices = $productItem->getRefItems('price', 'default', 'default');
165 165
 
166
-		$priceManager = \Aimeos\MShop\Factory::createManager( $context, 'price' );
167
-		$price = $priceManager->getLowestPrice( $prices, $quantity );
166
+		$priceManager = \Aimeos\MShop\Factory::createManager($context, 'price');
167
+		$price = $priceManager->getLowestPrice($prices, $quantity);
168 168
 
169
-		$attr = array_merge( $attr, $this->createOrderProductAttributes( $price, $prodid, $quantity, $configAttributeIds, 'config' ) );
170
-		$attr = array_merge( $attr, $this->createOrderProductAttributes( $price, $prodid, $quantity, $hiddenAttributeIds, 'hidden' ) );
171
-		$attr = array_merge( $attr, $this->createOrderProductAttributes( $price, $prodid, $quantity, array_keys( $customAttributeValues ), 'custom', $customAttributeValues ) );
169
+		$attr = array_merge($attr, $this->createOrderProductAttributes($price, $prodid, $quantity, $configAttributeIds, 'config'));
170
+		$attr = array_merge($attr, $this->createOrderProductAttributes($price, $prodid, $quantity, $hiddenAttributeIds, 'hidden'));
171
+		$attr = array_merge($attr, $this->createOrderProductAttributes($price, $prodid, $quantity, array_keys($customAttributeValues), 'custom', $customAttributeValues));
172 172
 
173 173
 		// remove product rebate of original price in favor to rebates granted for the order
174
-		$price->setRebate( '0.00' );
174
+		$price->setRebate('0.00');
175 175
 
176
-		$orderBaseProductItem->setPrice( $price );
177
-		$orderBaseProductItem->setAttributes( $attr );
176
+		$orderBaseProductItem->setPrice($price);
177
+		$orderBaseProductItem->setAttributes($attr);
178 178
 
179
-		$this->get()->addProduct( $orderBaseProductItem );
179
+		$this->get()->addProduct($orderBaseProductItem);
180 180
 		$this->save();
181 181
 	}
182 182
 
@@ -186,17 +186,17 @@  discard block
 block discarded – undo
186 186
 	 *
187 187
 	 * @param integer $position Position number (key) of the order product item
188 188
 	 */
189
-	public function deleteProduct( $position )
189
+	public function deleteProduct($position)
190 190
 	{
191
-		$product = $this->get()->getProduct( $position );
191
+		$product = $this->get()->getProduct($position);
192 192
 
193
-		if( $product->getFlags() === \Aimeos\MShop\Order\Item\Base\Product\Base::FLAG_IMMUTABLE )
193
+		if ($product->getFlags() === \Aimeos\MShop\Order\Item\Base\Product\Base::FLAG_IMMUTABLE)
194 194
 		{
195
-			$msg = sprintf( 'Basket item at position "%1$d" cannot be deleted manually', $position );
196
-			throw new \Aimeos\Controller\Frontend\Basket\Exception( $msg );
195
+			$msg = sprintf('Basket item at position "%1$d" cannot be deleted manually', $position);
196
+			throw new \Aimeos\Controller\Frontend\Basket\Exception($msg);
197 197
 		}
198 198
 
199
-		$this->get()->deleteProduct( $position );
199
+		$this->get()->deleteProduct($position);
200 200
 		$this->save();
201 201
 	}
202 202
 
@@ -210,34 +210,34 @@  discard block
 block discarded – undo
210 210
 	 * 	The 'stock'=>false option allows adding products without being in stock.
211 211
 	 * @param string[] $configAttributeCodes Codes of the product config attributes that should be REMOVED
212 212
 	 */
213
-	public function editProduct( $position, $quantity, array $options = [],
214
-		array $configAttributeCodes = [] )
213
+	public function editProduct($position, $quantity, array $options = [],
214
+		array $configAttributeCodes = [])
215 215
 	{
216
-		$product = $this->get()->getProduct( $position );
216
+		$product = $this->get()->getProduct($position);
217 217
 
218
-		if( $product->getFlags() & \Aimeos\MShop\Order\Item\Base\Product\Base::FLAG_IMMUTABLE )
218
+		if ($product->getFlags() & \Aimeos\MShop\Order\Item\Base\Product\Base::FLAG_IMMUTABLE)
219 219
 		{
220
-			$msg = sprintf( 'Basket item at position "%1$d" cannot be changed', $position );
221
-			throw new \Aimeos\Controller\Frontend\Basket\Exception( $msg );
220
+			$msg = sprintf('Basket item at position "%1$d" cannot be changed', $position);
221
+			throw new \Aimeos\Controller\Frontend\Basket\Exception($msg);
222 222
 		}
223 223
 
224
-		$product->setQuantity( $quantity );
224
+		$product->setQuantity($quantity);
225 225
 
226 226
 		$attributes = $product->getAttributes();
227
-		foreach( $attributes as $key => $attribute )
227
+		foreach ($attributes as $key => $attribute)
228 228
 		{
229
-			if( in_array( $attribute->getCode(), $configAttributeCodes ) ) {
230
-				unset( $attributes[$key] );
229
+			if (in_array($attribute->getCode(), $configAttributeCodes)) {
230
+				unset($attributes[$key]);
231 231
 			}
232 232
 		}
233
-		$product->setAttributes( $attributes );
233
+		$product->setAttributes($attributes);
234 234
 
235
-		$productItem = $this->getDomainItem( 'product', 'product.code', $product->getProductCode(), array( 'price', 'text' ) );
236
-		$prices = $productItem->getRefItems( 'price', 'default' );
237
-		$product->setPrice( $this->calcPrice( $product, $prices, $quantity ) );
235
+		$productItem = $this->getDomainItem('product', 'product.code', $product->getProductCode(), array('price', 'text'));
236
+		$prices = $productItem->getRefItems('price', 'default');
237
+		$product->setPrice($this->calcPrice($product, $prices, $quantity));
238 238
 
239
-		$this->get()->deleteProduct( $position );
240
-		$this->get()->addProduct( $product, $position );
239
+		$this->get()->deleteProduct($position);
240
+		$this->get()->addProduct($product, $position);
241 241
 
242 242
 		$this->save();
243 243
 	}
@@ -249,49 +249,49 @@  discard block
 block discarded – undo
249 249
 	 * @param string $code Coupon code entered by the user
250 250
 	 * @throws \Aimeos\Controller\Frontend\Basket\Exception if the coupon code is invalid or not allowed
251 251
 	 */
252
-	public function addCoupon( $code )
252
+	public function addCoupon($code)
253 253
 	{
254
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'coupon' );
255
-		$codeManager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'coupon/code' );
254
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'coupon');
255
+		$codeManager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'coupon/code');
256 256
 
257 257
 
258
-		$search = $codeManager->createSearch( true );
258
+		$search = $codeManager->createSearch(true);
259 259
 		$expr = array(
260
-			$search->compare( '==', 'coupon.code.code', $code ),
260
+			$search->compare('==', 'coupon.code.code', $code),
261 261
 			$search->getConditions(),
262 262
 		);
263
-		$search->setConditions( $search->combine( '&&', $expr ) );
264
-		$search->setSlice( 0, 1 );
263
+		$search->setConditions($search->combine('&&', $expr));
264
+		$search->setSlice(0, 1);
265 265
 
266
-		$result = $codeManager->searchItems( $search );
266
+		$result = $codeManager->searchItems($search);
267 267
 
268
-		if( ( $codeItem = reset( $result ) ) === false ) {
269
-			throw new \Aimeos\Controller\Frontend\Basket\Exception( sprintf( 'Coupon code "%1$s" is invalid or not available any more', $code ) );
268
+		if (($codeItem = reset($result)) === false) {
269
+			throw new \Aimeos\Controller\Frontend\Basket\Exception(sprintf('Coupon code "%1$s" is invalid or not available any more', $code));
270 270
 		}
271 271
 
272 272
 
273
-		$search = $manager->createSearch( true );
273
+		$search = $manager->createSearch(true);
274 274
 		$expr = array(
275
-			$search->compare( '==', 'coupon.id', $codeItem->getParentId() ),
275
+			$search->compare('==', 'coupon.id', $codeItem->getParentId()),
276 276
 			$search->getConditions(),
277 277
 		);
278
-		$search->setConditions( $search->combine( '&&', $expr ) );
279
-		$search->setSlice( 0, 1 );
278
+		$search->setConditions($search->combine('&&', $expr));
279
+		$search->setSlice(0, 1);
280 280
 
281
-		$result = $manager->searchItems( $search );
281
+		$result = $manager->searchItems($search);
282 282
 
283
-		if( ( $item = reset( $result ) ) === false ) {
284
-			throw new \Aimeos\Controller\Frontend\Basket\Exception( sprintf( 'Coupon for code "%1$s" is not available any more', $code ) );
283
+		if (($item = reset($result)) === false) {
284
+			throw new \Aimeos\Controller\Frontend\Basket\Exception(sprintf('Coupon for code "%1$s" is not available any more', $code));
285 285
 		}
286 286
 
287 287
 
288
-		$provider = $manager->getProvider( $item, $code );
288
+		$provider = $manager->getProvider($item, $code);
289 289
 
290
-		if( $provider->isAvailable( $this->get() ) !== true ) {
291
-			throw new \Aimeos\Controller\Frontend\Basket\Exception( sprintf( 'Requirements for coupon code "%1$s" aren\'t met', $code ) );
290
+		if ($provider->isAvailable($this->get()) !== true) {
291
+			throw new \Aimeos\Controller\Frontend\Basket\Exception(sprintf('Requirements for coupon code "%1$s" aren\'t met', $code));
292 292
 		}
293 293
 
294
-		$provider->addCoupon( $this->get() );
294
+		$provider->addCoupon($this->get());
295 295
 		$this->save();
296 296
 	}
297 297
 
@@ -302,21 +302,21 @@  discard block
 block discarded – undo
302 302
 	 * @param string $code Coupon code entered by the user
303 303
 	 * @throws \Aimeos\Controller\Frontend\Basket\Exception if the coupon code is invalid
304 304
 	 */
305
-	public function deleteCoupon( $code )
305
+	public function deleteCoupon($code)
306 306
 	{
307
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'coupon' );
307
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'coupon');
308 308
 
309 309
 		$search = $manager->createSearch();
310
-		$search->setConditions( $search->compare( '==', 'coupon.code.code', $code ) );
311
-		$search->setSlice( 0, 1 );
310
+		$search->setConditions($search->compare('==', 'coupon.code.code', $code));
311
+		$search->setSlice(0, 1);
312 312
 
313
-		$result = $manager->searchItems( $search );
313
+		$result = $manager->searchItems($search);
314 314
 
315
-		if( ( $item = reset( $result ) ) === false ) {
316
-			throw new \Aimeos\Controller\Frontend\Basket\Exception( sprintf( 'Coupon code "%1$s" is invalid', $code ) );
315
+		if (($item = reset($result)) === false) {
316
+			throw new \Aimeos\Controller\Frontend\Basket\Exception(sprintf('Coupon code "%1$s" is invalid', $code));
317 317
 		}
318 318
 
319
-		$manager->getProvider( $item, $code )->deleteCoupon( $this->get() );
319
+		$manager->getProvider($item, $code)->deleteCoupon($this->get());
320 320
 		$this->save();
321 321
 	}
322 322
 
@@ -329,28 +329,28 @@  discard block
 block discarded – undo
329 329
 	 * @throws \Aimeos\Controller\Frontend\Basket\Exception If the billing or delivery address is not of any required type of
330 330
 	 * 	if one of the keys is invalid when using an array with key/value pairs
331 331
 	 */
332
-	public function setAddress( $type, $value )
332
+	public function setAddress($type, $value)
333 333
 	{
334
-		$address = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'order/base/address' )->createItem();
335
-		$address->setType( $type );
334
+		$address = \Aimeos\MShop\Factory::createManager($this->getContext(), 'order/base/address')->createItem();
335
+		$address->setType($type);
336 336
 
337
-		if( $value instanceof \Aimeos\MShop\Common\Item\Address\Iface )
337
+		if ($value instanceof \Aimeos\MShop\Common\Item\Address\Iface)
338 338
 		{
339
-			$address->copyFrom( $value );
340
-			$this->get()->setAddress( $address, $type );
339
+			$address->copyFrom($value);
340
+			$this->get()->setAddress($address, $type);
341 341
 		}
342
-		else if( is_array( $value ) )
342
+		else if (is_array($value))
343 343
 		{
344
-			$this->setAddressFromArray( $address, $value );
345
-			$this->get()->setAddress( $address, $type );
344
+			$this->setAddressFromArray($address, $value);
345
+			$this->get()->setAddress($address, $type);
346 346
 		}
347
-		else if( $value === null )
347
+		else if ($value === null)
348 348
 		{
349
-			$this->get()->deleteAddress( $type );
349
+			$this->get()->deleteAddress($type);
350 350
 		}
351 351
 		else
352 352
 		{
353
-			throw new \Aimeos\Controller\Frontend\Basket\Exception( sprintf( 'Invalid value for address type "%1$s"', $type ) );
353
+			throw new \Aimeos\Controller\Frontend\Basket\Exception(sprintf('Invalid value for address type "%1$s"', $type));
354 354
 		}
355 355
 
356 356
 		$this->save();
@@ -366,48 +366,48 @@  discard block
 block discarded – undo
366 366
 	 * 	entered by the customer when choosing one of the delivery or payment options
367 367
 	 * @throws \Aimeos\Controller\Frontend\Basket\Exception If there is no price to the service item attached
368 368
 	 */
369
-	public function setService( $type, $id, array $attributes = [] )
369
+	public function setService($type, $id, array $attributes = [])
370 370
 	{
371
-		if( $id === null )
371
+		if ($id === null)
372 372
 		{
373
-			$this->get()->deleteService( $type );
373
+			$this->get()->deleteService($type);
374 374
 			$this->save();
375 375
 			return;
376 376
 		}
377 377
 
378 378
 		$context = $this->getContext();
379 379
 
380
-		$serviceManager = \Aimeos\MShop\Factory::createManager( $context, 'service' );
381
-		$serviceItem = $this->getDomainItem( 'service', 'service.id', $id, array( 'media', 'price', 'text' ) );
380
+		$serviceManager = \Aimeos\MShop\Factory::createManager($context, 'service');
381
+		$serviceItem = $this->getDomainItem('service', 'service.id', $id, array('media', 'price', 'text'));
382 382
 
383
-		$provider = $serviceManager->getProvider( $serviceItem );
384
-		$result = $provider->checkConfigFE( $attributes );
385
-		$unknown = array_diff_key( $attributes, $result );
383
+		$provider = $serviceManager->getProvider($serviceItem);
384
+		$result = $provider->checkConfigFE($attributes);
385
+		$unknown = array_diff_key($attributes, $result);
386 386
 
387
-		if( count( $unknown ) > 0 )
387
+		if (count($unknown) > 0)
388 388
 		{
389
-			$msg = sprintf( 'Unknown attributes "%1$s"', implode( '","', array_keys( $unknown ) ) );
390
-			throw new \Aimeos\Controller\Frontend\Basket\Exception( $msg );
389
+			$msg = sprintf('Unknown attributes "%1$s"', implode('","', array_keys($unknown)));
390
+			throw new \Aimeos\Controller\Frontend\Basket\Exception($msg);
391 391
 		}
392 392
 
393
-		foreach( $result as $key => $value )
393
+		foreach ($result as $key => $value)
394 394
 		{
395
-			if( $value !== null ) {
396
-				throw new \Aimeos\Controller\Frontend\Basket\Exception( $value );
395
+			if ($value !== null) {
396
+				throw new \Aimeos\Controller\Frontend\Basket\Exception($value);
397 397
 			}
398 398
 		}
399 399
 
400
-		$orderBaseServiceManager = \Aimeos\MShop\Factory::createManager( $context, 'order/base/service' );
400
+		$orderBaseServiceManager = \Aimeos\MShop\Factory::createManager($context, 'order/base/service');
401 401
 		$orderServiceItem = $orderBaseServiceManager->createItem();
402
-		$orderServiceItem->copyFrom( $serviceItem );
402
+		$orderServiceItem->copyFrom($serviceItem);
403 403
 
404 404
 		// remove service rebate of original price
405
-		$price = $provider->calcPrice( $this->get() )->setRebate( '0.00' );
406
-		$orderServiceItem->setPrice( $price );
405
+		$price = $provider->calcPrice($this->get())->setRebate('0.00');
406
+		$orderServiceItem->setPrice($price);
407 407
 
408
-		$provider->setConfigFE( $orderServiceItem, $attributes );
408
+		$provider->setConfigFE($orderServiceItem, $attributes);
409 409
 
410
-		$this->get()->setService( $orderServiceItem, $type );
410
+		$this->get()->setService($orderServiceItem, $type);
411 411
 		$this->save();
412 412
 	}
413 413
 
@@ -420,18 +420,18 @@  discard block
 block discarded – undo
420 420
 	 * 	an address item.
421 421
 	 * @throws \Aimeos\Controller\Frontend\Basket\Exception
422 422
 	 */
423
-	protected function setAddressFromArray( \Aimeos\MShop\Order\Item\Base\Address\Iface $address, array $map )
423
+	protected function setAddressFromArray(\Aimeos\MShop\Order\Item\Base\Address\Iface $address, array $map)
424 424
 	{
425
-		foreach( $map as $key => $value ) {
426
-			$map[$key] = strip_tags( $value ); // prevent XSS
425
+		foreach ($map as $key => $value) {
426
+			$map[$key] = strip_tags($value); // prevent XSS
427 427
 		}
428 428
 
429
-		$errors = $address->fromArray( $map );
429
+		$errors = $address->fromArray($map);
430 430
 
431
-		if( count( $errors ) > 0 )
431
+		if (count($errors) > 0)
432 432
 		{
433
-			$msg = sprintf( 'Invalid address properties, please check your input' );
434
-			throw new \Aimeos\Controller\Frontend\Basket\Exception( $msg, 0, null, $errors );
433
+			$msg = sprintf('Invalid address properties, please check your input');
434
+			throw new \Aimeos\Controller\Frontend\Basket\Exception($msg, 0, null, $errors);
435 435
 		}
436 436
 	}
437 437
 }
Please login to merge, or discard this patch.
controller/frontend/src/Controller/Frontend/Catalog/Standard.php 1 patch
Spacing   +54 added lines, -54 removed lines patch added patch discarded remove patch
@@ -29,9 +29,9 @@  discard block
 block discarded – undo
29 29
 	 * @return \Aimeos\MShop\Common\Manager\Iface Manager object
30 30
 	 * @since 2015.08
31 31
 	 */
32
-	public function createManager( $name )
32
+	public function createManager($name)
33 33
 	{
34
-		return \Aimeos\MShop\Factory::createManager( $this->getContext(), $name );
34
+		return \Aimeos\MShop\Factory::createManager($this->getContext(), $name);
35 35
 	}
36 36
 
37 37
 
@@ -43,7 +43,7 @@  discard block
 block discarded – undo
43 43
 	 */
44 44
 	public function createFilter()
45 45
 	{
46
-		return \Aimeos\MShop\Factory::createManager( $this->getContext(), 'catalog' )->createSearch( true );
46
+		return \Aimeos\MShop\Factory::createManager($this->getContext(), 'catalog')->createSearch(true);
47 47
 	}
48 48
 
49 49
 
@@ -55,9 +55,9 @@  discard block
 block discarded – undo
55 55
 	 * @return array Associative list of items implementing \Aimeos\MShop\Catalog\Item\Iface with their IDs as keys
56 56
 	 * @since 2017.03
57 57
 	 */
58
-	public function getPath( $id, array $domains = array( 'text', 'media' ) )
58
+	public function getPath($id, array $domains = array('text', 'media'))
59 59
 	{
60
-		return \Aimeos\MShop\Factory::createManager( $this->getContext(), 'catalog' )->getPath( $id, $domains );
60
+		return \Aimeos\MShop\Factory::createManager($this->getContext(), 'catalog')->getPath($id, $domains);
61 61
 	}
62 62
 
63 63
 
@@ -72,10 +72,10 @@  discard block
 block discarded – undo
72 72
 	 * @return \Aimeos\MShop\Catalog\Item\Iface Catalog node, maybe with children depending on the level constant
73 73
 	 * @since 2017.03
74 74
 	 */
75
-	public function getTree( $id = null, array $domains = array( 'text', 'media' ),
76
-		$level = \Aimeos\MW\Tree\Manager\Base::LEVEL_TREE, \Aimeos\MW\Criteria\Iface $search = null )
75
+	public function getTree($id = null, array $domains = array('text', 'media'),
76
+		$level = \Aimeos\MW\Tree\Manager\Base::LEVEL_TREE, \Aimeos\MW\Criteria\Iface $search = null)
77 77
 	{
78
-		return \Aimeos\MShop\Factory::createManager( $this->getContext(), 'catalog' )->getTree( $id, $domains, $level, $search );
78
+		return \Aimeos\MShop\Factory::createManager($this->getContext(), 'catalog')->getTree($id, $domains, $level, $search);
79 79
 	}
80 80
 
81 81
 
@@ -87,7 +87,7 @@  discard block
 block discarded – undo
87 87
 	 * @since 2015.08
88 88
 	 * @deprecated Use createFilter() instead
89 89
 	 */
90
-	public function createCatalogFilter( $default = true )
90
+	public function createCatalogFilter($default = true)
91 91
 	{
92 92
 		return $this->createFilter();
93 93
 	}
@@ -102,9 +102,9 @@  discard block
 block discarded – undo
102 102
 	 * @since 2015.08
103 103
 	 * @deprecated Use getPath() instead
104 104
 	 */
105
-	public function getCatalogPath( $id, array $domains = array( 'text', 'media' ) )
105
+	public function getCatalogPath($id, array $domains = array('text', 'media'))
106 106
 	{
107
-		return $this->getPath( $id, $domains );
107
+		return $this->getPath($id, $domains);
108 108
 	}
109 109
 
110 110
 
@@ -120,10 +120,10 @@  discard block
 block discarded – undo
120 120
 	 * @since 2015.08
121 121
 	 * @deprecated Use getTree() instead
122 122
 	 */
123
-	public function getCatalogTree( $id = null, array $domains = array( 'text', 'media' ),
124
-		$level = \Aimeos\MW\Tree\Manager\Base::LEVEL_TREE, \Aimeos\MW\Criteria\Iface $search = null )
123
+	public function getCatalogTree($id = null, array $domains = array('text', 'media'),
124
+		$level = \Aimeos\MW\Tree\Manager\Base::LEVEL_TREE, \Aimeos\MW\Criteria\Iface $search = null)
125 125
 	{
126
-		return $this->getTree( $id, $domains, $level, $search );
126
+		return $this->getTree($id, $domains, $level, $search);
127 127
 	}
128 128
 
129 129
 
@@ -137,10 +137,10 @@  discard block
 block discarded – undo
137 137
 	 * @since 2015.08
138 138
 	 * @deprecated Use getItems() method in index controller instead
139 139
 	 */
140
-	public function getProductItems( array $ids, array $domains = array( 'media', 'price', 'text' ) )
140
+	public function getProductItems(array $ids, array $domains = array('media', 'price', 'text'))
141 141
 	{
142
-		$cntl = \Aimeos\Controller\Frontend\Factory::createController( $this->getContext(), 'product' );
143
-		return $cntl->getItems( $ids, $domains );
142
+		$cntl = \Aimeos\Controller\Frontend\Factory::createController($this->getContext(), 'product');
143
+		return $cntl->getItems($ids, $domains);
144 144
 	}
145 145
 
146 146
 
@@ -153,10 +153,10 @@  discard block
 block discarded – undo
153 153
 	 * @since 2015.08
154 154
 	 * @deprecated Use method in index controller instead
155 155
 	 */
156
-	public function aggregateIndex( \Aimeos\MW\Criteria\Iface $filter, $key )
156
+	public function aggregateIndex(\Aimeos\MW\Criteria\Iface $filter, $key)
157 157
 	{
158
-		$cntl = \Aimeos\Controller\Frontend\Factory::createController( $this->getContext(), 'product' );
159
-		return $cntl->aggregate( $filter, $key );
158
+		$cntl = \Aimeos\Controller\Frontend\Factory::createController($this->getContext(), 'product');
159
+		return $cntl->aggregate($filter, $key);
160 160
 	}
161 161
 
162 162
 
@@ -172,10 +172,10 @@  discard block
 block discarded – undo
172 172
 	 * @since 2015.08
173 173
 	 * @deprecated Use method in index controller instead
174 174
 	 */
175
-	public function createIndexFilter( $sort = null, $direction = '+', $start = 0, $size = 100, $listtype = 'default' )
175
+	public function createIndexFilter($sort = null, $direction = '+', $start = 0, $size = 100, $listtype = 'default')
176 176
 	{
177
-		$cntl = \Aimeos\Controller\Frontend\Factory::createController( $this->getContext(), 'product' );
178
-		return $cntl->createFilter( $sort, $direction, $start, $size, $listtype );
177
+		$cntl = \Aimeos\Controller\Frontend\Factory::createController($this->getContext(), 'product');
178
+		return $cntl->createFilter($sort, $direction, $start, $size, $listtype);
179 179
 	}
180 180
 
181 181
 
@@ -192,12 +192,12 @@  discard block
 block discarded – undo
192 192
 	 * @since 2015.08
193 193
 	 * @deprecated Use createIndexFilter() and addIndexFilterCategory() instead
194 194
 	 */
195
-	public function createIndexFilterCategory( $catid, $sort = null, $direction = '+', $start = 0, $size = 100, $listtype = 'default' )
195
+	public function createIndexFilterCategory($catid, $sort = null, $direction = '+', $start = 0, $size = 100, $listtype = 'default')
196 196
 	{
197
-		$cntl = \Aimeos\Controller\Frontend\Factory::createController( $this->getContext(), 'product' );
197
+		$cntl = \Aimeos\Controller\Frontend\Factory::createController($this->getContext(), 'product');
198 198
 
199
-		$filter = $cntl->createFilter( $sort, $direction, $start, $size, $listtype );
200
-		$filter = $cntl->addFilterCategory( $filter, $catid, \Aimeos\MW\Tree\Manager\Base::LEVEL_ONE, $sort, $direction, $listtype );
199
+		$filter = $cntl->createFilter($sort, $direction, $start, $size, $listtype);
200
+		$filter = $cntl->addFilterCategory($filter, $catid, \Aimeos\MW\Tree\Manager\Base::LEVEL_ONE, $sort, $direction, $listtype);
201 201
 
202 202
 		return $filter;
203 203
 	}
@@ -216,12 +216,12 @@  discard block
 block discarded – undo
216 216
 	 * @since 2015.08
217 217
 	 * @deprecated Use createIndexFilter() and addIndexFilterText() instead
218 218
 	 */
219
-	public function createIndexFilterText( $input, $sort = null, $direction = '+', $start = 0, $size = 100, $listtype = 'default' )
219
+	public function createIndexFilterText($input, $sort = null, $direction = '+', $start = 0, $size = 100, $listtype = 'default')
220 220
 	{
221
-		$cntl = \Aimeos\Controller\Frontend\Factory::createController( $this->getContext(), 'product' );
221
+		$cntl = \Aimeos\Controller\Frontend\Factory::createController($this->getContext(), 'product');
222 222
 
223
-		$filter = $cntl->createFilter( $sort, $direction, $start, $size, $listtype );
224
-		$filter = $cntl->addFilterText( $filter, $input, $sort, $direction, $listtype );
223
+		$filter = $cntl->createFilter($sort, $direction, $start, $size, $listtype);
224
+		$filter = $cntl->addFilterText($filter, $input, $sort, $direction, $listtype);
225 225
 
226 226
 		return $filter;
227 227
 	}
@@ -236,10 +236,10 @@  discard block
 block discarded – undo
236 236
 	 * @since 2015.08
237 237
 	 * @deprecated Use method in index controller instead
238 238
 	 */
239
-	public function addIndexFilterCategory( \Aimeos\MW\Criteria\Iface $search, $catid )
239
+	public function addIndexFilterCategory(\Aimeos\MW\Criteria\Iface $search, $catid)
240 240
 	{
241
-		$cntl = \Aimeos\Controller\Frontend\Factory::createController( $this->getContext(), 'product' );
242
-		return $cntl->addFilterCategory( $search, $catid );
241
+		$cntl = \Aimeos\Controller\Frontend\Factory::createController($this->getContext(), 'product');
242
+		return $cntl->addFilterCategory($search, $catid);
243 243
 	}
244 244
 
245 245
 
@@ -253,10 +253,10 @@  discard block
 block discarded – undo
253 253
 	 * @since 2015.08
254 254
 	 * @deprecated Use method in index controller instead
255 255
 	 */
256
-	public function addIndexFilterText( \Aimeos\MW\Criteria\Iface $search, $input, $listtype = 'default' )
256
+	public function addIndexFilterText(\Aimeos\MW\Criteria\Iface $search, $input, $listtype = 'default')
257 257
 	{
258
-		$cntl = \Aimeos\Controller\Frontend\Factory::createController( $this->getContext(), 'product' );
259
-		return $cntl->addFilterText( $search, $input, $listtype );
258
+		$cntl = \Aimeos\Controller\Frontend\Factory::createController($this->getContext(), 'product');
259
+		return $cntl->addFilterText($search, $input, $listtype);
260 260
 	}
261 261
 
262 262
 
@@ -270,10 +270,10 @@  discard block
 block discarded – undo
270 270
 	 * @since 2015.08
271 271
 	 * @deprecated Use method in index controller instead
272 272
 	 */
273
-	public function getIndexItems( \Aimeos\MW\Criteria\Iface $filter, array $domains = array( 'media', 'price', 'text' ), &$total = null )
273
+	public function getIndexItems(\Aimeos\MW\Criteria\Iface $filter, array $domains = array('media', 'price', 'text'), &$total = null)
274 274
 	{
275
-		$cntl = \Aimeos\Controller\Frontend\Factory::createController( $this->getContext(), 'product' );
276
-		return $cntl->searchItems( $filter, $domains, $total );
275
+		$cntl = \Aimeos\Controller\Frontend\Factory::createController($this->getContext(), 'product');
276
+		return $cntl->searchItems($filter, $domains, $total);
277 277
 	}
278 278
 
279 279
 
@@ -290,37 +290,37 @@  discard block
 block discarded – undo
290 290
 	 * @return \Aimeos\MW\Criteria\Iface Criteria object containing the conditions for searching
291 291
 	 * @deprecated Use createFilter() method in index controller instead
292 292
 	 */
293
-	public function createTextFilter( $input, $sort = null, $direction = '+', $start = 0, $size = 25, $listtype = 'default', $type = 'name' )
293
+	public function createTextFilter($input, $sort = null, $direction = '+', $start = 0, $size = 25, $listtype = 'default', $type = 'name')
294 294
 	{
295 295
 		$locale = $this->getContext()->getLocale();
296 296
 		$langid = $locale->getLanguageId();
297 297
 
298
-		$search = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'index/text' )->createSearch( true );
298
+		$search = \Aimeos\MShop\Factory::createManager($this->getContext(), 'index/text')->createSearch(true);
299 299
 
300 300
 		$expr = array(
301
-			$search->compare( '>', $search->createFunction( 'index.text.relevance', array( $listtype, $langid, $input ) ), 0 ),
302
-			$search->compare( '>', $search->createFunction( 'index.text.value', array( $listtype, $langid, $type, 'product' ) ), '' ),
301
+			$search->compare('>', $search->createFunction('index.text.relevance', array($listtype, $langid, $input)), 0),
302
+			$search->compare('>', $search->createFunction('index.text.value', array($listtype, $langid, $type, 'product')), ''),
303 303
 		);
304 304
 
305 305
 		$sortations = [];
306 306
 
307
-		switch( $sort )
307
+		switch ($sort)
308 308
 		{
309 309
 			case 'name':
310
-				$cmpfunc = $search->createFunction( 'index.text.value', array( $listtype, $langid, 'name', 'product' ) );
311
-				$expr[] = $search->compare( '>=', $cmpfunc, '' );
310
+				$cmpfunc = $search->createFunction('index.text.value', array($listtype, $langid, 'name', 'product'));
311
+				$expr[] = $search->compare('>=', $cmpfunc, '');
312 312
 
313
-				$sortfunc = $search->createFunction( 'sort:index.text.value', array( $listtype, $langid, 'name' ) );
314
-				$sortations[] = $search->sort( $direction, $sortfunc );
313
+				$sortfunc = $search->createFunction('sort:index.text.value', array($listtype, $langid, 'name'));
314
+				$sortations[] = $search->sort($direction, $sortfunc);
315 315
 				break;
316 316
 
317 317
 			case 'relevance':
318 318
 				// we don't need to sort by 'sort:index.text.relevance' because it's a boolean match (relevance is either 0 or 1)
319 319
 		}
320 320
 
321
-		$search->setConditions( $search->combine( '&&', $expr ) );
322
-		$search->setSortations( $sortations );
323
-		$search->setSlice( $start, $size );
321
+		$search->setConditions($search->combine('&&', $expr));
322
+		$search->setSortations($sortations);
323
+		$search->setSlice($start, $size);
324 324
 
325 325
 		return $search;
326 326
 	}
@@ -333,8 +333,8 @@  discard block
 block discarded – undo
333 333
 	 * @return array Associative list of the product ID as key and the product text as value
334 334
 	 * @deprecated Use searchItems() method in index controller to retrieve product items instead
335 335
 	 */
336
-	public function getTextList( \Aimeos\MW\Criteria\Iface $filter )
336
+	public function getTextList(\Aimeos\MW\Criteria\Iface $filter)
337 337
 	{
338
-		return \Aimeos\MShop\Factory::createManager( $this->getContext(), 'index/text' )->searchTexts( $filter );
338
+		return \Aimeos\MShop\Factory::createManager($this->getContext(), 'index/text')->searchTexts($filter);
339 339
 	}
340 340
 }
Please login to merge, or discard this patch.
controller/frontend/src/Controller/Frontend/Product/Standard.php 1 patch
Spacing   +71 added lines, -71 removed lines patch added patch discarded remove patch
@@ -31,42 +31,42 @@  discard block
 block discarded – undo
31 31
 	 * @return \Aimeos\MW\Criteria\Iface Criteria object containing the conditions for searching
32 32
 	 * @since 2017.03
33 33
 	 */
34
-	public function addFilterAttribute( \Aimeos\MW\Criteria\Iface $filter, array $attrIds, array $optIds, array $oneIds )
34
+	public function addFilterAttribute(\Aimeos\MW\Criteria\Iface $filter, array $attrIds, array $optIds, array $oneIds)
35 35
 	{
36
-		if( !empty( $attrIds ) )
36
+		if (!empty($attrIds))
37 37
 		{
38
-			$attrIds = $this->validateIds( $attrIds );
38
+			$attrIds = $this->validateIds($attrIds);
39 39
 
40
-			$func = $filter->createFunction( 'index.attributeaggregate', array( $attrIds ) );
40
+			$func = $filter->createFunction('index.attributeaggregate', array($attrIds));
41 41
 			$expr = array(
42
-				$filter->compare( '==', $func, count( $attrIds ) ),
42
+				$filter->compare('==', $func, count($attrIds)),
43 43
 				$filter->getConditions(),
44 44
 			);
45
-			$filter->setConditions( $filter->combine( '&&', $expr ) );
45
+			$filter->setConditions($filter->combine('&&', $expr));
46 46
 		}
47 47
 
48
-		if( !empty( $optIds ) )
48
+		if (!empty($optIds))
49 49
 		{
50
-			$optIds = $this->validateIds( $optIds );
50
+			$optIds = $this->validateIds($optIds);
51 51
 
52
-			$func = $filter->createFunction( 'index.attributeaggregate', array( $optIds ) );
52
+			$func = $filter->createFunction('index.attributeaggregate', array($optIds));
53 53
 			$expr = array(
54
-				$filter->compare( '>', $func, 0 ),
54
+				$filter->compare('>', $func, 0),
55 55
 				$filter->getConditions(),
56 56
 			);
57
-			$filter->setConditions( $filter->combine( '&&', $expr ) );
57
+			$filter->setConditions($filter->combine('&&', $expr));
58 58
 		}
59 59
 
60
-		foreach( $oneIds as $type => $list )
60
+		foreach ($oneIds as $type => $list)
61 61
 		{
62
-			if( ( $list = $this->validateIds( (array) $list ) ) !== [] )
62
+			if (($list = $this->validateIds((array) $list)) !== [])
63 63
 			{
64
-				$func = $filter->createFunction( 'index.attributeaggregate', array( $list ) );
64
+				$func = $filter->createFunction('index.attributeaggregate', array($list));
65 65
 				$expr = array(
66
-					$filter->compare( '>', $func, 0 ),
66
+					$filter->compare('>', $func, 0),
67 67
 					$filter->getConditions(),
68 68
 				);
69
-				$filter->setConditions( $filter->combine( '&&', $expr ) );
69
+				$filter->setConditions($filter->combine('&&', $expr));
70 70
 			}
71 71
 		}
72 72
 
@@ -86,38 +86,38 @@  discard block
 block discarded – undo
86 86
 	 * @return \Aimeos\MW\Criteria\Iface Criteria object containing the conditions for searching
87 87
 	 * @since 2017.03
88 88
 	 */
89
-	public function addFilterCategory( \Aimeos\MW\Criteria\Iface $filter, $catId,
90
-		$level = \Aimeos\MW\Tree\Manager\Base::LEVEL_ONE, $sort = null, $direction = '+', $listtype = 'default' )
89
+	public function addFilterCategory(\Aimeos\MW\Criteria\Iface $filter, $catId,
90
+		$level = \Aimeos\MW\Tree\Manager\Base::LEVEL_ONE, $sort = null, $direction = '+', $listtype = 'default')
91 91
 	{
92
-		$catIds = ( !is_array( $catId ) ? explode( ',', $catId ) : $catId );
92
+		$catIds = (!is_array($catId) ? explode(',', $catId) : $catId);
93 93
 
94
-		if( $level != \Aimeos\MW\Tree\Manager\Base::LEVEL_ONE )
94
+		if ($level != \Aimeos\MW\Tree\Manager\Base::LEVEL_ONE)
95 95
 		{
96 96
 			$list = [];
97
-			$cntl = \Aimeos\Controller\Frontend\Factory::createController( $this->getContext(), 'catalog' );
97
+			$cntl = \Aimeos\Controller\Frontend\Factory::createController($this->getContext(), 'catalog');
98 98
 
99
-			foreach( $catIds as $catId )
99
+			foreach ($catIds as $catId)
100 100
 			{
101
-				$tree = $cntl->getCatalogTree( $catId, [], $level );
102
-				$list = array_merge( $list, $this->getCatalogIdsFromTree( $tree ) );
101
+				$tree = $cntl->getCatalogTree($catId, [], $level);
102
+				$list = array_merge($list, $this->getCatalogIdsFromTree($tree));
103 103
 			}
104 104
 
105 105
 			$catIds = $list;
106 106
 		}
107 107
 
108
-		$expr = array( $filter->compare( '==', 'index.catalog.id', array_unique( $catIds ) ) );
108
+		$expr = array($filter->compare('==', 'index.catalog.id', array_unique($catIds)));
109 109
 		$expr[] = $filter->getConditions();
110 110
 
111
-		if( $sort === 'relevance' )
111
+		if ($sort === 'relevance')
112 112
 		{
113
-			$cmpfunc = $filter->createFunction( 'index.catalog.position', array( $listtype, $catIds ) );
114
-			$expr[] = $filter->compare( '>=', $cmpfunc, 0 );
113
+			$cmpfunc = $filter->createFunction('index.catalog.position', array($listtype, $catIds));
114
+			$expr[] = $filter->compare('>=', $cmpfunc, 0);
115 115
 
116
-			$sortfunc = $filter->createFunction( 'sort:index.catalog.position', array( $listtype, $catIds ) );
117
-			$filter->setSortations( array( $filter->sort( $direction, $sortfunc ) ) );
116
+			$sortfunc = $filter->createFunction('sort:index.catalog.position', array($listtype, $catIds));
117
+			$filter->setSortations(array($filter->sort($direction, $sortfunc)));
118 118
 		}
119 119
 
120
-		$filter->setConditions( $filter->combine( '&&', $expr ) );
120
+		$filter->setConditions($filter->combine('&&', $expr));
121 121
 
122 122
 		return $filter;
123 123
 	}
@@ -134,13 +134,13 @@  discard block
 block discarded – undo
134 134
 	 * @return \Aimeos\MW\Criteria\Iface Criteria object containing the conditions for searching
135 135
 	 * @since 2017.03
136 136
 	 */
137
-	public function addFilterText( \Aimeos\MW\Criteria\Iface $filter, $input, $sort = null, $direction = '+', $listtype = 'default' )
137
+	public function addFilterText(\Aimeos\MW\Criteria\Iface $filter, $input, $sort = null, $direction = '+', $listtype = 'default')
138 138
 	{
139 139
 		$langid = $this->getContext()->getLocale()->getLanguageId();
140
-		$cmpfunc = $filter->createFunction( 'index.text.relevance', array( $listtype, $langid, $input ) );
141
-		$expr = array( $filter->compare( '>', $cmpfunc, 0 ), $filter->getConditions() );
140
+		$cmpfunc = $filter->createFunction('index.text.relevance', array($listtype, $langid, $input));
141
+		$expr = array($filter->compare('>', $cmpfunc, 0), $filter->getConditions());
142 142
 
143
-		return $filter->setConditions( $filter->combine( '&&', $expr ) );
143
+		return $filter->setConditions($filter->combine('&&', $expr));
144 144
 	}
145 145
 
146 146
 
@@ -152,9 +152,9 @@  discard block
 block discarded – undo
152 152
 	 * @return array Associative list of key values as key and the product count for this key as value
153 153
 	 * @since 2017.03
154 154
 	 */
155
-	public function aggregate( \Aimeos\MW\Criteria\Iface $filter, $key )
155
+	public function aggregate(\Aimeos\MW\Criteria\Iface $filter, $key)
156 156
 	{
157
-		return \Aimeos\MShop\Factory::createManager( $this->getContext(), 'index' )->aggregate( $filter, $key );
157
+		return \Aimeos\MShop\Factory::createManager($this->getContext(), 'index')->aggregate($filter, $key);
158 158
 	}
159 159
 
160 160
 
@@ -169,46 +169,46 @@  discard block
 block discarded – undo
169 169
 	 * @return \Aimeos\MW\Criteria\Iface Criteria object containing the conditions for searching
170 170
 	 * @since 2017.03
171 171
 	 */
172
-	public function createFilter( $sort = null, $direction = '+', $start = 0, $size = 100, $listtype = 'default' )
172
+	public function createFilter($sort = null, $direction = '+', $start = 0, $size = 100, $listtype = 'default')
173 173
 	{
174 174
 		$sortations = [];
175 175
 		$context = $this->getContext();
176 176
 
177
-		$search = \Aimeos\MShop\Factory::createManager( $context, 'index' )->createSearch( true );
178
-		$expr = array( $search->compare( '!=', 'index.catalog.id', null ) );
177
+		$search = \Aimeos\MShop\Factory::createManager($context, 'index')->createSearch(true);
178
+		$expr = array($search->compare('!=', 'index.catalog.id', null));
179 179
 
180
-		switch( $sort )
180
+		switch ($sort)
181 181
 		{
182 182
 			case 'code':
183
-				$sortations[] = $search->sort( $direction, 'product.code' );
183
+				$sortations[] = $search->sort($direction, 'product.code');
184 184
 				break;
185 185
 
186 186
 			case 'name':
187 187
 				$langid = $context->getLocale()->getLanguageId();
188 188
 
189
-				$cmpfunc = $search->createFunction( 'index.text.value', array( $listtype, $langid, 'name', 'product' ) );
190
-				$expr[] = $search->compare( '>=', $cmpfunc, '' );
189
+				$cmpfunc = $search->createFunction('index.text.value', array($listtype, $langid, 'name', 'product'));
190
+				$expr[] = $search->compare('>=', $cmpfunc, '');
191 191
 
192
-				$sortfunc = $search->createFunction( 'sort:index.text.value', array( $listtype, $langid, 'name' ) );
193
-				$sortations[] = $search->sort( $direction, $sortfunc );
192
+				$sortfunc = $search->createFunction('sort:index.text.value', array($listtype, $langid, 'name'));
193
+				$sortations[] = $search->sort($direction, $sortfunc);
194 194
 				break;
195 195
 
196 196
 			case 'price':
197 197
 				$currencyid = $context->getLocale()->getCurrencyId();
198 198
 
199
-				$cmpfunc = $search->createFunction( 'index.price.value', array( $listtype, $currencyid, 'default' ) );
200
-				$expr[] = $search->compare( '>=', $cmpfunc, '0.00' );
199
+				$cmpfunc = $search->createFunction('index.price.value', array($listtype, $currencyid, 'default'));
200
+				$expr[] = $search->compare('>=', $cmpfunc, '0.00');
201 201
 
202
-				$sortfunc = $search->createFunction( 'sort:index.price.value', array( $listtype, $currencyid, 'default' ) );
203
-				$sortations[] = $search->sort( $direction, $sortfunc );
202
+				$sortfunc = $search->createFunction('sort:index.price.value', array($listtype, $currencyid, 'default'));
203
+				$sortations[] = $search->sort($direction, $sortfunc);
204 204
 				break;
205 205
 		}
206 206
 
207 207
 		$expr[] = $search->getConditions();
208 208
 
209
-		$search->setConditions( $search->combine( '&&', $expr ) );
210
-		$search->setSortations( $sortations );
211
-		$search->setSlice( $start, $size );
209
+		$search->setConditions($search->combine('&&', $expr));
210
+		$search->setSortations($sortations);
211
+		$search->setSlice($start, $size);
212 212
 
213 213
 		return $search;
214 214
 	}
@@ -222,9 +222,9 @@  discard block
 block discarded – undo
222 222
 	 * @return \Aimeos\MShop\Product\Item\Iface Product item including the referenced domains items
223 223
 	 * @since 2017.03
224 224
 	 */
225
-	public function getItem( $productId, array $domains = array( 'attribute', 'media', 'price', 'product', 'product/property', 'text' ) )
225
+	public function getItem($productId, array $domains = array('attribute', 'media', 'price', 'product', 'product/property', 'text'))
226 226
 	{
227
-		return \Aimeos\MShop\Factory::createManager( $this->getContext(), 'product' )->getItem( $productId, $domains, true );
227
+		return \Aimeos\MShop\Factory::createManager($this->getContext(), 'product')->getItem($productId, $domains, true);
228 228
 	}
229 229
 
230 230
 
@@ -236,19 +236,19 @@  discard block
 block discarded – undo
236 236
 	 * @return \Aimeos\MShop\Product\Item\Iface[] Associative list of product IDs as keys and product items as values
237 237
 	 * @since 2017.03
238 238
 	 */
239
-	public function getItems( array $productIds, array $domains = array( 'media', 'price', 'text' ) )
239
+	public function getItems(array $productIds, array $domains = array('media', 'price', 'text'))
240 240
 	{
241
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'product' );
241
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'product');
242 242
 
243
-		$search = $manager->createSearch( true );
243
+		$search = $manager->createSearch(true);
244 244
 		$expr = array(
245
-			$search->compare( '==', 'product.id', $productIds ),
245
+			$search->compare('==', 'product.id', $productIds),
246 246
 			$search->getConditions(),
247 247
 		);
248
-		$search->setConditions( $search->combine( '&&', $expr ) );
249
-		$search->setSlice( 0, count( $productIds ) );
248
+		$search->setConditions($search->combine('&&', $expr));
249
+		$search->setSlice(0, count($productIds));
250 250
 
251
-		return $manager->searchItems( $search, $domains );
251
+		return $manager->searchItems($search, $domains);
252 252
 	}
253 253
 
254 254
 
@@ -261,9 +261,9 @@  discard block
 block discarded – undo
261 261
 	 * @return array Ordered list of product items implementing \Aimeos\MShop\Product\Item\Iface
262 262
 	 * @since 2017.03
263 263
 	 */
264
-	public function searchItems( \Aimeos\MW\Criteria\Iface $filter, array $domains = array( 'media', 'price', 'text' ), &$total = null )
264
+	public function searchItems(\Aimeos\MW\Criteria\Iface $filter, array $domains = array('media', 'price', 'text'), &$total = null)
265 265
 	{
266
-		return \Aimeos\MShop\Factory::createManager( $this->getContext(), 'index' )->searchItems( $filter, $domains, $total );
266
+		return \Aimeos\MShop\Factory::createManager($this->getContext(), 'index')->searchItems($filter, $domains, $total);
267 267
 	}
268 268
 
269 269
 
@@ -273,12 +273,12 @@  discard block
 block discarded – undo
273 273
 	 * @param \Aimeos\MShop\Catalog\Item\Iface $item Catalog item with children
274 274
 	 * @return array List of catalog IDs
275 275
 	 */
276
-	protected function getCatalogIdsFromTree( \Aimeos\MShop\Catalog\Item\Iface $item )
276
+	protected function getCatalogIdsFromTree(\Aimeos\MShop\Catalog\Item\Iface $item)
277 277
 	{
278
-		$list = array( $item->getId() );
278
+		$list = array($item->getId());
279 279
 
280
-		foreach( $item->getChildren() as $child ) {
281
-			$list = array_merge( $list, $this->getCatalogIdsFromTree( $child ) );
280
+		foreach ($item->getChildren() as $child) {
281
+			$list = array_merge($list, $this->getCatalogIdsFromTree($child));
282 282
 		}
283 283
 
284 284
 		return $list;
@@ -291,13 +291,13 @@  discard block
 block discarded – undo
291 291
 	 * @param array $ids List of IDs to validate
292 292
 	 * @return array List of validated IDs
293 293
 	 */
294
-	protected function validateIds( array $ids )
294
+	protected function validateIds(array $ids)
295 295
 	{
296 296
 		$list = [];
297 297
 
298
-		foreach( $ids as $id )
298
+		foreach ($ids as $id)
299 299
 		{
300
-			if( $id != '' ) {
300
+			if ($id != '') {
301 301
 				$list[] = (int) $id;
302 302
 			}
303 303
 		}
Please login to merge, or discard this patch.