@@ -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' ), array( 'errors' => $this->errors ) ); ?> |
|
195 | + "errors": <?= $this->partial($this->config($this->get('partial-errors', 'admin/jsonadm/partials/template-errors'), 'partials/errors-standard'), 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' ), 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'), 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' ), 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'), array('childItems' => $this->get('childItems', []), 'refItems' => $this->get('refItems', []))); ?> |
|
202 | 202 | |
203 | 203 | <?php endif; ?> |
204 | 204 |
@@ -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' ), array( 'errors' => $this->errors ) ); ?> |
|
60 | + , "errors": <?= $this->partial($this->config($this->get('partial-errors', 'admin/jsonadm/partials/template-errors'), 'partials/errors-standard'), 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' ), 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 | } |
@@ -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' ), array( 'errors' => $this->errors ) ); ?> |
|
27 | + ,"errors": <?= $this->partial($this->config('admin/jsonadm/partials/template-errors', 'partials/errors-standard'), array('errors' => $this->errors)); ?> |
|
28 | 28 | |
29 | 29 | <?php endif; ?> |
30 | 30 |
@@ -10,9 +10,9 @@ |
||
10 | 10 | |
11 | 11 | ?> |
12 | 12 | { |
13 | - <?php if( isset( $this->errors ) ) : ?> |
|
13 | + <?php if (isset($this->errors)) : ?> |
|
14 | 14 | |
15 | - "errors": <?= $this->partial( $this->config( 'admin/jsonadm/partials/template-errors', 'partials/errors-standard' ), array( 'errors' => $this->errors ) ); ?> |
|
15 | + "errors": <?= $this->partial($this->config('admin/jsonadm/partials/template-errors', 'partials/errors-standard'), array('errors' => $this->errors)); ?> |
|
16 | 16 | |
17 | 17 | <?php endif; ?> |
18 | 18 |
@@ -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' ), array( 'errors' => $this->errors ) ); ?> |
|
46 | + ,"errors": <?= $this->partial($this->config('admin/jsonadm/partials/template-errors', 'partials/errors-standard'), array('errors' => $this->errors)); ?> |
|
47 | 47 | |
48 | 48 | <?php endif; ?> |
49 | 49 |
@@ -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' ), array( 'errors' => $this->errors ) ); ?> |
|
34 | + "errors": <?= $this->partial($this->config($this->get('partial-errors', 'admin/jsonadm/partials/template-errors'), 'partials/errors-standard'), 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 | } |
@@ -123,6 +123,9 @@ |
||
123 | 123 | } |
124 | 124 | |
125 | 125 | |
126 | + /** |
|
127 | + * @param string $name |
|
128 | + */ |
|
126 | 129 | protected function access( $name ) |
127 | 130 | { |
128 | 131 | $class = new \ReflectionClass( \Aimeos\Admin\JsonAdm\Common\Factory\Base::class ); |
@@ -21,29 +21,29 @@ discard block |
||
21 | 21 | $this->context = \TestHelperJadm::getContext(); |
22 | 22 | $this->view = $this->context->getView(); |
23 | 23 | |
24 | - $this->client = new \Aimeos\Admin\JsonAdm\Product\Standard( $this->context, $this->view, [], '' ); |
|
24 | + $this->client = new \Aimeos\Admin\JsonAdm\Product\Standard($this->context, $this->view, [], ''); |
|
25 | 25 | |
26 | - $this->object = $this->getMockBuilder( \Aimeos\Admin\JsonAdm\Common\Factory\Base::class ) |
|
26 | + $this->object = $this->getMockBuilder(\Aimeos\Admin\JsonAdm\Common\Factory\Base::class) |
|
27 | 27 | ->getMockForAbstractClass(); |
28 | 28 | } |
29 | 29 | |
30 | 30 | |
31 | 31 | public function testinjectClient() |
32 | 32 | { |
33 | - $this->object->injectClient( 'test', $this->client ); |
|
33 | + $this->object->injectClient('test', $this->client); |
|
34 | 34 | } |
35 | 35 | |
36 | 36 | |
37 | 37 | public function testAddClientDecorators() |
38 | 38 | { |
39 | 39 | $config = $this->context->getConfig(); |
40 | - $config->set( 'client/jsonapi/common/decorators/default', ['Test'] ); |
|
41 | - $config->set( 'client/jsonapi/product/decorators/excludes', ['Test'] ); |
|
40 | + $config->set('client/jsonapi/common/decorators/default', ['Test']); |
|
41 | + $config->set('client/jsonapi/product/decorators/excludes', ['Test']); |
|
42 | 42 | |
43 | 43 | $params = [$this->client, $this->context, $this->view, [], 'product']; |
44 | - $result = $this->access( 'addClientDecorators' )->invokeArgs( $this->object, $params ); |
|
44 | + $result = $this->access('addClientDecorators')->invokeArgs($this->object, $params); |
|
45 | 45 | |
46 | - $this->assertInstanceOf( '\Aimeos\\Admin\\JsonAdm\\Iface', $result ); |
|
46 | + $this->assertInstanceOf('\Aimeos\\Admin\\JsonAdm\\Iface', $result); |
|
47 | 47 | } |
48 | 48 | |
49 | 49 | |
@@ -52,9 +52,9 @@ discard block |
||
52 | 52 | $prefix = '\Aimeos\\Admin\\JsonAdm\\Common\\Decorator\\'; |
53 | 53 | $params = [$this->client, ['Example'], $prefix, $this->context, $this->view, [], '']; |
54 | 54 | |
55 | - $result = $this->access( 'addDecorators' )->invokeArgs( $this->object, $params ); |
|
55 | + $result = $this->access('addDecorators')->invokeArgs($this->object, $params); |
|
56 | 56 | |
57 | - $this->assertInstanceOf( '\Aimeos\\Admin\\JsonAdm\\Iface', $result ); |
|
57 | + $this->assertInstanceOf('\Aimeos\\Admin\\JsonAdm\\Iface', $result); |
|
58 | 58 | } |
59 | 59 | |
60 | 60 | |
@@ -63,8 +63,8 @@ discard block |
||
63 | 63 | $prefix = '\Aimeos\\Admin\\JsonAdm\\Common\\Decorator\\'; |
64 | 64 | $params = [$this->client, ['Test'], $prefix, $this->context, $this->view, [], '']; |
65 | 65 | |
66 | - $this->setExpectedException( \Aimeos\Admin\JsonAdm\Exception::class ); |
|
67 | - $this->access( 'addDecorators' )->invokeArgs( $this->object, $params ); |
|
66 | + $this->setExpectedException(\Aimeos\Admin\JsonAdm\Exception::class); |
|
67 | + $this->access('addDecorators')->invokeArgs($this->object, $params); |
|
68 | 68 | } |
69 | 69 | |
70 | 70 | |
@@ -73,8 +73,8 @@ discard block |
||
73 | 73 | $prefix = '\Aimeos\\Admin\\JsonAdm\\Common\\Decorator\\'; |
74 | 74 | $params = [$this->client, [''], $prefix, $this->context, $this->view, [], '']; |
75 | 75 | |
76 | - $this->setExpectedException( \Aimeos\Admin\JsonAdm\Exception::class ); |
|
77 | - $this->access( 'addDecorators' )->invokeArgs( $this->object, $params ); |
|
76 | + $this->setExpectedException(\Aimeos\Admin\JsonAdm\Exception::class); |
|
77 | + $this->access('addDecorators')->invokeArgs($this->object, $params); |
|
78 | 78 | } |
79 | 79 | |
80 | 80 | |
@@ -84,9 +84,9 @@ discard block |
||
84 | 84 | $class = '\Aimeos\\Admin\\JsonAdm\\Product\\Standard'; |
85 | 85 | $params = [$class, $iface, $this->context, $this->view, [], '']; |
86 | 86 | |
87 | - $result = $this->access( 'createClientBase' )->invokeArgs( $this->object, $params ); |
|
87 | + $result = $this->access('createClientBase')->invokeArgs($this->object, $params); |
|
88 | 88 | |
89 | - $this->assertInstanceOf( '\Aimeos\\Admin\\JsonAdm\\Iface', $result ); |
|
89 | + $this->assertInstanceOf('\Aimeos\\Admin\\JsonAdm\\Iface', $result); |
|
90 | 90 | } |
91 | 91 | |
92 | 92 | |
@@ -95,10 +95,10 @@ discard block |
||
95 | 95 | $iface = '\Aimeos\\Admin\\JsonAdm\\Iface'; |
96 | 96 | $params = ['test', $iface, $this->context, $this->view, [], '']; |
97 | 97 | |
98 | - $this->object->injectClient( 'test', $this->client ); |
|
99 | - $result = $this->access( 'createClientBase' )->invokeArgs( $this->object, $params ); |
|
98 | + $this->object->injectClient('test', $this->client); |
|
99 | + $result = $this->access('createClientBase')->invokeArgs($this->object, $params); |
|
100 | 100 | |
101 | - $this->assertSame( $this->client, $result ); |
|
101 | + $this->assertSame($this->client, $result); |
|
102 | 102 | } |
103 | 103 | |
104 | 104 | |
@@ -107,8 +107,8 @@ discard block |
||
107 | 107 | $iface = '\Aimeos\\Admin\\JsonAdm\\Iface'; |
108 | 108 | $params = ['invalid', $iface, $this->context, $this->view, [], '']; |
109 | 109 | |
110 | - $this->setExpectedException( \Aimeos\Admin\JsonAdm\Exception::class ); |
|
111 | - $this->access( 'createClientBase' )->invokeArgs( $this->object, $params ); |
|
110 | + $this->setExpectedException(\Aimeos\Admin\JsonAdm\Exception::class); |
|
111 | + $this->access('createClientBase')->invokeArgs($this->object, $params); |
|
112 | 112 | } |
113 | 113 | |
114 | 114 | |
@@ -118,16 +118,16 @@ discard block |
||
118 | 118 | $class = '\Aimeos\\Admin\\JsonAdm\\Product\\Standard'; |
119 | 119 | $params = [$class, $iface, $this->context, $this->view, [], '']; |
120 | 120 | |
121 | - $this->setExpectedException( \Aimeos\MW\Common\Exception::class ); |
|
122 | - $this->access( 'createClientBase' )->invokeArgs( $this->object, $params ); |
|
121 | + $this->setExpectedException(\Aimeos\MW\Common\Exception::class); |
|
122 | + $this->access('createClientBase')->invokeArgs($this->object, $params); |
|
123 | 123 | } |
124 | 124 | |
125 | 125 | |
126 | - protected function access( $name ) |
|
126 | + protected function access($name) |
|
127 | 127 | { |
128 | - $class = new \ReflectionClass( \Aimeos\Admin\JsonAdm\Common\Factory\Base::class ); |
|
129 | - $method = $class->getMethod( $name ); |
|
130 | - $method->setAccessible( true ); |
|
128 | + $class = new \ReflectionClass(\Aimeos\Admin\JsonAdm\Common\Factory\Base::class); |
|
129 | + $method = $class->getMethod($name); |
|
130 | + $method->setAccessible(true); |
|
131 | 131 | |
132 | 132 | return $method; |
133 | 133 | } |
@@ -21,88 +21,88 @@ |
||
21 | 21 | $context = \TestHelperJadm::getContext(); |
22 | 22 | $this->view = $context->getView(); |
23 | 23 | |
24 | - $this->stub = $this->getMockBuilder( '\\Aimeos\\Admin\\JsonAdm\\Standard' ) |
|
25 | - ->setConstructorArgs( array( $context, $this->view, [], 'attribute' ) ) |
|
24 | + $this->stub = $this->getMockBuilder('\\Aimeos\\Admin\\JsonAdm\\Standard') |
|
25 | + ->setConstructorArgs(array($context, $this->view, [], 'attribute')) |
|
26 | 26 | ->getMock(); |
27 | 27 | |
28 | - $this->object = $this->getMockBuilder( '\\Aimeos\\Admin\\JsonAdm\\Common\\Decorator\Base' ) |
|
29 | - ->setConstructorArgs( [$this->stub, $context, $this->view, [], ''] ) |
|
28 | + $this->object = $this->getMockBuilder('\\Aimeos\\Admin\\JsonAdm\\Common\\Decorator\Base') |
|
29 | + ->setConstructorArgs([$this->stub, $context, $this->view, [], '']) |
|
30 | 30 | ->getMockForAbstractClass(); |
31 | 31 | } |
32 | 32 | |
33 | 33 | |
34 | 34 | protected function tearDown() |
35 | 35 | { |
36 | - unset( $this->object, $this->stub, $this->view ); |
|
36 | + unset($this->object, $this->stub, $this->view); |
|
37 | 37 | } |
38 | 38 | |
39 | 39 | |
40 | 40 | public function testDelete() |
41 | 41 | { |
42 | - $this->stub->expects( $this->once() )->method( 'delete' )->will( $this->returnArgument( 1 ) ); |
|
42 | + $this->stub->expects($this->once())->method('delete')->will($this->returnArgument(1)); |
|
43 | 43 | $response = $this->view->response(); |
44 | 44 | |
45 | - $this->assertSame( $response, $this->object->delete( $this->view->request(), $response ) ); |
|
45 | + $this->assertSame($response, $this->object->delete($this->view->request(), $response)); |
|
46 | 46 | } |
47 | 47 | |
48 | 48 | |
49 | 49 | public function testGet() |
50 | 50 | { |
51 | - $this->stub->expects( $this->once() )->method( 'get' )->will( $this->returnArgument( 1 ) ); |
|
51 | + $this->stub->expects($this->once())->method('get')->will($this->returnArgument(1)); |
|
52 | 52 | $response = $this->view->response(); |
53 | 53 | |
54 | - $this->assertSame( $response, $this->object->get( $this->view->request(), $response ) ); |
|
54 | + $this->assertSame($response, $this->object->get($this->view->request(), $response)); |
|
55 | 55 | } |
56 | 56 | |
57 | 57 | |
58 | 58 | public function testPatch() |
59 | 59 | { |
60 | - $this->stub->expects( $this->once() )->method( 'patch' )->will( $this->returnArgument( 1 ) ); |
|
60 | + $this->stub->expects($this->once())->method('patch')->will($this->returnArgument(1)); |
|
61 | 61 | $response = $this->view->response(); |
62 | 62 | |
63 | - $this->assertSame( $response, $this->object->patch( $this->view->request(), $response ) ); |
|
63 | + $this->assertSame($response, $this->object->patch($this->view->request(), $response)); |
|
64 | 64 | } |
65 | 65 | |
66 | 66 | |
67 | 67 | public function testPost() |
68 | 68 | { |
69 | - $this->stub->expects( $this->once() )->method( 'post' )->will( $this->returnArgument( 1 ) ); |
|
69 | + $this->stub->expects($this->once())->method('post')->will($this->returnArgument(1)); |
|
70 | 70 | $response = $this->view->response(); |
71 | 71 | |
72 | - $this->assertSame( $response, $this->object->post( $this->view->request(), $response ) ); |
|
72 | + $this->assertSame($response, $this->object->post($this->view->request(), $response)); |
|
73 | 73 | } |
74 | 74 | |
75 | 75 | |
76 | 76 | public function testPut() |
77 | 77 | { |
78 | - $this->stub->expects( $this->once() )->method( 'put' )->will( $this->returnArgument( 1 ) ); |
|
78 | + $this->stub->expects($this->once())->method('put')->will($this->returnArgument(1)); |
|
79 | 79 | $response = $this->view->response(); |
80 | 80 | |
81 | - $this->assertSame( $response, $this->object->put( $this->view->request(), $response ) ); |
|
81 | + $this->assertSame($response, $this->object->put($this->view->request(), $response)); |
|
82 | 82 | } |
83 | 83 | |
84 | 84 | |
85 | 85 | public function testOptions() |
86 | 86 | { |
87 | - $this->stub->expects( $this->once() )->method( 'options' )->will( $this->returnArgument( 1 ) ); |
|
87 | + $this->stub->expects($this->once())->method('options')->will($this->returnArgument(1)); |
|
88 | 88 | $response = $this->view->response(); |
89 | 89 | |
90 | - $this->assertSame( $response, $this->object->options( $this->view->request(), $response ) ); |
|
90 | + $this->assertSame($response, $this->object->options($this->view->request(), $response)); |
|
91 | 91 | } |
92 | 92 | |
93 | 93 | |
94 | 94 | public function testGetClient() |
95 | 95 | { |
96 | - $result = $this->access( 'getClient' )->invokeArgs( $this->object, [] ); |
|
97 | - $this->assertSame( $this->stub, $result ); |
|
96 | + $result = $this->access('getClient')->invokeArgs($this->object, []); |
|
97 | + $this->assertSame($this->stub, $result); |
|
98 | 98 | } |
99 | 99 | |
100 | 100 | |
101 | - protected function access( $name ) |
|
101 | + protected function access($name) |
|
102 | 102 | { |
103 | - $class = new \ReflectionClass( \Aimeos\Admin\JsonAdm\Common\Decorator\Base::class ); |
|
104 | - $method = $class->getMethod( $name ); |
|
105 | - $method->setAccessible( true ); |
|
103 | + $class = new \ReflectionClass(\Aimeos\Admin\JsonAdm\Common\Decorator\Base::class); |
|
104 | + $method = $class->getMethod($name); |
|
105 | + $method->setAccessible(true); |
|
106 | 106 | |
107 | 107 | return $method; |
108 | 108 | } |
@@ -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' ), array( 'errors' => $this->errors ) ); ?> |
|
27 | + , "errors": <?= $this->partial($this->config('admin/jsonadm/partials/template-errors', 'partials/errors-standard'), 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' ), array( 'data' => $this->get( 'data' ) ) ); ?> |
|
31 | + , "data": <?= $this->partial($this->config('admin/jsonadm/partials/template-data', 'partials/data-standard'), array('data' => $this->get('data'))); ?> |
|
32 | 32 | |
33 | 33 | <?php endif; ?> |
34 | 34 |