Completed
Push — master ( 45b214...6fb08c )
by Aimeos
03:09
created
controller/frontend/src/Controller/Frontend/Basket/Decorator/Base.php 2 patches
Doc Comments   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -61,7 +61,7 @@  discard block
 block discarded – undo
61 61
 
62 62
 	/**
63 63
 	 * Empties the basket and removing all products, addresses, services, etc.
64
-	 * @return void
64
+	 * @return Base
65 65
 	 */
66 66
 	public function clear()
67 67
 	{
@@ -247,7 +247,7 @@  discard block
 block discarded – undo
247 247
 	/**
248 248
 	 * Returns the frontend controller
249 249
 	 *
250
-	 * @return \Aimeos\Controller\Frontend\Basket\Iface Frontend controller object
250
+	 * @return \Aimeos\Controller\Frontend\Iface Frontend controller object
251 251
 	 */
252 252
 	protected function getController()
253 253
 	{
Please login to merge, or discard this 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
 
@@ -122,9 +122,9 @@  discard block
 block discarded – undo
122 122
 	 * @param integer $parts Constants which parts of the order base object should be loaded
123 123
 	 * @return \Aimeos\MShop\Order\Item\Base\Iface Order base object including the given parts
124 124
 	 */
125
-	public function load( $id, $parts = \Aimeos\MShop\Order\Manager\Base\Base::PARTS_ALL )
125
+	public function load($id, $parts = \Aimeos\MShop\Order\Manager\Base\Base::PARTS_ALL)
126 126
 	{
127
-		return $this->controller->load( $id, $parts );
127
+		return $this->controller->load($id, $parts);
128 128
 	}
129 129
 
130 130
 
@@ -149,9 +149,9 @@  discard block
 block discarded – undo
149 149
 	 * @throws \Aimeos\Controller\Frontend\Basket\Exception If the product isn't available
150 150
 	 * @return void
151 151
 	 */
152
-	public function addProduct( $prodid, $quantity = 1, array $options = array(), array $variantAttributeIds = array(),
152
+	public function addProduct($prodid, $quantity = 1, array $options = array(), array $variantAttributeIds = array(),
153 153
 		array $configAttributeIds = array(), array $hiddenAttributeIds = array(), array $customAttributeValues = array(),
154
-		$stocktype = 'default' )
154
+		$stocktype = 'default')
155 155
 	{
156 156
 		$this->controller->addProduct(
157 157
 			$prodid, $quantity, $options, $variantAttributeIds, $configAttributeIds,
@@ -166,9 +166,9 @@  discard block
 block discarded – undo
166 166
 	 * @param integer $position Position number (key) of the order product item
167 167
 	 * @return void
168 168
 	 */
169
-	public function deleteProduct( $position )
169
+	public function deleteProduct($position)
170 170
 	{
171
-		$this->controller->deleteProduct( $position );
171
+		$this->controller->deleteProduct($position);
172 172
 	}
173 173
 
174 174
 
@@ -181,9 +181,9 @@  discard block
 block discarded – undo
181 181
 	 * @param array $configAttributeCodes Codes of the product config attributes that should be REMOVED
182 182
 	 * @return void
183 183
 	 */
184
-	public function editProduct( $position, $quantity, array $options = array(), array $configAttributeCodes = array() )
184
+	public function editProduct($position, $quantity, array $options = array(), array $configAttributeCodes = array())
185 185
 	{
186
-		$this->controller->editProduct( $position, $quantity, $options, $configAttributeCodes );
186
+		$this->controller->editProduct($position, $quantity, $options, $configAttributeCodes);
187 187
 	}
188 188
 
189 189
 
@@ -194,9 +194,9 @@  discard block
 block discarded – undo
194 194
 	 * @throws \Aimeos\Controller\Frontend\Basket\Exception if the coupon code is invalid or not allowed
195 195
 	 * @return void
196 196
 	 */
197
-	public function addCoupon( $code )
197
+	public function addCoupon($code)
198 198
 	{
199
-		$this->controller->addCoupon( $code );
199
+		$this->controller->addCoupon($code);
200 200
 	}
201 201
 
202 202
 
@@ -207,9 +207,9 @@  discard block
 block discarded – undo
207 207
 	 * @throws \Aimeos\Controller\Frontend\Basket\Exception if the coupon code is invalid
208 208
 	 * @return void
209 209
 	 */
210
-	public function deleteCoupon( $code )
210
+	public function deleteCoupon($code)
211 211
 	{
212
-		$this->controller->deleteCoupon( $code );
212
+		$this->controller->deleteCoupon($code);
213 213
 	}
214 214
 
215 215
 
@@ -222,9 +222,9 @@  discard block
 block discarded – undo
222 222
 	 * 	if one of the keys is invalid when using an array with key/value pairs
223 223
 	 * @return void
224 224
 	 */
225
-	public function setAddress( $type, $value )
225
+	public function setAddress($type, $value)
226 226
 	{
227
-		$this->controller->setAddress( $type, $value );
227
+		$this->controller->setAddress($type, $value);
228 228
 	}
229 229
 
230 230
 
@@ -238,9 +238,9 @@  discard block
 block discarded – undo
238 238
 	 * @throws \Aimeos\Controller\Frontend\Basket\Exception If there is no price to the service item attached
239 239
 	 * @return void
240 240
 	 */
241
-	public function setService( $type, $id, array $attributes = array() )
241
+	public function setService($type, $id, array $attributes = array())
242 242
 	{
243
-		$this->controller->setService( $type, $id, $attributes );
243
+		$this->controller->setService($type, $id, $attributes);
244 244
 	}
245 245
 
246 246
 
Please login to merge, or discard this patch.
controller/frontend/src/Controller/Frontend/Order/Iface.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -31,7 +31,7 @@  discard block
 block discarded – undo
31 31
 	 * @return \Aimeos\MShop\Order\Item\Iface Order item that belongs to the stored basket
32 32
 	 * @deprecated 2017.04 Use store() from basket controller instead
33 33
 	 */
34
-	public function store( \Aimeos\MShop\Order\Item\Base\Iface $basket );
34
+	public function store(\Aimeos\MShop\Order\Item\Base\Iface $basket);
35 35
 
36 36
 
37 37
 	/**
@@ -53,7 +53,7 @@  discard block
 block discarded – undo
53 53
 	 * @param \Aimeos\MShop\Order\Item\Iface $orderItem Order item object
54 54
 	 * @return void
55 55
 	 */
56
-	public function block( \Aimeos\MShop\Order\Item\Iface $orderItem );
56
+	public function block(\Aimeos\MShop\Order\Item\Iface $orderItem);
57 57
 
58 58
 
59 59
 	/**
@@ -75,7 +75,7 @@  discard block
 block discarded – undo
75 75
 	 * @param \Aimeos\MShop\Order\Item\Iface $orderItem Order item object
76 76
 	 * @return void
77 77
 	 */
78
-	public function unblock( \Aimeos\MShop\Order\Item\Iface $orderItem );
78
+	public function unblock(\Aimeos\MShop\Order\Item\Iface $orderItem);
79 79
 
80 80
 
81 81
 	/**
@@ -93,5 +93,5 @@  discard block
 block discarded – undo
93 93
 	 * @param \Aimeos\MShop\Order\Item\Iface $orderItem Order item object
94 94
 	 * @return void
95 95
 	 */
96
-	public function update( \Aimeos\MShop\Order\Item\Iface $orderItem );
96
+	public function update(\Aimeos\MShop\Order\Item\Iface $orderItem);
97 97
 }
Please login to merge, or discard this patch.
controller/frontend/src/Controller/Frontend/Order/Standard.php 1 patch
Spacing   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -33,22 +33,22 @@  discard block
 block discarded – undo
33 33
 	 * @return \Aimeos\MShop\Order\Item\Iface Order item that belongs to the stored basket
34 34
 	 * @deprecated 2017.04 Use store() from basket controller instead
35 35
 	 */
36
-	public function store( \Aimeos\MShop\Order\Item\Base\Iface $basket )
36
+	public function store(\Aimeos\MShop\Order\Item\Base\Iface $basket)
37 37
 	{
38 38
 		$context = $this->getContext();
39 39
 
40
-		$orderManager = \Aimeos\MShop\Factory::createManager( $context, 'order' );
41
-		$orderBaseManager = \Aimeos\MShop\Factory::createManager( $context, 'order/base' );
40
+		$orderManager = \Aimeos\MShop\Factory::createManager($context, 'order');
41
+		$orderBaseManager = \Aimeos\MShop\Factory::createManager($context, 'order/base');
42 42
 
43 43
 
44 44
 		$orderBaseManager->begin();
45
-		$orderBaseManager->store( $basket );
45
+		$orderBaseManager->store($basket);
46 46
 		$orderBaseManager->commit();
47 47
 
48 48
 		$orderItem = $orderManager->createItem();
49
-		$orderItem->setBaseId( $basket->getId() );
50
-		$orderItem->setType( \Aimeos\MShop\Order\Item\Base::TYPE_WEB );
51
-		$orderManager->saveItem( $orderItem );
49
+		$orderItem->setBaseId($basket->getId());
50
+		$orderItem->setType(\Aimeos\MShop\Order\Item\Base::TYPE_WEB);
51
+		$orderManager->saveItem($orderItem);
52 52
 
53 53
 
54 54
 		return $orderItem;
@@ -73,9 +73,9 @@  discard block
 block discarded – undo
73 73
 	 *
74 74
 	 * @param \Aimeos\MShop\Order\Item\Iface $orderItem Order item object
75 75
 	 */
76
-	public function block( \Aimeos\MShop\Order\Item\Iface $orderItem )
76
+	public function block(\Aimeos\MShop\Order\Item\Iface $orderItem)
77 77
 	{
78
-		\Aimeos\Controller\Common\Order\Factory::createController( $this->getContext() )->block( $orderItem );
78
+		\Aimeos\Controller\Common\Order\Factory::createController($this->getContext())->block($orderItem);
79 79
 	}
80 80
 
81 81
 
@@ -97,9 +97,9 @@  discard block
 block discarded – undo
97 97
 	 *
98 98
 	 * @param \Aimeos\MShop\Order\Item\Iface $orderItem Order item object
99 99
 	 */
100
-	public function unblock( \Aimeos\MShop\Order\Item\Iface $orderItem )
100
+	public function unblock(\Aimeos\MShop\Order\Item\Iface $orderItem)
101 101
 	{
102
-		\Aimeos\Controller\Common\Order\Factory::createController( $this->getContext() )->unblock( $orderItem );
102
+		\Aimeos\Controller\Common\Order\Factory::createController($this->getContext())->unblock($orderItem);
103 103
 	}
104 104
 
105 105
 
@@ -117,8 +117,8 @@  discard block
 block discarded – undo
117 117
 	 *
118 118
 	 * @param \Aimeos\MShop\Order\Item\Iface $orderItem Order item object
119 119
 	 */
120
-	public function update( \Aimeos\MShop\Order\Item\Iface $orderItem )
120
+	public function update(\Aimeos\MShop\Order\Item\Iface $orderItem)
121 121
 	{
122
-		\Aimeos\Controller\Common\Order\Factory::createController( $this->getContext() )->update( $orderItem );
122
+		\Aimeos\Controller\Common\Order\Factory::createController($this->getContext())->update($orderItem);
123 123
 	}
124 124
 }
Please login to merge, or discard this patch.
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
 	/**
@@ -68,7 +68,7 @@  discard block
 block discarded – undo
68 68
 	 * @param integer $parts Constants which parts of the order base object should be loaded
69 69
 	 * @return \Aimeos\MShop\Order\Item\Base\Iface Order base object including the given parts
70 70
 	 */
71
-	public function load( $id, $parts = \Aimeos\MShop\Order\Manager\Base\Base::PARTS_ALL );
71
+	public function load($id, $parts = \Aimeos\MShop\Order\Manager\Base\Base::PARTS_ALL);
72 72
 
73 73
 
74 74
 	/**
@@ -92,9 +92,9 @@  discard block
 block discarded – undo
92 92
 	 * @throws \Aimeos\Controller\Frontend\Basket\Exception If the product isn't available
93 93
 	 * @return void
94 94
 	 */
95
-	public function addProduct( $prodid, $quantity = 1, array $options = array(), array $variantAttributeIds = array(),
95
+	public function addProduct($prodid, $quantity = 1, array $options = array(), array $variantAttributeIds = array(),
96 96
 		array $configAttributeIds = array(), array $hiddenAttributeIds = array(), array $customAttributeValues = array(),
97
-		$stocktype = 'default' );
97
+		$stocktype = 'default');
98 98
 
99 99
 
100 100
 	/**
@@ -103,7 +103,7 @@  discard block
 block discarded – undo
103 103
 	 * @param integer $position Position number (key) of the order product item
104 104
 	 * @return void
105 105
 	 */
106
-	public function deleteProduct( $position );
106
+	public function deleteProduct($position);
107 107
 
108 108
 
109 109
 	/**
@@ -114,7 +114,7 @@  discard block
 block discarded – undo
114 114
 	 * @param array $configAttributeCodes Codes of the product config attributes that should be REMOVED
115 115
 	 * @return void
116 116
 	 */
117
-	public function editProduct( $position, $quantity, array $configAttributeCodes = array() );
117
+	public function editProduct($position, $quantity, array $configAttributeCodes = array());
118 118
 
119 119
 
120 120
 	/**
@@ -124,7 +124,7 @@  discard block
 block discarded – undo
124 124
 	 * @throws \Aimeos\Controller\Frontend\Basket\Exception if the coupon code is invalid or not allowed
125 125
 	 * @return void
126 126
 	 */
127
-	public function addCoupon( $code );
127
+	public function addCoupon($code);
128 128
 
129 129
 
130 130
 	/**
@@ -134,7 +134,7 @@  discard block
 block discarded – undo
134 134
 	 * @throws \Aimeos\Controller\Frontend\Basket\Exception if the coupon code is invalid
135 135
 	 * @return void
136 136
 	 */
137
-	public function deleteCoupon( $code );
137
+	public function deleteCoupon($code);
138 138
 
139 139
 
140 140
 	/**
@@ -146,7 +146,7 @@  discard block
 block discarded – undo
146 146
 	 * 	if one of the keys is invalid when using an array with key/value pairs
147 147
 	 * @return void
148 148
 	 */
149
-	public function setAddress( $type, $value );
149
+	public function setAddress($type, $value);
150 150
 
151 151
 
152 152
 	/**
@@ -159,5 +159,5 @@  discard block
 block discarded – undo
159 159
 	 * @throws \Aimeos\Controller\Frontend\Basket\Exception If there is no price to the service item attached
160 160
 	 * @return void
161 161
 	 */
162
-	public function setService( $type, $id, array $attributes = array() );
162
+	public function setService($type, $id, array $attributes = array());
163 163
 }
Please login to merge, or discard this patch.
controller/frontend/src/Controller/Frontend/Basket/Standard.php 1 patch
Spacing   +120 added lines, -120 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;
@@ -110,7 +110,7 @@  discard block
 block discarded – undo
110 110
 		$basket = $this->get();
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;
@@ -124,9 +124,9 @@  discard block
 block discarded – undo
124 124
 	 * @param integer $parts Constants which parts of the order base object should be loaded
125 125
 	 * @return \Aimeos\MShop\Order\Item\Base\Iface Order base object including the given parts
126 126
 	 */
127
-	public function load( $id, $parts = \Aimeos\MShop\Order\Manager\Base\Base::PARTS_ALL )
127
+	public function load($id, $parts = \Aimeos\MShop\Order\Manager\Base\Base::PARTS_ALL)
128 128
 	{
129
-		return $this->domainManager->load( $id, $parts );
129
+		return $this->domainManager->load($id, $parts);
130 130
 	}
131 131
 
132 132
 
@@ -150,36 +150,36 @@  discard block
 block discarded – undo
150 150
 	 * @param string $stocktype Unique code of the stock type to deliver the products from
151 151
 	 * @throws \Aimeos\Controller\Frontend\Basket\Exception If the product isn't available
152 152
 	 */
153
-	public function addProduct( $prodid, $quantity = 1, array $options = array(), array $variantAttributeIds = array(),
153
+	public function addProduct($prodid, $quantity = 1, array $options = array(), array $variantAttributeIds = array(),
154 154
 		array $configAttributeIds = array(), array $hiddenAttributeIds = array(), array $customAttributeValues = array(),
155
-		$stocktype = 'default' )
155
+		$stocktype = 'default')
156 156
 	{
157 157
 		$context = $this->getContext();
158
-		$productManager = \Aimeos\MShop\Factory::createManager( $context, 'product' );
159
-		$productItem = $productManager->getItem( $prodid, array( 'media', 'supplier', 'price', 'product', 'text' ) );
158
+		$productManager = \Aimeos\MShop\Factory::createManager($context, 'product');
159
+		$productItem = $productManager->getItem($prodid, array('media', 'supplier', 'price', 'product', 'text'));
160 160
 
161
-		$orderBaseProductItem = \Aimeos\MShop\Factory::createManager( $context, 'order/base/product' )->createItem();
162
-		$orderBaseProductItem->copyFrom( $productItem );
163
-		$orderBaseProductItem->setQuantity( $quantity );
164
-		$orderBaseProductItem->setStockType( $stocktype );
161
+		$orderBaseProductItem = \Aimeos\MShop\Factory::createManager($context, 'order/base/product')->createItem();
162
+		$orderBaseProductItem->copyFrom($productItem);
163
+		$orderBaseProductItem->setQuantity($quantity);
164
+		$orderBaseProductItem->setStockType($stocktype);
165 165
 
166 166
 		$attr = array();
167
-		$prices = $productItem->getRefItems( 'price', 'default', 'default' );
167
+		$prices = $productItem->getRefItems('price', 'default', 'default');
168 168
 
169
-		$priceManager = \Aimeos\MShop\Factory::createManager( $context, 'price' );
170
-		$price = $priceManager->getLowestPrice( $prices, $quantity );
169
+		$priceManager = \Aimeos\MShop\Factory::createManager($context, 'price');
170
+		$price = $priceManager->getLowestPrice($prices, $quantity);
171 171
 
172
-		$attr = array_merge( $attr, $this->createOrderProductAttributes( $price, $prodid, $quantity, $configAttributeIds, 'config' ) );
173
-		$attr = array_merge( $attr, $this->createOrderProductAttributes( $price, $prodid, $quantity, $hiddenAttributeIds, 'hidden' ) );
174
-		$attr = array_merge( $attr, $this->createOrderProductAttributes( $price, $prodid, $quantity, array_keys( $customAttributeValues ), 'custom', $customAttributeValues ) );
172
+		$attr = array_merge($attr, $this->createOrderProductAttributes($price, $prodid, $quantity, $configAttributeIds, 'config'));
173
+		$attr = array_merge($attr, $this->createOrderProductAttributes($price, $prodid, $quantity, $hiddenAttributeIds, 'hidden'));
174
+		$attr = array_merge($attr, $this->createOrderProductAttributes($price, $prodid, $quantity, array_keys($customAttributeValues), 'custom', $customAttributeValues));
175 175
 
176 176
 		// remove product rebate of original price in favor to rebates granted for the order
177
-		$price->setRebate( '0.00' );
177
+		$price->setRebate('0.00');
178 178
 
179
-		$orderBaseProductItem->setPrice( $price );
180
-		$orderBaseProductItem->setAttributes( $attr );
179
+		$orderBaseProductItem->setPrice($price);
180
+		$orderBaseProductItem->setAttributes($attr);
181 181
 
182
-		$this->get()->addProduct( $orderBaseProductItem );
182
+		$this->get()->addProduct($orderBaseProductItem);
183 183
 		$this->save();
184 184
 	}
185 185
 
@@ -189,17 +189,17 @@  discard block
 block discarded – undo
189 189
 	 *
190 190
 	 * @param integer $position Position number (key) of the order product item
191 191
 	 */
192
-	public function deleteProduct( $position )
192
+	public function deleteProduct($position)
193 193
 	{
194
-		$product = $this->get()->getProduct( $position );
194
+		$product = $this->get()->getProduct($position);
195 195
 
196
-		if( $product->getFlags() === \Aimeos\MShop\Order\Item\Base\Product\Base::FLAG_IMMUTABLE )
196
+		if ($product->getFlags() === \Aimeos\MShop\Order\Item\Base\Product\Base::FLAG_IMMUTABLE)
197 197
 		{
198
-			$msg = sprintf( 'Basket item at position "%1$d" cannot be deleted manually', $position );
199
-			throw new \Aimeos\Controller\Frontend\Basket\Exception( $msg );
198
+			$msg = sprintf('Basket item at position "%1$d" cannot be deleted manually', $position);
199
+			throw new \Aimeos\Controller\Frontend\Basket\Exception($msg);
200 200
 		}
201 201
 
202
-		$this->get()->deleteProduct( $position );
202
+		$this->get()->deleteProduct($position);
203 203
 		$this->save();
204 204
 	}
205 205
 
@@ -213,34 +213,34 @@  discard block
 block discarded – undo
213 213
 	 * 	The 'stock'=>false option allows adding products without being in stock.
214 214
 	 * @param string[] $configAttributeCodes Codes of the product config attributes that should be REMOVED
215 215
 	 */
216
-	public function editProduct( $position, $quantity, array $options = array(),
217
-		array $configAttributeCodes = array() )
216
+	public function editProduct($position, $quantity, array $options = array(),
217
+		array $configAttributeCodes = array())
218 218
 	{
219
-		$product = $this->get()->getProduct( $position );
219
+		$product = $this->get()->getProduct($position);
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
 		{
223
-			$msg = sprintf( 'Basket item at position "%1$d" cannot be changed', $position );
224
-			throw new \Aimeos\Controller\Frontend\Basket\Exception( $msg );
223
+			$msg = sprintf('Basket item at position "%1$d" cannot be changed', $position);
224
+			throw new \Aimeos\Controller\Frontend\Basket\Exception($msg);
225 225
 		}
226 226
 
227
-		$product->setQuantity( $quantity );
227
+		$product->setQuantity($quantity);
228 228
 
229 229
 		$attributes = $product->getAttributes();
230
-		foreach( $attributes as $key => $attribute )
230
+		foreach ($attributes as $key => $attribute)
231 231
 		{
232
-			if( in_array( $attribute->getCode(), $configAttributeCodes ) ) {
233
-				unset( $attributes[$key] );
232
+			if (in_array($attribute->getCode(), $configAttributeCodes)) {
233
+				unset($attributes[$key]);
234 234
 			}
235 235
 		}
236
-		$product->setAttributes( $attributes );
236
+		$product->setAttributes($attributes);
237 237
 
238
-		$productItem = $this->getDomainItem( 'product', 'product.code', $product->getProductCode(), array( 'price', 'text' ) );
239
-		$prices = $productItem->getRefItems( 'price', 'default' );
240
-		$product->setPrice( $this->calcPrice( $product, $prices, $quantity ) );
238
+		$productItem = $this->getDomainItem('product', 'product.code', $product->getProductCode(), array('price', 'text'));
239
+		$prices = $productItem->getRefItems('price', 'default');
240
+		$product->setPrice($this->calcPrice($product, $prices, $quantity));
241 241
 
242
-		$this->get()->deleteProduct( $position );
243
-		$this->get()->addProduct( $product, $position );
242
+		$this->get()->deleteProduct($position);
243
+		$this->get()->addProduct($product, $position);
244 244
 
245 245
 		$this->save();
246 246
 	}
@@ -252,49 +252,49 @@  discard block
 block discarded – undo
252 252
 	 * @param string $code Coupon code entered by the user
253 253
 	 * @throws \Aimeos\Controller\Frontend\Basket\Exception if the coupon code is invalid or not allowed
254 254
 	 */
255
-	public function addCoupon( $code )
255
+	public function addCoupon($code)
256 256
 	{
257
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'coupon' );
258
-		$codeManager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'coupon/code' );
257
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'coupon');
258
+		$codeManager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'coupon/code');
259 259
 
260 260
 
261
-		$search = $codeManager->createSearch( true );
261
+		$search = $codeManager->createSearch(true);
262 262
 		$expr = array(
263
-			$search->compare( '==', 'coupon.code.code', $code ),
263
+			$search->compare('==', 'coupon.code.code', $code),
264 264
 			$search->getConditions(),
265 265
 		);
266
-		$search->setConditions( $search->combine( '&&', $expr ) );
267
-		$search->setSlice( 0, 1 );
266
+		$search->setConditions($search->combine('&&', $expr));
267
+		$search->setSlice(0, 1);
268 268
 
269
-		$result = $codeManager->searchItems( $search );
269
+		$result = $codeManager->searchItems($search);
270 270
 
271
-		if( ( $codeItem = reset( $result ) ) === false ) {
272
-			throw new \Aimeos\Controller\Frontend\Basket\Exception( sprintf( 'Coupon code "%1$s" is invalid or not available any more', $code ) );
271
+		if (($codeItem = reset($result)) === false) {
272
+			throw new \Aimeos\Controller\Frontend\Basket\Exception(sprintf('Coupon code "%1$s" is invalid or not available any more', $code));
273 273
 		}
274 274
 
275 275
 
276
-		$search = $manager->createSearch( true );
276
+		$search = $manager->createSearch(true);
277 277
 		$expr = array(
278
-			$search->compare( '==', 'coupon.id', $codeItem->getParentId() ),
278
+			$search->compare('==', 'coupon.id', $codeItem->getParentId()),
279 279
 			$search->getConditions(),
280 280
 		);
281
-		$search->setConditions( $search->combine( '&&', $expr ) );
282
-		$search->setSlice( 0, 1 );
281
+		$search->setConditions($search->combine('&&', $expr));
282
+		$search->setSlice(0, 1);
283 283
 
284
-		$result = $manager->searchItems( $search );
284
+		$result = $manager->searchItems($search);
285 285
 
286
-		if( ( $item = reset( $result ) ) === false ) {
287
-			throw new \Aimeos\Controller\Frontend\Basket\Exception( sprintf( 'Coupon for code "%1$s" is not available any more', $code ) );
286
+		if (($item = reset($result)) === false) {
287
+			throw new \Aimeos\Controller\Frontend\Basket\Exception(sprintf('Coupon for code "%1$s" is not available any more', $code));
288 288
 		}
289 289
 
290 290
 
291
-		$provider = $manager->getProvider( $item, $code );
291
+		$provider = $manager->getProvider($item, $code);
292 292
 
293
-		if( $provider->isAvailable( $this->get() ) !== true ) {
294
-			throw new \Aimeos\Controller\Frontend\Basket\Exception( sprintf( 'Requirements for coupon code "%1$s" aren\'t met', $code ) );
293
+		if ($provider->isAvailable($this->get()) !== true) {
294
+			throw new \Aimeos\Controller\Frontend\Basket\Exception(sprintf('Requirements for coupon code "%1$s" aren\'t met', $code));
295 295
 		}
296 296
 
297
-		$provider->addCoupon( $this->get() );
297
+		$provider->addCoupon($this->get());
298 298
 		$this->save();
299 299
 	}
300 300
 
@@ -305,21 +305,21 @@  discard block
 block discarded – undo
305 305
 	 * @param string $code Coupon code entered by the user
306 306
 	 * @throws \Aimeos\Controller\Frontend\Basket\Exception if the coupon code is invalid
307 307
 	 */
308
-	public function deleteCoupon( $code )
308
+	public function deleteCoupon($code)
309 309
 	{
310
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'coupon' );
310
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'coupon');
311 311
 
312 312
 		$search = $manager->createSearch();
313
-		$search->setConditions( $search->compare( '==', 'coupon.code.code', $code ) );
314
-		$search->setSlice( 0, 1 );
313
+		$search->setConditions($search->compare('==', 'coupon.code.code', $code));
314
+		$search->setSlice(0, 1);
315 315
 
316
-		$result = $manager->searchItems( $search );
316
+		$result = $manager->searchItems($search);
317 317
 
318
-		if( ( $item = reset( $result ) ) === false ) {
319
-			throw new \Aimeos\Controller\Frontend\Basket\Exception( sprintf( 'Coupon code "%1$s" is invalid', $code ) );
318
+		if (($item = reset($result)) === false) {
319
+			throw new \Aimeos\Controller\Frontend\Basket\Exception(sprintf('Coupon code "%1$s" is invalid', $code));
320 320
 		}
321 321
 
322
-		$manager->getProvider( $item, $code )->deleteCoupon( $this->get() );
322
+		$manager->getProvider($item, $code)->deleteCoupon($this->get());
323 323
 		$this->save();
324 324
 	}
325 325
 
@@ -332,28 +332,28 @@  discard block
 block discarded – undo
332 332
 	 * @throws \Aimeos\Controller\Frontend\Basket\Exception If the billing or delivery address is not of any required type of
333 333
 	 * 	if one of the keys is invalid when using an array with key/value pairs
334 334
 	 */
335
-	public function setAddress( $type, $value )
335
+	public function setAddress($type, $value)
336 336
 	{
337
-		$address = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'order/base/address' )->createItem();
338
-		$address->setType( $type );
337
+		$address = \Aimeos\MShop\Factory::createManager($this->getContext(), 'order/base/address')->createItem();
338
+		$address->setType($type);
339 339
 
340
-		if( $value instanceof \Aimeos\MShop\Common\Item\Address\Iface )
340
+		if ($value instanceof \Aimeos\MShop\Common\Item\Address\Iface)
341 341
 		{
342
-			$address->copyFrom( $value );
343
-			$this->get()->setAddress( $address, $type );
342
+			$address->copyFrom($value);
343
+			$this->get()->setAddress($address, $type);
344 344
 		}
345
-		else if( is_array( $value ) )
345
+		else if (is_array($value))
346 346
 		{
347
-			$this->setAddressFromArray( $address, $value );
348
-			$this->get()->setAddress( $address, $type );
347
+			$this->setAddressFromArray($address, $value);
348
+			$this->get()->setAddress($address, $type);
349 349
 		}
350
-		else if( $value === null )
350
+		else if ($value === null)
351 351
 		{
352
-			$this->get()->deleteAddress( $type );
352
+			$this->get()->deleteAddress($type);
353 353
 		}
354 354
 		else
355 355
 		{
356
-			throw new \Aimeos\Controller\Frontend\Basket\Exception( sprintf( 'Invalid value for address type "%1$s"', $type ) );
356
+			throw new \Aimeos\Controller\Frontend\Basket\Exception(sprintf('Invalid value for address type "%1$s"', $type));
357 357
 		}
358 358
 
359 359
 		$this->save();
@@ -369,42 +369,42 @@  discard block
 block discarded – undo
369 369
 	 * 	entered by the customer when choosing one of the delivery or payment options
370 370
 	 * @throws \Aimeos\Controller\Frontend\Basket\Exception If there is no price to the service item attached
371 371
 	 */
372
-	public function setService( $type, $id, array $attributes = array() )
372
+	public function setService($type, $id, array $attributes = array())
373 373
 	{
374 374
 		$context = $this->getContext();
375 375
 
376
-		$serviceManager = \Aimeos\MShop\Factory::createManager( $context, 'service' );
377
-		$serviceItem = $this->getDomainItem( 'service', 'service.id', $id, array( 'media', 'price', 'text' ) );
376
+		$serviceManager = \Aimeos\MShop\Factory::createManager($context, 'service');
377
+		$serviceItem = $this->getDomainItem('service', 'service.id', $id, array('media', 'price', 'text'));
378 378
 
379
-		$provider = $serviceManager->getProvider( $serviceItem );
380
-		$result = $provider->checkConfigFE( $attributes );
381
-		$unknown = array_diff_key( $attributes, $result );
379
+		$provider = $serviceManager->getProvider($serviceItem);
380
+		$result = $provider->checkConfigFE($attributes);
381
+		$unknown = array_diff_key($attributes, $result);
382 382
 
383
-		if( count( $unknown ) > 0 )
383
+		if (count($unknown) > 0)
384 384
 		{
385
-			$msg = sprintf( 'Unknown attributes "%1$s"', implode( '","', array_keys( $unknown ) ) );
386
-			throw new \Aimeos\Controller\Frontend\Basket\Exception( $msg );
385
+			$msg = sprintf('Unknown attributes "%1$s"', implode('","', array_keys($unknown)));
386
+			throw new \Aimeos\Controller\Frontend\Basket\Exception($msg);
387 387
 		}
388 388
 
389
-		foreach( $result as $key => $value )
389
+		foreach ($result as $key => $value)
390 390
 		{
391
-			if( $value !== null ) {
392
-				throw new \Aimeos\Controller\Frontend\Basket\Exception( $value );
391
+			if ($value !== null) {
392
+				throw new \Aimeos\Controller\Frontend\Basket\Exception($value);
393 393
 			}
394 394
 		}
395 395
 
396
-		$orderBaseServiceManager = \Aimeos\MShop\Factory::createManager( $context, 'order/base/service' );
396
+		$orderBaseServiceManager = \Aimeos\MShop\Factory::createManager($context, 'order/base/service');
397 397
 		$orderServiceItem = $orderBaseServiceManager->createItem();
398
-		$orderServiceItem->copyFrom( $serviceItem );
398
+		$orderServiceItem->copyFrom($serviceItem);
399 399
 
400
-		$price = $provider->calcPrice( $this->get() );
400
+		$price = $provider->calcPrice($this->get());
401 401
 		// remove service rebate of original price
402
-		$price->setRebate( '0.00' );
403
-		$orderServiceItem->setPrice( $price );
402
+		$price->setRebate('0.00');
403
+		$orderServiceItem->setPrice($price);
404 404
 
405
-		$provider->setConfigFE( $orderServiceItem, $attributes );
405
+		$provider->setConfigFE($orderServiceItem, $attributes);
406 406
 
407
-		$this->get()->setService( $orderServiceItem, $type );
407
+		$this->get()->setService($orderServiceItem, $type);
408 408
 		$this->save();
409 409
 	}
410 410
 
@@ -417,18 +417,18 @@  discard block
 block discarded – undo
417 417
 	 * 	an address item.
418 418
 	 * @throws \Aimeos\Controller\Frontend\Basket\Exception
419 419
 	 */
420
-	protected function setAddressFromArray( \Aimeos\MShop\Order\Item\Base\Address\Iface $address, array $map )
420
+	protected function setAddressFromArray(\Aimeos\MShop\Order\Item\Base\Address\Iface $address, array $map)
421 421
 	{
422
-		foreach( $map as $key => $value ) {
423
-			$map[$key] = strip_tags( $value ); // prevent XSS
422
+		foreach ($map as $key => $value) {
423
+			$map[$key] = strip_tags($value); // prevent XSS
424 424
 		}
425 425
 
426
-		$errors = $address->fromArray( $map );
426
+		$errors = $address->fromArray($map);
427 427
 
428
-		if( count( $errors ) > 0 )
428
+		if (count($errors) > 0)
429 429
 		{
430
-			$msg = sprintf( 'Invalid address properties, please check your input' );
431
-			throw new \Aimeos\Controller\Frontend\Basket\Exception( $msg, 0, null, $errors );
430
+			$msg = sprintf('Invalid address properties, please check your input');
431
+			throw new \Aimeos\Controller\Frontend\Basket\Exception($msg, 0, null, $errors);
432 432
 		}
433 433
 	}
434 434
 }
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, array() ) ) === 0 )
98
+		if (count($productManager->searchItems($search, array())) === 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 = array();
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 = array();
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
 					array(),
237
-					$this->getValue( $attrIds, 'variant', array() ),
238
-					$this->getValue( $attrIds, 'config', array() ),
239
-					$this->getValue( $attrIds, 'hidden', array() ),
240
-					$this->getValue( $attrIds, 'custom', array() ),
237
+					$this->getValue($attrIds, 'variant', array()),
238
+					$this->getValue($attrIds, 'config', array()),
239
+					$this->getValue($attrIds, 'hidden', array()),
240
+					$this->getValue($attrIds, 'custom', array()),
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 = array();
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 = array() )
301
+	protected function createOrderProductAttributes(\Aimeos\MShop\Price\Item\Iface $price, $prodid, $quantity,
302
+			array $attributeIds, $type, array $attributeValues = array())
303 303
 	{
304
-		if( empty( $attributeIds ) ) {
304
+		if (empty($attributeIds)) {
305 305
 			return array();
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 = array();
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 array();
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 array();
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 = array();
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 = array();
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 array();
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/tests/Controller/Frontend/Basket/StandardTest.php 1 patch
Spacing   +202 added lines, -202 removed lines patch added patch discarded remove patch
@@ -19,98 +19,98 @@  discard block
 block discarded – undo
19 19
 	public static function setUpBeforeClass()
20 20
 	{
21 21
 		$context = \TestHelperFrontend::getContext();
22
-		self::$testItem = \Aimeos\MShop\Factory::createManager( $context, 'product' )->findItem( 'U:TESTP' );
22
+		self::$testItem = \Aimeos\MShop\Factory::createManager($context, 'product')->findItem('U:TESTP');
23 23
 	}
24 24
 
25 25
 
26 26
 	protected function setUp()
27 27
 	{
28
-		\Aimeos\MShop\Factory::setCache( true );
28
+		\Aimeos\MShop\Factory::setCache(true);
29 29
 
30 30
 		$this->context = \TestHelperFrontend::getContext();
31
-		$this->object = new \Aimeos\Controller\Frontend\Basket\Standard( $this->context );
31
+		$this->object = new \Aimeos\Controller\Frontend\Basket\Standard($this->context);
32 32
 	}
33 33
 
34 34
 
35 35
 	protected function tearDown()
36 36
 	{
37
-		\Aimeos\MShop\Factory::setCache( false );
37
+		\Aimeos\MShop\Factory::setCache(false);
38 38
 		\Aimeos\MShop\Factory::clear();
39 39
 
40 40
 		$this->object->clear();
41
-		$this->context->getSession()->set( 'aimeos', array() );
41
+		$this->context->getSession()->set('aimeos', array());
42 42
 
43
-		unset( $this->context, $this->object );
43
+		unset($this->context, $this->object);
44 44
 	}
45 45
 
46 46
 
47 47
 	public function testClear()
48 48
 	{
49
-		$this->object->addProduct( self::$testItem->getId(), 2 );
49
+		$this->object->addProduct(self::$testItem->getId(), 2);
50 50
 		$this->object->clear();
51 51
 
52
-		$this->assertEquals( 0, count( $this->object->get()->getProducts() ) );
52
+		$this->assertEquals(0, count($this->object->get()->getProducts()));
53 53
 	}
54 54
 
55 55
 
56 56
 	public function testGet()
57 57
 	{
58
-		$this->assertInstanceOf( '\Aimeos\MShop\Order\Item\Base\Iface', $this->object->get() );
58
+		$this->assertInstanceOf('\Aimeos\MShop\Order\Item\Base\Iface', $this->object->get());
59 59
 	}
60 60
 
61 61
 
62 62
 	public function testSave()
63 63
 	{
64
-		$stub = $this->getMockBuilder( '\Aimeos\MShop\Order\Manager\Base\Standard' )
65
-			->setConstructorArgs( [$this->context] )
66
-			->setMethods( ['setSession'] )
64
+		$stub = $this->getMockBuilder('\Aimeos\MShop\Order\Manager\Base\Standard')
65
+			->setConstructorArgs([$this->context])
66
+			->setMethods(['setSession'])
67 67
 			->getMock();
68 68
 
69
-		\Aimeos\MShop\Factory::injectManager( $this->context, 'order/base', $stub );
69
+		\Aimeos\MShop\Factory::injectManager($this->context, 'order/base', $stub);
70 70
 
71
-		$stub->expects( $this->exactly( 2 ) )->method( 'setSession' );
71
+		$stub->expects($this->exactly(2))->method('setSession');
72 72
 
73
-		$object = new \Aimeos\Controller\Frontend\Basket\Standard( $this->context );
74
-		$object->addProduct( self::$testItem->getId(), 2 );
73
+		$object = new \Aimeos\Controller\Frontend\Basket\Standard($this->context);
74
+		$object->addProduct(self::$testItem->getId(), 2);
75 75
 		$object->save();
76 76
 	}
77 77
 
78 78
 
79 79
 	public function testSetType()
80 80
 	{
81
-		$this->assertInstanceOf( '\Aimeos\Controller\Frontend\Basket\Iface', $this->object->setType( 'test' ) );
81
+		$this->assertInstanceOf('\Aimeos\Controller\Frontend\Basket\Iface', $this->object->setType('test'));
82 82
 	}
83 83
 
84 84
 
85 85
 	public function testStore()
86 86
 	{
87
-		$stub = $this->getMockBuilder( '\Aimeos\MShop\Order\Manager\Base\Standard' )
88
-			->setConstructorArgs( [$this->context] )
89
-			->setMethods( ['store'] )
87
+		$stub = $this->getMockBuilder('\Aimeos\MShop\Order\Manager\Base\Standard')
88
+			->setConstructorArgs([$this->context])
89
+			->setMethods(['store'])
90 90
 			->getMock();
91 91
 
92
-		\Aimeos\MShop\Factory::injectManager( $this->context, 'order/base', $stub );
92
+		\Aimeos\MShop\Factory::injectManager($this->context, 'order/base', $stub);
93 93
 
94
-		$stub->expects( $this->once() )->method( 'store' );
94
+		$stub->expects($this->once())->method('store');
95 95
 
96
-		$object = new \Aimeos\Controller\Frontend\Basket\Standard( $this->context );
96
+		$object = new \Aimeos\Controller\Frontend\Basket\Standard($this->context);
97 97
 		$object->store();
98 98
 	}
99 99
 
100 100
 
101 101
 	public function testLoad()
102 102
 	{
103
-		$stub = $this->getMockBuilder( '\Aimeos\MShop\Order\Manager\Base\Standard' )
104
-			->setConstructorArgs( [$this->context] )
105
-			->setMethods( ['load'] )
103
+		$stub = $this->getMockBuilder('\Aimeos\MShop\Order\Manager\Base\Standard')
104
+			->setConstructorArgs([$this->context])
105
+			->setMethods(['load'])
106 106
 			->getMock();
107 107
 
108
-		\Aimeos\MShop\Factory::injectManager( $this->context, 'order/base', $stub );
108
+		\Aimeos\MShop\Factory::injectManager($this->context, 'order/base', $stub);
109 109
 
110
-		$stub->expects( $this->once() )->method( 'load' )
111
-			->will( $this->returnValue( $stub->createItem() ) );
110
+		$stub->expects($this->once())->method('load')
111
+			->will($this->returnValue($stub->createItem()));
112 112
 
113
-		$object = new \Aimeos\Controller\Frontend\Basket\Standard( $this->context );
113
+		$object = new \Aimeos\Controller\Frontend\Basket\Standard($this->context);
114 114
 		$object->load( -1 );
115 115
 	}
116 116
 
@@ -118,250 +118,250 @@  discard block
 block discarded – undo
118 118
 	public function testAddDeleteProduct()
119 119
 	{
120 120
 		$basket = $this->object->get();
121
-		$item = \Aimeos\MShop\Factory::createManager( $this->context, 'product' )->findItem( 'CNC' );
121
+		$item = \Aimeos\MShop\Factory::createManager($this->context, 'product')->findItem('CNC');
122 122
 
123
-		$this->object->addProduct( $item->getId(), 2, array(), array(), array(), array(), array(), 'default' );
124
-		$item2 = $this->object->get()->getProduct( 0 );
125
-		$this->object->deleteProduct( 0 );
123
+		$this->object->addProduct($item->getId(), 2, array(), array(), array(), array(), array(), 'default');
124
+		$item2 = $this->object->get()->getProduct(0);
125
+		$this->object->deleteProduct(0);
126 126
 
127
-		$this->assertEquals( 0, count( $basket->getProducts() ) );
128
-		$this->assertEquals( 'CNC', $item2->getProductCode() );
127
+		$this->assertEquals(0, count($basket->getProducts()));
128
+		$this->assertEquals('CNC', $item2->getProductCode());
129 129
 	}
130 130
 
131 131
 
132 132
 	public function testAddProductCustomAttribute()
133 133
 	{
134
-		$attributeManager = \Aimeos\MShop\Factory::createManager( $this->context, 'attribute' );
134
+		$attributeManager = \Aimeos\MShop\Factory::createManager($this->context, 'attribute');
135 135
 
136 136
 		$search = $attributeManager->createSearch();
137 137
 		$expr = array(
138
-			$search->compare( '==', 'attribute.code', 'custom' ),
139
-			$search->compare( '==', 'attribute.type.code', 'date' ),
138
+			$search->compare('==', 'attribute.code', 'custom'),
139
+			$search->compare('==', 'attribute.type.code', 'date'),
140 140
 		);
141
-		$search->setConditions( $search->combine( '&&', $expr ) );
141
+		$search->setConditions($search->combine('&&', $expr));
142 142
 
143
-		$attributes = $attributeManager->searchItems( $search );
143
+		$attributes = $attributeManager->searchItems($search);
144 144
 
145
-		if( ( $attrItem = reset( $attributes ) ) === false ) {
146
-			throw new \RuntimeException( 'Attribute not found' );
145
+		if (($attrItem = reset($attributes)) === false) {
146
+			throw new \RuntimeException('Attribute not found');
147 147
 		}
148 148
 
149
-		$attrValues = array( $attrItem->getId() => '2000-01-01' );
149
+		$attrValues = array($attrItem->getId() => '2000-01-01');
150 150
 
151
-		$this->object->addProduct( self::$testItem->getId(), 1, array(), array(), array(), array(), $attrValues );
151
+		$this->object->addProduct(self::$testItem->getId(), 1, array(), array(), array(), array(), $attrValues);
152 152
 		$basket = $this->object->get();
153 153
 
154
-		$this->assertEquals( 1, count( $basket->getProducts() ) );
155
-		$this->assertEquals( '2000-01-01', $basket->getProduct( 0 )->getAttribute( 'date', 'custom' ) );
154
+		$this->assertEquals(1, count($basket->getProducts()));
155
+		$this->assertEquals('2000-01-01', $basket->getProduct(0)->getAttribute('date', 'custom'));
156 156
 	}
157 157
 
158 158
 
159 159
 	public function testAddProductAttributeNotAssigned()
160 160
 	{
161
-		$attributeManager = \Aimeos\MShop\Factory::createManager( $this->context, 'attribute' );
161
+		$attributeManager = \Aimeos\MShop\Factory::createManager($this->context, 'attribute');
162 162
 
163 163
 		$search = $attributeManager->createSearch();
164 164
 		$expr = array(
165
-			$search->compare( '==', 'attribute.code', '30' ),
166
-			$search->compare( '==', 'attribute.type.code', 'width' ),
165
+			$search->compare('==', 'attribute.code', '30'),
166
+			$search->compare('==', 'attribute.type.code', 'width'),
167 167
 		);
168
-		$search->setConditions( $search->combine( '&&', $expr ) );
168
+		$search->setConditions($search->combine('&&', $expr));
169 169
 
170
-		$attribute = $attributeManager->searchItems( $search );
170
+		$attribute = $attributeManager->searchItems($search);
171 171
 
172
-		if( empty( $attribute ) ) {
173
-			throw new \RuntimeException( 'Attribute not found' );
172
+		if (empty($attribute)) {
173
+			throw new \RuntimeException('Attribute not found');
174 174
 		}
175 175
 
176
-		$hiddenAttrIds = array_keys( $attribute );
177
-		$configAttrIds = array_keys( $attribute );
176
+		$hiddenAttrIds = array_keys($attribute);
177
+		$configAttrIds = array_keys($attribute);
178 178
 
179
-		$this->setExpectedException( '\\Aimeos\\Controller\\Frontend\\Basket\\Exception' );
180
-		$this->object->addProduct( self::$testItem->getId(), 1, array(), array(), $configAttrIds, $hiddenAttrIds );
179
+		$this->setExpectedException('\\Aimeos\\Controller\\Frontend\\Basket\\Exception');
180
+		$this->object->addProduct(self::$testItem->getId(), 1, array(), array(), $configAttrIds, $hiddenAttrIds);
181 181
 	}
182 182
 
183 183
 
184 184
 	public function testAddProductNegativeQuantityException()
185 185
 	{
186
-		$this->setExpectedException( '\\Aimeos\\MShop\\Order\\Exception' );
187
-		$this->object->addProduct( self::$testItem->getId(), -1 );
186
+		$this->setExpectedException('\\Aimeos\\MShop\\Order\\Exception');
187
+		$this->object->addProduct(self::$testItem->getId(), -1);
188 188
 	}
189 189
 
190 190
 
191 191
 	public function testAddProductNoPriceException()
192 192
 	{
193
-		$item = \Aimeos\MShop\Factory::createManager( $this->context, 'product' )->findItem( 'MNOP' );
193
+		$item = \Aimeos\MShop\Factory::createManager($this->context, 'product')->findItem('MNOP');
194 194
 
195
-		$this->setExpectedException( '\\Aimeos\\MShop\\Price\\Exception' );
196
-		$this->object->addProduct( $item->getId(), 1 );
195
+		$this->setExpectedException('\\Aimeos\\MShop\\Price\\Exception');
196
+		$this->object->addProduct($item->getId(), 1);
197 197
 	}
198 198
 
199 199
 
200 200
 	public function testAddProductConfigAttributeException()
201 201
 	{
202
-		$this->setExpectedException( '\\Aimeos\\Controller\\Frontend\\Basket\\Exception' );
203
-		$this->object->addProduct( self::$testItem->getId(), 1, array(), array(), array( -1 ) );
202
+		$this->setExpectedException('\\Aimeos\\Controller\\Frontend\\Basket\\Exception');
203
+		$this->object->addProduct(self::$testItem->getId(), 1, array(), array(), array( -1 ));
204 204
 	}
205 205
 
206 206
 
207 207
 	public function testAddProductLowQuantityPriceException()
208 208
 	{
209
-		$item = \Aimeos\MShop\Factory::createManager( $this->context, 'product' )->findItem( 'IJKL' );
209
+		$item = \Aimeos\MShop\Factory::createManager($this->context, 'product')->findItem('IJKL');
210 210
 
211
-		$this->setExpectedException( '\\Aimeos\\MShop\\Price\\Exception' );
212
-		$this->object->addProduct( $item->getId(), 1 );
211
+		$this->setExpectedException('\\Aimeos\\MShop\\Price\\Exception');
212
+		$this->object->addProduct($item->getId(), 1);
213 213
 	}
214 214
 
215 215
 
216 216
 	public function testAddProductHigherQuantities()
217 217
 	{
218
-		$item = \Aimeos\MShop\Factory::createManager( $this->context, 'product' )->findItem( 'IJKL' );
218
+		$item = \Aimeos\MShop\Factory::createManager($this->context, 'product')->findItem('IJKL');
219 219
 
220
-		$this->object->addProduct( $item->getId(), 2, array(), array(), array(), array(), array(), 'unit_type3' );
220
+		$this->object->addProduct($item->getId(), 2, array(), array(), array(), array(), array(), 'unit_type3');
221 221
 
222
-		$this->assertEquals( 2, $this->object->get()->getProduct( 0 )->getQuantity() );
223
-		$this->assertEquals( 'IJKL', $this->object->get()->getProduct( 0 )->getProductCode() );
222
+		$this->assertEquals(2, $this->object->get()->getProduct(0)->getQuantity());
223
+		$this->assertEquals('IJKL', $this->object->get()->getProduct(0)->getProductCode());
224 224
 	}
225 225
 
226 226
 
227 227
 	public function testDeleteProductFlagError()
228 228
 	{
229
-		$this->object->addProduct( self::$testItem->getId(), 2 );
229
+		$this->object->addProduct(self::$testItem->getId(), 2);
230 230
 
231
-		$item = $this->object->get()->getProduct( 0 );
232
-		$item->setFlags( \Aimeos\MShop\Order\Item\Base\Product\Base::FLAG_IMMUTABLE );
231
+		$item = $this->object->get()->getProduct(0);
232
+		$item->setFlags(\Aimeos\MShop\Order\Item\Base\Product\Base::FLAG_IMMUTABLE);
233 233
 
234
-		$this->setExpectedException( '\\Aimeos\\Controller\\Frontend\\Basket\\Exception' );
235
-		$this->object->deleteProduct( 0 );
234
+		$this->setExpectedException('\\Aimeos\\Controller\\Frontend\\Basket\\Exception');
235
+		$this->object->deleteProduct(0);
236 236
 	}
237 237
 
238 238
 
239 239
 	public function testEditProduct()
240 240
 	{
241
-		$this->object->addProduct( self::$testItem->getId(), 1 );
241
+		$this->object->addProduct(self::$testItem->getId(), 1);
242 242
 
243
-		$item = $this->object->get()->getProduct( 0 );
244
-		$this->assertEquals( 1, $item->getQuantity() );
243
+		$item = $this->object->get()->getProduct(0);
244
+		$this->assertEquals(1, $item->getQuantity());
245 245
 
246
-		$this->object->editProduct( 0, 4 );
246
+		$this->object->editProduct(0, 4);
247 247
 
248
-		$item = $this->object->get()->getProduct( 0 );
249
-		$this->assertEquals( 4, $item->getQuantity() );
250
-		$this->assertEquals( 'U:TESTP', $item->getProductCode() );
248
+		$item = $this->object->get()->getProduct(0);
249
+		$this->assertEquals(4, $item->getQuantity());
250
+		$this->assertEquals('U:TESTP', $item->getProductCode());
251 251
 	}
252 252
 
253 253
 
254 254
 	public function testEditProductAttributes()
255 255
 	{
256
-		$attributeManager = \Aimeos\MShop\Factory::createManager( $this->context, 'attribute' );
256
+		$attributeManager = \Aimeos\MShop\Factory::createManager($this->context, 'attribute');
257 257
 
258 258
 		$search = $attributeManager->createSearch();
259 259
 		$conditions = array(
260
-			$search->compare( '==', 'attribute.domain', 'product' ),
261
-			$search->combine( '||', array(
262
-				$search->combine( '&&', array(
263
-					$search->compare( '==', 'attribute.code', 'xs' ),
264
-					$search->compare( '==', 'attribute.type.code', 'size' ),
265
-				) ),
266
-				$search->combine( '&&', array(
267
-					$search->compare( '==', 'attribute.code', 'white' ),
268
-					$search->compare( '==', 'attribute.type.code', 'color' ),
269
-				) ),
270
-			) )
260
+			$search->compare('==', 'attribute.domain', 'product'),
261
+			$search->combine('||', array(
262
+				$search->combine('&&', array(
263
+					$search->compare('==', 'attribute.code', 'xs'),
264
+					$search->compare('==', 'attribute.type.code', 'size'),
265
+				)),
266
+				$search->combine('&&', array(
267
+					$search->compare('==', 'attribute.code', 'white'),
268
+					$search->compare('==', 'attribute.type.code', 'color'),
269
+				)),
270
+			))
271 271
 		);
272
-		$search->setConditions( $search->combine( '&&', $conditions ) );
273
-		$attributes = $attributeManager->searchItems( $search );
272
+		$search->setConditions($search->combine('&&', $conditions));
273
+		$attributes = $attributeManager->searchItems($search);
274 274
 
275
-		if( ( $attribute = reset( $attributes ) ) === false ) {
276
-			throw new \RuntimeException( 'No attributes available' );
275
+		if (($attribute = reset($attributes)) === false) {
276
+			throw new \RuntimeException('No attributes available');
277 277
 		}
278 278
 
279 279
 
280
-		$item = \Aimeos\MShop\Factory::createManager( $this->context, 'product' )->findItem( 'U:TESTP' );
280
+		$item = \Aimeos\MShop\Factory::createManager($this->context, 'product')->findItem('U:TESTP');
281 281
 
282
-		$this->object->addProduct( $item->getId(), 1, array(), array(), array_keys( $attributes ) );
283
-		$this->object->editProduct( 0, 4 );
282
+		$this->object->addProduct($item->getId(), 1, array(), array(), array_keys($attributes));
283
+		$this->object->editProduct(0, 4);
284 284
 
285
-		$item = $this->object->get()->getProduct( 0 );
286
-		$this->assertEquals( 2, count( $item->getAttributes() ) );
287
-		$this->assertEquals( 4, $item->getQuantity() );
285
+		$item = $this->object->get()->getProduct(0);
286
+		$this->assertEquals(2, count($item->getAttributes()));
287
+		$this->assertEquals(4, $item->getQuantity());
288 288
 
289 289
 
290
-		$this->object->editProduct( 0, 3, array(), array( $attribute->getType() ) );
290
+		$this->object->editProduct(0, 3, array(), array($attribute->getType()));
291 291
 
292
-		$item = $this->object->get()->getProduct( 0 );
293
-		$this->assertEquals( 3, $item->getQuantity() );
294
-		$this->assertEquals( 1, count( $item->getAttributes() ) );
295
-		$this->assertEquals( 'U:TESTP', $item->getProductCode() );
292
+		$item = $this->object->get()->getProduct(0);
293
+		$this->assertEquals(3, $item->getQuantity());
294
+		$this->assertEquals(1, count($item->getAttributes()));
295
+		$this->assertEquals('U:TESTP', $item->getProductCode());
296 296
 	}
297 297
 
298 298
 
299 299
 	public function testEditProductFlagError()
300 300
 	{
301
-		$this->object->addProduct( self::$testItem->getId(), 2 );
301
+		$this->object->addProduct(self::$testItem->getId(), 2);
302 302
 
303
-		$item = $this->object->get()->getProduct( 0 );
304
-		$item->setFlags( \Aimeos\MShop\Order\Item\Base\Product\Base::FLAG_IMMUTABLE );
303
+		$item = $this->object->get()->getProduct(0);
304
+		$item->setFlags(\Aimeos\MShop\Order\Item\Base\Product\Base::FLAG_IMMUTABLE);
305 305
 
306
-		$this->setExpectedException( '\\Aimeos\\Controller\\Frontend\\Basket\\Exception' );
307
-		$this->object->editProduct( 0, 4 );
306
+		$this->setExpectedException('\\Aimeos\\Controller\\Frontend\\Basket\\Exception');
307
+		$this->object->editProduct(0, 4);
308 308
 	}
309 309
 
310 310
 
311 311
 	public function testAddCoupon()
312 312
 	{
313
-		$this->object->addProduct( self::$testItem->getId(), 2 );
314
-		$this->object->addCoupon( 'GHIJ' );
313
+		$this->object->addProduct(self::$testItem->getId(), 2);
314
+		$this->object->addCoupon('GHIJ');
315 315
 
316 316
 		$basket = $this->object->get();
317 317
 
318
-		$this->assertEquals( 1, count( $basket->getCoupons() ) );
318
+		$this->assertEquals(1, count($basket->getCoupons()));
319 319
 	}
320 320
 
321 321
 
322 322
 	public function testAddCouponInvalidCode()
323 323
 	{
324
-		$this->setExpectedException( '\\Aimeos\\Controller\\Frontend\\Basket\\Exception' );
325
-		$this->object->addCoupon( 'invalid' );
324
+		$this->setExpectedException('\\Aimeos\\Controller\\Frontend\\Basket\\Exception');
325
+		$this->object->addCoupon('invalid');
326 326
 	}
327 327
 
328 328
 
329 329
 	public function testAddCouponMissingRequirements()
330 330
 	{
331
-		$this->setExpectedException( '\\Aimeos\\Controller\\Frontend\\Basket\\Exception' );
332
-		$this->object->addCoupon( 'OPQR' );
331
+		$this->setExpectedException('\\Aimeos\\Controller\\Frontend\\Basket\\Exception');
332
+		$this->object->addCoupon('OPQR');
333 333
 	}
334 334
 
335 335
 
336 336
 	public function testDeleteCoupon()
337 337
 	{
338
-		$this->object->addProduct( self::$testItem->getId(), 2 );
339
-		$this->object->addCoupon( '90AB' );
340
-		$this->object->deleteCoupon( '90AB' );
338
+		$this->object->addProduct(self::$testItem->getId(), 2);
339
+		$this->object->addCoupon('90AB');
340
+		$this->object->deleteCoupon('90AB');
341 341
 
342 342
 		$basket = $this->object->get();
343 343
 
344
-		$this->assertEquals( 0, count( $basket->getCoupons() ) );
344
+		$this->assertEquals(0, count($basket->getCoupons()));
345 345
 	}
346 346
 
347 347
 
348 348
 	public function testSetAddressDelete()
349 349
 	{
350
-		$this->object->setAddress( \Aimeos\MShop\Order\Item\Base\Address\Base::TYPE_PAYMENT, null );
350
+		$this->object->setAddress(\Aimeos\MShop\Order\Item\Base\Address\Base::TYPE_PAYMENT, null);
351 351
 
352
-		$this->setExpectedException( '\Aimeos\MShop\Order\Exception' );
353
-		$this->object->get()->getAddress( \Aimeos\MShop\Order\Item\Base\Address\Base::TYPE_PAYMENT );
352
+		$this->setExpectedException('\Aimeos\MShop\Order\Exception');
353
+		$this->object->get()->getAddress(\Aimeos\MShop\Order\Item\Base\Address\Base::TYPE_PAYMENT);
354 354
 	}
355 355
 
356 356
 
357 357
 	public function testSetBillingAddressByItem()
358 358
 	{
359
-		$item = $this->getAddress( 'Example company' );
359
+		$item = $this->getAddress('Example company');
360 360
 
361
-		$this->object->setAddress( \Aimeos\MShop\Order\Item\Base\Address\Base::TYPE_PAYMENT, $item );
361
+		$this->object->setAddress(\Aimeos\MShop\Order\Item\Base\Address\Base::TYPE_PAYMENT, $item);
362 362
 
363
-		$address = $this->object->get()->getAddress( \Aimeos\MShop\Order\Item\Base\Address\Base::TYPE_PAYMENT );
364
-		$this->assertEquals( 'Example company', $address->getCompany() );
363
+		$address = $this->object->get()->getAddress(\Aimeos\MShop\Order\Item\Base\Address\Base::TYPE_PAYMENT);
364
+		$this->assertEquals('Example company', $address->getCompany());
365 365
 	}
366 366
 
367 367
 
@@ -389,37 +389,37 @@  discard block
 block discarded – undo
389 389
 			'order.base.address.flag' => 0,
390 390
 		);
391 391
 
392
-		$this->object->setAddress( \Aimeos\MShop\Order\Item\Base\Address\Base::TYPE_PAYMENT, $fixture );
392
+		$this->object->setAddress(\Aimeos\MShop\Order\Item\Base\Address\Base::TYPE_PAYMENT, $fixture);
393 393
 
394
-		$address = $this->object->get()->getAddress( \Aimeos\MShop\Order\Item\Base\Address\Base::TYPE_PAYMENT );
395
-		$this->assertEquals( 'Example company', $address->getCompany() );
396
-		$this->assertEquals( 'Dr.', $address->getTitle() );
397
-		$this->assertEquals( 'firstunit', $address->getFirstname() );
394
+		$address = $this->object->get()->getAddress(\Aimeos\MShop\Order\Item\Base\Address\Base::TYPE_PAYMENT);
395
+		$this->assertEquals('Example company', $address->getCompany());
396
+		$this->assertEquals('Dr.', $address->getTitle());
397
+		$this->assertEquals('firstunit', $address->getFirstname());
398 398
 	}
399 399
 
400 400
 
401 401
 	public function testSetBillingAddressByArrayError()
402 402
 	{
403
-		$this->setExpectedException( '\\Aimeos\\Controller\\Frontend\\Basket\\Exception' );
404
-		$this->object->setAddress( \Aimeos\MShop\Order\Item\Base\Address\Base::TYPE_PAYMENT, array( 'error' => false ) );
403
+		$this->setExpectedException('\\Aimeos\\Controller\\Frontend\\Basket\\Exception');
404
+		$this->object->setAddress(\Aimeos\MShop\Order\Item\Base\Address\Base::TYPE_PAYMENT, array('error' => false));
405 405
 	}
406 406
 
407 407
 
408 408
 	public function testSetBillingAddressParameterError()
409 409
 	{
410
-		$this->setExpectedException( '\\Aimeos\\Controller\\Frontend\\Basket\\Exception' );
411
-		$this->object->setAddress( \Aimeos\MShop\Order\Item\Base\Address\Base::TYPE_PAYMENT, 'error' );
410
+		$this->setExpectedException('\\Aimeos\\Controller\\Frontend\\Basket\\Exception');
411
+		$this->object->setAddress(\Aimeos\MShop\Order\Item\Base\Address\Base::TYPE_PAYMENT, 'error');
412 412
 	}
413 413
 
414 414
 
415 415
 	public function testSetDeliveryAddressByItem()
416 416
 	{
417
-		$item = $this->getAddress( 'Example company' );
417
+		$item = $this->getAddress('Example company');
418 418
 
419
-		$this->object->setAddress( \Aimeos\MShop\Order\Item\Base\Address\Base::TYPE_DELIVERY, $item );
419
+		$this->object->setAddress(\Aimeos\MShop\Order\Item\Base\Address\Base::TYPE_DELIVERY, $item);
420 420
 
421
-		$address = $this->object->get()->getAddress( \Aimeos\MShop\Order\Item\Base\Address\Base::TYPE_DELIVERY );
422
-		$this->assertEquals( 'Example company', $address->getCompany() );
421
+		$address = $this->object->get()->getAddress(\Aimeos\MShop\Order\Item\Base\Address\Base::TYPE_DELIVERY);
422
+		$this->assertEquals('Example company', $address->getCompany());
423 423
 	}
424 424
 
425 425
 
@@ -446,119 +446,119 @@  discard block
 block discarded – undo
446 446
 			'order.base.address.website' => 'www.example.com',
447 447
 			'order.base.address.flag' => 0,
448 448
 		);
449
-		$this->object->setAddress( \Aimeos\MShop\Order\Item\Base\Address\Base::TYPE_DELIVERY, $fixture );
449
+		$this->object->setAddress(\Aimeos\MShop\Order\Item\Base\Address\Base::TYPE_DELIVERY, $fixture);
450 450
 
451
-		$address = $this->object->get()->getAddress( \Aimeos\MShop\Order\Item\Base\Address\Base::TYPE_DELIVERY );
452
-		$this->assertEquals( 'Example company', $address->getCompany() );
453
-		$this->assertEquals( 'Dr.', $address->getTitle() );
454
-		$this->assertEquals( 'firstunit', $address->getFirstname() );
451
+		$address = $this->object->get()->getAddress(\Aimeos\MShop\Order\Item\Base\Address\Base::TYPE_DELIVERY);
452
+		$this->assertEquals('Example company', $address->getCompany());
453
+		$this->assertEquals('Dr.', $address->getTitle());
454
+		$this->assertEquals('firstunit', $address->getFirstname());
455 455
 	}
456 456
 
457 457
 
458 458
 	public function testSetDeliveryAddressByArrayError()
459 459
 	{
460
-		$this->setExpectedException( '\\Aimeos\\Controller\\Frontend\\Basket\\Exception' );
461
-		$this->object->setAddress( \Aimeos\MShop\Order\Item\Base\Address\Base::TYPE_DELIVERY, array( 'error' => false ) );
460
+		$this->setExpectedException('\\Aimeos\\Controller\\Frontend\\Basket\\Exception');
461
+		$this->object->setAddress(\Aimeos\MShop\Order\Item\Base\Address\Base::TYPE_DELIVERY, array('error' => false));
462 462
 	}
463 463
 
464 464
 
465 465
 	public function testSetDeliveryAddressTypeError()
466 466
 	{
467
-		$this->setExpectedException( '\\Aimeos\\Controller\\Frontend\\Basket\\Exception' );
468
-		$this->object->setAddress( \Aimeos\MShop\Order\Item\Base\Address\Base::TYPE_DELIVERY, 'error' );
467
+		$this->setExpectedException('\\Aimeos\\Controller\\Frontend\\Basket\\Exception');
468
+		$this->object->setAddress(\Aimeos\MShop\Order\Item\Base\Address\Base::TYPE_DELIVERY, 'error');
469 469
 	}
470 470
 
471 471
 
472 472
 	public function testSetServicePayment()
473 473
 	{
474
-		$manager = \Aimeos\MShop\Factory::createManager( $this->context, 'service' );
475
-		$service = $manager->findItem( 'unitpaymentcode', array(), 'service', 'payment' );
474
+		$manager = \Aimeos\MShop\Factory::createManager($this->context, 'service');
475
+		$service = $manager->findItem('unitpaymentcode', array(), 'service', 'payment');
476 476
 
477
-		$this->object->setService( 'payment', $service->getId(), array() );
478
-		$this->assertEquals( 'unitpaymentcode', $this->object->get()->getService( 'payment' )->getCode() );
477
+		$this->object->setService('payment', $service->getId(), array());
478
+		$this->assertEquals('unitpaymentcode', $this->object->get()->getService('payment')->getCode());
479 479
 
480
-		$this->setExpectedException( '\\Aimeos\\Controller\\Frontend\\Basket\\Exception' );
481
-		$this->object->setService( 'payment', $service->getId(), array( 'prepay' => true ) );
480
+		$this->setExpectedException('\\Aimeos\\Controller\\Frontend\\Basket\\Exception');
481
+		$this->object->setService('payment', $service->getId(), array('prepay' => true));
482 482
 	}
483 483
 
484 484
 
485 485
 	public function testSetDeliveryOption()
486 486
 	{
487
-		$manager = \Aimeos\MShop\Factory::createManager( $this->context, 'service' );
488
-		$service = $manager->findItem( 'unitcode', array(), 'service', 'delivery' );
487
+		$manager = \Aimeos\MShop\Factory::createManager($this->context, 'service');
488
+		$service = $manager->findItem('unitcode', array(), 'service', 'delivery');
489 489
 
490
-		$this->object->setService( 'delivery', $service->getId(), array() );
491
-		$this->assertEquals( 'unitcode', $this->object->get()->getService( 'delivery' )->getCode() );
490
+		$this->object->setService('delivery', $service->getId(), array());
491
+		$this->assertEquals('unitcode', $this->object->get()->getService('delivery')->getCode());
492 492
 
493
-		$this->setExpectedException( '\\Aimeos\\Controller\\Frontend\\Basket\\Exception' );
494
-		$this->object->setService( 'delivery', $service->getId(), array( 'fast shipping' => true, 'air shipping' => false ) );
493
+		$this->setExpectedException('\\Aimeos\\Controller\\Frontend\\Basket\\Exception');
494
+		$this->object->setService('delivery', $service->getId(), array('fast shipping' => true, 'air shipping' => false));
495 495
 	}
496 496
 
497 497
 
498 498
 	public function testCheckLocale()
499 499
 	{
500
-		$manager = \Aimeos\MShop\Factory::createManager( $this->context, 'service' );
501
-		$payment = $manager->findItem( 'unitpaymentcode', array(), 'service', 'payment' );
502
-		$delivery = $manager->findItem( 'unitcode', array(), 'service', 'delivery' );
500
+		$manager = \Aimeos\MShop\Factory::createManager($this->context, 'service');
501
+		$payment = $manager->findItem('unitpaymentcode', array(), 'service', 'payment');
502
+		$delivery = $manager->findItem('unitcode', array(), 'service', 'delivery');
503 503
 
504
-		$this->object->addProduct( self::$testItem->getId(), 2 );
505
-		$this->object->addCoupon( 'OPQR' );
504
+		$this->object->addProduct(self::$testItem->getId(), 2);
505
+		$this->object->addCoupon('OPQR');
506 506
 
507
-		$this->object->setService( 'payment', $payment->getId() );
508
-		$this->object->setService( 'delivery', $delivery->getId() );
507
+		$this->object->setService('payment', $payment->getId());
508
+		$this->object->setService('delivery', $delivery->getId());
509 509
 
510 510
 		$basket = $this->object->get();
511 511
 		$price = $basket->getPrice();
512 512
 
513
-		foreach( $basket->getProducts() as $product )
513
+		foreach ($basket->getProducts() as $product)
514 514
 		{
515
-			$this->assertEquals( 2, $product->getQuantity() );
516
-			$product->getPrice()->setCurrencyId( 'CHF' );
515
+			$this->assertEquals(2, $product->getQuantity());
516
+			$product->getPrice()->setCurrencyId('CHF');
517 517
 		}
518 518
 
519
-		$basket->getService( 'delivery' )->getPrice()->setCurrencyId( 'CHF' );
520
-		$basket->getService( 'payment' )->getPrice()->setCurrencyId( 'CHF' );
521
-		$basket->getLocale()->setCurrencyId( 'CHF' );
522
-		$price->setCurrencyId( 'CHF' );
519
+		$basket->getService('delivery')->getPrice()->setCurrencyId('CHF');
520
+		$basket->getService('payment')->getPrice()->setCurrencyId('CHF');
521
+		$basket->getLocale()->setCurrencyId('CHF');
522
+		$price->setCurrencyId('CHF');
523 523
 
524
-		$this->context->getLocale()->setCurrencyId( 'CHF' );
525
-		$this->object->setAddress( \Aimeos\MShop\Order\Item\Base\Address\Base::TYPE_PAYMENT, $this->getAddress( 'Example company' ) );
524
+		$this->context->getLocale()->setCurrencyId('CHF');
525
+		$this->object->setAddress(\Aimeos\MShop\Order\Item\Base\Address\Base::TYPE_PAYMENT, $this->getAddress('Example company'));
526 526
 
527
-		$this->context->getSession()->set( 'aimeos/basket/currency', 'CHF' );
528
-		$this->context->getLocale()->setCurrencyId( 'EUR' );
527
+		$this->context->getSession()->set('aimeos/basket/currency', 'CHF');
528
+		$this->context->getLocale()->setCurrencyId('EUR');
529 529
 
530
-		$this->context->getSession()->set( 'aimeos/basket/content-unittest-en-EUR-', null );
530
+		$this->context->getSession()->set('aimeos/basket/content-unittest-en-EUR-', null);
531 531
 
532
-		$object = new \Aimeos\Controller\Frontend\Basket\Standard( $this->context );
532
+		$object = new \Aimeos\Controller\Frontend\Basket\Standard($this->context);
533 533
 		$basket = $object->get();
534 534
 
535
-		foreach( $basket->getProducts() as $product )
535
+		foreach ($basket->getProducts() as $product)
536 536
 		{
537
-			$this->assertEquals( 'EUR', $product->getPrice()->getCurrencyId() );
538
-			$this->assertEquals( 2, $product->getQuantity() );
537
+			$this->assertEquals('EUR', $product->getPrice()->getCurrencyId());
538
+			$this->assertEquals(2, $product->getQuantity());
539 539
 		}
540 540
 
541
-		$this->assertEquals( 'EUR', $basket->getService( 'payment' )->getPrice()->getCurrencyId() );
542
-		$this->assertEquals( 'EUR', $basket->getService( 'delivery' )->getPrice()->getCurrencyId() );
543
-		$this->assertEquals( 'EUR', $basket->getLocale()->getCurrencyId() );
544
-		$this->assertEquals( 'EUR', $basket->getPrice()->getCurrencyId() );
541
+		$this->assertEquals('EUR', $basket->getService('payment')->getPrice()->getCurrencyId());
542
+		$this->assertEquals('EUR', $basket->getService('delivery')->getPrice()->getCurrencyId());
543
+		$this->assertEquals('EUR', $basket->getLocale()->getCurrencyId());
544
+		$this->assertEquals('EUR', $basket->getPrice()->getCurrencyId());
545 545
 	}
546 546
 
547 547
 
548 548
 	/**
549 549
 	 * @param string $company
550 550
 	 */
551
-	protected function getAddress( $company )
551
+	protected function getAddress($company)
552 552
 	{
553
-		$customer = \Aimeos\MShop\Customer\Manager\Factory::createManager( \TestHelperFrontend::getContext(), 'Standard' );
554
-		$addressManager = $customer->getSubManager( 'address', 'Standard' );
553
+		$customer = \Aimeos\MShop\Customer\Manager\Factory::createManager(\TestHelperFrontend::getContext(), 'Standard');
554
+		$addressManager = $customer->getSubManager('address', 'Standard');
555 555
 
556 556
 		$search = $addressManager->createSearch();
557
-		$search->setConditions( $search->compare( '==', 'customer.address.company', $company ) );
558
-		$items = $addressManager->searchItems( $search );
557
+		$search->setConditions($search->compare('==', 'customer.address.company', $company));
558
+		$items = $addressManager->searchItems($search);
559 559
 
560
-		if( ( $item = reset( $items ) ) === false ) {
561
-			throw new \RuntimeException( sprintf( 'No address item with company "%1$s" found', $company ) );
560
+		if (($item = reset($items)) === false) {
561
+			throw new \RuntimeException(sprintf('No address item with company "%1$s" found', $company));
562 562
 		}
563 563
 
564 564
 		return $item;
Please login to merge, or discard this patch.
controller/frontend/tests/Controller/Frontend/Basket/Decorator/BaseTest.php 1 patch
Spacing   +43 added lines, -43 removed lines patch added patch discarded remove patch
@@ -20,54 +20,54 @@  discard block
 block discarded – undo
20 20
 	{
21 21
 		$this->context = \TestHelperFrontend::getContext();
22 22
 
23
-		$this->stub = $this->getMockBuilder( '\Aimeos\Controller\Frontend\Basket\Standard' )
23
+		$this->stub = $this->getMockBuilder('\Aimeos\Controller\Frontend\Basket\Standard')
24 24
 			->disableOriginalConstructor()
25 25
 			->getMock();
26 26
 
27
-		$this->object = $this->getMockBuilder( '\Aimeos\Controller\Frontend\Basket\Decorator\Base' )
28
-			->setConstructorArgs( [$this->stub, $this->context] )
27
+		$this->object = $this->getMockBuilder('\Aimeos\Controller\Frontend\Basket\Decorator\Base')
28
+			->setConstructorArgs([$this->stub, $this->context])
29 29
 			->getMockForAbstractClass();
30 30
 	}
31 31
 
32 32
 
33 33
 	protected function tearDown()
34 34
 	{
35
-		unset( $this->context, $this->object, $this->stub );
35
+		unset($this->context, $this->object, $this->stub);
36 36
 	}
37 37
 
38 38
 
39 39
 	public function testConstructException()
40 40
 	{
41
-		$stub = $this->getMockBuilder( '\Aimeos\Controller\Frontend\Iface' )->getMock();
41
+		$stub = $this->getMockBuilder('\Aimeos\Controller\Frontend\Iface')->getMock();
42 42
 
43
-		$this->setExpectedException( '\Aimeos\Controller\Frontend\Exception' );
43
+		$this->setExpectedException('\Aimeos\Controller\Frontend\Exception');
44 44
 
45
-		$this->getMockBuilder( '\Aimeos\Controller\Frontend\Basket\Decorator\Base' )
46
-			->setConstructorArgs( [$stub, $this->context] )
45
+		$this->getMockBuilder('\Aimeos\Controller\Frontend\Basket\Decorator\Base')
46
+			->setConstructorArgs([$stub, $this->context])
47 47
 			->getMockForAbstractClass();
48 48
 	}
49 49
 
50 50
 
51 51
 	public function testCall()
52 52
 	{
53
-		$stub = $this->getMockBuilder( '\Aimeos\Controller\Frontend\Basket\Standard' )
53
+		$stub = $this->getMockBuilder('\Aimeos\Controller\Frontend\Basket\Standard')
54 54
 			->disableOriginalConstructor()
55
-			->setMethods( ['invalid'] )
55
+			->setMethods(['invalid'])
56 56
 			->getMock();
57 57
 
58
-		$object = $this->getMockBuilder( '\Aimeos\Controller\Frontend\Basket\Decorator\Base' )
59
-			->setConstructorArgs( [$stub, $this->context] )
58
+		$object = $this->getMockBuilder('\Aimeos\Controller\Frontend\Basket\Decorator\Base')
59
+			->setConstructorArgs([$stub, $this->context])
60 60
 			->getMockForAbstractClass();
61 61
 
62
-		$stub->expects( $this->once() )->method( 'invalid' )->will( $this->returnValue( true ) );
62
+		$stub->expects($this->once())->method('invalid')->will($this->returnValue(true));
63 63
 
64
-		$this->assertTrue( $object->invalid() );
64
+		$this->assertTrue($object->invalid());
65 65
 	}
66 66
 
67 67
 
68 68
 	public function testClear()
69 69
 	{
70
-		$this->stub->expects( $this->once() )->method( 'clear' );
70
+		$this->stub->expects($this->once())->method('clear');
71 71
 
72 72
 		$this->object->clear();
73 73
 	}
@@ -76,18 +76,18 @@  discard block
 block discarded – undo
76 76
 	public function testGet()
77 77
 	{
78 78
 		$context = \TestHelperFrontend::getContext();
79
-		$order = \Aimeos\MShop\Factory::createManager( $context, 'order/base' )->createItem();
79
+		$order = \Aimeos\MShop\Factory::createManager($context, 'order/base')->createItem();
80 80
 
81
-		$this->stub->expects( $this->once() )->method( 'get' )
82
-			->will( $this->returnValue( $order ) );
81
+		$this->stub->expects($this->once())->method('get')
82
+			->will($this->returnValue($order));
83 83
 
84
-		$this->assertInstanceOf( '\Aimeos\MShop\Order\Item\Base\Iface', $this->object->get() );
84
+		$this->assertInstanceOf('\Aimeos\MShop\Order\Item\Base\Iface', $this->object->get());
85 85
 	}
86 86
 
87 87
 
88 88
 	public function testSave()
89 89
 	{
90
-		$this->stub->expects( $this->once() )->method( 'save' );
90
+		$this->stub->expects($this->once())->method('save');
91 91
 
92 92
 		$this->object->save();
93 93
 	}
@@ -95,15 +95,15 @@  discard block
 block discarded – undo
95 95
 
96 96
 	public function testSetType()
97 97
 	{
98
-		$this->stub->expects( $this->once() )->method( 'setType' );
98
+		$this->stub->expects($this->once())->method('setType');
99 99
 
100
-		$this->object->setType( 'test' );
100
+		$this->object->setType('test');
101 101
 	}
102 102
 
103 103
 
104 104
 	public function testStore()
105 105
 	{
106
-		$this->stub->expects( $this->once() )->method( 'store' );
106
+		$this->stub->expects($this->once())->method('store');
107 107
 
108 108
 		$this->object->store();
109 109
 	}
@@ -111,7 +111,7 @@  discard block
 block discarded – undo
111 111
 
112 112
 	public function testLoad()
113 113
 	{
114
-		$this->stub->expects( $this->once() )->method( 'load' );
114
+		$this->stub->expects($this->once())->method('load');
115 115
 
116 116
 		$this->object->load( -1 );
117 117
 	}
@@ -119,7 +119,7 @@  discard block
 block discarded – undo
119 119
 
120 120
 	public function testAddProduct()
121 121
 	{
122
-		$this->stub->expects( $this->once() )->method( 'addProduct' );
122
+		$this->stub->expects($this->once())->method('addProduct');
123 123
 
124 124
 		$this->object->addProduct( -1 );
125 125
 	}
@@ -127,65 +127,65 @@  discard block
 block discarded – undo
127 127
 
128 128
 	public function testDeleteProduct()
129 129
 	{
130
-		$this->stub->expects( $this->once() )->method( 'deleteProduct' );
130
+		$this->stub->expects($this->once())->method('deleteProduct');
131 131
 
132
-		$this->object->deleteProduct( 0 );
132
+		$this->object->deleteProduct(0);
133 133
 	}
134 134
 
135 135
 
136 136
 	public function testEditProduct()
137 137
 	{
138
-		$this->stub->expects( $this->once() )->method( 'editProduct' );
138
+		$this->stub->expects($this->once())->method('editProduct');
139 139
 
140
-		$this->object->editProduct( 0, 1 );
140
+		$this->object->editProduct(0, 1);
141 141
 	}
142 142
 
143 143
 
144 144
 	public function testAddCoupon()
145 145
 	{
146
-		$this->stub->expects( $this->once() )->method( 'addCoupon' );
146
+		$this->stub->expects($this->once())->method('addCoupon');
147 147
 
148
-		$this->object->addCoupon( 'test' );
148
+		$this->object->addCoupon('test');
149 149
 	}
150 150
 
151 151
 
152 152
 	public function testDeleteCoupon()
153 153
 	{
154
-		$this->stub->expects( $this->once() )->method( 'deleteCoupon' );
154
+		$this->stub->expects($this->once())->method('deleteCoupon');
155 155
 
156
-		$this->object->deleteCoupon( 'test' );
156
+		$this->object->deleteCoupon('test');
157 157
 	}
158 158
 
159 159
 
160 160
 	public function testSetAddress()
161 161
 	{
162
-		$this->stub->expects( $this->once() )->method( 'setAddress' );
162
+		$this->stub->expects($this->once())->method('setAddress');
163 163
 
164
-		$this->object->setAddress( \Aimeos\MShop\Order\Item\Base\Address\Base::TYPE_PAYMENT, null );
164
+		$this->object->setAddress(\Aimeos\MShop\Order\Item\Base\Address\Base::TYPE_PAYMENT, null);
165 165
 	}
166 166
 
167 167
 
168 168
 	public function testSetService()
169 169
 	{
170
-		$this->stub->expects( $this->once() )->method( 'setService' );
170
+		$this->stub->expects($this->once())->method('setService');
171 171
 
172
-		$this->object->setService( \Aimeos\MShop\Order\Item\Base\Service\Base::TYPE_PAYMENT, -1 );
172
+		$this->object->setService(\Aimeos\MShop\Order\Item\Base\Service\Base::TYPE_PAYMENT, -1);
173 173
 	}
174 174
 
175 175
 
176 176
 	public function testGetController()
177 177
 	{
178
-		$result = $this->access( 'getController' )->invokeArgs( $this->object, [] );
178
+		$result = $this->access('getController')->invokeArgs($this->object, []);
179 179
 
180
-		$this->assertSame( $this->stub, $result );
180
+		$this->assertSame($this->stub, $result);
181 181
 	}
182 182
 
183 183
 
184
-	protected function access( $name )
184
+	protected function access($name)
185 185
 	{
186
-		$class = new \ReflectionClass( '\Aimeos\Controller\Frontend\Basket\Decorator\Base' );
187
-		$method = $class->getMethod( $name );
188
-		$method->setAccessible( true );
186
+		$class = new \ReflectionClass('\Aimeos\Controller\Frontend\Basket\Decorator\Base');
187
+		$method = $class->getMethod($name);
188
+		$method->setAccessible(true);
189 189
 
190 190
 		return $method;
191 191
 	}
Please login to merge, or discard this patch.