Completed
Push — master ( 937f3b...5e44e2 )
by Aimeos
16:51 queued 07:27
created
controller/frontend/src/Controller/Frontend/Service/Standard.php 1 patch
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -67,8 +67,7 @@
 block discarded – undo
67 67
 				} else {
68 68
 					unset( $this->items[$type][$id] );
69 69
 				}
70
-			}
71
-			catch( \Aimeos\MShop\Service\Exception $e )
70
+			} catch( \Aimeos\MShop\Service\Exception $e )
72 71
 			{
73 72
 				$msg = sprintf( 'Unable to create provider "%1$s" for service with ID "%2$s"', $service->getCode(), $id );
74 73
 				$this->getContext()->getLogger()->log( $msg, \Aimeos\MW\Logger\Base::WARN );
Please login to merge, or discard this patch.
controller/frontend/src/Controller/Frontend/Basket/Base.php 1 patch
Braces   +4 added lines, -8 removed lines patch added patch discarded remove patch
@@ -160,8 +160,7 @@  discard block
 block discarded – undo
160 160
 			{
161 161
 				$this->setAddress( $type, $item->toArray() );
162 162
 				$basket->deleteAddress( $type );
163
-			}
164
-			catch( \Exception $e )
163
+			} catch( \Exception $e )
165 164
 			{
166 165
 				$logger = $this->getContext()->getLogger();
167 166
 				$str = 'Error migrating address with type "%1$s" in basket to locale "%2$s": %3$s';
@@ -190,8 +189,7 @@  discard block
 block discarded – undo
190 189
 			{
191 190
 				$this->addCoupon( $code );
192 191
 				$basket->deleteCoupon( $code, true );
193
-			}
194
-			catch( \Exception $e )
192
+			} catch( \Exception $e )
195 193
 			{
196 194
 				$logger = $this->getContext()->getLogger();
197 195
 				$str = 'Error migrating coupon with code "%1$s" in basket to locale "%2$s": %3$s';
@@ -240,8 +238,7 @@  discard block
 block discarded – undo
240 238
 				);
241 239
 
242 240
 				$basket->deleteProduct( $pos );
243
-			}
244
-			catch( \Exception $e )
241
+			} catch( \Exception $e )
245 242
 			{
246 243
 				$code = $product->getProductCode();
247 244
 				$logger = $this->getContext()->getLogger();
@@ -276,8 +273,7 @@  discard block
 block discarded – undo
276 273
 
277 274
 				$this->setService( $type, $item->getServiceId(), $attributes );
278 275
 				$basket->deleteService( $type );
279
-			}
280
-			catch( \Exception $e ) { ; } // Don't notify the user as appropriate services can be added automatically
276
+			} catch( \Exception $e ) { ; } // Don't notify the user as appropriate services can be added automatically
281 277
 		}
282 278
 
283 279
 		return $errors;
Please login to merge, or discard this patch.
controller/frontend/src/Controller/Frontend/Basket/Decorator/Select.php 1 patch
Braces   +6 added lines, -4 removed lines patch added patch discarded remove patch
@@ -104,10 +104,11 @@  discard block
 block discarded – undo
104 104
 		{
105 105
 			$msg = sprintf( 'No unique article found for selected attributes and product ID "%1$s"', $productItem->getId() );
106 106
 			throw new \Aimeos\Controller\Frontend\Basket\Exception( $msg );
107
-		}
108
-		else if( ( $result = reset( $productItems ) ) !== false ) // count == 1
107
+		} else if( ( $result = reset( $productItems ) ) !== false ) {
108
+			// count == 1
109 109
 		{
110 110
 			$productItem = $result;
111
+		}
111 112
 			$orderBaseProductItem->setProductCode( $productItem->getCode() );
112 113
 
113 114
 			$subprices = $productItem->getRefItems( 'price', 'default', 'default' );
@@ -133,10 +134,11 @@  discard block
 block discarded – undo
133 134
 
134 135
 				$attr[] = $orderAttributeItem;
135 136
 			}
136
-		}
137
-		else if( !isset( $options['variant'] ) || $options['variant'] != false ) // count == 0
137
+		} else if( !isset( $options['variant'] ) || $options['variant'] != false ) {
138
+			// count == 0
138 139
 		{
139 140
 			$msg = sprintf( 'No article found for selected attributes and product ID "%1$s"', $productItem->getId() );
141
+		}
140 142
 			throw new \Aimeos\Controller\Frontend\Basket\Exception( $msg );
141 143
 		}
142 144
 
Please login to merge, or discard this patch.
controller/frontend/src/Controller/Frontend/Basket/Standard.php 1 patch
Braces   +3 added lines, -6 removed lines patch added patch discarded remove patch
@@ -287,17 +287,14 @@
 block discarded – undo
287 287
 		{
288 288
 			$address->copyFrom( $value );
289 289
 			$this->basket->setAddress( $address, $type );
290
-		}
291
-		else if( is_array( $value ) )
290
+		} else if( is_array( $value ) )
292 291
 		{
293 292
 			$this->setAddressFromArray( $address, $value );
294 293
 			$this->basket->setAddress( $address, $type );
295
-		}
296
-		else if( $value === null )
294
+		} else if( $value === null )
297 295
 		{
298 296
 			$this->basket->deleteAddress( $type );
299
-		}
300
-		else
297
+		} else
301 298
 		{
302 299
 			throw new \Aimeos\Controller\Frontend\Basket\Exception( sprintf( 'Invalid value for address type "%1$s"', $type ) );
303 300
 		}
Please login to merge, or discard this patch.
controller/frontend/src/Controller/Frontend/Product/Standard.php 1 patch
Doc Comments   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -268,6 +268,7 @@  discard block
 block discarded – undo
268 268
 	 * @param \Aimeos\MW\Criteria\Iface $filter Critera object which contains the filter conditions
269 269
 	 * @param string[] $domains Domain names of items that are associated with the products and that should be fetched too
270 270
 	 * @param integer &$total Parameter where the total number of found products will be stored in
271
+	 * @param integer $total
271 272
 	 * @return array Ordered list of product items implementing \Aimeos\MShop\Product\Item\Iface
272 273
 	 * @since 2017.03
273 274
 	 */
@@ -293,7 +294,7 @@  discard block
 block discarded – undo
293 294
 	 * Returns the list of catalog IDs for the given catalog tree
294 295
 	 *
295 296
 	 * @param \Aimeos\MShop\Catalog\Item\Iface $item Catalog item with children
296
-	 * @return array List of catalog IDs
297
+	 * @return integer[] List of catalog IDs
297 298
 	 */
298 299
 	protected function getCatalogIdsFromTree( \Aimeos\MShop\Catalog\Item\Iface $item )
299 300
 	{
Please login to merge, or discard this patch.
controller/frontend/src/Controller/Frontend/Basket/Decorator/Base.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -212,7 +212,7 @@
 block discarded – undo
212 212
 	/**
213 213
 	 * Returns the frontend controller
214 214
 	 *
215
-	 * @return \Aimeos\Controller\Frontend\Basket\Iface Frontend controller object
215
+	 * @return \Aimeos\Controller\Frontend\Iface Frontend controller object
216 216
 	 */
217 217
 	protected function getController()
218 218
 	{
Please login to merge, or discard this patch.
controller/frontend/src/Controller/Frontend/Catalog/Decorator/Base.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -278,7 +278,7 @@
 block discarded – undo
278 278
 	/**
279 279
 	 * Returns the frontend controller
280 280
 	 *
281
-	 * @return \Aimeos\Controller\Frontend\Catalog\Iface Frontend controller object
281
+	 * @return \Aimeos\Controller\Frontend\Iface Frontend controller object
282 282
 	 */
283 283
 	protected function getController()
284 284
 	{
Please login to merge, or discard this patch.
controller/frontend/src/Controller/Frontend/Order/Decorator/Base.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -152,7 +152,7 @@
 block discarded – undo
152 152
 	/**
153 153
 	 * Returns the frontend controller
154 154
 	 *
155
-	 * @return \Aimeos\Controller\Frontend\Order\Iface Frontend controller object
155
+	 * @return \Aimeos\Controller\Frontend\Iface Frontend controller object
156 156
 	 */
157 157
 	protected function getController()
158 158
 	{
Please login to merge, or discard this patch.
controller/frontend/src/Controller/Frontend/Product/Decorator/Base.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -191,7 +191,7 @@
 block discarded – undo
191 191
 	/**
192 192
 	 * Returns the frontend controller
193 193
 	 *
194
-	 * @return \Aimeos\Controller\Frontend\Product\Iface Frontend controller object
194
+	 * @return \Aimeos\Controller\Frontend\Iface Frontend controller object
195 195
 	 */
196 196
 	protected function getController()
197 197
 	{
Please login to merge, or discard this patch.