@@ -8,32 +8,32 @@ discard block |
||
8 | 8 | */ |
9 | 9 | |
10 | 10 | |
11 | -$target = $this->config( 'admin/jsonadm/url/target' ); |
|
12 | -$cntl = $this->config( 'admin/jsonadm/url/controller', 'jsonadm' ); |
|
13 | -$action = $this->config( 'admin/jsonadm/url/action', 'get' ); |
|
14 | -$config = $this->config( 'admin/jsonadm/url/config', [] ); |
|
11 | +$target = $this->config('admin/jsonadm/url/target'); |
|
12 | +$cntl = $this->config('admin/jsonadm/url/controller', 'jsonadm'); |
|
13 | +$action = $this->config('admin/jsonadm/url/action', 'get'); |
|
14 | +$config = $this->config('admin/jsonadm/url/config', []); |
|
15 | 15 | |
16 | 16 | |
17 | 17 | $resources = $attributes = []; |
18 | -$site = $this->param( 'site', 'default' ); |
|
18 | +$site = $this->param('site', 'default'); |
|
19 | 19 | |
20 | -foreach( $this->get( 'resources', [] ) as $resource ) { |
|
21 | - $resources[$resource] = $this->url( $target, $cntl, $action, ['site' => $site, 'resource' => $resource], [], $config ); |
|
20 | +foreach ($this->get('resources', []) as $resource) { |
|
21 | + $resources[$resource] = $this->url($target, $cntl, $action, ['site' => $site, 'resource' => $resource], [], $config); |
|
22 | 22 | } |
23 | 23 | |
24 | -foreach( $this->get( 'attributes', [] ) as $attr ) { |
|
25 | - $attributes[$attr->getCode()] = $attr->toArray( true ); |
|
24 | +foreach ($this->get('attributes', []) as $attr) { |
|
25 | + $attributes[$attr->getCode()] = $attr->toArray(true); |
|
26 | 26 | } |
27 | 27 | |
28 | 28 | |
29 | 29 | ?> |
30 | 30 | { |
31 | 31 | "meta": { |
32 | - "prefix": <?= json_encode( $this->get( 'prefix' ) ); ?>, |
|
33 | - "resources": <?= json_encode( $resources ); ?>, |
|
34 | - "attributes": <?= json_encode( $attributes ); ?> |
|
32 | + "prefix": <?= json_encode($this->get('prefix')); ?>, |
|
33 | + "resources": <?= json_encode($resources); ?>, |
|
34 | + "attributes": <?= json_encode($attributes); ?> |
|
35 | 35 | |
36 | - <?php if( $this->csrf()->name() != '' ) : ?> |
|
36 | + <?php if ($this->csrf()->name() != '') : ?> |
|
37 | 37 | , "csrf": { |
38 | 38 | "name": "<?= $this->csrf()->name(); ?>", |
39 | 39 | "value": "<?= $this->csrf()->value(); ?>" |
@@ -41,9 +41,9 @@ discard block |
||
41 | 41 | <?php endif; ?> |
42 | 42 | } |
43 | 43 | |
44 | - <?php if( isset( $this->errors ) ) : ?> |
|
44 | + <?php if (isset($this->errors)) : ?> |
|
45 | 45 | |
46 | - ,"errors": <?= $this->partial( $this->config( 'admin/jsonadm/partials/template-errors', 'partials/errors-standard.php' ), array( 'errors' => $this->errors ) ); ?> |
|
46 | + ,"errors": <?= $this->partial($this->config('admin/jsonadm/partials/template-errors', 'partials/errors-standard.php'), array('errors' => $this->errors)); ?> |
|
47 | 47 | |
48 | 48 | <?php endif; ?> |
49 | 49 |
@@ -22,7 +22,7 @@ discard block |
||
22 | 22 | $this->context = \TestHelperJadm::getContext(); |
23 | 23 | $this->view = $this->context->getView(); |
24 | 24 | |
25 | - $this->object = new \Aimeos\Admin\JsonAdm\Coupon\Config\Standard( $this->context, $this->view, $templatePaths, 'coupon/config' ); |
|
25 | + $this->object = new \Aimeos\Admin\JsonAdm\Coupon\Config\Standard($this->context, $this->view, $templatePaths, 'coupon/config'); |
|
26 | 26 | } |
27 | 27 | |
28 | 28 | |
@@ -31,20 +31,20 @@ discard block |
||
31 | 31 | $params = array( |
32 | 32 | 'id' => 'Example,Required,BasketValues', |
33 | 33 | ); |
34 | - $helper = new \Aimeos\MW\View\Helper\Param\Standard( $this->view, $params ); |
|
35 | - $this->view->addHelper( 'param', $helper ); |
|
34 | + $helper = new \Aimeos\MW\View\Helper\Param\Standard($this->view, $params); |
|
35 | + $this->view->addHelper('param', $helper); |
|
36 | 36 | |
37 | - $response = $this->object->get( $this->view->request(), $this->view->response() ); |
|
38 | - $result = json_decode( (string) $response->getBody(), true ); |
|
37 | + $response = $this->object->get($this->view->request(), $this->view->response()); |
|
38 | + $result = json_decode((string) $response->getBody(), true); |
|
39 | 39 | |
40 | - $this->assertEquals( 200, $response->getStatusCode() ); |
|
41 | - $this->assertEquals( 1, count( $response->getHeader( 'Content-Type' ) ) ); |
|
40 | + $this->assertEquals(200, $response->getStatusCode()); |
|
41 | + $this->assertEquals(1, count($response->getHeader('Content-Type'))); |
|
42 | 42 | |
43 | - $this->assertEquals( 2, $result['meta']['total'] ); |
|
44 | - $this->assertInternalType( 'array', $result['data'] ); |
|
45 | - $this->assertEquals( 'basketvalues.total-value-min', $result['data'][0]['id'] ); |
|
46 | - $this->assertEquals( 'basketvalues.total-value-max', $result['data'][1]['id'] ); |
|
43 | + $this->assertEquals(2, $result['meta']['total']); |
|
44 | + $this->assertInternalType('array', $result['data']); |
|
45 | + $this->assertEquals('basketvalues.total-value-min', $result['data'][0]['id']); |
|
46 | + $this->assertEquals('basketvalues.total-value-max', $result['data'][1]['id']); |
|
47 | 47 | |
48 | - $this->assertArrayNotHasKey( 'errors', $result ); |
|
48 | + $this->assertArrayNotHasKey('errors', $result); |
|
49 | 49 | } |
50 | 50 | } |
51 | 51 | \ No newline at end of file |
@@ -118,16 +118,14 @@ |
||
118 | 118 | { |
119 | 119 | $response = $this->getItems( $view, $request, $response ); |
120 | 120 | $status = 200; |
121 | - } |
|
122 | - catch( \Aimeos\MShop\Exception $e ) |
|
121 | + } catch( \Aimeos\MShop\Exception $e ) |
|
123 | 122 | { |
124 | 123 | $status = 404; |
125 | 124 | $view->errors = array( array( |
126 | 125 | 'title' => $this->getContext()->getI18n()->dt( 'mshop', $e->getMessage() ), |
127 | 126 | 'detail' => $e->getTraceAsString(), |
128 | 127 | ) ); |
129 | - } |
|
130 | - catch( \Exception $e ) |
|
128 | + } catch( \Exception $e ) |
|
131 | 129 | { |
132 | 130 | $status = 500; |
133 | 131 | $view->errors = array( array( |
@@ -110,30 +110,30 @@ discard block |
||
110 | 110 | * @param \Psr\Http\Message\ResponseInterface $response Response object |
111 | 111 | * @return \Psr\Http\Message\ResponseInterface Modified response object |
112 | 112 | */ |
113 | - public function get( ServerRequestInterface $request, ResponseInterface $response ) |
|
113 | + public function get(ServerRequestInterface $request, ResponseInterface $response) |
|
114 | 114 | { |
115 | 115 | $view = $this->getView(); |
116 | 116 | |
117 | 117 | try |
118 | 118 | { |
119 | - $response = $this->getItems( $view, $request, $response ); |
|
119 | + $response = $this->getItems($view, $request, $response); |
|
120 | 120 | $status = 200; |
121 | 121 | } |
122 | - catch( \Aimeos\MShop\Exception $e ) |
|
122 | + catch (\Aimeos\MShop\Exception $e) |
|
123 | 123 | { |
124 | 124 | $status = 404; |
125 | - $view->errors = array( array( |
|
126 | - 'title' => $this->getContext()->getI18n()->dt( 'mshop', $e->getMessage() ), |
|
125 | + $view->errors = array(array( |
|
126 | + 'title' => $this->getContext()->getI18n()->dt('mshop', $e->getMessage()), |
|
127 | 127 | 'detail' => $e->getTraceAsString(), |
128 | - ) ); |
|
128 | + )); |
|
129 | 129 | } |
130 | - catch( \Exception $e ) |
|
130 | + catch (\Exception $e) |
|
131 | 131 | { |
132 | 132 | $status = 500; |
133 | - $view->errors = array( array( |
|
133 | + $view->errors = array(array( |
|
134 | 134 | 'title' => $e->getMessage(), |
135 | 135 | 'detail' => $e->getTraceAsString(), |
136 | - ) ); |
|
136 | + )); |
|
137 | 137 | } |
138 | 138 | |
139 | 139 | /** admin/jsonadm/coupon/config/template-get |
@@ -158,11 +158,11 @@ discard block |
||
158 | 158 | $tplconf = 'admin/jsonadm/coupon/config/template-get'; |
159 | 159 | $default = 'config-default.php'; |
160 | 160 | |
161 | - $body = $view->render( $view->config( $tplconf, $default ) ); |
|
161 | + $body = $view->render($view->config($tplconf, $default)); |
|
162 | 162 | |
163 | - return $response->withHeader( 'Content-Type', 'application/vnd.api+json; supported-ext="bulk"' ) |
|
164 | - ->withBody( $view->response()->createStreamFromString( $body ) ) |
|
165 | - ->withStatus( $status ); |
|
163 | + return $response->withHeader('Content-Type', 'application/vnd.api+json; supported-ext="bulk"') |
|
164 | + ->withBody($view->response()->createStreamFromString($body)) |
|
165 | + ->withStatus($status); |
|
166 | 166 | } |
167 | 167 | |
168 | 168 | |
@@ -174,18 +174,18 @@ discard block |
||
174 | 174 | * @param \Psr\Http\Message\ResponseInterface $response Response object |
175 | 175 | * @return \Psr\Http\Message\ResponseInterface Modified response object |
176 | 176 | */ |
177 | - protected function getItems( \Aimeos\MW\View\Iface $view, ServerRequestInterface $request, ResponseInterface $response ) |
|
177 | + protected function getItems(\Aimeos\MW\View\Iface $view, ServerRequestInterface $request, ResponseInterface $response) |
|
178 | 178 | { |
179 | - if( ( $id = $view->param( 'id' ) ) == null ) { |
|
180 | - throw new \Aimeos\Admin\JsonAdm\Exception( sprintf( 'No ID given' ), 400 ); |
|
179 | + if (($id = $view->param('id')) == null) { |
|
180 | + throw new \Aimeos\Admin\JsonAdm\Exception(sprintf('No ID given'), 400); |
|
181 | 181 | } |
182 | 182 | |
183 | - $manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'coupon' ); |
|
183 | + $manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'coupon'); |
|
184 | 184 | |
185 | 185 | $item = $manager->createItem(); |
186 | - $item->setProvider( $id ); |
|
186 | + $item->setProvider($id); |
|
187 | 187 | |
188 | - $view->configItems = $manager->getProvider( $item, null )->getConfigBE(); |
|
188 | + $view->configItems = $manager->getProvider($item, null)->getConfigBE(); |
|
189 | 189 | |
190 | 190 | return $response; |
191 | 191 | } |
@@ -11,9 +11,9 @@ discard block |
||
11 | 11 | ?> |
12 | 12 | { |
13 | 13 | "meta": { |
14 | - "total": <?= $this->get( 'total', 0 ); ?> |
|
14 | + "total": <?= $this->get('total', 0); ?> |
|
15 | 15 | |
16 | - <?php if( $this->csrf()->name() != '' ) : ?> |
|
16 | + <?php if ($this->csrf()->name() != '') : ?> |
|
17 | 17 | , "csrf": { |
18 | 18 | "name": "<?= $this->csrf()->name(); ?>", |
19 | 19 | "value": "<?= $this->csrf()->value(); ?>" |
@@ -22,9 +22,9 @@ discard block |
||
22 | 22 | |
23 | 23 | } |
24 | 24 | |
25 | - <?php if( isset( $this->errors ) ) : ?> |
|
25 | + <?php if (isset($this->errors)) : ?> |
|
26 | 26 | |
27 | - ,"errors": <?= $this->partial( $this->config( 'admin/jsonadm/partials/template-errors', 'partials/errors-standard.php' ), array( 'errors' => $this->errors ) ); ?> |
|
27 | + ,"errors": <?= $this->partial($this->config('admin/jsonadm/partials/template-errors', 'partials/errors-standard.php'), array('errors' => $this->errors)); ?> |
|
28 | 28 | |
29 | 29 | <?php endif; ?> |
30 | 30 |
@@ -11,9 +11,9 @@ discard block |
||
11 | 11 | ?> |
12 | 12 | { |
13 | 13 | "meta": { |
14 | - "total": <?= $this->get( 'total', 0 ); ?> |
|
14 | + "total": <?= $this->get('total', 0); ?> |
|
15 | 15 | |
16 | - <?php if( $this->csrf()->name() != '' ) : ?> |
|
16 | + <?php if ($this->csrf()->name() != '') : ?> |
|
17 | 17 | , "csrf": { |
18 | 18 | "name": "<?= $this->csrf()->name(); ?>", |
19 | 19 | "value": "<?= $this->csrf()->value(); ?>" |
@@ -22,13 +22,13 @@ discard block |
||
22 | 22 | |
23 | 23 | } |
24 | 24 | |
25 | - <?php if( isset( $this->errors ) ) : ?> |
|
25 | + <?php if (isset($this->errors)) : ?> |
|
26 | 26 | |
27 | - , "errors": <?= $this->partial( $this->config( 'admin/jsonadm/partials/template-errors', 'partials/errors-standard.php' ), array( 'errors' => $this->errors ) ); ?> |
|
27 | + , "errors": <?= $this->partial($this->config('admin/jsonadm/partials/template-errors', 'partials/errors-standard.php'), array('errors' => $this->errors)); ?> |
|
28 | 28 | |
29 | - <?php elseif( isset( $this->data ) ) : ?> |
|
29 | + <?php elseif (isset($this->data)) : ?> |
|
30 | 30 | |
31 | - , "data": <?= $this->partial( $this->config( 'admin/jsonadm/partials/template-data', 'partials/data-standard.php' ), array( 'data' => $this->get( 'data' ) ) ); ?> |
|
31 | + , "data": <?= $this->partial($this->config('admin/jsonadm/partials/template-data', 'partials/data-standard.php'), array('data' => $this->get('data'))); ?> |
|
32 | 32 | |
33 | 33 | <?php endif; ?> |
34 | 34 |
@@ -22,7 +22,7 @@ discard block |
||
22 | 22 | * @see admin/jsonadm/url/action |
23 | 23 | * @see admin/jsonadm/url/config |
24 | 24 | */ |
25 | -$target = $this->config( 'admin/jsonadm/url/target' ); |
|
25 | +$target = $this->config('admin/jsonadm/url/target'); |
|
26 | 26 | |
27 | 27 | /** admin/jsonadm/url/controller |
28 | 28 | * Name of the client whose action should be called |
@@ -38,7 +38,7 @@ discard block |
||
38 | 38 | * @see admin/jsonadm/url/action |
39 | 39 | * @see admin/jsonadm/url/config |
40 | 40 | */ |
41 | -$cntl = $this->config( 'admin/jsonadm/url/controller', 'jsonadm' ); |
|
41 | +$cntl = $this->config('admin/jsonadm/url/controller', 'jsonadm'); |
|
42 | 42 | |
43 | 43 | /** admin/jsonadm/url/action |
44 | 44 | * Name of the action that should create the output |
@@ -54,7 +54,7 @@ discard block |
||
54 | 54 | * @see admin/jsonadm/url/controller |
55 | 55 | * @see admin/jsonadm/url/config |
56 | 56 | */ |
57 | -$action = $this->config( 'admin/jsonadm/url/action', 'get' ); |
|
57 | +$action = $this->config('admin/jsonadm/url/action', 'get'); |
|
58 | 58 | |
59 | 59 | /** admin/jsonadm/url/config |
60 | 60 | * Associative list of configuration options used for generating the URL |
@@ -76,7 +76,7 @@ discard block |
||
76 | 76 | * @see admin/jsonadm/url/controller |
77 | 77 | * @see admin/jsonadm/url/action |
78 | 78 | */ |
79 | -$config = $this->config( 'admin/jsonadm/url/config', [] ); |
|
79 | +$config = $this->config('admin/jsonadm/url/config', []); |
|
80 | 80 | |
81 | 81 | |
82 | 82 | /** admin/jsonadm/partials/template-errors |
@@ -128,22 +128,22 @@ discard block |
||
128 | 128 | */ |
129 | 129 | |
130 | 130 | |
131 | -$total = $this->get( 'total', 0 ); |
|
132 | -$offset = max( $this->param( 'page/offset', 0 ), 0 ); |
|
133 | -$limit = max( $this->param( 'page/limit', 25 ), 1 ); |
|
131 | +$total = $this->get('total', 0); |
|
132 | +$offset = max($this->param('page/offset', 0), 0); |
|
133 | +$limit = max($this->param('page/limit', 25), 1); |
|
134 | 134 | |
135 | -$first = ( $offset > 0 ? 0 : null ); |
|
136 | -$prev = ( $offset - $limit >= 0 ? $offset - $limit : null ); |
|
137 | -$next = ( $offset + $limit < $total ? $offset + $limit : null ); |
|
138 | -$last = ( ((int) ($total / $limit)) * $limit > $offset ? ((int) ($total / $limit)) * $limit : null ); |
|
135 | +$first = ($offset > 0 ? 0 : null); |
|
136 | +$prev = ($offset - $limit >= 0 ? $offset - $limit : null); |
|
137 | +$next = ($offset + $limit < $total ? $offset + $limit : null); |
|
138 | +$last = (((int) ($total / $limit)) * $limit > $offset ? ((int) ($total / $limit)) * $limit : null); |
|
139 | 139 | |
140 | 140 | |
141 | -$ref = array( 'id', 'resource', 'filter', 'page', 'sort', 'include', 'fields' ); |
|
142 | -$params = array_intersect_key( $this->param(), array_flip( $ref ) ) + ['id' => '']; |
|
143 | -$fields = $this->param( 'fields', [] ); |
|
141 | +$ref = array('id', 'resource', 'filter', 'page', 'sort', 'include', 'fields'); |
|
142 | +$params = array_intersect_key($this->param(), array_flip($ref)) + ['id' => '']; |
|
143 | +$fields = $this->param('fields', []); |
|
144 | 144 | |
145 | -foreach( (array) $fields as $resource => $list ) { |
|
146 | - $fields[$resource] = array_flip( explode( ',', $list ) ); |
|
145 | +foreach ((array) $fields as $resource => $list) { |
|
146 | + $fields[$resource] = array_flip(explode(',', $list)); |
|
147 | 147 | } |
148 | 148 | |
149 | 149 | |
@@ -152,7 +152,7 @@ discard block |
||
152 | 152 | "meta": { |
153 | 153 | "total": <?= $total; ?> |
154 | 154 | |
155 | - <?php if( $this->csrf()->name() != '' ) : ?> |
|
155 | + <?php if ($this->csrf()->name() != '') : ?> |
|
156 | 156 | , "csrf": { |
157 | 157 | "name": "<?= $this->csrf()->name(); ?>", |
158 | 158 | "value": "<?= $this->csrf()->value(); ?>" |
@@ -163,42 +163,42 @@ discard block |
||
163 | 163 | |
164 | 164 | "links": { |
165 | 165 | |
166 | - <?php if( is_array( $this->get( 'data' ) ) ) : ?> |
|
166 | + <?php if (is_array($this->get('data'))) : ?> |
|
167 | 167 | |
168 | - <?php if( $first !== null ) : ?> |
|
168 | + <?php if ($first !== null) : ?> |
|
169 | 169 | |
170 | - "first": "<?php $params['page']['offset'] = $first; echo $this->url( $target, $cntl, $action, $params, [], $config ); ?>", |
|
170 | + "first": "<?php $params['page']['offset'] = $first; echo $this->url($target, $cntl, $action, $params, [], $config); ?>", |
|
171 | 171 | |
172 | 172 | <?php endif; ?> |
173 | - <?php if( $prev !== null ) : ?> |
|
173 | + <?php if ($prev !== null) : ?> |
|
174 | 174 | |
175 | - "prev": "<?php $params['page']['offset'] = $prev; echo $this->url( $target, $cntl, $action, $params, [], $config ); ?>", |
|
175 | + "prev": "<?php $params['page']['offset'] = $prev; echo $this->url($target, $cntl, $action, $params, [], $config); ?>", |
|
176 | 176 | |
177 | 177 | <?php endif; ?> |
178 | - <?php if( $next !== null ) : ?> |
|
178 | + <?php if ($next !== null) : ?> |
|
179 | 179 | |
180 | - "next": "<?php $params['page']['offset'] = $next; echo $this->url( $target, $cntl, $action, $params, [], $config ); ?>", |
|
180 | + "next": "<?php $params['page']['offset'] = $next; echo $this->url($target, $cntl, $action, $params, [], $config); ?>", |
|
181 | 181 | |
182 | 182 | <?php endif; ?> |
183 | - <?php if( $last !== null ) : ?> |
|
183 | + <?php if ($last !== null) : ?> |
|
184 | 184 | |
185 | - "last": "<?php $params['page']['offset'] = $last; echo $this->url( $target, $cntl, $action, $params, [], $config ); ?>", |
|
185 | + "last": "<?php $params['page']['offset'] = $last; echo $this->url($target, $cntl, $action, $params, [], $config); ?>", |
|
186 | 186 | |
187 | 187 | <?php endif; ?> |
188 | 188 | <?php endif; ?> |
189 | 189 | |
190 | - "self": "<?php $params['page']['offset'] = $offset; echo $this->url( $target, $cntl, $action, $params, [], $config ); ?>" |
|
190 | + "self": "<?php $params['page']['offset'] = $offset; echo $this->url($target, $cntl, $action, $params, [], $config); ?>" |
|
191 | 191 | }, |
192 | 192 | |
193 | - <?php if( isset( $this->errors ) ) : ?> |
|
193 | + <?php if (isset($this->errors)) : ?> |
|
194 | 194 | |
195 | - "errors": <?= $this->partial( $this->config( $this->get( 'partial-errors', 'admin/jsonadm/partials/template-errors' ), 'partials/errors-standard.php' ), array( 'errors' => $this->errors ) ); ?> |
|
195 | + "errors": <?= $this->partial($this->config($this->get('partial-errors', 'admin/jsonadm/partials/template-errors'), 'partials/errors-standard.php'), array('errors' => $this->errors)); ?> |
|
196 | 196 | |
197 | - <?php elseif( isset( $this->data ) ) : ?> |
|
197 | + <?php elseif (isset($this->data)) : ?> |
|
198 | 198 | |
199 | - "data": <?= $this->partial( $this->config( $this->get( 'partial-data', 'admin/jsonadm/partials/template-data' ), 'partials/data-standard.php' ), array( 'data' => $this->get( 'data' ), 'childItems' => $this->get( 'childItems', [] ), 'listItems' => $this->get( 'listItems', [] ) ) ); ?>, |
|
199 | + "data": <?= $this->partial($this->config($this->get('partial-data', 'admin/jsonadm/partials/template-data'), 'partials/data-standard.php'), array('data' => $this->get('data'), 'childItems' => $this->get('childItems', []), 'listItems' => $this->get('listItems', []))); ?>, |
|
200 | 200 | |
201 | - "included": <?= $this->partial( $this->config( $this->get( 'partial-included', 'admin/jsonadm/partials/template-included' ), 'partials/included-standard.php' ), array( 'childItems' => $this->get( 'childItems', [] ), 'refItems' => $this->get( 'refItems', [] ) ) ); ?> |
|
201 | + "included": <?= $this->partial($this->config($this->get('partial-included', 'admin/jsonadm/partials/template-included'), 'partials/included-standard.php'), array('childItems' => $this->get('childItems', []), 'refItems' => $this->get('refItems', []))); ?> |
|
202 | 202 | |
203 | 203 | <?php endif; ?> |
204 | 204 |
@@ -8,19 +8,19 @@ discard block |
||
8 | 8 | */ |
9 | 9 | |
10 | 10 | |
11 | -$data = $this->get( 'data', [] ); |
|
11 | +$data = $this->get('data', []); |
|
12 | 12 | $entries = []; |
13 | 13 | |
14 | -foreach( $data as $key => $value ) { |
|
15 | - $entries[] = array( 'id' => $key, 'type' => 'aggregate', 'attributes' => $value ); |
|
14 | +foreach ($data as $key => $value) { |
|
15 | + $entries[] = array('id' => $key, 'type' => 'aggregate', 'attributes' => $value); |
|
16 | 16 | } |
17 | 17 | |
18 | 18 | ?> |
19 | 19 | { |
20 | 20 | "meta": { |
21 | - "total": <?= count( $data ); ?> |
|
21 | + "total": <?= count($data); ?> |
|
22 | 22 | |
23 | - <?php if( $this->csrf()->name() != '' ) : ?> |
|
23 | + <?php if ($this->csrf()->name() != '') : ?> |
|
24 | 24 | , "csrf": { |
25 | 25 | "name": "<?= $this->csrf()->name(); ?>", |
26 | 26 | "value": "<?= $this->csrf()->value(); ?>" |
@@ -29,13 +29,13 @@ discard block |
||
29 | 29 | |
30 | 30 | }, |
31 | 31 | |
32 | - <?php if( isset( $this->errors ) ) : ?> |
|
32 | + <?php if (isset($this->errors)) : ?> |
|
33 | 33 | |
34 | - "errors": <?= $this->partial( $this->config( $this->get( 'partial-errors', 'admin/jsonadm/partials/template-errors' ), 'partials/errors-standard.php' ), array( 'errors' => $this->errors ) ); ?> |
|
34 | + "errors": <?= $this->partial($this->config($this->get('partial-errors', 'admin/jsonadm/partials/template-errors'), 'partials/errors-standard.php'), array('errors' => $this->errors)); ?> |
|
35 | 35 | |
36 | - <?php elseif( isset( $this->data ) ) : ?> |
|
36 | + <?php elseif (isset($this->data)) : ?> |
|
37 | 37 | |
38 | - "data": <?= json_encode( $entries ); ?> |
|
38 | + "data": <?= json_encode($entries); ?> |
|
39 | 39 | |
40 | 40 | <?php endif; ?> |
41 | 41 | } |
@@ -11,9 +11,9 @@ discard block |
||
11 | 11 | ?> |
12 | 12 | { |
13 | 13 | "meta": { |
14 | - "total": <?= $this->get( 'total', 0 ); ?> |
|
14 | + "total": <?= $this->get('total', 0); ?> |
|
15 | 15 | |
16 | - <?php if( $this->csrf()->name() != '' ) : ?> |
|
16 | + <?php if ($this->csrf()->name() != '') : ?> |
|
17 | 17 | , "csrf": { |
18 | 18 | "name": "<?= $this->csrf()->name(); ?>", |
19 | 19 | "value": "<?= $this->csrf()->value(); ?>" |
@@ -22,13 +22,13 @@ discard block |
||
22 | 22 | |
23 | 23 | } |
24 | 24 | |
25 | - <?php if( isset( $this->errors ) ) : ?> |
|
25 | + <?php if (isset($this->errors)) : ?> |
|
26 | 26 | |
27 | - , "errors": <?= $this->partial( $this->config( 'admin/jsonadm/partials/template-errors', 'partials/errors-standard.php' ), array( 'errors' => $this->errors ) ); ?> |
|
27 | + , "errors": <?= $this->partial($this->config('admin/jsonadm/partials/template-errors', 'partials/errors-standard.php'), array('errors' => $this->errors)); ?> |
|
28 | 28 | |
29 | - <?php elseif( isset( $this->data ) ) : ?> |
|
29 | + <?php elseif (isset($this->data)) : ?> |
|
30 | 30 | |
31 | - , "data": <?= $this->partial( $this->config( 'admin/jsonadm/partials/template-data', 'partials/data-standard.php' ), array( 'data' => $this->get( 'data' ) ) ); ?> |
|
31 | + , "data": <?= $this->partial($this->config('admin/jsonadm/partials/template-data', 'partials/data-standard.php'), array('data' => $this->get('data'))); ?> |
|
32 | 32 | |
33 | 33 | <?php endif; ?> |
34 | 34 |
@@ -9,29 +9,29 @@ discard block |
||
9 | 9 | |
10 | 10 | |
11 | 11 | $options = 0; |
12 | -if( defined( 'JSON_PRETTY_PRINT' ) ) { |
|
12 | +if (defined('JSON_PRETTY_PRINT')) { |
|
13 | 13 | $options = JSON_PRETTY_PRINT; |
14 | 14 | } |
15 | 15 | |
16 | 16 | |
17 | -$fields = $this->param( 'fields', [] ); |
|
17 | +$fields = $this->param('fields', []); |
|
18 | 18 | |
19 | -foreach( (array) $fields as $resource => $list ) { |
|
20 | - $fields[$resource] = array_flip( explode( ',', $list ) ); |
|
19 | +foreach ((array) $fields as $resource => $list) { |
|
20 | + $fields[$resource] = array_flip(explode(',', $list)); |
|
21 | 21 | } |
22 | 22 | |
23 | 23 | |
24 | -$build = function( array $attrItems, $id ) use ( $fields ) |
|
24 | +$build = function(array $attrItems, $id) use ($fields) |
|
25 | 25 | { |
26 | 26 | $result = []; |
27 | 27 | $type = 'criteria/attribute'; |
28 | 28 | |
29 | - foreach( $attrItems as $attrItem ) |
|
29 | + foreach ($attrItems as $attrItem) |
|
30 | 30 | { |
31 | - $attributes = $attrItem->toArray( true ); |
|
31 | + $attributes = $attrItem->toArray(true); |
|
32 | 32 | |
33 | - if( isset( $fields[$type] ) ) { |
|
34 | - $attributes = array_intersect_key( $attributes, $fields[$type] ); |
|
33 | + if (isset($fields[$type])) { |
|
34 | + $attributes = array_intersect_key($attributes, $fields[$type]); |
|
35 | 35 | } |
36 | 36 | |
37 | 37 | $result[] = array( |
@@ -45,23 +45,23 @@ discard block |
||
45 | 45 | }; |
46 | 46 | |
47 | 47 | |
48 | -$configItems = $this->get( 'configItems', [] ); |
|
48 | +$configItems = $this->get('configItems', []); |
|
49 | 49 | |
50 | 50 | |
51 | 51 | ?> |
52 | 52 | { |
53 | 53 | "meta": { |
54 | - "total": <?= count( $configItems ); ?> |
|
54 | + "total": <?= count($configItems); ?> |
|
55 | 55 | |
56 | 56 | } |
57 | 57 | |
58 | - <?php if( isset( $this->errors ) ) : ?> |
|
58 | + <?php if (isset($this->errors)) : ?> |
|
59 | 59 | |
60 | - , "errors": <?= $this->partial( $this->config( $this->get( 'partial-errors', 'admin/jsonadm/partials/template-errors' ), 'partials/errors-standard.php' ), array( 'errors' => $this->errors ) ); ?> |
|
60 | + , "errors": <?= $this->partial($this->config($this->get('partial-errors', 'admin/jsonadm/partials/template-errors'), 'partials/errors-standard.php'), array('errors' => $this->errors)); ?> |
|
61 | 61 | |
62 | 62 | <?php else : ?> |
63 | 63 | |
64 | - , "data": <?= json_encode( $build( $configItems, $this->param( 'id' ) ), $options ); ?> |
|
64 | + , "data": <?= json_encode($build($configItems, $this->param('id')), $options); ?> |
|
65 | 65 | |
66 | 66 | <?php endif; ?> |
67 | 67 | } |
@@ -59,9 +59,12 @@ |
||
59 | 59 | |
60 | 60 | , "errors": <?= $this->partial( $this->config( $this->get( 'partial-errors', 'admin/jsonadm/partials/template-errors' ), 'partials/errors-standard.php' ), array( 'errors' => $this->errors ) ); ?> |
61 | 61 | |
62 | - <?php else : ?> |
|
62 | + <?php else { |
|
63 | + : ?> |
|
63 | 64 | |
64 | - , "data": <?= json_encode( $build( $configItems, $this->param( 'id' ) ), $options ); ?> |
|
65 | + , "data": <?= json_encode( $build( $configItems, $this->param( 'id' ) ), $options ); |
|
66 | +} |
|
67 | +?> |
|
65 | 68 | |
66 | 69 | <?php endif; ?> |
67 | 70 | } |