| @@ -8,27 +8,27 @@ | ||
| 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": <?php echo count( $data ); ?> | |
| 21 | + "total": <?php echo count($data); ?> | |
| 22 | 22 | |
| 23 | 23 | }, | 
| 24 | 24 | |
| 25 | - <?php if( isset( $this->errors ) ) : ?> | |
| 25 | + <?php if (isset($this->errors)) : ?> | |
| 26 | 26 | |
| 27 | - "errors": <?php echo $this->partial( $this->config( $this->get( 'partial-errors', 'admin/jsonadm/partials/template-errors' ), 'partials/errors-standard.php' ), array( 'errors' => $this->errors ) ); ?> | |
| 27 | +		"errors": <?php echo $this->partial($this->config($this->get('partial-errors', '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": <?php echo json_encode( $entries ); ?> | |
| 31 | + "data": <?php echo json_encode($entries); ?> | |
| 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 ) ); | |
| 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)); | |
| 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 | |
| @@ -156,42 +156,42 @@ discard block | ||
| 156 | 156 | |
| 157 | 157 |  	"links": { | 
| 158 | 158 | |
| 159 | - <?php if( is_array( $this->get( 'data' ) ) ) : ?> | |
| 159 | +		<?php if (is_array($this->get('data'))) : ?> | |
| 160 | 160 | |
| 161 | - <?php if( $first !== null ) : ?> | |
| 161 | + <?php if ($first !== null) : ?> | |
| 162 | 162 | |
| 163 | - "first": "<?php $params['page']['offset'] = $first; echo $this->url( $target, $cntl, $action, $params, [], $config ); ?>", | |
| 163 | + "first": "<?php $params['page']['offset'] = $first; echo $this->url($target, $cntl, $action, $params, [], $config); ?>", | |
| 164 | 164 | |
| 165 | 165 | <?php endif; ?> | 
| 166 | - <?php if( $prev !== null ) : ?> | |
| 166 | + <?php if ($prev !== null) : ?> | |
| 167 | 167 | |
| 168 | - "prev": "<?php $params['page']['offset'] = $prev; echo $this->url( $target, $cntl, $action, $params, [], $config ); ?>", | |
| 168 | + "prev": "<?php $params['page']['offset'] = $prev; echo $this->url($target, $cntl, $action, $params, [], $config); ?>", | |
| 169 | 169 | |
| 170 | 170 | <?php endif; ?> | 
| 171 | - <?php if( $next !== null ) : ?> | |
| 171 | + <?php if ($next !== null) : ?> | |
| 172 | 172 | |
| 173 | - "next": "<?php $params['page']['offset'] = $next; echo $this->url( $target, $cntl, $action, $params, [], $config ); ?>", | |
| 173 | + "next": "<?php $params['page']['offset'] = $next; echo $this->url($target, $cntl, $action, $params, [], $config); ?>", | |
| 174 | 174 | |
| 175 | 175 | <?php endif; ?> | 
| 176 | - <?php if( $last !== null ) : ?> | |
| 176 | + <?php if ($last !== null) : ?> | |
| 177 | 177 | |
| 178 | - "last": "<?php $params['page']['offset'] = $last; echo $this->url( $target, $cntl, $action, $params, [], $config ); ?>", | |
| 178 | + "last": "<?php $params['page']['offset'] = $last; echo $this->url($target, $cntl, $action, $params, [], $config); ?>", | |
| 179 | 179 | |
| 180 | 180 | <?php endif; ?> | 
| 181 | 181 | <?php endif; ?> | 
| 182 | 182 | |
| 183 | - "self": "<?php $params['page']['offset'] = $offset; echo $this->url( $target, $cntl, $action, $params, [], $config ); ?>" | |
| 183 | + "self": "<?php $params['page']['offset'] = $offset; echo $this->url($target, $cntl, $action, $params, [], $config); ?>" | |
| 184 | 184 | }, | 
| 185 | 185 | |
| 186 | - <?php if( isset( $this->errors ) ) : ?> | |
| 186 | + <?php if (isset($this->errors)) : ?> | |
| 187 | 187 | |
| 188 | - "errors": <?php echo $this->partial( $this->config( $this->get( 'partial-errors', 'admin/jsonadm/partials/template-errors' ), 'partials/errors-standard.php' ), array( 'errors' => $this->errors ) ); ?> | |
| 188 | +		"errors": <?php echo $this->partial($this->config($this->get('partial-errors', 'admin/jsonadm/partials/template-errors'), 'partials/errors-standard.php'), array('errors' => $this->errors)); ?> | |
| 189 | 189 | |
| 190 | - <?php elseif( isset( $this->data ) ) : ?> | |
| 190 | + <?php elseif (isset($this->data)) : ?> | |
| 191 | 191 | |
| 192 | - "data": <?php echo $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', [] ) ) ); ?>, | |
| 192 | +		"data": <?php echo $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', []))); ?>, | |
| 193 | 193 | |
| 194 | - "included": <?php echo $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', [] ) ) ); ?> | |
| 194 | +		"included": <?php echo $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', []))); ?> | |
| 195 | 195 | |
| 196 | 196 | <?php endif; ?> | 
| 197 | 197 | |
| @@ -11,13 +11,13 @@ | ||
| 11 | 11 | ?> | 
| 12 | 12 |  { | 
| 13 | 13 |  	"meta": { | 
| 14 | - "total": <?php echo $this->get( 'total', 0 ); ?> | |
| 14 | +		"total": <?php echo $this->get('total', 0); ?> | |
| 15 | 15 | |
| 16 | 16 | } | 
| 17 | 17 | |
| 18 | - <?php if( isset( $this->errors ) ) : ?> | |
| 18 | + <?php if (isset($this->errors)) : ?> | |
| 19 | 19 | |
| 20 | - ,"errors": <?php echo $this->partial( $this->config( 'admin/jsonadm/partials/template-errors', 'partials/errors-standard.php' ), array( 'errors' => $this->errors ) ); ?> | |
| 20 | +		,"errors": <?php echo $this->partial($this->config('admin/jsonadm/partials/template-errors', 'partials/errors-standard.php'), array('errors' => $this->errors)); ?> | |
| 21 | 21 | |
| 22 | 22 | <?php endif; ?> | 
| 23 | 23 | |
| @@ -11,17 +11,17 @@ | ||
| 11 | 11 | ?> | 
| 12 | 12 |  { | 
| 13 | 13 |  	"meta": { | 
| 14 | - "total": <?php echo $this->get( 'total', 0 ); ?> | |
| 14 | +		"total": <?php echo $this->get('total', 0); ?> | |
| 15 | 15 | |
| 16 | 16 | } | 
| 17 | 17 | |
| 18 | - <?php if( isset( $this->errors ) ) : ?> | |
| 18 | + <?php if (isset($this->errors)) : ?> | |
| 19 | 19 | |
| 20 | - , "errors": <?php echo $this->partial( $this->config( 'admin/jsonadm/partials/template-errors', 'partials/errors-standard.php' ), array( 'errors' => $this->errors ) ); ?> | |
| 20 | +		, "errors": <?php echo $this->partial($this->config('admin/jsonadm/partials/template-errors', 'partials/errors-standard.php'), array('errors' => $this->errors)); ?> | |
| 21 | 21 | |
| 22 | - <?php elseif( isset( $this->data ) ) : ?> | |
| 22 | + <?php elseif (isset($this->data)) : ?> | |
| 23 | 23 | |
| 24 | - , "data": <?php echo $this->partial( $this->config( 'admin/jsonadm/partials/template-data', 'partials/data-standard.php' ), array( 'data' => $this->get( 'data' ) ) ); ?> | |
| 24 | +		, "data": <?php echo $this->partial($this->config('admin/jsonadm/partials/template-data', 'partials/data-standard.php'), array('data' => $this->get('data'))); ?> | |
| 25 | 25 | |
| 26 | 26 | <?php endif; ?> | 
| 27 | 27 | |
| @@ -8,35 +8,35 @@ | ||
| 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": <?php echo json_encode( $this->get( 'prefix' ) ); ?>, | |
| 33 | - "resources": <?php echo json_encode( $resources ); ?>, | |
| 34 | - "attributes": <?php echo json_encode( $attributes ); ?> | |
| 32 | +		"prefix": <?php echo json_encode($this->get('prefix')); ?>, | |
| 33 | + "resources": <?php echo json_encode($resources); ?>, | |
| 34 | + "attributes": <?php echo json_encode($attributes); ?> | |
| 35 | 35 | } | 
| 36 | 36 | |
| 37 | - <?php if( isset( $this->errors ) ) : ?> | |
| 37 | + <?php if (isset($this->errors)) : ?> | |
| 38 | 38 | |
| 39 | - ,"errors": <?php echo $this->partial( $this->config( 'admin/jsonadm/partials/template-errors', 'partials/errors-standard.php' ), array( 'errors' => $this->errors ) ); ?> | |
| 39 | +		,"errors": <?php echo $this->partial($this->config('admin/jsonadm/partials/template-errors', 'partials/errors-standard.php'), array('errors' => $this->errors)); ?> | |
| 40 | 40 | |
| 41 | 41 | <?php endif; ?> | 
| 42 | 42 | |
| @@ -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": <?php echo $this->partial( $this->config( 'admin/jsonadm/partials/template-errors', 'partials/errors-standard.php' ), array( 'errors' => $this->errors ) ); ?> | |
| 15 | +		"errors": <?php echo $this->partial($this->config('admin/jsonadm/partials/template-errors', 'partials/errors-standard.php'), array('errors' => $this->errors)); ?> | |
| 16 | 16 | |
| 17 | 17 | <?php endif; ?> | 
| 18 | 18 | |
| @@ -9,9 +9,9 @@ | ||
| 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 | -echo json_encode( $this->get( 'errors', [] ), $options ); | |
| 18 | 17 | \ No newline at end of file | 
| 18 | +echo json_encode($this->get('errors', []), $options); | |
| 19 | 19 | \ No newline at end of file | 
| @@ -9,35 +9,35 @@ 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 $items ) use ( $fields ) | |
| 24 | +$build = function(array $items) use ($fields) | |
| 25 | 25 |  { | 
| 26 | 26 | $list = []; | 
| 27 | 27 | |
| 28 | - $target = $this->config( 'admin/jsonadm/url/target' ); | |
| 29 | - $cntl = $this->config( 'admin/jsonadm/url/controller', 'jsonadm' ); | |
| 30 | - $action = $this->config( 'admin/jsonadm/url/action', 'get' ); | |
| 31 | - $config = $this->config( 'admin/jsonadm/url/config', [] ); | |
| 28 | +	$target = $this->config('admin/jsonadm/url/target'); | |
| 29 | +	$cntl = $this->config('admin/jsonadm/url/controller', 'jsonadm'); | |
| 30 | +	$action = $this->config('admin/jsonadm/url/action', 'get'); | |
| 31 | +	$config = $this->config('admin/jsonadm/url/config', []); | |
| 32 | 32 | |
| 33 | - foreach( (array) $items as $item ) | |
| 33 | + foreach ((array) $items as $item) | |
| 34 | 34 |  	{ | 
| 35 | 35 | $id = $item->getId(); | 
| 36 | 36 | $type = $item->getResourceType(); | 
| 37 | - $attributes = $item->toArray( true ); | |
| 37 | + $attributes = $item->toArray(true); | |
| 38 | 38 | |
| 39 | -		if( isset( $fields[$type] ) ) { | |
| 40 | - $attributes = array_intersect_key( $attributes, $fields[$type] ); | |
| 39 | +		if (isset($fields[$type])) { | |
| 40 | + $attributes = array_intersect_key($attributes, $fields[$type]); | |
| 41 | 41 | } | 
| 42 | 42 | |
| 43 | 43 | $list[] = array( | 
| @@ -45,9 +45,9 @@ discard block | ||
| 45 | 45 | 'type' => $type, | 
| 46 | 46 | 'attributes' => $attributes, | 
| 47 | 47 | 'links' => array( | 
| 48 | - 'self' => $this->url( $target, $cntl, $action, array( 'resource' => $type, 'id' => $id ), [], $config ), | |
| 48 | +				'self' => $this->url($target, $cntl, $action, array('resource' => $type, 'id' => $id), [], $config), | |
| 49 | 49 | 'related' => array( | 
| 50 | - 'href' => $this->url( $target, $cntl, $action, array( 'resource' => $type, 'id' => null ), [], $config ) | |
| 50 | +					'href' => $this->url($target, $cntl, $action, array('resource' => $type, 'id' => null), [], $config) | |
| 51 | 51 | ) | 
| 52 | 52 | ) | 
| 53 | 53 | ); | 
| @@ -58,8 +58,8 @@ discard block | ||
| 58 | 58 | |
| 59 | 59 | |
| 60 | 60 | $response = []; | 
| 61 | -$response = $build( $this->get( 'childItems', [] ) ); | |
| 62 | -$response = array_merge( $response, $build( $this->get( 'refItems', [] ) ) ); | |
| 61 | +$response = $build($this->get('childItems', [])); | |
| 62 | +$response = array_merge($response, $build($this->get('refItems', []))); | |
| 63 | 63 | |
| 64 | 64 | |
| 65 | -echo json_encode( $response, $options ); | |
| 66 | 65 | \ No newline at end of file | 
| 66 | +echo json_encode($response, $options); | |
| 67 | 67 | \ No newline at end of file | 
| @@ -9,32 +9,32 @@ 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( \Aimeos\MShop\Common\Item\Iface $item, array $childItems, array $listItems ) use ( $fields ) | |
| 24 | +$build = function(\Aimeos\MShop\Common\Item\Iface $item, array $childItems, array $listItems) use ($fields) | |
| 25 | 25 |  { | 
| 26 | 26 | $id = $item->getId(); | 
| 27 | 27 | $type = $item->getResourceType(); | 
| 28 | - $params = array( 'resource' => $type, 'id' => $id ); | |
| 29 | - $attributes = $item->toArray( true ); | |
| 28 | +	$params = array('resource' => $type, 'id' => $id); | |
| 29 | + $attributes = $item->toArray(true); | |
| 30 | 30 | |
| 31 | - $target = $this->config( 'admin/jsonadm/url/target' ); | |
| 32 | - $cntl = $this->config( 'admin/jsonadm/url/controller', 'jsonadm' ); | |
| 33 | - $action = $this->config( 'admin/jsonadm/url/action', 'get' ); | |
| 34 | - $config = $this->config( 'admin/jsonadm/url/config', [] ); | |
| 31 | +	$target = $this->config('admin/jsonadm/url/target'); | |
| 32 | +	$cntl = $this->config('admin/jsonadm/url/controller', 'jsonadm'); | |
| 33 | +	$action = $this->config('admin/jsonadm/url/action', 'get'); | |
| 34 | +	$config = $this->config('admin/jsonadm/url/config', []); | |
| 35 | 35 | |
| 36 | -	if( isset( $fields[$type] ) ) { | |
| 37 | - $attributes = array_intersect_key( $attributes, $fields[$type] ); | |
| 36 | +	if (isset($fields[$type])) { | |
| 37 | + $attributes = array_intersect_key($attributes, $fields[$type]); | |
| 38 | 38 | } | 
| 39 | 39 | |
| 40 | 40 | $result = array( | 
| @@ -42,35 +42,35 @@ discard block | ||
| 42 | 42 | 'type' => $type, | 
| 43 | 43 | 'attributes' => $attributes, | 
| 44 | 44 | 'links' => array( | 
| 45 | - 'self' => $this->url( $target, $cntl, $action, $params, [], $config ) | |
| 45 | + 'self' => $this->url($target, $cntl, $action, $params, [], $config) | |
| 46 | 46 | ), | 
| 47 | 47 | 'relationships' => [] | 
| 48 | 48 | ); | 
| 49 | 49 | |
| 50 | - foreach( $childItems as $childItem ) | |
| 50 | + foreach ($childItems as $childItem) | |
| 51 | 51 |  	{ | 
| 52 | - if( $childItem->getParentId() == $id ) | |
| 52 | + if ($childItem->getParentId() == $id) | |
| 53 | 53 |  		{ | 
| 54 | 54 | $type = $childItem->getResourceType(); | 
| 55 | - $result['relationships'][$type][] = array( 'data' => array( 'id' => $childItem->getId(), 'type' => $type ) ); | |
| 55 | +			$result['relationships'][$type][] = array('data' => array('id' => $childItem->getId(), 'type' => $type)); | |
| 56 | 56 | } | 
| 57 | 57 | } | 
| 58 | 58 | |
| 59 | - foreach( $listItems as $listId => $listItem ) | |
| 59 | + foreach ($listItems as $listId => $listItem) | |
| 60 | 60 |  	{ | 
| 61 | - if( $listItem->getParentId() == $id ) | |
| 61 | + if ($listItem->getParentId() == $id) | |
| 62 | 62 |  		{ | 
| 63 | 63 | $type = $listItem->getDomain(); | 
| 64 | - $params = array( 'resource' => $listItem->getResourceType(), 'id' => $listId ); | |
| 64 | +			$params = array('resource' => $listItem->getResourceType(), 'id' => $listId); | |
| 65 | 65 | |
| 66 | - $result['relationships'][$type][] = array( 'data' => array( | |
| 66 | +			$result['relationships'][$type][] = array('data' => array( | |
| 67 | 67 | 'id' => $listItem->getRefId(), | 
| 68 | 68 | 'type' => $type, | 
| 69 | - 'attributes' => $listItem->toArray( true ), | |
| 69 | + 'attributes' => $listItem->toArray(true), | |
| 70 | 70 | 'links' => array( | 
| 71 | - 'self' => $this->url( $target, $cntl, $action, $params, [], $config ) | |
| 71 | + 'self' => $this->url($target, $cntl, $action, $params, [], $config) | |
| 72 | 72 | ) | 
| 73 | - ) ); | |
| 73 | + )); | |
| 74 | 74 | } | 
| 75 | 75 | } | 
| 76 | 76 | |
| @@ -78,21 +78,21 @@ discard block | ||
| 78 | 78 | }; | 
| 79 | 79 | |
| 80 | 80 | |
| 81 | -$data = $this->get( 'data', [] ); | |
| 82 | -$childItems = $this->get( 'childItems', [] ); | |
| 83 | -$listItems = $this->get( 'listItems', [] ); | |
| 81 | +$data = $this->get('data', []); | |
| 82 | +$childItems = $this->get('childItems', []); | |
| 83 | +$listItems = $this->get('listItems', []); | |
| 84 | 84 | |
| 85 | -if( is_array( $data ) ) | |
| 85 | +if (is_array($data)) | |
| 86 | 86 |  { | 
| 87 | 87 | $response = []; | 
| 88 | 88 | |
| 89 | -	foreach( $data as $item ) { | |
| 90 | - $response[] = $build( $item, $childItems, $listItems ); | |
| 89 | +	foreach ($data as $item) { | |
| 90 | + $response[] = $build($item, $childItems, $listItems); | |
| 91 | 91 | } | 
| 92 | 92 | } | 
| 93 | -elseif( $data !== null ) | |
| 93 | +elseif ($data !== null) | |
| 94 | 94 |  { | 
| 95 | - $response = $build( $data, $childItems, $listItems ); | |
| 95 | + $response = $build($data, $childItems, $listItems); | |
| 96 | 96 | } | 
| 97 | 97 | else | 
| 98 | 98 |  { | 
| @@ -100,4 +100,4 @@ discard block | ||
| 100 | 100 | } | 
| 101 | 101 | |
| 102 | 102 | |
| 103 | -echo json_encode( $response, $options ); | |
| 104 | 103 | \ No newline at end of file | 
| 104 | +echo json_encode($response, $options); | |
| 105 | 105 | \ No newline at end of file | 
| @@ -89,12 +89,10 @@ | ||
| 89 | 89 |  	foreach( $data as $item ) { | 
| 90 | 90 | $response[] = $build( $item, $childItems, $listItems ); | 
| 91 | 91 | } | 
| 92 | -} | |
| 93 | -elseif( $data !== null ) | |
| 92 | +} elseif( $data !== null ) | |
| 94 | 93 |  { | 
| 95 | 94 | $response = $build( $data, $childItems, $listItems ); | 
| 96 | -} | |
| 97 | -else | |
| 95 | +} else | |
| 98 | 96 |  { | 
| 99 | 97 | $response = null; | 
| 100 | 98 | } |