Completed
Push — master ( 6ed995...1fef29 )
by Aimeos
14:56
created
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 )->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/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/jobs/src/Controller/Jobs/Order/Service/Delivery/Standard.php 1 patch
Braces   +2 added lines, -4 removed lines patch added patch discarded remove patch
@@ -112,8 +112,7 @@  discard block
 block discarded – undo
112 112
 							{
113 113
 								$serviceProvider->process( $orderItem );
114 114
 								$orderManager->saveItem( $orderItem );
115
-							}
116
-							catch( \Exception $e )
115
+							} catch( \Exception $e )
117 116
 							{
118 117
 								$str = 'Error while processing order with ID "%1$s": %2$s';
119 118
 								$context->getLogger()->log( sprintf( $str, $orderItem->getId(), $e->getMessage() ) );
@@ -125,8 +124,7 @@  discard block
 block discarded – undo
125 124
 						$orderSearch->setSlice( $orderStart );
126 125
 					}
127 126
 					while( $orderCount >= $orderSearch->getSliceSize() );
128
-				}
129
-				catch( \Exception $e )
127
+				} catch( \Exception $e )
130 128
 				{
131 129
 					$str = 'Error while processing service with ID "%1$s": %2$s';
132 130
 					$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.
common/src/Controller/Common/Product/Import/Csv/Processor/Base.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -133,7 +133,7 @@
 block discarded – undo
133 133
 	 *
134 134
 	 * @param array $list Associative list of key/value pairs
135 135
 	 * @param string $key Key for the value to retrieve
136
-	 * @param mixed $default Default value if key isn't found
136
+	 * @param string $default Default value if key isn't found
137 137
 	 * @param mixed Value for the key in the list of the default value
138 138
 	 */
139 139
 	protected function getValue( array $list, $key, $default )
Please login to merge, or discard this patch.
src/Controller/Common/Product/Import/Csv/Processor/Media/Standard.php 1 patch
Braces   +2 added lines, -4 removed lines patch added patch discarded remove patch
@@ -116,8 +116,7 @@  discard block
 block discarded – undo
116 116
 						$listItem = $listMap[$url][$type][$typecode];
117 117
 						$refItem = $listItem->getRefItem();
118 118
 						unset( $listItems[ $listItem->getId() ] );
119
-					}
120
-					else
119
+					} else
121 120
 					{
122 121
 						$listItem = $listManager->createItem();
123 122
 						$refItem = $manager->createItem();
@@ -150,8 +149,7 @@  discard block
 block discarded – undo
150 149
 			$data = $this->getObject()->process( $product, $data );
151 150
 
152 151
 			$manager->commit();
153
-		}
154
-		catch( \Exception $e )
152
+		} catch( \Exception $e )
155 153
 		{
156 154
 			$manager->rollback();
157 155
 			throw $e;
Please login to merge, or discard this patch.
src/Controller/Common/Product/Import/Csv/Processor/Property/Standard.php 1 patch
Braces   +2 added lines, -4 removed lines patch added patch discarded remove patch
@@ -69,8 +69,7 @@  discard block
 block discarded – undo
69 69
 				{
70 70
 					$item = $propMap[ $list['product.property.value'] ][$typecode];
71 71
 					unset( $items[ $item->getId() ] );
72
-				}
73
-				else
72
+				} else
74 73
 				{
75 74
 					$item = $manager->createItem();
76 75
 				}
@@ -84,8 +83,7 @@  discard block
 block discarded – undo
84 83
 			$data = $this->getObject()->process( $product, $data );
85 84
 
86 85
 			$manager->commit();
87
-		}
88
-		catch( \Exception $e )
86
+		} catch( \Exception $e )
89 87
 		{
90 88
 			$manager->rollback();
91 89
 			throw $e;
Please login to merge, or discard this patch.
src/Controller/Common/Product/Import/Csv/Processor/Attribute/Standard.php 1 patch
Braces   +2 added lines, -4 removed lines patch added patch discarded remove patch
@@ -127,8 +127,7 @@  discard block
 block discarded – undo
127 127
 					{
128 128
 						$listItem = $listMap[$code][$typecode];
129 129
 						unset( $listItems[ $listItem->getId() ] );
130
-					}
131
-					else
130
+					} else
132 131
 					{
133 132
 						$listItem = $listManager->createItem();
134 133
 					}
@@ -143,8 +142,7 @@  discard block
 block discarded – undo
143 142
 			$data = $this->getObject()->process( $product, $data );
144 143
 
145 144
 			$manager->commit();
146
-		}
147
-		catch( \Exception $e )
145
+		} catch( \Exception $e )
148 146
 		{
149 147
 			$manager->rollback();
150 148
 			throw $e;
Please login to merge, or discard this patch.
src/Controller/Common/Product/Import/Csv/Processor/Catalog/Standard.php 1 patch
Braces   +2 added lines, -4 removed lines patch added patch discarded remove patch
@@ -145,8 +145,7 @@  discard block
 block discarded – undo
145 145
 					{
146 146
 						$listItem = $listMap[$catid][$type];
147 147
 						unset( $listItems[ $listItem->getId() ] );
148
-					}
149
-					else
148
+					} else
150 149
 					{
151 150
 						$listItem = $listManager->createItem();
152 151
 					}
@@ -160,8 +159,7 @@  discard block
 block discarded – undo
160 159
 			$data = $this->getObject()->process( $product, $data );
161 160
 
162 161
 			$manager->commit();
163
-		}
164
-		catch( \Exception $e )
162
+		} catch( \Exception $e )
165 163
 		{
166 164
 			$manager->rollback();
167 165
 			throw $e;
Please login to merge, or discard this patch.