Completed
Push — master ( 475749...c0b163 )
by Aimeos
02:12
created
controller/jobs/src/Controller/Jobs/Order/Service/Payment/Standard.php 1 patch
Braces   +3 added lines, -6 removed lines patch added patch discarded remove patch
@@ -120,8 +120,7 @@  discard block
 block discarded – undo
120 120
 					{
121 121
 						$capdate = date( 'Y-m-d 00:00:00', time() - 86400 * $capDays );
122 122
 						$expr[] = $orderSearch->compare( '<=', 'order.datepayment', $capdate );
123
-					}
124
-					else
123
+					} else
125 124
 					{
126 125
 						$expr[] = $orderSearch->compare( '==', 'order.statusdelivery', $status );
127 126
 					}
@@ -144,8 +143,7 @@  discard block
 block discarded – undo
144 143
 							try
145 144
 							{
146 145
 								$serviceProvider->capture( $orderItem );
147
-							}
148
-							catch( \Exception $e )
146
+							} catch( \Exception $e )
149 147
 							{
150 148
 								$str = 'Error while capturing payment for order with ID "%1$s": %2$s';
151 149
 								$context->getLogger()->log( sprintf( $str, $orderItem->getId(), $e->getMessage() ) );
@@ -157,8 +155,7 @@  discard block
 block discarded – undo
157 155
 						$orderSearch->setSlice( $orderStart );
158 156
 					}
159 157
 					while( $orderCount >= $orderSearch->getSliceSize() );
160
-				}
161
-				catch( \Exception $e )
158
+				} catch( \Exception $e )
162 159
 				{
163 160
 					$str = 'Error while capturing payments for service with ID "%1$s": %2$s';
164 161
 					$context->getLogger()->log( sprintf( $str, $serviceItem->getId(), $e->getMessage() ) );
Please login to merge, or discard this patch.
Controller/Common/Product/Import/Csv/Processor/Catalog/StandardTest.php 1 patch
Doc Comments   +1 added lines patch added patch discarded remove patch
@@ -321,6 +321,7 @@
 block discarded – undo
321 321
 
322 322
 	/**
323 323
 	 * @param string $code
324
+	 * @return \Aimeos\MShop\Catalog\Item\Iface
324 325
 	 */
325 326
 	protected function get( $code )
326 327
 	{
Please login to merge, or discard this patch.
controller/jobs/src/Controller/Jobs/Product/Import/Csv/Standard.php 1 patch
Braces   +2 added lines, -4 removed lines patch added patch discarded remove patch
@@ -351,8 +351,7 @@  discard block
 block discarded – undo
351 351
 			}
352 352
 
353 353
 			$container->close();
354
-		}
355
-		catch( \Exception $e )
354
+		} catch( \Exception $e )
356 355
 		{
357 356
 			$logger->log( 'Product import error: ' . $e->getMessage() );
358 357
 			$logger->log( $e->getTraceAsString() );
@@ -540,8 +539,7 @@  discard block
 block discarded – undo
540 539
 				}
541 540
 
542 541
 				$manager->commit();
543
-			}
544
-			catch( \Exception $e )
542
+			} catch( \Exception $e )
545 543
 			{
546 544
 				$manager->rollback();
547 545
 
Please login to merge, or discard this patch.
src/Controller/Common/Product/Import/Csv/Processor/Stock/Standard.php 1 patch
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -131,8 +131,7 @@
 block discarded – undo
131 131
 			$data = $this->getObject()->process( $product, $data );
132 132
 
133 133
 			$manager->commit();
134
-		}
135
-		catch( \Exception $e )
134
+		} catch( \Exception $e )
136 135
 		{
137 136
 			$manager->rollback();
138 137
 			throw $e;
Please login to merge, or discard this patch.
controller/jobs/src/Controller/Jobs/Order/Export/Csv/Standard.php 1 patch
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -121,8 +121,7 @@
 block discarded – undo
121 121
 				}
122 122
 
123 123
 				$this->export( $processors, $data, $maxcnt );
124
-			}
125
-			catch( \Exception $e )
124
+			} catch( \Exception $e )
126 125
 			{
127 126
 				$logger->log( 'Order export error: ' . $e->getMessage() );
128 127
 				$logger->log( $e->getTraceAsString() );
Please login to merge, or discard this patch.
common/src/Controller/Common/Coupon/Import/Csv/Processor/Base.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -29,7 +29,7 @@
 block discarded – undo
29 29
 	 * Initializes the object
30 30
 	 *
31 31
 	 * @param \Aimeos\MShop\Context\Item\Iface $context Context object
32
-	 * @param array $mapping Associative list of field position in CSV as key and domain item key as value
32
+	 * @param string[] $mapping Associative list of field position in CSV as key and domain item key as value
33 33
 	 * @param \Aimeos\Controller\Common\Coupon\Import\Csv\Processor\Iface $object Decorated processor
34 34
 	 */
35 35
 	public function __construct( \Aimeos\MShop\Context\Item\Iface $context, array $mapping,
Please login to merge, or discard this patch.
controller/jobs/src/Controller/Jobs/Coupon/Import/Csv/Code/Standard.php 1 patch
Braces   +2 added lines, -4 removed lines patch added patch discarded remove patch
@@ -160,8 +160,7 @@  discard block
 block discarded – undo
160 160
 				$msg = 'Finished coupon import: %1$d successful, %2$s errors, %3$s total (%4$s)';
161 161
 				$logger->log( sprintf( $msg, $total - $errors, $errors, $total, __CLASS__ ), \Aimeos\MW\Logger\Base::NOTICE );
162 162
 			}
163
-		}
164
-		catch( \Exception $e )
163
+		} catch( \Exception $e )
165 164
 		{
166 165
 			$logger->log( 'Coupon import error: ' . $e->getMessage() );
167 166
 			$logger->log( $e->getTraceAsString() );
@@ -309,8 +308,7 @@  discard block
 block discarded – undo
309 308
 				$list = $processor->process( $item, $list );
310 309
 
311 310
 				$manager->commit();
312
-			}
313
-			catch( \Exception $e )
311
+			} catch( \Exception $e )
314 312
 			{
315 313
 				$manager->rollback();
316 314
 
Please login to merge, or discard this patch.
controller/jobs/src/Controller/Jobs/Order/Service/Async/Standard.php 1 patch
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -66,8 +66,7 @@
 block discarded – undo
66 66
 				try
67 67
 				{
68 68
 					$serviceManager->getProvider( $serviceItem, $serviceItem->getType() )->updateAsync();
69
-				}
70
-				catch( \Exception $e )
69
+				} catch( \Exception $e )
71 70
 				{
72 71
 					$msg = 'Executing updateAsyc() of "%1$s" failed: %2$s';
73 72
 					$context->getLogger()->log( sprintf( $msg, $serviceItem->getProvider(), $e->getMessage() ) );
Please login to merge, or discard this patch.
controller/jobs/tests/Controller/Jobs/Catalog/Import/Csv/StandardTest.php 1 patch
Doc Comments   +3 added lines patch added patch discarded remove patch
@@ -248,6 +248,9 @@
 block discarded – undo
248 248
 	}
249 249
 
250 250
 
251
+	/**
252
+	 * @param string $catcode
253
+	 */
251 254
 	protected function get( $catcode, array $domains = [] )
252 255
 	{
253 256
 		$manager = \Aimeos\MShop\Catalog\Manager\Factory::createManager( $this->context );
Please login to merge, or discard this patch.