@@ -83,8 +83,7 @@ |
||
83 | 83 | foreach( $items as $localeItem ) { |
84 | 84 | $data[] = $entryFcn( $localeItem ); |
85 | 85 | } |
86 | - } |
|
87 | - else |
|
86 | + } else |
|
88 | 87 | { |
89 | 88 | $data = $entryFcn( $items ); |
90 | 89 | } |
@@ -91,8 +91,7 @@ |
||
91 | 91 | foreach( $items as $addrItem ) { |
92 | 92 | $data[] = $entryFcn( $addrItem ); |
93 | 93 | } |
94 | - } |
|
95 | - else |
|
94 | + } else |
|
96 | 95 | { |
97 | 96 | $data = $entryFcn( $items ); |
98 | 97 | } |
@@ -101,8 +101,7 @@ |
||
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 | } |
@@ -23,7 +23,7 @@ |
||
23 | 23 | $first = ( $offset > 0 ? 0 : null ); |
24 | 24 | $prev = ( $offset - $limit >= 0 ? $offset - $limit : null ); |
25 | 25 | $next = ( $offset + $limit < $total ? $offset + $limit : null ); |
26 | -$last = ( ((int) ($total / $limit)) * $limit > $offset ? ((int) ($total / $limit)) * $limit : null ); |
|
26 | +$last = ( ( (int) ( $total / $limit ) ) * $limit > $offset ? ( (int) ( $total / $limit ) ) * $limit : null ); |
|
27 | 27 | |
28 | 28 | |
29 | 29 | $ref = array( 'resource', 'id', 'related', 'relatedid', 'filter', 'page', 'sort', 'include', 'fields' ); |
@@ -41,7 +41,7 @@ |
||
41 | 41 | unset( $attributes['service.config'] ); // don't expose private information |
42 | 42 | |
43 | 43 | $params = array( 'resource' => $type, 'id' => $id ); |
44 | - $basketParams = [ 'resource' => 'basket', 'id' => 'default', 'related' => 'service', 'relatedid' => $item->getType() ]; |
|
44 | + $basketParams = ['resource' => 'basket', 'id' => 'default', 'related' => 'service', 'relatedid' => $item->getType()]; |
|
45 | 45 | |
46 | 46 | if( isset( $fields[$type] ) ) { |
47 | 47 | $attributes = array_intersect_key( $attributes, $fields[$type] ); |
@@ -211,8 +211,7 @@ |
||
211 | 211 | $data[] = $entryFcn( $item, $prices, $feConfig ); |
212 | 212 | $included = array_merge( $included, $flatFcn( $inclFcn( $item ) ) ); |
213 | 213 | } |
214 | - } |
|
215 | - else |
|
214 | + } else |
|
216 | 215 | { |
217 | 216 | $data = $entryFcn( $this->items, $prices, $feConfig ); |
218 | 217 | $included = $flatFcn( $inclFcn( $this->items ) ); |
@@ -89,7 +89,7 @@ discard block |
||
89 | 89 | $first = ( $offset > 0 ? 0 : null ); |
90 | 90 | $prev = ( $offset - $limit >= 0 ? $offset - $limit : null ); |
91 | 91 | $next = ( $offset + $limit < $total ? $offset + $limit : null ); |
92 | -$last = ( ((int) ($total / $limit)) * $limit > $offset ? ((int) ($total / $limit)) * $limit : null ); |
|
92 | +$last = ( ( (int) ( $total / $limit ) ) * $limit > $offset ? ( (int) ( $total / $limit ) ) * $limit : null ); |
|
93 | 93 | |
94 | 94 | |
95 | 95 | $ref = array( 'resource', 'id', 'related', 'relatedid', 'filter', 'page', 'sort', 'include', 'fields' ); |
@@ -109,7 +109,7 @@ discard block |
||
109 | 109 | $type = $item->getResourceType(); |
110 | 110 | |
111 | 111 | $params = array( 'resource' => $type, 'id' => $id ); |
112 | - $basketParams = [ 'resource' => 'basket', 'id' => 'default', 'related' => 'product' ]; |
|
112 | + $basketParams = ['resource' => 'basket', 'id' => 'default', 'related' => 'product']; |
|
113 | 113 | |
114 | 114 | if( isset( $fields[$type] ) ) { |
115 | 115 | $attributes = array_intersect_key( $attributes, $fields[$type] ); |
@@ -295,8 +295,7 @@ |
||
295 | 295 | $data[] = $entryFcn( $item ); |
296 | 296 | $included = array_merge( $included, $flatFcn( $inclFcn( $item, [] ) ) ); |
297 | 297 | } |
298 | - } |
|
299 | - else |
|
298 | + } else |
|
300 | 299 | { |
301 | 300 | $data = $entryFcn( $items ); |
302 | 301 | $included = $flatFcn( $inclFcn( $items, [] ) ); |
@@ -23,7 +23,7 @@ |
||
23 | 23 | $first = ( $offset > 0 ? 0 : null ); |
24 | 24 | $prev = ( $offset - $limit >= 0 ? $offset - $limit : null ); |
25 | 25 | $next = ( $offset + $limit < $total ? $offset + $limit : null ); |
26 | -$last = ( ((int) ($total / $limit)) * $limit > $offset ? ((int) ($total / $limit)) * $limit : null ); |
|
26 | +$last = ( ( (int) ( $total / $limit ) ) * $limit > $offset ? ( (int) ( $total / $limit ) ) * $limit : null ); |
|
27 | 27 | |
28 | 28 | |
29 | 29 | $ref = array( 'resource', 'id', 'related', 'relatedid', 'filter', 'page', 'sort', 'include', 'fields' ); |
@@ -222,8 +222,7 @@ |
||
222 | 222 | $data[] = $entryFcn( $attrItem ); |
223 | 223 | $included = array_merge( $included, $flatFcn( $inclFcn( $attrItem ) ) ); |
224 | 224 | } |
225 | - } |
|
226 | - else |
|
225 | + } else |
|
227 | 226 | { |
228 | 227 | $data = $entryFcn( $items ); |
229 | 228 | $included = $flatFcn( $inclFcn( $items ) ); |
@@ -28,9 +28,12 @@ |
||
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 | } |
@@ -101,8 +101,7 @@ |
||
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 | } |
@@ -96,8 +96,7 @@ |
||
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 | } |