Completed
Push — master ( a98373...830d97 )
by Aimeos
02:08
created
controller/frontend/src/Controller/Frontend/Basket/Base.php 2 patches
Braces   +4 added lines, -8 removed lines patch added patch discarded remove patch
@@ -233,8 +233,7 @@  discard block
 block discarded – undo
233 233
 			{
234 234
 				$this->setAddress( $type, $item->toArray() );
235 235
 				$basket->deleteAddress( $type );
236
-			}
237
-			catch( \Exception $e )
236
+			} catch( \Exception $e )
238 237
 			{
239 238
 				$logger = $this->getContext()->getLogger();
240 239
 				$errors['address'][$type] = $e->getMessage();
@@ -264,8 +263,7 @@  discard block
 block discarded – undo
264 263
 			{
265 264
 				$this->addCoupon( $code );
266 265
 				$basket->deleteCoupon( $code, true );
267
-			}
268
-			catch( \Exception $e )
266
+			} catch( \Exception $e )
269 267
 			{
270 268
 				$logger = $this->getContext()->getLogger();
271 269
 				$errors['coupon'][$code] = $e->getMessage();
@@ -314,8 +312,7 @@  discard block
 block discarded – undo
314 312
 				);
315 313
 
316 314
 				$basket->deleteProduct( $pos );
317
-			}
318
-			catch( \Exception $e )
315
+			} catch( \Exception $e )
319 316
 			{
320 317
 				$code = $product->getProductCode();
321 318
 				$logger = $this->getContext()->getLogger();
@@ -353,8 +350,7 @@  discard block
 block discarded – undo
353 350
 
354 351
 					$this->addService( $type, $item->getServiceId(), $attributes );
355 352
 					$basket->deleteService( $type );
356
-				}
357
-				catch( \Exception $e ) { ; } // Don't notify the user as appropriate services can be added automatically
353
+				} catch( \Exception $e ) { ; } // Don't notify the user as appropriate services can be added automatically
358 354
 			}
359 355
 		}
360 356
 
Please login to merge, or discard this patch.
Spacing   +146 added lines, -146 removed lines patch added patch discarded remove patch
@@ -31,52 +31,52 @@  discard block
 block discarded – undo
31 31
 	 * @param integer $quantity New product quantity
32 32
 	 * @return \Aimeos\MShop\Price\Item\Iface Price item with calculated price
33 33
 	 */
34
-	protected function calcPrice( \Aimeos\MShop\Order\Item\Base\Product\Iface $product, array $prices, $quantity )
34
+	protected function calcPrice(\Aimeos\MShop\Order\Item\Base\Product\Iface $product, array $prices, $quantity)
35 35
 	{
36 36
 		$context = $this->getContext();
37 37
 
38
-		if( empty( $prices ) )
38
+		if (empty($prices))
39 39
 		{
40
-			$manager = \Aimeos\MShop\Factory::createManager( $context, 'product' );
41
-			$prices = $manager->getItem( $product->getProductId(), array( 'price' ) )->getRefItems( 'price', 'default' );
40
+			$manager = \Aimeos\MShop\Factory::createManager($context, 'product');
41
+			$prices = $manager->getItem($product->getProductId(), array('price'))->getRefItems('price', 'default');
42 42
 		}
43 43
 
44 44
 
45
-		$priceManager = \Aimeos\MShop\Factory::createManager( $context, 'price' );
46
-		$price = $priceManager->getLowestPrice( $prices, $quantity );
45
+		$priceManager = \Aimeos\MShop\Factory::createManager($context, 'price');
46
+		$price = $priceManager->getLowestPrice($prices, $quantity);
47 47
 
48 48
 		// customers can pay what they would like to pay
49
-		if( ( $attr = $product->getAttributeItem( 'price', 'custom' ) ) !== null )
49
+		if (($attr = $product->getAttributeItem('price', 'custom')) !== null)
50 50
 		{
51 51
 			$amount = $attr->getValue();
52 52
 
53
-			if( preg_match( '/^[0-9]*(\.[0-9]+)?$/', $amount ) !== 1 || ((double) $amount) < 0.01 )
53
+			if (preg_match('/^[0-9]*(\.[0-9]+)?$/', $amount) !== 1 || ((double) $amount) < 0.01)
54 54
 			{
55
-				$msg = $context->getI18n()->dt( 'controller/frontend', 'Invalid price value "%1$s"' );
56
-				throw new \Aimeos\Controller\Frontend\Basket\Exception( sprintf( $msg, $amount ) );
55
+				$msg = $context->getI18n()->dt('controller/frontend', 'Invalid price value "%1$s"');
56
+				throw new \Aimeos\Controller\Frontend\Basket\Exception(sprintf($msg, $amount));
57 57
 			}
58 58
 
59
-			$price->setValue( $amount );
59
+			$price->setValue($amount);
60 60
 		}
61 61
 
62 62
 		$orderAttributes = $product->getAttributeItems();
63
-		$attrItems = $this->getAttributeItems( $orderAttributes );
63
+		$attrItems = $this->getAttributeItems($orderAttributes);
64 64
 
65 65
 		// add prices of (optional) attributes
66
-		foreach( $orderAttributes as $orderAttrItem )
66
+		foreach ($orderAttributes as $orderAttrItem)
67 67
 		{
68 68
 			$attrId = $orderAttrItem->getAttributeId();
69 69
 
70
-			if( isset( $attrItems[$attrId] )
71
-				&& ( $prices = $attrItems[$attrId]->getRefItems( 'price', 'default' ) ) !== []
70
+			if (isset($attrItems[$attrId])
71
+				&& ($prices = $attrItems[$attrId]->getRefItems('price', 'default')) !== []
72 72
 			) {
73
-				$attrPrice = $priceManager->getLowestPrice( $prices, $orderAttrItem->getQuantity() );
74
-				$price->addItem( $attrPrice, $orderAttrItem->getQuantity() );
73
+				$attrPrice = $priceManager->getLowestPrice($prices, $orderAttrItem->getQuantity());
74
+				$price->addItem($attrPrice, $orderAttrItem->getQuantity());
75 75
 			}
76 76
 		}
77 77
 
78 78
 		// remove product rebate of original price in favor to rebates granted for the order
79
-		$price->setRebate( '0.00' );
79
+		$price->setRebate('0.00');
80 80
 
81 81
 		return $price;
82 82
 	}
@@ -90,36 +90,36 @@  discard block
 block discarded – undo
90 90
 	 * @param array $refMap Associative list of list type codes as keys and lists of reference IDs as values
91 91
 	 * @throws \Aimeos\Controller\Frontend\Basket\Exception If one or more of the IDs are not associated
92 92
 	 */
93
-	protected function checkListRef( $prodId, $domain, array $refMap )
93
+	protected function checkListRef($prodId, $domain, array $refMap)
94 94
 	{
95
-		if( empty( $refMap ) ) {
95
+		if (empty($refMap)) {
96 96
 			return;
97 97
 		}
98 98
 
99 99
 		$context = $this->getContext();
100
-		$productManager = \Aimeos\MShop\Factory::createManager( $context, 'product' );
101
-		$search = $productManager->createSearch( true );
100
+		$productManager = \Aimeos\MShop\Factory::createManager($context, 'product');
101
+		$search = $productManager->createSearch(true);
102 102
 
103 103
 		$expr = array(
104
-			$search->compare( '==', 'product.id', $prodId ),
104
+			$search->compare('==', 'product.id', $prodId),
105 105
 			$search->getConditions(),
106 106
 		);
107 107
 
108
-		foreach( $refMap as $listType => $refIds )
108
+		foreach ($refMap as $listType => $refIds)
109 109
 		{
110
-			foreach( $refIds as $key => $refId )
110
+			foreach ($refIds as $key => $refId)
111 111
 			{
112
-				$cmpfunc = $search->createFunction( 'product:has', [$domain, $listType, (string) $refId] );
113
-				$expr[] = $search->compare( '!=', $cmpfunc, null );
112
+				$cmpfunc = $search->createFunction('product:has', [$domain, $listType, (string) $refId]);
113
+				$expr[] = $search->compare('!=', $cmpfunc, null);
114 114
 			}
115 115
 		}
116 116
 
117
-		$search->setConditions( $search->combine( '&&', $expr ) );
117
+		$search->setConditions($search->combine('&&', $expr));
118 118
 
119
-		if( count( $productManager->searchItems( $search, [] ) ) === 0 )
119
+		if (count($productManager->searchItems($search, [])) === 0)
120 120
 		{
121
-			$msg = $context->getI18n()->dt( 'controller/frontend', 'Invalid "%1$s" references for product with ID %2$s' );
122
-			throw new \Aimeos\Controller\Frontend\Basket\Exception( sprintf( $msg, $domain, json_encode( $prodId ) ) );
121
+			$msg = $context->getI18n()->dt('controller/frontend', 'Invalid "%1$s" references for product with ID %2$s');
122
+			throw new \Aimeos\Controller\Frontend\Basket\Exception(sprintf($msg, $domain, json_encode($prodId)));
123 123
 		}
124 124
 	}
125 125
 
@@ -130,40 +130,40 @@  discard block
 block discarded – undo
130 130
 	 * @param \Aimeos\MShop\Locale\Item\Iface $locale Locale object from current basket
131 131
 	 * @param string $type Basket type
132 132
 	 */
133
-	protected function checkLocale( \Aimeos\MShop\Locale\Item\Iface $locale, $type )
133
+	protected function checkLocale(\Aimeos\MShop\Locale\Item\Iface $locale, $type)
134 134
 	{
135 135
 		$errors = [];
136 136
 		$context = $this->getContext();
137 137
 		$session = $context->getSession();
138 138
 
139
-		$localeStr = $session->get( 'aimeos/basket/locale' );
139
+		$localeStr = $session->get('aimeos/basket/locale');
140 140
 		$localeKey = $locale->getSite()->getCode() . '|' . $locale->getLanguageId() . '|' . $locale->getCurrencyId();
141 141
 
142
-		if( $localeStr !== null && $localeStr !== $localeKey )
142
+		if ($localeStr !== null && $localeStr !== $localeKey)
143 143
 		{
144
-			$locParts = explode( '|', $localeStr );
145
-			$locSite = ( isset( $locParts[0] ) ? $locParts[0] : '' );
146
-			$locLanguage = ( isset( $locParts[1] ) ? $locParts[1] : '' );
147
-			$locCurrency = ( isset( $locParts[2] ) ? $locParts[2] : '' );
144
+			$locParts = explode('|', $localeStr);
145
+			$locSite = (isset($locParts[0]) ? $locParts[0] : '');
146
+			$locLanguage = (isset($locParts[1]) ? $locParts[1] : '');
147
+			$locCurrency = (isset($locParts[2]) ? $locParts[2] : '');
148 148
 
149
-			$localeManager = \Aimeos\MShop\Factory::createManager( $context, 'locale' );
150
-			$locale = $localeManager->bootstrap( $locSite, $locLanguage, $locCurrency, false );
149
+			$localeManager = \Aimeos\MShop\Factory::createManager($context, 'locale');
150
+			$locale = $localeManager->bootstrap($locSite, $locLanguage, $locCurrency, false);
151 151
 
152 152
 			$context = clone $context;
153
-			$context->setLocale( $locale );
153
+			$context->setLocale($locale);
154 154
 
155
-			$manager = \Aimeos\MShop\Factory::createManager( $context, 'order/base' );
156
-			$basket = $manager->getSession( $type );
155
+			$manager = \Aimeos\MShop\Factory::createManager($context, 'order/base');
156
+			$basket = $manager->getSession($type);
157 157
 
158
-			$this->copyAddresses( $basket, $errors, $localeKey );
159
-			$this->copyServices( $basket, $errors );
160
-			$this->copyProducts( $basket, $errors, $localeKey );
161
-			$this->copyCoupons( $basket, $errors, $localeKey );
158
+			$this->copyAddresses($basket, $errors, $localeKey);
159
+			$this->copyServices($basket, $errors);
160
+			$this->copyProducts($basket, $errors, $localeKey);
161
+			$this->copyCoupons($basket, $errors, $localeKey);
162 162
 
163
-			$manager->setSession( $basket, $type );
163
+			$manager->setSession($basket, $type);
164 164
 		}
165 165
 
166
-		$session->set( 'aimeos/basket/locale', $localeKey );
166
+		$session->set('aimeos/basket/locale', $localeKey);
167 167
 	}
168 168
 
169 169
 
@@ -175,22 +175,22 @@  discard block
 block discarded – undo
175 175
 	 * @param string $localeKey Unique identifier of the site, language and currency
176 176
 	 * @return array Associative list of errors occured
177 177
 	 */
178
-	protected function copyAddresses( \Aimeos\MShop\Order\Item\Base\Iface $basket, array $errors, $localeKey )
178
+	protected function copyAddresses(\Aimeos\MShop\Order\Item\Base\Iface $basket, array $errors, $localeKey)
179 179
 	{
180
-		foreach( $basket->getAddresses() as $type => $item )
180
+		foreach ($basket->getAddresses() as $type => $item)
181 181
 		{
182 182
 			try
183 183
 			{
184
-				$this->setAddress( $type, $item->toArray() );
185
-				$basket->deleteAddress( $type );
184
+				$this->setAddress($type, $item->toArray());
185
+				$basket->deleteAddress($type);
186 186
 			}
187
-			catch( \Exception $e )
187
+			catch (\Exception $e)
188 188
 			{
189 189
 				$logger = $this->getContext()->getLogger();
190 190
 				$errors['address'][$type] = $e->getMessage();
191 191
 
192 192
 				$str = 'Error migrating address with type "%1$s" in basket to locale "%2$s": %3$s';
193
-				$logger->log( sprintf( $str, $type, $localeKey, $e->getMessage() ), \Aimeos\MW\Logger\Base::INFO );
193
+				$logger->log(sprintf($str, $type, $localeKey, $e->getMessage()), \Aimeos\MW\Logger\Base::INFO);
194 194
 			}
195 195
 		}
196 196
 
@@ -206,22 +206,22 @@  discard block
 block discarded – undo
206 206
 	 * @param string $localeKey Unique identifier of the site, language and currency
207 207
 	 * @return array Associative list of errors occured
208 208
 	 */
209
-	protected function copyCoupons( \Aimeos\MShop\Order\Item\Base\Iface $basket, array $errors, $localeKey )
209
+	protected function copyCoupons(\Aimeos\MShop\Order\Item\Base\Iface $basket, array $errors, $localeKey)
210 210
 	{
211
-		foreach( $basket->getCoupons() as $code => $list )
211
+		foreach ($basket->getCoupons() as $code => $list)
212 212
 		{
213 213
 			try
214 214
 			{
215
-				$this->addCoupon( $code );
216
-				$basket->deleteCoupon( $code, true );
215
+				$this->addCoupon($code);
216
+				$basket->deleteCoupon($code, true);
217 217
 			}
218
-			catch( \Exception $e )
218
+			catch (\Exception $e)
219 219
 			{
220 220
 				$logger = $this->getContext()->getLogger();
221 221
 				$errors['coupon'][$code] = $e->getMessage();
222 222
 
223 223
 				$str = 'Error migrating coupon with code "%1$s" in basket to locale "%2$s": %3$s';
224
-				$logger->log( sprintf( $str, $code, $localeKey, $e->getMessage() ), \Aimeos\MW\Logger\Base::INFO );
224
+				$logger->log(sprintf($str, $code, $localeKey, $e->getMessage()), \Aimeos\MW\Logger\Base::INFO);
225 225
 			}
226 226
 		}
227 227
 
@@ -237,11 +237,11 @@  discard block
 block discarded – undo
237 237
 	 * @param string $localeKey Unique identifier of the site, language and currency
238 238
 	 * @return array Associative list of errors occured
239 239
 	 */
240
-	protected function copyProducts( \Aimeos\MShop\Order\Item\Base\Iface $basket, array $errors, $localeKey )
240
+	protected function copyProducts(\Aimeos\MShop\Order\Item\Base\Iface $basket, array $errors, $localeKey)
241 241
 	{
242
-		foreach( $basket->getProducts() as $pos => $product )
242
+		foreach ($basket->getProducts() as $pos => $product)
243 243
 		{
244
-			if( $product->getFlags() & \Aimeos\MShop\Order\Item\Base\Product\Base::FLAG_IMMUTABLE ) {
244
+			if ($product->getFlags() & \Aimeos\MShop\Order\Item\Base\Product\Base::FLAG_IMMUTABLE) {
245 245
 				continue;
246 246
 			}
247 247
 
@@ -249,9 +249,9 @@  discard block
 block discarded – undo
249 249
 			{
250 250
 				$variantIds = $configIds = $customIds = [];
251 251
 
252
-				foreach( $product->getAttributeItems() as $attrItem )
252
+				foreach ($product->getAttributeItems() as $attrItem)
253 253
 				{
254
-					switch( $attrItem->getType() )
254
+					switch ($attrItem->getType())
255 255
 					{
256 256
 						case 'variant': $variantIds[] = $attrItem->getAttributeId(); break;
257 257
 						case 'config': $configIds[$attrItem->getAttributeId()] = $attrItem->getQuantity(); break;
@@ -264,16 +264,16 @@  discard block
 block discarded – undo
264 264
 					$variantIds, $configIds, [], $customIds
265 265
 				);
266 266
 
267
-				$basket->deleteProduct( $pos );
267
+				$basket->deleteProduct($pos);
268 268
 			}
269
-			catch( \Exception $e )
269
+			catch (\Exception $e)
270 270
 			{
271 271
 				$code = $product->getProductCode();
272 272
 				$logger = $this->getContext()->getLogger();
273 273
 				$errors['product'][$pos] = $e->getMessage();
274 274
 
275 275
 				$str = 'Error migrating product with code "%1$s" in basket to locale "%2$s": %3$s';
276
-				$logger->log( sprintf( $str, $code, $localeKey, $e->getMessage() ), \Aimeos\MW\Logger\Base::INFO );
276
+				$logger->log(sprintf($str, $code, $localeKey, $e->getMessage()), \Aimeos\MW\Logger\Base::INFO);
277 277
 			}
278 278
 		}
279 279
 
@@ -288,24 +288,24 @@  discard block
 block discarded – undo
288 288
 	 * @param array $errors Associative list of previous errors
289 289
 	 * @return array Associative list of errors occured
290 290
 	 */
291
-	protected function copyServices( \Aimeos\MShop\Order\Item\Base\Iface $basket, array $errors )
291
+	protected function copyServices(\Aimeos\MShop\Order\Item\Base\Iface $basket, array $errors)
292 292
 	{
293
-		foreach( $basket->getServices() as $type => $list )
293
+		foreach ($basket->getServices() as $type => $list)
294 294
 		{
295
-			foreach( $list as $item )
295
+			foreach ($list as $item)
296 296
 			{
297 297
 				try
298 298
 				{
299 299
 					$attributes = [];
300 300
 
301
-					foreach( $item->getAttributeItems() as $attrItem ) {
301
+					foreach ($item->getAttributeItems() as $attrItem) {
302 302
 						$attributes[$attrItem->getCode()] = $attrItem->getValue();
303 303
 					}
304 304
 
305
-					$this->addService( $type, $item->getServiceId(), $attributes );
306
-					$basket->deleteService( $type );
305
+					$this->addService($type, $item->getServiceId(), $attributes);
306
+					$basket->deleteService($type);
307 307
 				}
308
-				catch( \Exception $e ) { ; } // Don't notify the user as appropriate services can be added automatically
308
+				catch (\Exception $e) {; } // Don't notify the user as appropriate services can be added automatically
309 309
 			}
310 310
 		}
311 311
 
@@ -318,28 +318,28 @@  discard block
 block discarded – undo
318 318
 	 *
319 319
 	 * @param \Aimeos\MShop\Order\Item\Base\Iface $basket Basket object
320 320
 	 */
321
-	protected function createSubscriptions( \Aimeos\MShop\Order\Item\Base\Iface $basket )
321
+	protected function createSubscriptions(\Aimeos\MShop\Order\Item\Base\Iface $basket)
322 322
 	{
323
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'subscription' );
323
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'subscription');
324 324
 
325
-		foreach( $basket->getProducts() as $orderProduct )
325
+		foreach ($basket->getProducts() as $orderProduct)
326 326
 		{
327
-			if( ( $interval = $orderProduct->getAttribute( 'interval', 'config' ) ) !== null )
327
+			if (($interval = $orderProduct->getAttribute('interval', 'config')) !== null)
328 328
 			{
329 329
 				$item = $manager->createItem();
330
-				$item->setOrderBaseId( $basket->getId() );
331
-				$item->setOrderProductId( $orderProduct->getId() );
332
-				$item->setInterval( $interval );
333
-				$item->setStatus( 1 );
334
-
335
-				if( ( $end = $orderProduct->getAttribute( 'intervalend', 'custom' ) ) !== null
336
-					|| ( $end = $orderProduct->getAttribute( 'intervalend', 'config' ) ) !== null
337
-					|| ( $end = $orderProduct->getAttribute( 'intervalend', 'hidden' ) ) !== null
330
+				$item->setOrderBaseId($basket->getId());
331
+				$item->setOrderProductId($orderProduct->getId());
332
+				$item->setInterval($interval);
333
+				$item->setStatus(1);
334
+
335
+				if (($end = $orderProduct->getAttribute('intervalend', 'custom')) !== null
336
+					|| ($end = $orderProduct->getAttribute('intervalend', 'config')) !== null
337
+					|| ($end = $orderProduct->getAttribute('intervalend', 'hidden')) !== null
338 338
 				) {
339
-					$item->setDateEnd( $end );
339
+					$item->setDateEnd($end);
340 340
 				}
341 341
 
342
-				$manager->saveItem( $item, false );
342
+				$manager->saveItem($item, false);
343 343
 			}
344 344
 		}
345 345
 	}
@@ -353,32 +353,32 @@  discard block
 block discarded – undo
353 353
 	 * @return array List of items implementing \Aimeos\MShop\Attribute\Item\Iface
354 354
 	 * @throws \Aimeos\Controller\Frontend\Basket\Exception If the actual attribute number doesn't match the expected one
355 355
 	 */
356
-	protected function getAttributes( array $attributeIds, array $domains = array( 'price', 'text' ) )
356
+	protected function getAttributes(array $attributeIds, array $domains = array('price', 'text'))
357 357
 	{
358
-		if( empty( $attributeIds ) ) {
358
+		if (empty($attributeIds)) {
359 359
 			return [];
360 360
 		}
361 361
 
362
-		$attributeManager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'attribute' );
362
+		$attributeManager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'attribute');
363 363
 
364
-		$search = $attributeManager->createSearch( true );
364
+		$search = $attributeManager->createSearch(true);
365 365
 		$expr = array(
366
-			$search->compare( '==', 'attribute.id', $attributeIds ),
366
+			$search->compare('==', 'attribute.id', $attributeIds),
367 367
 			$search->getConditions(),
368 368
 		);
369
-		$search->setConditions( $search->combine( '&&', $expr ) );
370
-		$search->setSlice( 0, count( $attributeIds ) );
369
+		$search->setConditions($search->combine('&&', $expr));
370
+		$search->setSlice(0, count($attributeIds));
371 371
 
372
-		$attrItems = $attributeManager->searchItems( $search, $domains );
372
+		$attrItems = $attributeManager->searchItems($search, $domains);
373 373
 
374
-		if( count( $attrItems ) !== count( $attributeIds ) )
374
+		if (count($attrItems) !== count($attributeIds))
375 375
 		{
376 376
 			$i18n = $this->getContext()->getI18n();
377
-			$expected = implode( ',', $attributeIds );
378
-			$actual = implode( ',', array_keys( $attrItems ) );
379
-			$msg = $i18n->dt( 'controller/frontend', 'Available attribute IDs "%1$s" do not match the given attribute IDs "%2$s"' );
377
+			$expected = implode(',', $attributeIds);
378
+			$actual = implode(',', array_keys($attrItems));
379
+			$msg = $i18n->dt('controller/frontend', 'Available attribute IDs "%1$s" do not match the given attribute IDs "%2$s"');
380 380
 
381
-			throw new \Aimeos\Controller\Frontend\Basket\Exception( sprintf( $msg, $actual, $expected ) );
381
+			throw new \Aimeos\Controller\Frontend\Basket\Exception(sprintf($msg, $actual, $expected));
382 382
 		}
383 383
 
384 384
 		return $attrItems;
@@ -391,30 +391,30 @@  discard block
 block discarded – undo
391 391
 	 * @param \Aimeos\MShop\Order\Item\Base\Product\Attribute\Item[] $orderAttributes List of order product attribute items
392 392
 	 * @return \Aimeos\MShop\Attribute\Item\Iface[] Associative list of attribute IDs as key and attribute items as values
393 393
 	 */
394
-	protected function getAttributeItems( array $orderAttributes )
394
+	protected function getAttributeItems(array $orderAttributes)
395 395
 	{
396
-		if( empty( $orderAttributes ) ) {
396
+		if (empty($orderAttributes)) {
397 397
 			return [];
398 398
 		}
399 399
 
400
-		$attributeManager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'attribute' );
401
-		$search = $attributeManager->createSearch( true );
400
+		$attributeManager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'attribute');
401
+		$search = $attributeManager->createSearch(true);
402 402
 		$expr = [];
403 403
 
404
-		foreach( $orderAttributes as $item )
404
+		foreach ($orderAttributes as $item)
405 405
 		{
406 406
 			$tmp = array(
407
-				$search->compare( '==', 'attribute.domain', 'product' ),
408
-				$search->compare( '==', 'attribute.code', $item->getValue() ),
409
-				$search->compare( '==', 'attribute.type', $item->getCode() ),
410
-				$search->compare( '>', 'attribute.status', 0 ),
407
+				$search->compare('==', 'attribute.domain', 'product'),
408
+				$search->compare('==', 'attribute.code', $item->getValue()),
409
+				$search->compare('==', 'attribute.type', $item->getCode()),
410
+				$search->compare('>', 'attribute.status', 0),
411 411
 				$search->getConditions(),
412 412
 			);
413
-			$expr[] = $search->combine( '&&', $tmp );
413
+			$expr[] = $search->combine('&&', $tmp);
414 414
 		}
415 415
 
416
-		$search->setConditions( $search->combine( '||', $expr ) );
417
-		return $attributeManager->searchItems( $search, array( 'price' ) );
416
+		$search->setConditions($search->combine('||', $expr));
417
+		return $attributeManager->searchItems($search, array('price'));
418 418
 	}
419 419
 
420 420
 
@@ -427,24 +427,24 @@  discard block
 block discarded – undo
427 427
 	 * @param array $quantities Associative list of attribute IDs as keys and their quantities as values
428 428
 	 * @return array List of items implementing \Aimeos\MShop\Order\Item\Product\Attribute\Iface
429 429
 	 */
430
-	protected function getOrderProductAttributes( $type, array $ids, array $values = [], array $quantities = [] )
430
+	protected function getOrderProductAttributes($type, array $ids, array $values = [], array $quantities = [])
431 431
 	{
432
-		if( empty( $ids ) ) {
432
+		if (empty($ids)) {
433 433
 			return [];
434 434
 		}
435 435
 
436 436
 		$list = [];
437
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'order/base/product/attribute' );
437
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'order/base/product/attribute');
438 438
 
439
-		foreach( $this->getAttributes( $ids ) as $id => $attrItem )
439
+		foreach ($this->getAttributes($ids) as $id => $attrItem)
440 440
 		{
441 441
 			$item = $manager->createItem();
442
-			$item->copyFrom( $attrItem );
443
-			$item->setType( $type );
444
-			$item->setQuantity( isset( $quantities[$id] ) ? $quantities[$id] : 1 );
442
+			$item->copyFrom($attrItem);
443
+			$item->setType($type);
444
+			$item->setQuantity(isset($quantities[$id]) ? $quantities[$id] : 1);
445 445
 
446
-			if( isset( $values[$id] ) ) {
447
-				$item->setValue( $values[$id] );
446
+			if (isset($values[$id])) {
447
+				$item->setValue($values[$id]);
448 448
 			}
449 449
 
450 450
 			$list[] = $item;
@@ -461,23 +461,23 @@  discard block
 block discarded – undo
461 461
 	 * @param string $code Code of the list type
462 462
 	 * @return \Aimeos\MShop\Common\Item\Type\Iface List type item
463 463
 	 */
464
-	protected function getProductListTypeItem( $domain, $code )
464
+	protected function getProductListTypeItem($domain, $code)
465 465
 	{
466 466
 		$context = $this->getContext();
467 467
 
468
-		if( empty( $this->listTypeItems ) )
468
+		if (empty($this->listTypeItems))
469 469
 		{
470
-			$manager = \Aimeos\MShop\Factory::createManager( $context, 'product/lists/type' );
470
+			$manager = \Aimeos\MShop\Factory::createManager($context, 'product/lists/type');
471 471
 
472
-			foreach( $manager->searchItems( $manager->createSearch( true ) ) as $item ) {
473
-				$this->listTypeItems[ $item->getDomain() ][ $item->getCode() ] = $item;
472
+			foreach ($manager->searchItems($manager->createSearch(true)) as $item) {
473
+				$this->listTypeItems[$item->getDomain()][$item->getCode()] = $item;
474 474
 			}
475 475
 		}
476 476
 
477
-		if( !isset( $this->listTypeItems[$domain][$code] ) )
477
+		if (!isset($this->listTypeItems[$domain][$code]))
478 478
 		{
479
-			$msg = $context->getI18n()->dt( 'controller/frontend', 'List type for domain "%1$s" and code "%2$s" not found' );
480
-			throw new \Aimeos\Controller\Frontend\Basket\Exception( sprintf( $msg, $domain, $code ) );
479
+			$msg = $context->getI18n()->dt('controller/frontend', 'List type for domain "%1$s" and code "%2$s" not found');
480
+			throw new \Aimeos\Controller\Frontend\Basket\Exception(sprintf($msg, $domain, $code));
481 481
 		}
482 482
 
483 483
 		return $this->listTypeItems[$domain][$code];
@@ -492,35 +492,35 @@  discard block
 block discarded – undo
492 492
 	 * @param array $domains Names of the domain items that should be fetched too
493 493
 	 * @return array List of products matching the given attributes
494 494
 	 */
495
-	protected function getProductVariants( \Aimeos\MShop\Product\Item\Iface $productItem, array $variantAttributeIds,
496
-			array $domains = array( 'attribute', 'media', 'price', 'text' ) )
495
+	protected function getProductVariants(\Aimeos\MShop\Product\Item\Iface $productItem, array $variantAttributeIds,
496
+			array $domains = array('attribute', 'media', 'price', 'text'))
497 497
 	{
498 498
 		$subProductIds = [];
499
-		foreach( $productItem->getRefItems( 'product', 'default', 'default' ) as $item ) {
499
+		foreach ($productItem->getRefItems('product', 'default', 'default') as $item) {
500 500
 			$subProductIds[] = $item->getId();
501 501
 		}
502 502
 
503
-		if( count( $subProductIds ) === 0 ) {
503
+		if (count($subProductIds) === 0) {
504 504
 			return [];
505 505
 		}
506 506
 
507
-		$productManager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'product' );
508
-		$search = $productManager->createSearch( true );
507
+		$productManager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'product');
508
+		$search = $productManager->createSearch(true);
509 509
 
510 510
 		$expr = array(
511
-			$search->compare( '==', 'product.id', $subProductIds ),
511
+			$search->compare('==', 'product.id', $subProductIds),
512 512
 			$search->getConditions(),
513 513
 		);
514 514
 
515
-		foreach( $variantAttributeIds as $id )
515
+		foreach ($variantAttributeIds as $id)
516 516
 		{
517
-			$cmpfunc = $search->createFunction( 'product:has', ['attribute', 'variant', (string) $id] );
518
-			$expr[] = $search->compare( '!=', $cmpfunc, null );
517
+			$cmpfunc = $search->createFunction('product:has', ['attribute', 'variant', (string) $id]);
518
+			$expr[] = $search->compare('!=', $cmpfunc, null);
519 519
 		}
520 520
 
521
-		$search->setConditions( $search->combine( '&&', $expr ) );
521
+		$search->setConditions($search->combine('&&', $expr));
522 522
 
523
-		return $productManager->searchItems( $search, $domains );
523
+		return $productManager->searchItems($search, $domains);
524 524
 	}
525 525
 
526 526
 
@@ -532,9 +532,9 @@  discard block
 block discarded – undo
532 532
 	 * @param mixed $default Default value if no value is available for the given name
533 533
 	 * @return mixed Value from the array or default value
534 534
 	 */
535
-	protected function getValue( array $values, $name, $default = null )
535
+	protected function getValue(array $values, $name, $default = null)
536 536
 	{
537
-		if( isset( $values[$name] ) ) {
537
+		if (isset($values[$name])) {
538 538
 			return $values[$name];
539 539
 		}
540 540
 
Please login to merge, or discard this patch.
controller/frontend/src/Controller/Frontend/Order/Standard.php 1 patch
Spacing   +37 added lines, -37 removed lines patch added patch discarded remove patch
@@ -29,11 +29,11 @@  discard block
 block discarded – undo
29 29
 	 * @param string $type Arbitrary order type (max. eight chars)
30 30
 	 * @return \Aimeos\MShop\Order\Item\Iface Created order object
31 31
 	 */
32
-	public function addItem( $baseId, $type )
32
+	public function addItem($baseId, $type)
33 33
 	{
34 34
 		$total = 0;
35 35
 		$context = $this->getContext();
36
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'order' );
36
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'order');
37 37
 
38 38
 		/** controller/frontend/order/limit-seconds
39 39
 		 * Order limitation time frame in seconds
@@ -51,24 +51,24 @@  discard block
 block discarded – undo
51 51
 		 * @see controller/frontend/basket/limit-count
52 52
 		 * @see controller/frontend/basket/limit-seconds
53 53
 		 */
54
-		$seconds = $context->getConfig()->get( 'controller/frontend/order/limit-seconds', 300 );
54
+		$seconds = $context->getConfig()->get('controller/frontend/order/limit-seconds', 300);
55 55
 
56 56
 		$search = $manager->createSearch();
57 57
 		$expr = [
58
-			$search->compare( '==', 'order.baseid', $baseId ),
59
-			$search->compare( '>=', 'order.ctime', date( 'Y-m-d H:i:s', time() - $seconds ) ),
58
+			$search->compare('==', 'order.baseid', $baseId),
59
+			$search->compare('>=', 'order.ctime', date('Y-m-d H:i:s', time() - $seconds)),
60 60
 		];
61
-		$search->setConditions( $search->combine( '&&', $expr ) );
62
-		$search->setSlice( 0, 0 );
61
+		$search->setConditions($search->combine('&&', $expr));
62
+		$search->setSlice(0, 0);
63 63
 
64
-		$manager->searchItems( $search, [], $total );
64
+		$manager->searchItems($search, [], $total);
65 65
 
66
-		if( $total > 0 ) {
67
-			throw new \Aimeos\Controller\Frontend\Order\Exception( sprintf( 'The order has already been created' ) );
66
+		if ($total > 0) {
67
+			throw new \Aimeos\Controller\Frontend\Order\Exception(sprintf('The order has already been created'));
68 68
 		}
69 69
 
70
-		$item = $manager->createItem()->setBaseId( $baseId )->setType( $type );
71
-		return $manager->saveItem( $item );
70
+		$item = $manager->createItem()->setBaseId($baseId)->setType($type);
71
+		return $manager->saveItem($item);
72 72
 	}
73 73
 
74 74
 
@@ -79,7 +79,7 @@  discard block
 block discarded – undo
79 79
 	 */
80 80
 	public function createFilter()
81 81
 	{
82
-		return \Aimeos\MShop\Factory::createManager( $this->getContext(), 'order' )->createSearch( true );
82
+		return \Aimeos\MShop\Factory::createManager($this->getContext(), 'order')->createSearch(true);
83 83
 	}
84 84
 
85 85
 
@@ -90,30 +90,30 @@  discard block
 block discarded – undo
90 90
 	 * @param boolean $default Use default criteria to limit orders
91 91
 	 * @return \Aimeos\MShop\Order\Item\Iface Order object
92 92
 	 */
93
-	public function getItem( $id, $default = true )
93
+	public function getItem($id, $default = true)
94 94
 	{
95 95
 		$context = $this->getContext();
96
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'order' );
96
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'order');
97 97
 
98
-		$search = $manager->createSearch( true );
98
+		$search = $manager->createSearch(true);
99 99
 		$expr = [
100
-			$search->compare( '==', 'order.id', $id ),
100
+			$search->compare('==', 'order.id', $id),
101 101
 			$search->getConditions(),
102 102
 		];
103 103
 
104
-		if( $default !== false ) {
105
-			$expr[] = $search->compare( '==', 'order.editor', $context->getEditor() );
104
+		if ($default !== false) {
105
+			$expr[] = $search->compare('==', 'order.editor', $context->getEditor());
106 106
 		}
107 107
 
108
-		$search->setConditions( $search->combine( '&&', $expr ) );
108
+		$search->setConditions($search->combine('&&', $expr));
109 109
 
110
-		$items = $manager->searchItems( $search );
110
+		$items = $manager->searchItems($search);
111 111
 
112
-		if( ( $item = reset( $items ) ) !== false ) {
112
+		if (($item = reset($items)) !== false) {
113 113
 			return $item;
114 114
 		}
115 115
 
116
-		throw new \Aimeos\Controller\Frontend\Order\Exception( sprintf( 'No order item for ID "%1$s" found', $id ) );
116
+		throw new \Aimeos\Controller\Frontend\Order\Exception(sprintf('No order item for ID "%1$s" found', $id));
117 117
 	}
118 118
 
119 119
 
@@ -123,10 +123,10 @@  discard block
 block discarded – undo
123 123
 	 * @param \Aimeos\MShop\Order\Item\Iface $item Order object
124 124
 	 * @return \Aimeos\MShop\Order\Item\Iface Saved order item
125 125
 	 */
126
-	public function saveItem( \Aimeos\MShop\Order\Item\Iface $item )
126
+	public function saveItem(\Aimeos\MShop\Order\Item\Iface $item)
127 127
 	{
128
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'order' );
129
-		return $manager->saveItem( $item );
128
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'order');
129
+		return $manager->saveItem($item);
130 130
 	}
131 131
 
132 132
 
@@ -137,18 +137,18 @@  discard block
 block discarded – undo
137 137
 	 * @param integer|null &$total Variable that will contain the total number of available items
138 138
 	 * @return \Aimeos\MShop\Order\Item\Iface[] Associative list of IDs as keys and order objects as values
139 139
 	 */
140
-	public function searchItems( \Aimeos\MW\Criteria\Iface $filter, &$total = null )
140
+	public function searchItems(\Aimeos\MW\Criteria\Iface $filter, &$total = null)
141 141
 	{
142 142
 		$context = $this->getContext();
143
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'order' );
143
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'order');
144 144
 
145 145
 		$expr = [
146 146
 			$filter->getConditions(),
147
-			$filter->compare( '==', 'order.base.customerid', $context->getUserId() ),
147
+			$filter->compare('==', 'order.base.customerid', $context->getUserId()),
148 148
 		];
149
-		$filter->setConditions( $filter->combine( '&&', $expr ) );
149
+		$filter->setConditions($filter->combine('&&', $expr));
150 150
 
151
-		return $manager->searchItems( $filter, [], $total );
151
+		return $manager->searchItems($filter, [], $total);
152 152
 	}
153 153
 
154 154
 
@@ -170,9 +170,9 @@  discard block
 block discarded – undo
170 170
 	 *
171 171
 	 * @param \Aimeos\MShop\Order\Item\Iface $orderItem Order item object
172 172
 	 */
173
-	public function block( \Aimeos\MShop\Order\Item\Iface $orderItem )
173
+	public function block(\Aimeos\MShop\Order\Item\Iface $orderItem)
174 174
 	{
175
-		\Aimeos\Controller\Common\Order\Factory::createController( $this->getContext() )->block( $orderItem );
175
+		\Aimeos\Controller\Common\Order\Factory::createController($this->getContext())->block($orderItem);
176 176
 	}
177 177
 
178 178
 
@@ -194,9 +194,9 @@  discard block
 block discarded – undo
194 194
 	 *
195 195
 	 * @param \Aimeos\MShop\Order\Item\Iface $orderItem Order item object
196 196
 	 */
197
-	public function unblock( \Aimeos\MShop\Order\Item\Iface $orderItem )
197
+	public function unblock(\Aimeos\MShop\Order\Item\Iface $orderItem)
198 198
 	{
199
-		\Aimeos\Controller\Common\Order\Factory::createController( $this->getContext() )->unblock( $orderItem );
199
+		\Aimeos\Controller\Common\Order\Factory::createController($this->getContext())->unblock($orderItem);
200 200
 	}
201 201
 
202 202
 
@@ -214,8 +214,8 @@  discard block
 block discarded – undo
214 214
 	 *
215 215
 	 * @param \Aimeos\MShop\Order\Item\Iface $orderItem Order item object
216 216
 	 */
217
-	public function update( \Aimeos\MShop\Order\Item\Iface $orderItem )
217
+	public function update(\Aimeos\MShop\Order\Item\Iface $orderItem)
218 218
 	{
219
-		\Aimeos\Controller\Common\Order\Factory::createController( $this->getContext() )->update( $orderItem );
219
+		\Aimeos\Controller\Common\Order\Factory::createController($this->getContext())->update($orderItem);
220 220
 	}
221 221
 }
Please login to merge, or discard this patch.
controller/frontend/src/Controller/Frontend/Service/Iface.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -30,7 +30,7 @@  discard block
 block discarded – undo
30 30
 	 * @param string[] $attributes List of attribute codes as keys and strings entered by the customer as value
31 31
 	 * @return string[] List of attributes codes as keys and error messages as values for invalid or missing values
32 32
 	 */
33
-	public function checkAttributes( $serviceId, array $attributes );
33
+	public function checkAttributes($serviceId, array $attributes);
34 34
 
35 35
 	/**
36 36
 	 * Returns the service item for the given ID
@@ -39,7 +39,7 @@  discard block
 block discarded – undo
39 39
 	 * @param array $ref List of domains for which the items referenced by the services should be fetched too
40 40
 	 * @return \Aimeos\MShop\Service\Provider\Iface Service provider object
41 41
 	 */
42
-	public function getProvider( $serviceId, $ref = ['media', 'price', 'text'] );
42
+	public function getProvider($serviceId, $ref = ['media', 'price', 'text']);
43 43
 
44 44
 	/**
45 45
 	 * Returns the service providers for the given type
@@ -48,7 +48,7 @@  discard block
 block discarded – undo
48 48
 	 * @param array $ref List of domains for which the items referenced by the services should be fetched too
49 49
 	 * @return \Aimeos\MShop\Service\Provider\Iface[] List of service IDs as keys and service provider objects as values
50 50
 	 */
51
-	public function getProviders( $type = null, $ref = ['media', 'price', 'text'] );
51
+	public function getProviders($type = null, $ref = ['media', 'price', 'text']);
52 52
 
53 53
 	/**
54 54
 	 * Processes the service for the given order, e.g. payment and delivery services
@@ -61,7 +61,7 @@  discard block
 block discarded – undo
61 61
 	 * @return \Aimeos\MShop\Common\Item\Helper\Form\Iface|null Form object with URL, parameters, etc.
62 62
 	 * 	or null if no form data is required
63 63
 	 */
64
-	public function process( \Aimeos\MShop\Order\Item\Iface $orderItem, $serviceId, array $urls, array $params );
64
+	public function process(\Aimeos\MShop\Order\Item\Iface $orderItem, $serviceId, array $urls, array $params);
65 65
 
66 66
 
67 67
 	/**
@@ -72,7 +72,7 @@  discard block
 block discarded – undo
72 72
 	 * @param string $code Unique code of the service used for the current order
73 73
 	 * @return \Psr\Http\Message\ResponseInterface Response object
74 74
 	 */
75
-	public function updatePush( ServerRequestInterface $request, ResponseInterface $response, $code );
75
+	public function updatePush(ServerRequestInterface $request, ResponseInterface $response, $code);
76 76
 
77 77
 
78 78
 	/**
@@ -83,5 +83,5 @@  discard block
 block discarded – undo
83 83
 	 * @param string $orderid ID of the order whose payment status should be updated
84 84
 	 * @return \Aimeos\MShop\Order\Item\Iface $orderItem Order item that has been updated
85 85
 	 */
86
-	public function updateSync( ServerRequestInterface $request, $code, $orderid );
86
+	public function updateSync(ServerRequestInterface $request, $code, $orderid);
87 87
 }
Please login to merge, or discard this patch.
controller/frontend/src/Controller/Frontend/Order/Iface.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -27,7 +27,7 @@  discard block
 block discarded – undo
27 27
 	 * @param string $type Arbitrary order type (max. eight chars)
28 28
 	 * @return \Aimeos\MShop\Order\Item\Iface Created order object
29 29
 	 */
30
-	public function addItem( $baseId, $type );
30
+	public function addItem($baseId, $type);
31 31
 
32 32
 
33 33
 	/**
@@ -45,7 +45,7 @@  discard block
 block discarded – undo
45 45
 	 * @param boolean $default Use default criteria to limit orders
46 46
 	 * @return \Aimeos\MShop\Order\Item\Iface Order object
47 47
 	 */
48
-	public function getItem( $id, $default = true );
48
+	public function getItem($id, $default = true);
49 49
 
50 50
 
51 51
 	/**
@@ -54,7 +54,7 @@  discard block
 block discarded – undo
54 54
 	 * @param \Aimeos\MShop\Order\Item\Iface $item Order object
55 55
 	 * @return \Aimeos\MShop\Order\Item\Iface Saved order item
56 56
 	 */
57
-	public function saveItem( \Aimeos\MShop\Order\Item\Iface $item );
57
+	public function saveItem(\Aimeos\MShop\Order\Item\Iface $item);
58 58
 
59 59
 
60 60
 	/**
@@ -64,7 +64,7 @@  discard block
 block discarded – undo
64 64
 	 * @param integer &$total|null Variable that will contain the total number of available items
65 65
 	 * @return \Aimeos\MShop\Order\Item\Iface[] Associative list of IDs as keys and order objects as values
66 66
 	 */
67
-	public function searchItems( \Aimeos\MW\Criteria\Iface $filter, &$total = null );
67
+	public function searchItems(\Aimeos\MW\Criteria\Iface $filter, &$total = null);
68 68
 
69 69
 
70 70
 	/**
@@ -86,7 +86,7 @@  discard block
 block discarded – undo
86 86
 	 * @param \Aimeos\MShop\Order\Item\Iface $orderItem Order item object
87 87
 	 * @return void
88 88
 	 */
89
-	public function block( \Aimeos\MShop\Order\Item\Iface $orderItem );
89
+	public function block(\Aimeos\MShop\Order\Item\Iface $orderItem);
90 90
 
91 91
 
92 92
 	/**
@@ -108,7 +108,7 @@  discard block
 block discarded – undo
108 108
 	 * @param \Aimeos\MShop\Order\Item\Iface $orderItem Order item object
109 109
 	 * @return void
110 110
 	 */
111
-	public function unblock( \Aimeos\MShop\Order\Item\Iface $orderItem );
111
+	public function unblock(\Aimeos\MShop\Order\Item\Iface $orderItem);
112 112
 
113 113
 
114 114
 	/**
@@ -126,5 +126,5 @@  discard block
 block discarded – undo
126 126
 	 * @param \Aimeos\MShop\Order\Item\Iface $orderItem Order item object
127 127
 	 * @return void
128 128
 	 */
129
-	public function update( \Aimeos\MShop\Order\Item\Iface $orderItem );
129
+	public function update(\Aimeos\MShop\Order\Item\Iface $orderItem);
130 130
 }
Please login to merge, or discard this patch.
controller/frontend/src/Controller/Frontend/Customer/Standard.php 3 patches
Spacing   +133 added lines, -133 removed lines patch added patch discarded remove patch
@@ -28,33 +28,33 @@  discard block
 block discarded – undo
28 28
 	 * @return \Aimeos\MShop\Customer\Item\Iface Customer item
29 29
 	 * @since 2017.04
30 30
 	 */
31
-	public function addItem( array $values )
31
+	public function addItem(array $values)
32 32
 	{
33 33
 		$list = [];
34 34
 		$context = $this->getContext();
35 35
 		$config = $context->getConfig();
36 36
 
37 37
 		// Show only generated passwords in account creation e-mails
38
-		$pass = ( isset( $values['customer.password'] ) ? false : true );
38
+		$pass = (isset($values['customer.password']) ? false : true);
39 39
 
40
-		foreach( $values as $key => $val ) {
41
-			$list[str_replace( 'order.base.address', 'customer', $key )] = $val;
40
+		foreach ($values as $key => $val) {
41
+			$list[str_replace('order.base.address', 'customer', $key)] = $val;
42 42
 		}
43 43
 
44
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'customer' );
45
-		$list = $this->addItemDefaults( $list );
44
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'customer');
45
+		$list = $this->addItemDefaults($list);
46 46
 
47 47
 		try
48 48
 		{
49
-			$item = $manager->findItem( $list['customer.code'], [], true );
49
+			$item = $manager->findItem($list['customer.code'], [], true);
50 50
 		}
51
-		catch( \Aimeos\MShop\Exception $e )
51
+		catch (\Aimeos\MShop\Exception $e)
52 52
 		{
53
-			$this->checkLimit( $list );
53
+			$this->checkLimit($list);
54 54
 
55 55
 			$item = $manager->createItem();
56
-			$item->fromArray( $list );
57
-			$item->setId( null );
56
+			$item->fromArray($list);
57
+			$item->setId(null);
58 58
 
59 59
 			/** controller/frontend/customer/groupids
60 60
 			 * List of groups new customers should be assigned to
@@ -68,13 +68,13 @@  discard block
 block discarded – undo
68 68
 			 * @category User
69 69
 			 * @category Developer
70 70
 			 */
71
-			$item->setGroups( (array) $config->get( 'controller/frontend/customer/groupids', [] ) );
71
+			$item->setGroups((array) $config->get('controller/frontend/customer/groupids', []));
72 72
 
73
-			$item = $manager->saveItem( $item );
73
+			$item = $manager->saveItem($item);
74 74
 
75 75
 			$msg = $item->toArray();
76
-			$msg['customer.password'] = ( $pass ? $list['customer.password'] : null );
77
-			$context->getMessageQueue( 'mq-email', 'customer/email/account' )->add( json_encode( $msg ) );
76
+			$msg['customer.password'] = ($pass ? $list['customer.password'] : null);
77
+			$context->getMessageQueue('mq-email', 'customer/email/account')->add(json_encode($msg));
78 78
 		}
79 79
 
80 80
 		return $item;
@@ -86,14 +86,14 @@  discard block
 block discarded – undo
86 86
 	 *
87 87
 	 * @return \Aimeos\MShop\Customer\Item\Iface Customer item
88 88
 	 */
89
-	public function createItem( array $values = [] )
89
+	public function createItem(array $values = [])
90 90
 	{
91
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'customer' );
91
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'customer');
92 92
 
93 93
 		$item = $manager->createItem();
94
-		$item->fromArray( $values );
95
-		$item->setId( null );
96
-		$item->setStatus( 1 );
94
+		$item->fromArray($values);
95
+		$item->setId(null);
96
+		$item->setStatus(1);
97 97
 
98 98
 		return $item;
99 99
 	}
@@ -105,12 +105,12 @@  discard block
 block discarded – undo
105 105
 	 * @param string $id Unique customer ID
106 106
 	 * @since 2017.04
107 107
 	 */
108
-	public function deleteItem( $id )
108
+	public function deleteItem($id)
109 109
 	{
110
-		$this->checkUser( $id );
110
+		$this->checkUser($id);
111 111
 
112
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'customer' );
113
-		$manager->deleteItem( $id );
112
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'customer');
113
+		$manager->deleteItem($id);
114 114
 	}
115 115
 
116 116
 
@@ -122,17 +122,17 @@  discard block
 block discarded – undo
122 122
 	 * @return \Aimeos\MShop\Customer\Item\Iface Customer item
123 123
 	 * @since 2017.04
124 124
 	 */
125
-	public function editItem( $id, array $values )
125
+	public function editItem($id, array $values)
126 126
 	{
127
-		$this->checkUser( $id );
127
+		$this->checkUser($id);
128 128
 
129
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'customer' );
130
-		$item = $manager->getItem( $id, ['customer/group'], true );
129
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'customer');
130
+		$item = $manager->getItem($id, ['customer/group'], true);
131 131
 
132
-		unset( $values['customer.id'] );
133
-		$item->fromArray( $values );
132
+		unset($values['customer.id']);
133
+		$item->fromArray($values);
134 134
 
135
-		return $manager->saveItem( $item );
135
+		return $manager->saveItem($item);
136 136
 	}
137 137
 
138 138
 
@@ -144,17 +144,17 @@  discard block
 block discarded – undo
144 144
 	 * @return \Aimeos\MShop\Customer\Item\Iface Customer item including the referenced domains items
145 145
 	 * @since 2017.04
146 146
 	 */
147
-	public function getItem( $id = null, array $domains = [] )
147
+	public function getItem($id = null, array $domains = [])
148 148
 	{
149
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'customer' );
149
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'customer');
150 150
 
151
-		if( $id == null ) {
152
-			return $manager->getItem( $this->getContext()->getUserId(), $domains, true );
151
+		if ($id == null) {
152
+			return $manager->getItem($this->getContext()->getUserId(), $domains, true);
153 153
 		}
154 154
 
155
-		$this->checkUser( $id );
155
+		$this->checkUser($id);
156 156
 
157
-		return $manager->getItem( $id, $domains, true );
157
+		return $manager->getItem($id, $domains, true);
158 158
 	}
159 159
 
160 160
 
@@ -168,9 +168,9 @@  discard block
 block discarded – undo
168 168
 	 * @return \Aimeos\MShop\Customer\Item\Iface Customer item including the referenced domains items
169 169
 	 * @since 2017.04
170 170
 	 */
171
-	public function findItem( $code, array $domains = [] )
171
+	public function findItem($code, array $domains = [])
172 172
 	{
173
-		return \Aimeos\MShop\Factory::createManager( $this->getContext(), 'customer' )->findItem( $code, $domains, true );
173
+		return \Aimeos\MShop\Factory::createManager($this->getContext(), 'customer')->findItem($code, $domains, true);
174 174
 	}
175 175
 
176 176
 
@@ -180,9 +180,9 @@  discard block
 block discarded – undo
180 180
 	 * @param \Aimeos\MShop\Customer\Item\Iface $item Customer item
181 181
 	 * @return \Aimeos\MShop\Customer\Item\Address\Iface Customer address item including the generated ID
182 182
 	 */
183
-	public function saveItem( \Aimeos\MShop\Customer\Item\Iface $item )
183
+	public function saveItem(\Aimeos\MShop\Customer\Item\Iface $item)
184 184
 	{
185
-		return \Aimeos\MShop\Factory::createManager( $this->getContext(), 'customer' )->saveItem( $item );
185
+		return \Aimeos\MShop\Factory::createManager($this->getContext(), 'customer')->saveItem($item);
186 186
 	}
187 187
 
188 188
 
@@ -193,17 +193,17 @@  discard block
 block discarded – undo
193 193
 	 * @return \Aimeos\MShop\Customer\Item\Address\Iface Customer address item
194 194
 	 * @since 2017.04
195 195
 	 */
196
-	public function addAddressItem( array $values )
196
+	public function addAddressItem(array $values)
197 197
 	{
198 198
 		$context = $this->getContext();
199
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'customer/address' );
199
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'customer/address');
200 200
 
201 201
 		$item = $manager->createItem();
202
-		$item->fromArray( $values );
203
-		$item->setId( null );
204
-		$item->setParentId( $context->getUserId() );
202
+		$item->fromArray($values);
203
+		$item->setId(null);
204
+		$item->setParentId($context->getUserId());
205 205
 
206
-		return $manager->saveItem( $item );
206
+		return $manager->saveItem($item);
207 207
 	}
208 208
 
209 209
 
@@ -212,16 +212,16 @@  discard block
 block discarded – undo
212 212
 	 *
213 213
 	 * @return \Aimeos\MShop\Customer\Item\Address\Iface Customer address item
214 214
 	 */
215
-	public function createAddressItem( array $values = [] )
215
+	public function createAddressItem(array $values = [])
216 216
 	{
217 217
 		$context = $this->getContext();
218
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'customer/address' );
218
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'customer/address');
219 219
 
220 220
 		$item = $manager->createItem();
221
-		$item->fromArray( $values );
222
-		$item->setId( null );
221
+		$item->fromArray($values);
222
+		$item->setId(null);
223 223
 
224
-		$item->setParentId( $context->getUserId() );
224
+		$item->setParentId($context->getUserId());
225 225
 
226 226
 		return $item;
227 227
 	}
@@ -233,13 +233,13 @@  discard block
 block discarded – undo
233 233
 	 * @param string $id Unique customer address ID
234 234
 	 * @since 2017.04
235 235
 	 */
236
-	public function deleteAddressItem( $id )
236
+	public function deleteAddressItem($id)
237 237
 	{
238
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'customer/address' );
238
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'customer/address');
239 239
 
240
-		$this->checkUser( $manager->getItem( $id, [], true )->getParentId() );
240
+		$this->checkUser($manager->getItem($id, [], true)->getParentId());
241 241
 
242
-		$manager->deleteItem( $id );
242
+		$manager->deleteItem($id);
243 243
 	}
244 244
 
245 245
 
@@ -251,17 +251,17 @@  discard block
 block discarded – undo
251 251
 	 * @return \Aimeos\MShop\Customer\Item\Address\Iface Customer address item
252 252
 	 * @since 2017.04
253 253
 	 */
254
-	public function editAddressItem( $id, array $values )
254
+	public function editAddressItem($id, array $values)
255 255
 	{
256
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'customer/address' );
256
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'customer/address');
257 257
 
258
-		$item = $manager->getItem( $id, [], true );
259
-		$this->checkUser( $item->getParentId() );
258
+		$item = $manager->getItem($id, [], true);
259
+		$this->checkUser($item->getParentId());
260 260
 
261
-		unset( $values['customer.address.id'] );
262
-		$item->fromArray( $values );
261
+		unset($values['customer.address.id']);
262
+		$item->fromArray($values);
263 263
 
264
-		return $manager->saveItem( $item );
264
+		return $manager->saveItem($item);
265 265
 	}
266 266
 
267 267
 
@@ -272,12 +272,12 @@  discard block
 block discarded – undo
272 272
 	 * @return \Aimeos\MShop\Customer\Item\Address\Iface Customer address item
273 273
 	 * @since 2017.04
274 274
 	 */
275
-	public function getAddressItem( $id )
275
+	public function getAddressItem($id)
276 276
 	{
277
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'customer/address' );
277
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'customer/address');
278 278
 
279
-		$item = $manager->getItem( $id );
280
-		$this->checkUser( $item->getParentId() );
279
+		$item = $manager->getItem($id);
280
+		$this->checkUser($item->getParentId());
281 281
 
282 282
 		return $item;
283 283
 	}
@@ -289,9 +289,9 @@  discard block
 block discarded – undo
289 289
 	 * @param \Aimeos\MShop\Customer\Item\Address\Iface $item Customer address item
290 290
 	 * @return \Aimeos\MShop\Customer\Item\Address\Iface Customer address item including the generated ID
291 291
 	 */
292
-	public function saveAddressItem( \Aimeos\MShop\Customer\Item\Address\Iface $item )
292
+	public function saveAddressItem(\Aimeos\MShop\Customer\Item\Address\Iface $item)
293 293
 	{
294
-		return \Aimeos\MShop\Factory::createManager( $this->getContext(), 'customer/address' )->saveItem( $item );
294
+		return \Aimeos\MShop\Factory::createManager($this->getContext(), 'customer/address')->saveItem($item);
295 295
 	}
296 296
 
297 297
 
@@ -302,32 +302,32 @@  discard block
 block discarded – undo
302 302
 	 * @return \Aimeos\MShop\Common\Item\Lists\Iface Customer lists item
303 303
 	 * @since 2017.06
304 304
 	 */
305
-	public function addListItem( array $values )
305
+	public function addListItem(array $values)
306 306
 	{
307 307
 		$context = $this->getContext();
308
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'customer/lists' );
308
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'customer/lists');
309 309
 
310
-		if( !isset( $values['customer.lists.typeid'] ) )
310
+		if (!isset($values['customer.lists.typeid']))
311 311
 		{
312
-			if( !isset( $values['customer.lists.type'] ) ) {
313
-				throw new \Aimeos\Controller\Frontend\Customer\Exception( sprintf( 'No customer lists type code' ) );
312
+			if (!isset($values['customer.lists.type'])) {
313
+				throw new \Aimeos\Controller\Frontend\Customer\Exception(sprintf('No customer lists type code'));
314 314
 			}
315 315
 
316
-			if( !isset( $values['customer.lists.domain'] ) ) {
317
-				throw new \Aimeos\Controller\Frontend\Customer\Exception( sprintf( 'No customer lists domain' ) );
316
+			if (!isset($values['customer.lists.domain'])) {
317
+				throw new \Aimeos\Controller\Frontend\Customer\Exception(sprintf('No customer lists domain'));
318 318
 			}
319 319
 
320
-			$typeManager = \Aimeos\MShop\Factory::createManager( $context, 'customer/lists/type' );
321
-			$typeItem = $typeManager->findItem( $values['customer.lists.type'], [], $values['customer.lists.domain'] );
320
+			$typeManager = \Aimeos\MShop\Factory::createManager($context, 'customer/lists/type');
321
+			$typeItem = $typeManager->findItem($values['customer.lists.type'], [], $values['customer.lists.domain']);
322 322
 			$values['customer.lists.typeid'] = $typeItem->getId();
323 323
 		}
324 324
 
325 325
 		$item = $manager->createItem();
326
-		$item->fromArray( $values );
327
-		$item->setId( null );
328
-		$item->setParentId( $context->getUserId() );
326
+		$item->fromArray($values);
327
+		$item->setId(null);
328
+		$item->setParentId($context->getUserId());
329 329
 
330
-		return $manager->saveItem( $item );
330
+		return $manager->saveItem($item);
331 331
 	}
332 332
 
333 333
 
@@ -340,10 +340,10 @@  discard block
 block discarded – undo
340 340
 	public function createListsFilter()
341 341
 	{
342 342
 		$context = $this->getContext();
343
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'customer/lists' );
343
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'customer/lists');
344 344
 
345 345
 		$filter = $manager->createSearch();
346
-		$filter->setConditions( $filter->compare( '==', 'customer.lists.parentid', $context->getUserId() ) );
346
+		$filter->setConditions($filter->compare('==', 'customer.lists.parentid', $context->getUserId()));
347 347
 
348 348
 		return $filter;
349 349
 	}
@@ -355,13 +355,13 @@  discard block
 block discarded – undo
355 355
 	 * @param string $id Unique customer address ID
356 356
 	 * @since 2017.06
357 357
 	 */
358
-	public function deleteListItem( $id )
358
+	public function deleteListItem($id)
359 359
 	{
360
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'customer/lists' );
360
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'customer/lists');
361 361
 
362
-		$this->checkUser( $manager->getItem( $id )->getParentId() );
362
+		$this->checkUser($manager->getItem($id)->getParentId());
363 363
 
364
-		$manager->deleteItem( $id );
364
+		$manager->deleteItem($id);
365 365
 	}
366 366
 
367 367
 
@@ -373,33 +373,33 @@  discard block
 block discarded – undo
373 373
 	 * @return \Aimeos\MShop\Common\Item\Lists\Iface Customer lists item
374 374
 	 * @since 2017.06
375 375
 	 */
376
-	public function editListItem( $id, array $values )
376
+	public function editListItem($id, array $values)
377 377
 	{
378 378
 		$context = $this->getContext();
379
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'customer/lists' );
379
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'customer/lists');
380 380
 
381
-		$item = $manager->getItem( $id, [], true );
382
-		$this->checkUser( $item->getParentId() );
381
+		$item = $manager->getItem($id, [], true);
382
+		$this->checkUser($item->getParentId());
383 383
 
384
-		if( !isset( $values['customer.lists.typeid'] ) )
384
+		if (!isset($values['customer.lists.typeid']))
385 385
 		{
386
-			if( !isset( $values['customer.lists.type'] ) ) {
387
-				throw new \Aimeos\Controller\Frontend\Customer\Exception( sprintf( 'No customer lists type code' ) );
386
+			if (!isset($values['customer.lists.type'])) {
387
+				throw new \Aimeos\Controller\Frontend\Customer\Exception(sprintf('No customer lists type code'));
388 388
 			}
389 389
 
390
-			if( !isset( $values['customer.lists.domain'] ) ) {
391
-				throw new \Aimeos\Controller\Frontend\Customer\Exception( sprintf( 'No customer lists domain' ) );
390
+			if (!isset($values['customer.lists.domain'])) {
391
+				throw new \Aimeos\Controller\Frontend\Customer\Exception(sprintf('No customer lists domain'));
392 392
 			}
393 393
 
394
-			$typeManager = \Aimeos\MShop\Factory::createManager( $context, 'customer/lists/type' );
395
-			$typeItem = $typeManager->findItem( $values['customer.lists.type'], [], $values['customer.lists.domain'], true );
394
+			$typeManager = \Aimeos\MShop\Factory::createManager($context, 'customer/lists/type');
395
+			$typeItem = $typeManager->findItem($values['customer.lists.type'], [], $values['customer.lists.domain'], true);
396 396
 			$values['customer.lists.typeid'] = $typeItem->getId();
397 397
 		}
398 398
 
399
-		unset( $values['customer.lists.id'] );
400
-		$item->fromArray( $values );
399
+		unset($values['customer.lists.id']);
400
+		$item->fromArray($values);
401 401
 
402
-		return $manager->saveItem( $item );
402
+		return $manager->saveItem($item);
403 403
 	}
404 404
 
405 405
 
@@ -410,12 +410,12 @@  discard block
 block discarded – undo
410 410
 	 * @return \Aimeos\MShop\Customer\Item\Address\Iface Customer address item
411 411
 	 * @since 2017.06
412 412
 	 */
413
-	public function getListItem( $id )
413
+	public function getListItem($id)
414 414
 	{
415
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'customer/lists' );
416
-		$item = $manager->getItem( $id );
415
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'customer/lists');
416
+		$item = $manager->getItem($id);
417 417
 
418
-		$this->checkUser( $item->getParentId() );
418
+		$this->checkUser($item->getParentId());
419 419
 
420 420
 		return $item;
421 421
 	}
@@ -429,11 +429,11 @@  discard block
 block discarded – undo
429 429
 	 * @return \Aimeos\MShop\Common\Item\Lists\Iface[] Customer list items
430 430
 	 * @since 2017.06
431 431
 	 */
432
-	public function searchListItems( \Aimeos\MW\Criteria\Iface $filter, &$total = null )
432
+	public function searchListItems(\Aimeos\MW\Criteria\Iface $filter, &$total = null)
433 433
 	{
434
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'customer/lists' );
434
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'customer/lists');
435 435
 
436
-		return $manager->searchItems( $filter, [], $total );
436
+		return $manager->searchItems($filter, [], $total);
437 437
 	}
438 438
 
439 439
 
@@ -443,37 +443,37 @@  discard block
 block discarded – undo
443 443
 	 * @param string[] $values Associative list of customer keys (e.g. "customer.label") and their values
444 444
 	 * @return string[] Associative list of customer key/value pairs with default values set
445 445
 	 */
446
-	protected function addItemDefaults( array $values )
446
+	protected function addItemDefaults(array $values)
447 447
 	{
448
-		if( !isset( $values['customer.label'] ) || $values['customer.label'] == '' )
448
+		if (!isset($values['customer.label']) || $values['customer.label'] == '')
449 449
 		{
450 450
 			$label = '';
451 451
 
452
-			if( isset( $values['customer.lastname'] ) ) {
452
+			if (isset($values['customer.lastname'])) {
453 453
 				$label = $values['customer.lastname'];
454 454
 			}
455 455
 
456
-			if( isset( $values['customer.firstname'] ) && $values['customer.firstname'] != '' ) {
456
+			if (isset($values['customer.firstname']) && $values['customer.firstname'] != '') {
457 457
 				$label = $values['customer.firstname'] . ' ' . $label;
458 458
 			}
459 459
 
460
-			if( isset( $values['customer.company'] ) && $values['customer.company'] != '' ) {
460
+			if (isset($values['customer.company']) && $values['customer.company'] != '') {
461 461
 				$label .= ' (' . $values['customer.company'] . ')';
462 462
 			}
463 463
 
464 464
 			$values['customer.label'] = $label;
465 465
 		}
466 466
 
467
-		if( !isset( $values['customer.code'] ) && isset( $values['customer.email'] ) ) {
467
+		if (!isset($values['customer.code']) && isset($values['customer.email'])) {
468 468
 			$values['customer.code'] = $values['customer.email'];
469 469
 		}
470 470
 
471
-		if( !isset( $values['customer.status'] ) ) {
471
+		if (!isset($values['customer.status'])) {
472 472
 			$values['customer.status'] = 1;
473 473
 		}
474 474
 
475
-		if( !isset( $values['customer.password'] ) ) {
476
-			$values['customer.password'] = substr( md5( microtime( true ) . getmypid() . rand() ), -8 );
475
+		if (!isset($values['customer.password'])) {
476
+			$values['customer.password'] = substr(md5(microtime(true) . getmypid() . rand()), -8);
477 477
 		}
478 478
 
479 479
 		return $values;
@@ -486,7 +486,7 @@  discard block
 block discarded – undo
486 486
 	 * @param string[] $values Associative list of customer keys (e.g. "customer.label") and their values
487 487
 	 * @throws \Aimeos\Controller\Frontend\Customer\Exception If access isn't allowed
488 488
 	 */
489
-	protected function checkLimit( array $values )
489
+	protected function checkLimit(array $values)
490 490
 	{
491 491
 		$total = 0;
492 492
 		$context = $this->getContext();
@@ -507,7 +507,7 @@  discard block
 block discarded – undo
507 507
 		 * @category Developer
508 508
 		 * @see controller/frontend/customer/limit-seconds
509 509
 		 */
510
-		$count = $config->get( 'controller/frontend/customer/limit-count', 5 );
510
+		$count = $config->get('controller/frontend/customer/limit-count', 5);
511 511
 
512 512
 		/** controller/frontend/customer/limit-seconds
513 513
 		 * Customer account limitation time frame in seconds
@@ -525,22 +525,22 @@  discard block
 block discarded – undo
525 525
 		 * @category Developer
526 526
 		 * @see controller/frontend/customer/limit-count
527 527
 		 */
528
-		$seconds = $config->get( 'controller/frontend/customer/limit-seconds', 300 );
528
+		$seconds = $config->get('controller/frontend/customer/limit-seconds', 300);
529 529
 
530
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'customer' );
530
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'customer');
531 531
 
532 532
 		$search = $manager->createSearch();
533 533
 		$expr = [
534
-			$search->compare( '==', 'customer.editor', $context->getEditor() ),
535
-			$search->compare( '>=', 'customer.ctime', date( 'Y-m-d H:i:s', time() - $seconds ) ),
534
+			$search->compare('==', 'customer.editor', $context->getEditor()),
535
+			$search->compare('>=', 'customer.ctime', date('Y-m-d H:i:s', time() - $seconds)),
536 536
 		];
537
-		$search->setConditions( $search->combine( '&&', $expr ) );
538
-		$search->setSlice( 0, 0 );
537
+		$search->setConditions($search->combine('&&', $expr));
538
+		$search->setSlice(0, 0);
539 539
 
540
-		$manager->searchItems( $search, [], $total );
540
+		$manager->searchItems($search, [], $total);
541 541
 
542
-		if( $total > $count ) {
543
-			throw new \Aimeos\Controller\Frontend\Basket\Exception( sprintf( 'Temporary limit reached' ) );
542
+		if ($total > $count) {
543
+			throw new \Aimeos\Controller\Frontend\Basket\Exception(sprintf('Temporary limit reached'));
544 544
 		}
545 545
 	}
546 546
 
@@ -551,12 +551,12 @@  discard block
 block discarded – undo
551 551
 	 * @param string $id Unique customer ID
552 552
 	 * @throws \Aimeos\Controller\Frontend\Customer\Exception If access isn't allowed
553 553
 	 */
554
-	protected function checkUser( $id )
554
+	protected function checkUser($id)
555 555
 	{
556
-		if( $id != $this->getContext()->getUserId() )
556
+		if ($id != $this->getContext()->getUserId())
557 557
 		{
558
-			$msg = sprintf( 'Not allowed to access customer data for ID "%1$s"', $id );
559
-			throw new \Aimeos\Controller\Frontend\Customer\Exception( $msg );
558
+			$msg = sprintf('Not allowed to access customer data for ID "%1$s"', $id);
559
+			throw new \Aimeos\Controller\Frontend\Customer\Exception($msg);
560 560
 		}
561 561
 	}
562 562
 }
Please login to merge, or discard this patch.
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -47,8 +47,7 @@
 block discarded – undo
47 47
 		try
48 48
 		{
49 49
 			$item = $manager->findItem( $list['customer.code'], [], true );
50
-		}
51
-		catch( \Aimeos\MShop\Exception $e )
50
+		} catch( \Aimeos\MShop\Exception $e )
52 51
 		{
53 52
 			$this->checkLimit( $list );
54 53
 
Please login to merge, or discard this patch.
Doc Comments   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -84,7 +84,7 @@  discard block
 block discarded – undo
84 84
 	/**
85 85
 	 * Creates a new customer item object pre-filled with the given values but not yet stored
86 86
 	 *
87
-	 * @return \Aimeos\MShop\Customer\Item\Iface Customer item
87
+	 * @return \Aimeos\MShop\Attribute\Item\Iface Customer item
88 88
 	 */
89 89
 	public function createItem( array $values = [] )
90 90
 	{
@@ -210,7 +210,7 @@  discard block
 block discarded – undo
210 210
 	/**
211 211
 	 * Creates a new customer address item object pre-filled with the given values but not yet stored
212 212
 	 *
213
-	 * @return \Aimeos\MShop\Customer\Item\Address\Iface Customer address item
213
+	 * @return \Aimeos\MShop\Attribute\Item\Iface Customer address item
214 214
 	 */
215 215
 	public function createAddressItem( array $values = [] )
216 216
 	{
Please login to merge, or discard this patch.
controller/frontend/tests/Controller/Frontend/Catalog/StandardTest.php 1 patch
Spacing   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -19,13 +19,13 @@  discard block
 block discarded – undo
19 19
 	protected function setUp()
20 20
 	{
21 21
 		$this->context = \TestHelperFrontend::getContext();
22
-		$this->object = new \Aimeos\Controller\Frontend\Catalog\Standard( $this->context );
22
+		$this->object = new \Aimeos\Controller\Frontend\Catalog\Standard($this->context);
23 23
 	}
24 24
 
25 25
 
26 26
 	protected function tearDown()
27 27
 	{
28
-		unset( $this->object, $this->context );
28
+		unset($this->object, $this->context);
29 29
 	}
30 30
 
31 31
 
@@ -33,19 +33,19 @@  discard block
 block discarded – undo
33 33
 	{
34 34
 		$filter = $this->object->createFilter();
35 35
 
36
-		$this->assertInstanceOf( '\\Aimeos\\MW\\Criteria\\Iface', $filter );
36
+		$this->assertInstanceOf('\\Aimeos\\MW\\Criteria\\Iface', $filter);
37 37
 	}
38 38
 
39 39
 
40 40
 	public function testGetPath()
41 41
 	{
42
-		$manager = \Aimeos\MShop\Factory::createManager( $this->context, 'catalog' );
43
-		$items = $this->object->getPath( $manager->findItem( 'cafe' )->getId() );
42
+		$manager = \Aimeos\MShop\Factory::createManager($this->context, 'catalog');
43
+		$items = $this->object->getPath($manager->findItem('cafe')->getId());
44 44
 
45
-		$this->assertEquals( 3, count( $items ) );
45
+		$this->assertEquals(3, count($items));
46 46
 
47
-		foreach( $items as $item ) {
48
-			$this->assertInstanceOf( '\\Aimeos\\MShop\\Catalog\\Item\\Iface', $item );
47
+		foreach ($items as $item) {
48
+			$this->assertInstanceOf('\\Aimeos\\MShop\\Catalog\\Item\\Iface', $item);
49 49
 		}
50 50
 	}
51 51
 
@@ -54,10 +54,10 @@  discard block
 block discarded – undo
54 54
 	{
55 55
 		$tree = $this->object->getTree();
56 56
 
57
-		$this->assertEquals( 2, count( $tree->getChildren() ) );
57
+		$this->assertEquals(2, count($tree->getChildren()));
58 58
 
59
-		foreach( $tree->getChildren() as $item ) {
60
-			$this->assertInstanceOf( '\\Aimeos\\MShop\\Catalog\\Item\\Iface', $item );
59
+		foreach ($tree->getChildren() as $item) {
60
+			$this->assertInstanceOf('\\Aimeos\\MShop\\Catalog\\Item\\Iface', $item);
61 61
 		}
62 62
 	}
63 63
 }
Please login to merge, or discard this patch.
controller/frontend/src/Controller/Frontend/Catalog/Iface.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -37,7 +37,7 @@  discard block
 block discarded – undo
37 37
 	 * @return array Associative list of items implementing \Aimeos\MShop\Catalog\Item\Iface with their IDs as keys
38 38
 	 * @since 2017.03
39 39
 	 */
40
-	public function getPath( $id, array $domains = array( 'text', 'media' ) );
40
+	public function getPath($id, array $domains = array('text', 'media'));
41 41
 
42 42
 
43 43
 	/**
@@ -51,6 +51,6 @@  discard block
 block discarded – undo
51 51
 	 * @return \Aimeos\MShop\Catalog\Item\Iface Catalog node, maybe with children depending on the level constant
52 52
 	 * @since 2017.03
53 53
 	 */
54
-	public function getTree( $id = null, array $domains = array( 'text', 'media' ),
55
-		$level = \Aimeos\MW\Tree\Manager\Base::LEVEL_TREE, \Aimeos\MW\Criteria\Iface $search = null );
54
+	public function getTree($id = null, array $domains = array('text', 'media'),
55
+		$level = \Aimeos\MW\Tree\Manager\Base::LEVEL_TREE, \Aimeos\MW\Criteria\Iface $search = null);
56 56
 }
Please login to merge, or discard this patch.
controller/frontend/src/Controller/Frontend/Catalog/Standard.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -30,7 +30,7 @@  discard block
 block discarded – undo
30 30
 	 */
31 31
 	public function createFilter()
32 32
 	{
33
-		return \Aimeos\MShop\Factory::createManager( $this->getContext(), 'catalog' )->createSearch( true );
33
+		return \Aimeos\MShop\Factory::createManager($this->getContext(), 'catalog')->createSearch(true);
34 34
 	}
35 35
 
36 36
 
@@ -42,9 +42,9 @@  discard block
 block discarded – undo
42 42
 	 * @return array Associative list of items implementing \Aimeos\MShop\Catalog\Item\Iface with their IDs as keys
43 43
 	 * @since 2017.03
44 44
 	 */
45
-	public function getPath( $id, array $domains = array( 'text', 'media' ) )
45
+	public function getPath($id, array $domains = array('text', 'media'))
46 46
 	{
47
-		return \Aimeos\MShop\Factory::createManager( $this->getContext(), 'catalog' )->getPath( $id, $domains );
47
+		return \Aimeos\MShop\Factory::createManager($this->getContext(), 'catalog')->getPath($id, $domains);
48 48
 	}
49 49
 
50 50
 
@@ -59,9 +59,9 @@  discard block
 block discarded – undo
59 59
 	 * @return \Aimeos\MShop\Catalog\Item\Iface Catalog node, maybe with children depending on the level constant
60 60
 	 * @since 2017.03
61 61
 	 */
62
-	public function getTree( $id = null, array $domains = array( 'text', 'media' ),
63
-		$level = \Aimeos\MW\Tree\Manager\Base::LEVEL_TREE, \Aimeos\MW\Criteria\Iface $search = null )
62
+	public function getTree($id = null, array $domains = array('text', 'media'),
63
+		$level = \Aimeos\MW\Tree\Manager\Base::LEVEL_TREE, \Aimeos\MW\Criteria\Iface $search = null)
64 64
 	{
65
-		return \Aimeos\MShop\Factory::createManager( $this->getContext(), 'catalog' )->getTree( $id, $domains, $level, $search );
65
+		return \Aimeos\MShop\Factory::createManager($this->getContext(), 'catalog')->getTree($id, $domains, $level, $search);
66 66
 	}
67 67
 }
Please login to merge, or discard this patch.
controller/frontend/src/Controller/Frontend/Basket/Decorator/Select.php 2 patches
Braces   +6 added lines, -4 removed lines patch added patch discarded remove patch
@@ -121,10 +121,11 @@  discard block
 block discarded – undo
121 121
 		{
122 122
 			$msg = $context->getI18n()->dt( 'controller/frontend', 'No unique article found for selected attributes and product ID "%1$s"' );
123 123
 			throw new \Aimeos\Controller\Frontend\Basket\Exception( sprintf( $msg, $productItem->getId() ) );
124
-		}
125
-		else if( ( $result = reset( $productItems ) ) !== false ) // count == 1
124
+		} else if( ( $result = reset( $productItems ) ) !== false ) {
125
+			// count == 1
126 126
 		{
127 127
 			$productItem = $result;
128
+		}
128 129
 			$orderBaseProductItem->setProductCode( $productItem->getCode() );
129 130
 
130 131
 			$subprices = $productItem->getRefItems( 'price', 'default', 'default' );
@@ -150,10 +151,11 @@  discard block
 block discarded – undo
150 151
 
151 152
 				$attr[] = $orderAttributeItem;
152 153
 			}
153
-		}
154
-		else if( $requireVariant != false ) // count == 0
154
+		} else if( $requireVariant != false ) {
155
+			// count == 0
155 156
 		{
156 157
 			$msg = $context->getI18n()->dt( 'controller/frontend', 'No article found for selected attributes and product ID "%1$s"' );
158
+		}
157 159
 			throw new \Aimeos\Controller\Frontend\Basket\Exception( sprintf( $msg, $productItem->getId() ) );
158 160
 		}
159 161
 
Please login to merge, or discard this patch.
Spacing   +43 added lines, -43 removed lines patch added patch discarded remove patch
@@ -36,14 +36,14 @@  discard block
 block discarded – undo
36 36
 	 * @param string $stocktype Unique code of the stock type to deliver the products from
37 37
 	 * @throws \Aimeos\Controller\Frontend\Basket\Exception If the product isn't available
38 38
 	 */
39
-	public function addProduct( $prodid, $quantity = 1, $stocktype = 'default', array $variantAttributeIds = [],
40
-		array $configAttributeIds = [], array $hiddenAttributeIds = [], array $customAttributeValues = [] )
39
+	public function addProduct($prodid, $quantity = 1, $stocktype = 'default', array $variantAttributeIds = [],
40
+		array $configAttributeIds = [], array $hiddenAttributeIds = [], array $customAttributeValues = [])
41 41
 	{
42 42
 		$context = $this->getContext();
43
-		$productManager = \Aimeos\MShop\Factory::createManager( $context, 'product' );
44
-		$productItem = $productManager->getItem( $prodid, [], true );
43
+		$productManager = \Aimeos\MShop\Factory::createManager($context, 'product');
44
+		$productItem = $productManager->getItem($prodid, [], true);
45 45
 
46
-		if( $productManager->getItem( $prodid, [], true )->getType() !== 'select' )
46
+		if ($productManager->getItem($prodid, [], true)->getType() !== 'select')
47 47
 		{
48 48
 			return $this->getController()->addProduct(
49 49
 				$prodid, $quantity, $stocktype, $variantAttributeIds,
@@ -51,30 +51,30 @@  discard block
 block discarded – undo
51 51
 			);
52 52
 		}
53 53
 
54
-		$productItem = $productManager->getItem( $prodid, ['attribute', 'media', 'supplier', 'price', 'product', 'text'], true );
55
-		$prices = $productItem->getRefItems( 'price', 'default', 'default' );
56
-		$hidden = $productItem->getRefItems( 'attribute', null, 'hidden' );
54
+		$productItem = $productManager->getItem($prodid, ['attribute', 'media', 'supplier', 'price', 'product', 'text'], true);
55
+		$prices = $productItem->getRefItems('price', 'default', 'default');
56
+		$hidden = $productItem->getRefItems('attribute', null, 'hidden');
57 57
 
58
-		$orderBaseProductItem = \Aimeos\MShop\Factory::createManager( $context, 'order/base/product' )->createItem();
59
-		$orderBaseProductItem->copyFrom( $productItem )->setQuantity( $quantity )->setStockType( $stocktype );
58
+		$orderBaseProductItem = \Aimeos\MShop\Factory::createManager($context, 'order/base/product')->createItem();
59
+		$orderBaseProductItem->copyFrom($productItem)->setQuantity($quantity)->setStockType($stocktype);
60 60
 
61
-		$attr = $this->getVariantDetails( $orderBaseProductItem, $productItem, $prices, $variantAttributeIds );
62
-		$hidden += $productItem->getRefItems( 'attribute', null, 'hidden' );
61
+		$attr = $this->getVariantDetails($orderBaseProductItem, $productItem, $prices, $variantAttributeIds);
62
+		$hidden += $productItem->getRefItems('attribute', null, 'hidden');
63 63
 
64 64
 		$attributeMap = [
65
-			'custom' => array_keys( $customAttributeValues ),
66
-			'config' => array_keys( $configAttributeIds ),
65
+			'custom' => array_keys($customAttributeValues),
66
+			'config' => array_keys($configAttributeIds),
67 67
 		];
68
-		$this->checkListRef( array( $prodid, $productItem->getId() ), 'attribute', $attributeMap );
68
+		$this->checkListRef(array($prodid, $productItem->getId()), 'attribute', $attributeMap);
69 69
 
70
-		$custAttr = $this->getOrderProductAttributes( 'custom', array_keys( $customAttributeValues ), $customAttributeValues );
71
-		$confAttr = $this->getOrderProductAttributes( 'config', array_keys( $configAttributeIds ), [], $configAttributeIds );
72
-		$attr = array_merge( $attr, $custAttr, $confAttr, $this->getOrderProductAttributes( 'hidden', array_keys( $hidden ) ) );
70
+		$custAttr = $this->getOrderProductAttributes('custom', array_keys($customAttributeValues), $customAttributeValues);
71
+		$confAttr = $this->getOrderProductAttributes('config', array_keys($configAttributeIds), [], $configAttributeIds);
72
+		$attr = array_merge($attr, $custAttr, $confAttr, $this->getOrderProductAttributes('hidden', array_keys($hidden)));
73 73
 
74
-		$orderBaseProductItem->setAttributeItems( $attr );
75
-		$orderBaseProductItem->setPrice( $this->calcPrice( $orderBaseProductItem, $prices, $quantity ) );
74
+		$orderBaseProductItem->setAttributeItems($attr);
75
+		$orderBaseProductItem->setPrice($this->calcPrice($orderBaseProductItem, $prices, $quantity));
76 76
 
77
-		$this->getController()->get()->addProduct( $orderBaseProductItem );
77
+		$this->getController()->get()->addProduct($orderBaseProductItem);
78 78
 		$this->getController()->save();
79 79
 	}
80 80
 
@@ -89,12 +89,12 @@  discard block
 block discarded – undo
89 89
 	 * @return \Aimeos\MShop\Order\Item\Base\Product\Attribute\Iface[] List of order product attributes
90 90
 	 * @throws \Aimeos\Controller\Frontend\Basket\Exception If no product variant is found
91 91
 	 */
92
-	protected function getVariantDetails( \Aimeos\MShop\Order\Item\Base\Product\Iface $orderBaseProductItem,
93
-		\Aimeos\MShop\Product\Item\Iface &$productItem, array &$prices, array $variantAttributeIds )
92
+	protected function getVariantDetails(\Aimeos\MShop\Order\Item\Base\Product\Iface $orderBaseProductItem,
93
+		\Aimeos\MShop\Product\Item\Iface &$productItem, array &$prices, array $variantAttributeIds)
94 94
 	{
95 95
 		$attr = [];
96 96
 		$context = $this->getContext();
97
-		$productItems = $this->getProductVariants( $productItem, $variantAttributeIds );
97
+		$productItems = $this->getProductVariants($productItem, $variantAttributeIds);
98 98
 
99 99
 		/** controller/frontend/basket/require-variant
100 100
 		 * A variant of a selection product must be chosen
@@ -115,47 +115,47 @@  discard block
 block discarded – undo
115 115
 		 * @category Developer
116 116
 		 * @category User
117 117
 		 */
118
-		$requireVariant = $context->getConfig()->get( 'controller/frontend/basket/require-variant', true );
118
+		$requireVariant = $context->getConfig()->get('controller/frontend/basket/require-variant', true);
119 119
 
120 120
 
121
-		if( count( $productItems ) > 1 )
121
+		if (count($productItems) > 1)
122 122
 		{
123
-			$msg = $context->getI18n()->dt( 'controller/frontend', 'No unique article found for selected attributes and product ID "%1$s"' );
124
-			throw new \Aimeos\Controller\Frontend\Basket\Exception( sprintf( $msg, $productItem->getId() ) );
123
+			$msg = $context->getI18n()->dt('controller/frontend', 'No unique article found for selected attributes and product ID "%1$s"');
124
+			throw new \Aimeos\Controller\Frontend\Basket\Exception(sprintf($msg, $productItem->getId()));
125 125
 		}
126
-		else if( ( $result = reset( $productItems ) ) !== false ) // count == 1
126
+		else if (($result = reset($productItems)) !== false) // count == 1
127 127
 		{
128 128
 			$productItem = $result;
129
-			$orderBaseProductItem->setProductCode( $productItem->getCode() );
129
+			$orderBaseProductItem->setProductCode($productItem->getCode());
130 130
 
131
-			$subprices = $productItem->getRefItems( 'price', 'default', 'default' );
131
+			$subprices = $productItem->getRefItems('price', 'default', 'default');
132 132
 
133
-			if( !empty( $subprices ) ) {
133
+			if (!empty($subprices)) {
134 134
 				$prices = $subprices;
135 135
 			}
136 136
 
137
-			$submedia = $productItem->getRefItems( 'media', 'default', 'default' );
137
+			$submedia = $productItem->getRefItems('media', 'default', 'default');
138 138
 
139
-			if( ( $mediaItem = reset( $submedia ) ) !== false ) {
140
-				$orderBaseProductItem->setMediaUrl( $mediaItem->getPreview() );
139
+			if (($mediaItem = reset($submedia)) !== false) {
140
+				$orderBaseProductItem->setMediaUrl($mediaItem->getPreview());
141 141
 			}
142 142
 
143
-			$orderProductAttrManager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'order/base/product/attribute' );
144
-			$variantAttributes = $productItem->getRefItems( 'attribute', null, 'variant' );
143
+			$orderProductAttrManager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'order/base/product/attribute');
144
+			$variantAttributes = $productItem->getRefItems('attribute', null, 'variant');
145 145
 
146
-			foreach( $this->getAttributes( array_keys( $variantAttributes ), array( 'text' ) ) as $attrItem )
146
+			foreach ($this->getAttributes(array_keys($variantAttributes), array('text')) as $attrItem)
147 147
 			{
148 148
 				$orderAttributeItem = $orderProductAttrManager->createItem();
149
-				$orderAttributeItem->copyFrom( $attrItem );
150
-				$orderAttributeItem->setType( 'variant' );
149
+				$orderAttributeItem->copyFrom($attrItem);
150
+				$orderAttributeItem->setType('variant');
151 151
 
152 152
 				$attr[] = $orderAttributeItem;
153 153
 			}
154 154
 		}
155
-		else if( $requireVariant != false ) // count == 0
155
+		else if ($requireVariant != false) // count == 0
156 156
 		{
157
-			$msg = $context->getI18n()->dt( 'controller/frontend', 'No article found for selected attributes and product ID "%1$s"' );
158
-			throw new \Aimeos\Controller\Frontend\Basket\Exception( sprintf( $msg, $productItem->getId() ) );
157
+			$msg = $context->getI18n()->dt('controller/frontend', 'No article found for selected attributes and product ID "%1$s"');
158
+			throw new \Aimeos\Controller\Frontend\Basket\Exception(sprintf($msg, $productItem->getId()));
159 159
 		}
160 160
 
161 161
 		return $attr;
Please login to merge, or discard this patch.