@@ -231,8 +231,7 @@ |
||
231 | 231 | $data[] = $entryFcn( $productItem ); |
232 | 232 | $included = array_merge( $included, $refFcn( $productItem, 0 ) ); |
233 | 233 | } |
234 | - } |
|
235 | - else |
|
234 | + } else |
|
236 | 235 | { |
237 | 236 | $data = $entryFcn( $items ); |
238 | 237 | $included = $refFcn( $items, 0 ); |
@@ -105,8 +105,7 @@ |
||
105 | 105 | foreach( $items as $stockId => $stockItem ) { |
106 | 106 | $data[] = $entryFcn( $stockItem ); |
107 | 107 | } |
108 | - } |
|
109 | - else |
|
108 | + } else |
|
110 | 109 | { |
111 | 110 | $data = $entryFcn( $items ); |
112 | 111 | } |
@@ -20,9 +20,12 @@ |
||
20 | 20 | |
21 | 21 | "errors": <?php echo json_encode( $this->errors, JSON_PRETTY_PRINT ); ?> |
22 | 22 | |
23 | - <?php else : ?> |
|
23 | + <?php else { |
|
24 | + : ?> |
|
24 | 25 | |
25 | - "data": <?php echo json_encode( $entries ); ?> |
|
26 | + "data": <?php echo json_encode( $entries ); |
|
27 | +} |
|
28 | +?> |
|
26 | 29 | |
27 | 30 | <?php endif; ?> |
28 | 31 | } |
@@ -152,8 +152,7 @@ |
||
152 | 152 | $data[] = $entryFcn( $attrItem ); |
153 | 153 | $included = array_merge( $included, $refFcn( $attrItem, 0 ) ); |
154 | 154 | } |
155 | - } |
|
156 | - else |
|
155 | + } else |
|
157 | 156 | { |
158 | 157 | $data = $entryFcn( $items ); |
159 | 158 | $included = $refFcn( $items, 0 ); |
@@ -39,16 +39,14 @@ |
||
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 = array( array( |
47 | 46 | 'title' => $this->getContext()->getI18n()->dt( 'mshop', $e->getMessage() ), |
48 | 47 | 'detail' => $e->getTraceAsString(), |
49 | 48 | ) ); |
50 | - } |
|
51 | - catch( \Exception $e ) |
|
49 | + } catch( \Exception $e ) |
|
52 | 50 | { |
53 | 51 | $status = 500; |
54 | 52 | $view->errors = array( array( |
@@ -101,8 +101,7 @@ |
||
101 | 101 | $decorators = $config->get( 'client/jsonapi/' . $dpath . 'decorators/local', array() ); |
102 | 102 | $client = self::addDecorators( $client, $decorators, $classprefix, $context, $view, $templatePaths, $path ); |
103 | 103 | } |
104 | - } |
|
105 | - else |
|
104 | + } else |
|
106 | 105 | { |
107 | 106 | $classprefix = '\\Aimeos\\Client\\JsonApi\\Common\\Decorator\\'; |
108 | 107 | $client = self::addDecorators( $client, $decorators, $classprefix, $context, $view, $templatePaths, $path ); |
@@ -44,16 +44,14 @@ |
||
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 = array( array( |
52 | 51 | 'title' => $this->getContext()->getI18n()->dt( 'mshop', $e->getMessage() ), |
53 | 52 | 'detail' => $e->getTraceAsString(), |
54 | 53 | ) ); |
55 | - } |
|
56 | - catch( \Exception $e ) |
|
54 | + } catch( \Exception $e ) |
|
57 | 55 | { |
58 | 56 | $status = 500; |
59 | 57 | $view->errors = array( array( |
@@ -46,16 +46,14 @@ discard block |
||
46 | 46 | } |
47 | 47 | |
48 | 48 | $status = 200; |
49 | - } |
|
50 | - catch( \Aimeos\MShop\Exception $e ) |
|
49 | + } catch( \Aimeos\MShop\Exception $e ) |
|
51 | 50 | { |
52 | 51 | $status = 404; |
53 | 52 | $view->errors = array( array( |
54 | 53 | 'title' => $this->getContext()->getI18n()->dt( 'mshop', $e->getMessage() ), |
55 | 54 | 'detail' => $e->getTraceAsString(), |
56 | 55 | ) ); |
57 | - } |
|
58 | - catch( \Exception $e ) |
|
56 | + } catch( \Exception $e ) |
|
59 | 57 | { |
60 | 58 | $status = 500; |
61 | 59 | $view->errors = array( array( |
@@ -87,8 +85,7 @@ discard block |
||
87 | 85 | */ |
88 | 86 | $tplconf = 'client/jsonapi/product/standard/template-aggregate'; |
89 | 87 | $default = 'aggregate-default.php'; |
90 | - } |
|
91 | - else |
|
88 | + } else |
|
92 | 89 | { |
93 | 90 | /** client/jsonapi/product/standard/template-get |
94 | 91 | * Relative path to the product JSON API template for GET requests |
@@ -60,8 +60,7 @@ |
||
60 | 60 | $view->resources = (array) $resources; |
61 | 61 | $view->prefix = $prefix; |
62 | 62 | $status = 200; |
63 | - } |
|
64 | - catch( \Exception $e ) |
|
63 | + } catch( \Exception $e ) |
|
65 | 64 | { |
66 | 65 | $status = 500; |
67 | 66 | $view->errors = array( array( |