Completed
Push — master ( 0acc31...830070 )
by Aimeos
02:31
created
client/jsonapi/templates/order/standard.php 1 patch
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -96,8 +96,7 @@
 block discarded – undo
96 96
 				foreach( $items as $item ) {
97 97
 					$data[] = $entryFcn( $item, $this->get( 'form' ) );
98 98
 				}
99
-			}
100
-			else
99
+			} else
101 100
 			{
102 101
 				$data = $entryFcn( $items, $this->get( 'form' ) );
103 102
 			}
Please login to merge, or discard this patch.
client/jsonapi/src/Client/JsonApi/Basket/Service/Standard.php 1 patch
Braces   +5 added lines, -10 removed lines patch added patch discarded remove patch
@@ -82,8 +82,7 @@  discard block
 block discarded – undo
82 82
 
83 83
 					$this->controller->deleteService( $entry->id );
84 84
 				}
85
-			}
86
-			else
85
+			} else
87 86
 			{
88 87
 				$this->controller->deleteService( $relId );
89 88
 			}
@@ -91,13 +90,11 @@  discard block
 block discarded – undo
91 90
 
92 91
 			$view->item = $this->controller->get();
93 92
 			$status = 200;
94
-		}
95
-		catch( \Aimeos\MShop\Exception $e )
93
+		} catch( \Aimeos\MShop\Exception $e )
96 94
 		{
97 95
 			$status = 404;
98 96
 			$view->errors = $this->getErrorDetails( $e, 'mshop' );
99
-		}
100
-		catch( \Exception $e )
97
+		} catch( \Exception $e )
101 98
 		{
102 99
 			$status = 500;
103 100
 			$view->errors = $this->getErrorDetails( $e );
@@ -159,13 +156,11 @@  discard block
 block discarded – undo
159 156
 
160 157
 			$view->item = $this->controller->get();
161 158
 			$status = 201;
162
-		}
163
-		catch( \Aimeos\MShop\Exception $e )
159
+		} catch( \Aimeos\MShop\Exception $e )
164 160
 		{
165 161
 			$status = 404;
166 162
 			$view->errors = $this->getErrorDetails( $e, 'mshop' );
167
-		}
168
-		catch( \Exception $e )
163
+		} catch( \Exception $e )
169 164
 		{
170 165
 			$status = 500;
171 166
 			$view->errors = $this->getErrorDetails( $e );
Please login to merge, or discard this patch.
client/jsonapi/src/Client/JsonApi/Standard.php 1 patch
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -102,8 +102,7 @@
 block discarded – undo
102 102
 
103 103
 			$view->resources = (array) $resources;
104 104
 			$status = 200;
105
-		}
106
-		catch( \Exception $e )
105
+		} catch( \Exception $e )
107 106
 		{
108 107
 			$status = 500;
109 108
 			$view->errors = $this->getErrorDetails( $e );
Please login to merge, or discard this patch.
client/jsonapi/src/Client/JsonApi/Customer/Address/Standard.php 1 patch
Braces   +14 added lines, -28 removed lines patch added patch discarded remove patch
@@ -77,25 +77,21 @@  discard block
 block discarded – undo
77 77
 
78 78
 					$this->controller->deleteAddressItem( $entry->id );
79 79
 				}
80
-			}
81
-			else
80
+			} else
82 81
 			{
83 82
 				$this->controller->deleteAddressItem( $relId );
84 83
 			}
85 84
 
86 85
 			$status = 200;
87
-		}
88
-		catch( \Aimeos\Controller\Frontend\Customer\Exception $e )
86
+		} catch( \Aimeos\Controller\Frontend\Customer\Exception $e )
89 87
 		{
90 88
 			$status = 403;
91 89
 			$view->errors = $this->getErrorDetails( $e, 'controller/frontend' );
92
-		}
93
-		catch( \Aimeos\MShop\Exception $e )
90
+		} catch( \Aimeos\MShop\Exception $e )
94 91
 		{
95 92
 			$status = 404;
96 93
 			$view->errors = $this->getErrorDetails( $e, 'mshop' );
97
-		}
98
-		catch( \Exception $e )
94
+		} catch( \Exception $e )
99 95
 		{
100 96
 			$status = 500;
101 97
 			$view->errors = $this->getErrorDetails( $e );
@@ -125,26 +121,22 @@  discard block
 block discarded – undo
125 121
 			{
126 122
 				$view->items = $cntl->getItem( $view->param( 'id' ), ['customer/address'] )->getAddressItems();
127 123
 				$view->total = count( $view->items );
128
-			}
129
-			else
124
+			} else
130 125
 			{
131 126
 				$view->items = $cntl->getAddressItem( $relId );
132 127
 				$view->total = 1;
133 128
 			}
134 129
 
135 130
 			$status = 200;
136
-		}
137
-		catch( \Aimeos\Controller\Frontend\Customer\Exception $e )
131
+		} catch( \Aimeos\Controller\Frontend\Customer\Exception $e )
138 132
 		{
139 133
 			$status = 403;
140 134
 			$view->errors = $this->getErrorDetails( $e, 'controller/frontend' );
141
-		}
142
-		catch( \Aimeos\MShop\Exception $e )
135
+		} catch( \Aimeos\MShop\Exception $e )
143 136
 		{
144 137
 			$status = 404;
145 138
 			$view->errors = $this->getErrorDetails( $e, 'mshop' );
146
-		}
147
-		catch( \Exception $e )
139
+		} catch( \Exception $e )
148 140
 		{
149 141
 			$status = 500;
150 142
 			$view->errors = $this->getErrorDetails( $e );
@@ -178,18 +170,15 @@  discard block
 block discarded – undo
178 170
 			$view->items = $cntl->editAddressItem( $view->param( 'relatedid' ), (array) $payload->data->attributes );
179 171
 			$view->total = 1;
180 172
 			$status = 200;
181
-		}
182
-		catch( \Aimeos\Controller\Frontend\Customer\Exception $e )
173
+		} catch( \Aimeos\Controller\Frontend\Customer\Exception $e )
183 174
 		{
184 175
 			$status = 403;
185 176
 			$view->errors = $this->getErrorDetails( $e, 'controller/frontend' );
186
-		}
187
-		catch( \Aimeos\MShop\Exception $e )
177
+		} catch( \Aimeos\MShop\Exception $e )
188 178
 		{
189 179
 			$status = 404;
190 180
 			$view->errors = $this->getErrorDetails( $e, 'mshop' );
191
-		}
192
-		catch( \Exception $e )
181
+		} catch( \Exception $e )
193 182
 		{
194 183
 			$status = 500;
195 184
 			$view->errors = $this->getErrorDetails( $e );
@@ -236,18 +225,15 @@  discard block
 block discarded – undo
236 225
 			$view->total = count( $list );
237 226
 			$view->items = $list;
238 227
 			$status = 201;
239
-		}
240
-		catch( \Aimeos\Controller\Frontend\Customer\Exception $e )
228
+		} catch( \Aimeos\Controller\Frontend\Customer\Exception $e )
241 229
 		{
242 230
 			$status = 403;
243 231
 			$view->errors = $this->getErrorDetails( $e, 'controller/frontend' );
244
-		}
245
-		catch( \Aimeos\MShop\Exception $e )
232
+		} catch( \Aimeos\MShop\Exception $e )
246 233
 		{
247 234
 			$status = 404;
248 235
 			$view->errors = $this->getErrorDetails( $e, 'mshop' );
249
-		}
250
-		catch( \Exception $e )
236
+		} catch( \Exception $e )
251 237
 		{
252 238
 			$status = 500;
253 239
 			$view->errors = $this->getErrorDetails( $e );
Please login to merge, or discard this patch.
client/jsonapi/src/Client/JsonApi/Base.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -150,7 +150,7 @@
 block discarded – undo
150 150
 	 * Sets the view object that will generate the admin output.
151 151
 	 *
152 152
 	 * @param \Aimeos\MW\View\Iface $view The view object which generates the admin output
153
-	 * @return \Aimeos\Admin\JQAdm\Iface Reference to this object for fluent calls
153
+	 * @return Base Reference to this object for fluent calls
154 154
 	 */
155 155
 	public function setView( \Aimeos\MW\View\Iface $view )
156 156
 	{
Please login to merge, or discard this patch.
client/jsonapi/src/Client/JsonApi/Common/Factory/Base.php 2 patches
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -40,7 +40,7 @@
 block discarded – undo
40 40
 	/**
41 41
 	 * Adds the decorators to the JSON API client object
42 42
 	 *
43
-	 * @param \Aimeos\Client\JsonApi\Common\Iface $client Client object
43
+	 * @param \Aimeos\Client\JsonApi\Iface $client Client object
44 44
 	 * @param \Aimeos\MShop\Context\Item\Iface $context Context instance with necessary objects
45 45
 	 * @param string $path Name of the client, e.g "product"
46 46
 	 * @return \Aimeos\Client\JsonApi\Iface Client object
Please login to merge, or discard this patch.
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -99,8 +99,7 @@
 block discarded – undo
99 99
 				$decorators = $config->get( 'client/jsonapi/' . $dpath . 'decorators/local', [] );
100 100
 				$client = self::addDecorators( $client, $decorators, $classprefix, $context, $path );
101 101
 			}
102
-		}
103
-		else
102
+		} else
104 103
 		{
105 104
 			$classprefix = '\\Aimeos\\Client\\JsonApi\\Common\\Decorator\\';
106 105
 			$client = self::addDecorators( $client, $decorators, $classprefix, $context, $path );
Please login to merge, or discard this patch.
client/jsonapi/src/Client/JsonApi/Common/Decorator/Base.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -150,7 +150,7 @@
 block discarded – undo
150 150
 	 * Sets the view object that will generate the admin output.
151 151
 	 *
152 152
 	 * @param \Aimeos\MW\View\Iface $view The view object which generates the admin output
153
-	 * @return \Aimeos\Admin\JQAdm\Iface Reference to this object for fluent calls
153
+	 * @return Base Reference to this object for fluent calls
154 154
 	 */
155 155
 	public function setView( \Aimeos\MW\View\Iface $view )
156 156
 	{
Please login to merge, or discard this patch.
client/jsonapi/src/Client/JsonApi/Subscription/Standard.php 1 patch
Braces   +7 added lines, -14 removed lines patch added patch discarded remove patch
@@ -43,18 +43,15 @@  discard block
 block discarded – undo
43 43
 			$view->total = 1;
44 44
 
45 45
 			$status = 200;
46
-		}
47
-		catch( \Aimeos\Controller\Frontend\Exception $e )
46
+		} catch( \Aimeos\Controller\Frontend\Exception $e )
48 47
 		{
49 48
 			$status = 403;
50 49
 			$view->errors = $this->getErrorDetails( $e, 'controller/frontend' );
51
-		}
52
-		catch( \Aimeos\MShop\Exception $e )
50
+		} catch( \Aimeos\MShop\Exception $e )
53 51
 		{
54 52
 			$status = 404;
55 53
 			$view->errors = $this->getErrorDetails( $e, 'mshop' );
56
-		}
57
-		catch( \Exception $e )
54
+		} catch( \Exception $e )
58 55
 		{
59 56
 			$status = 500;
60 57
 			$view->errors = $this->getErrorDetails( $e );
@@ -83,8 +80,7 @@  discard block
 block discarded – undo
83 80
 			{
84 81
 				$view->items = $cntl->getItem( $id );
85 82
 				$view->total = 1;
86
-			}
87
-			else
83
+			} else
88 84
 			{
89 85
 				$total = 0;
90 86
 				$filter = $cntl->createFilter();
@@ -95,18 +91,15 @@  discard block
 block discarded – undo
95 91
 			}
96 92
 
97 93
 			$status = 200;
98
-		}
99
-		catch( \Aimeos\Controller\Frontend\Exception $e )
94
+		} catch( \Aimeos\Controller\Frontend\Exception $e )
100 95
 		{
101 96
 			$status = 403;
102 97
 			$view->errors = $this->getErrorDetails( $e, 'controller/frontend' );
103
-		}
104
-		catch( \Aimeos\MShop\Exception $e )
98
+		} catch( \Aimeos\MShop\Exception $e )
105 99
 		{
106 100
 			$status = 404;
107 101
 			$view->errors = $this->getErrorDetails( $e, 'mshop' );
108
-		}
109
-		catch( \Exception $e )
102
+		} catch( \Exception $e )
110 103
 		{
111 104
 			$status = 500;
112 105
 			$view->errors = $this->getErrorDetails( $e );
Please login to merge, or discard this patch.
client/jsonapi/templates/subscription/standard.php 1 patch
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -101,8 +101,7 @@
 block discarded – undo
101 101
 				foreach( $items as $item ) {
102 102
 					$data[] = $entryFcn( $item );
103 103
 				}
104
-			}
105
-			else
104
+			} else
106 105
 			{
107 106
 				$data = $entryFcn( $items );
108 107
 			}
Please login to merge, or discard this patch.