Completed
Push — master ( 67397e...3fea31 )
by Aimeos
01:44
created
client/jsonapi/templates/basket/standard.php 1 patch
Braces   +5 added lines, -2 removed lines patch added patch discarded remove patch
@@ -262,10 +262,13 @@
 block discarded – undo
262 262
 					"href": "<?= $this->url( $target, $cntl, $action, ['resource' => 'basket', 'id' => $basketId, 'related' => 'coupon'], [], $config ); ?>",
263 263
 					"allow": ["POST"]
264 264
 				}
265
-			<?php else : ?>
265
+			<?php else {
266
+	: ?>
266 267
 				,
267 268
 				"order": {
268
-					"href": "<?= $this->url( $target, $cntl, $action, ['resource' => 'order'], [], $config ); ?>",
269
+					"href": "<?= $this->url( $target, $cntl, $action, ['resource' => 'order'], [], $config );
270
+}
271
+?>",
269 272
 					"allow": ["POST"]
270 273
 				}
271 274
 			<?php endif; ?>
Please login to merge, or discard this patch.
client/jsonapi/templates/aggregate-standard.php 1 patch
Braces   +5 added lines, -2 removed lines patch added patch discarded remove patch
@@ -28,9 +28,12 @@
 block discarded – undo
28 28
 
29 29
 		"errors": <?= json_encode( $this->errors, JSON_PRETTY_PRINT ); ?>
30 30
 
31
-	<?php else : ?>
31
+	<?php else {
32
+	: ?>
32 33
 
33
-		"data": <?= json_encode( $entries ); ?>
34
+		"data": <?= json_encode( $entries );
35
+}
36
+?>
34 37
 
35 38
 	<?php endif; ?>
36 39
 }
Please login to merge, or discard this patch.
client/jsonapi/src/Client/JsonApi/Catalog/Standard.php 1 patch
Braces   +2 added lines, -4 removed lines patch added patch discarded remove patch
@@ -39,13 +39,11 @@
 block discarded – undo
39 39
 		{
40 40
 			$response = $this->getItem( $view, $request, $response );
41 41
 			$status = 200;
42
-		}
43
-		catch( \Aimeos\MShop\Exception $e )
42
+		} catch( \Aimeos\MShop\Exception $e )
44 43
 		{
45 44
 			$status = 404;
46 45
 			$view->errors = $this->getErrorDetails( $e, 'mshop' );
47
-		}
48
-		catch( \Exception $e )
46
+		} catch( \Exception $e )
49 47
 		{
50 48
 			$status = 500;
51 49
 			$view->errors = $this->getErrorDetails( $e );
Please login to merge, or discard this patch.
client/jsonapi/src/Client/JsonApi/Stock/Standard.php 1 patch
Braces   +2 added lines, -4 removed lines patch added patch discarded remove patch
@@ -44,13 +44,11 @@
 block discarded – undo
44 44
 			}
45 45
 
46 46
 			$status = 200;
47
-		}
48
-		catch( \Aimeos\MShop\Exception $e )
47
+		} catch( \Aimeos\MShop\Exception $e )
49 48
 		{
50 49
 			$status = 404;
51 50
 			$view->errors = $this->getErrorDetails( $e, 'mshop' );
52
-		}
53
-		catch( \Exception $e )
51
+		} catch( \Exception $e )
54 52
 		{
55 53
 			$status = 500;
56 54
 			$view->errors = $this->getErrorDetails( $e );
Please login to merge, or discard this patch.
client/jsonapi/src/Client/JsonApi/Order/Standard.php 1 patch
Braces   +8 added lines, -16 removed lines patch added patch discarded remove patch
@@ -43,8 +43,7 @@  discard block
 block discarded – undo
43 43
 			{
44 44
 				$view->items = $cntl->getItem( $id );
45 45
 				$view->total = 1;
46
-			}
47
-			else
46
+			} else
48 47
 			{
49 48
 				$total = 0;
50 49
 				$filter = $cntl->createFilter();
@@ -55,18 +54,15 @@  discard block
 block discarded – undo
55 54
 			}
56 55
 
57 56
 			$status = 200;
58
-		}
59
-		catch( \Aimeos\Controller\Frontend\Exception $e )
57
+		} catch( \Aimeos\Controller\Frontend\Exception $e )
60 58
 		{
61 59
 			$status = 403;
62 60
 			$view->errors = $this->getErrorDetails( $e, 'controller/frontend' );
63
-		}
64
-		catch( \Aimeos\MShop\Exception $e )
61
+		} catch( \Aimeos\MShop\Exception $e )
65 62
 		{
66 63
 			$status = 404;
67 64
 			$view->errors = $this->getErrorDetails( $e, 'mshop' );
68
-		}
69
-		catch( \Exception $e )
65
+		} catch( \Exception $e )
70 66
 		{
71 67
 			$status = 500;
72 68
 			$view->errors = $this->getErrorDetails( $e );
@@ -107,23 +103,19 @@  discard block
 block discarded – undo
107 103
 			$view->total = 1;
108 104
 
109 105
 			$status = 201;
110
-		}
111
-		catch( \Aimeos\Client\JsonApi\Exception $e )
106
+		} catch( \Aimeos\Client\JsonApi\Exception $e )
112 107
 		{
113 108
 			$status = $e->getCode();
114 109
 			$view->errors = $this->getErrorDetails( $e, 'client/jsonapi' );
115
-		}
116
-		catch( \Aimeos\Controller\Frontend\Exception $e )
110
+		} catch( \Aimeos\Controller\Frontend\Exception $e )
117 111
 		{
118 112
 			$status = 403;
119 113
 			$view->errors = $this->getErrorDetails( $e, 'controller/frontend' );
120
-		}
121
-		catch( \Aimeos\MShop\Exception $e )
114
+		} catch( \Aimeos\MShop\Exception $e )
122 115
 		{
123 116
 			$status = 404;
124 117
 			$view->errors = $this->getErrorDetails( $e, 'mshop' );
125
-		}
126
-		catch( \Exception $e )
118
+		} catch( \Exception $e )
127 119
 		{
128 120
 			$status = 500;
129 121
 			$view->errors = $this->getErrorDetails( $e );
Please login to merge, or discard this patch.
client/jsonapi/src/Client/JsonApi/Service/Standard.php 1 patch
Braces   +3 added lines, -6 removed lines patch added patch discarded remove patch
@@ -58,8 +58,7 @@  discard block
 block discarded – undo
58 58
 					$view->items = $provider->getServiceItem();
59 59
 					$view->total = 1;
60 60
 				}
61
-			}
62
-			else
61
+			} else
63 62
 			{
64 63
 				$attributes = $prices = $items = [];
65 64
 				$type = $view->param( 'filter/cs_type' );
@@ -81,13 +80,11 @@  discard block
 block discarded – undo
81 80
 			}
82 81
 
83 82
 			$status = 200;
84
-		}
85
-		catch( \Aimeos\MShop\Exception $e )
83
+		} catch( \Aimeos\MShop\Exception $e )
86 84
 		{
87 85
 			$status = 404;
88 86
 			$view->errors = $this->getErrorDetails( $e, 'mshop' );
89
-		}
90
-		catch( \Exception $e )
87
+		} catch( \Exception $e )
91 88
 		{
92 89
 			$status = 500;
93 90
 			$view->errors = $this->getErrorDetails( $e );
Please login to merge, or discard this patch.
client/jsonapi/src/Client/JsonApi/Basket/Address/Standard.php 1 patch
Braces   +5 added lines, -10 removed lines patch added patch discarded remove patch
@@ -78,8 +78,7 @@  discard block
 block discarded – undo
78 78
 
79 79
 					$this->controller->setAddress( $entry->id, null );
80 80
 				}
81
-			}
82
-			else
81
+			} else
83 82
 			{
84 83
 				$this->controller->setAddress( $relId, null );
85 84
 			}
@@ -87,13 +86,11 @@  discard block
 block discarded – undo
87 86
 
88 87
 			$view->item = $this->controller->get();
89 88
 			$status = 200;
90
-		}
91
-		catch( \Aimeos\MShop\Exception $e )
89
+		} catch( \Aimeos\MShop\Exception $e )
92 90
 		{
93 91
 			$status = 404;
94 92
 			$view->errors = $this->getErrorDetails( $e, 'mshop' );
95
-		}
96
-		catch( \Exception $e )
93
+		} catch( \Exception $e )
97 94
 		{
98 95
 			$status = 500;
99 96
 			$view->errors = $this->getErrorDetails( $e );
@@ -139,13 +136,11 @@  discard block
 block discarded – undo
139 136
 
140 137
 			$view->item = $this->controller->get();
141 138
 			$status = 201;
142
-		}
143
-		catch( \Aimeos\MShop\Exception $e )
139
+		} catch( \Aimeos\MShop\Exception $e )
144 140
 		{
145 141
 			$status = 404;
146 142
 			$view->errors = $this->getErrorDetails( $e, 'mshop' );
147
-		}
148
-		catch( \Exception $e )
143
+		} catch( \Exception $e )
149 144
 		{
150 145
 			$status = 500;
151 146
 			$view->errors = $this->getErrorDetails( $e );
Please login to merge, or discard this patch.
client/jsonapi/src/Client/JsonApi/Basket/Product/Standard.php 1 patch
Braces   +7 added lines, -14 removed lines patch added patch discarded remove patch
@@ -78,8 +78,7 @@  discard block
 block discarded – undo
78 78
 
79 79
 					$this->controller->deleteProduct( $entry->id );
80 80
 				}
81
-			}
82
-			else
81
+			} else
83 82
 			{
84 83
 				$this->controller->deleteProduct( $relId );
85 84
 			}
@@ -87,13 +86,11 @@  discard block
 block discarded – undo
87 86
 
88 87
 			$view->item = $this->controller->get();
89 88
 			$status = 200;
90
-		}
91
-		catch( \Aimeos\MShop\Exception $e )
89
+		} catch( \Aimeos\MShop\Exception $e )
92 90
 		{
93 91
 			$status = 404;
94 92
 			$view->errors = $this->getErrorDetails( $e, 'mshop' );
95
-		}
96
-		catch( \Exception $e )
93
+		} catch( \Exception $e )
97 94
 		{
98 95
 			$status = 500;
99 96
 			$view->errors = $this->getErrorDetails( $e );
@@ -146,13 +143,11 @@  discard block
 block discarded – undo
146 143
 
147 144
 			$view->item = $this->controller->get();
148 145
 			$status = 200;
149
-		}
150
-		catch( \Aimeos\MShop\Exception $e )
146
+		} catch( \Aimeos\MShop\Exception $e )
151 147
 		{
152 148
 			$status = 404;
153 149
 			$view->errors = $this->getErrorDetails( $e, 'mshop' );
154
-		}
155
-		catch( \Exception $e )
150
+		} catch( \Exception $e )
156 151
 		{
157 152
 			$status = 500;
158 153
 			$view->errors = $this->getErrorDetails( $e );
@@ -206,13 +201,11 @@  discard block
 block discarded – undo
206 201
 
207 202
 			$view->item = $this->controller->get();
208 203
 			$status = 201;
209
-		}
210
-		catch( \Aimeos\MShop\Exception $e )
204
+		} catch( \Aimeos\MShop\Exception $e )
211 205
 		{
212 206
 			$status = 404;
213 207
 			$view->errors = $this->getErrorDetails( $e, 'mshop' );
214
-		}
215
-		catch( \Exception $e )
208
+		} catch( \Exception $e )
216 209
 		{
217 210
 			$status = 500;
218 211
 			$view->errors = $this->getErrorDetails( $e );
Please login to merge, or discard this patch.
client/jsonapi/src/Client/JsonApi/Basket/Standard.php 1 patch
Braces   +9 added lines, -18 removed lines patch added patch discarded remove patch
@@ -59,13 +59,11 @@  discard block
 block discarded – undo
59 59
 			$status = 200;
60 60
 			$type = $view->param( 'id', 'default' );
61 61
 			$view->item = $this->controller->setType( $type )->clear()->get();
62
-		}
63
-		catch( \Aimeos\MShop\Exception $e )
62
+		} catch( \Aimeos\MShop\Exception $e )
64 63
 		{
65 64
 			$status = 404;
66 65
 			$view->errors = $this->getErrorDetails( $e, 'mshop' );
67
-		}
68
-		catch( \Exception $e )
66
+		} catch( \Exception $e )
69 67
 		{
70 68
 			$status = 500;
71 69
 			$view->errors = $this->getErrorDetails( $e );
@@ -93,21 +91,18 @@  discard block
 block discarded – undo
93 91
 			try
94 92
 			{
95 93
 				$view->item = $this->controller->load( $id, $this->getParts( $view ) );
96
-			}
97
-			catch( \Aimeos\MShop\Exception $e )
94
+			} catch( \Aimeos\MShop\Exception $e )
98 95
 			{
99 96
 				$view->item = $this->controller->setType( $id )->get();
100 97
 				$allow = true;
101 98
 			}
102 99
 
103 100
 			$status = 200;
104
-		}
105
-		catch( \Aimeos\MShop\Exception $e )
101
+		} catch( \Aimeos\MShop\Exception $e )
106 102
 		{
107 103
 			$status = 404;
108 104
 			$view->errors = $this->getErrorDetails( $e, 'mshop' );
109
-		}
110
-		catch( \Exception $e )
105
+		} catch( \Exception $e )
111 106
 		{
112 107
 			$status = 500;
113 108
 			$view->errors = $this->getErrorDetails( $e );
@@ -141,13 +136,11 @@  discard block
 block discarded – undo
141 136
 
142 137
 			$view->item = $basket;
143 138
 			$status = 200;
144
-		}
145
-		catch( \Aimeos\MShop\Exception $e )
139
+		} catch( \Aimeos\MShop\Exception $e )
146 140
 		{
147 141
 			$status = 404;
148 142
 			$view->errors = $this->getErrorDetails( $e, 'mshop' );
149
-		}
150
-		catch( \Exception $e )
143
+		} catch( \Exception $e )
151 144
 		{
152 145
 			$status = 500;
153 146
 			$view->errors = $this->getErrorDetails( $e );
@@ -175,13 +168,11 @@  discard block
 block discarded – undo
175 168
 
176 169
 			$view->item = $item;
177 170
 			$status = 200;
178
-		}
179
-		catch( \Aimeos\MShop\Exception $e )
171
+		} catch( \Aimeos\MShop\Exception $e )
180 172
 		{
181 173
 			$status = 404;
182 174
 			$view->errors = $this->getErrorDetails( $e, 'mshop' );
183
-		}
184
-		catch( \Exception $e )
175
+		} catch( \Exception $e )
185 176
 		{
186 177
 			$status = 500;
187 178
 			$view->errors = $this->getErrorDetails( $e );
Please login to merge, or discard this patch.