aimeos /
ai-admin-jsonadm
@@ -107,20 +107,20 @@ discard block |
||
| 107 | 107 | * @param array $include List of resource types that should be fetched |
| 108 | 108 | * @return array List of items implementing \Aimeos\MShop\Common\Item\Iface |
| 109 | 109 | */ |
| 110 | - protected function getChildItems( array $items, array $include ) |
|
| 110 | + protected function getChildItems(array $items, array $include) |
|
| 111 | 111 | { |
| 112 | 112 | $list = []; |
| 113 | - $refIds = array_keys( $items ); |
|
| 114 | - $include = array_intersect( $include, array( 'supplier/address' ) ); |
|
| 113 | + $refIds = array_keys($items); |
|
| 114 | + $include = array_intersect($include, array('supplier/address')); |
|
| 115 | 115 | |
| 116 | - foreach( $include as $type ) |
|
| 116 | + foreach ($include as $type) |
|
| 117 | 117 | { |
| 118 | - $manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), $type ); |
|
| 118 | + $manager = \Aimeos\MShop\Factory::createManager($this->getContext(), $type); |
|
| 119 | 119 | |
| 120 | 120 | $search = $manager->createSearch(); |
| 121 | - $search->setConditions( $search->compare( '==', str_replace( '/', '.', $type ) . '.parentid', $refIds ) ); |
|
| 121 | + $search->setConditions($search->compare('==', str_replace('/', '.', $type) . '.parentid', $refIds)); |
|
| 122 | 122 | |
| 123 | - $list = array_merge( $list, $manager->searchItems( $search ) ); |
|
| 123 | + $list = array_merge($list, $manager->searchItems($search)); |
|
| 124 | 124 | } |
| 125 | 125 | |
| 126 | 126 | return $list; |
@@ -134,17 +134,17 @@ discard block |
||
| 134 | 134 | * @param array $include List of resource types that should be fetched |
| 135 | 135 | * @return array List of items implementing \Aimeos\MShop\Common\Item\Lists\Iface |
| 136 | 136 | */ |
| 137 | - protected function getListItems( array $items, array $include ) |
|
| 137 | + protected function getListItems(array $items, array $include) |
|
| 138 | 138 | { |
| 139 | - $manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'supplier/lists' ); |
|
| 139 | + $manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'supplier/lists'); |
|
| 140 | 140 | |
| 141 | 141 | $search = $manager->createSearch(); |
| 142 | 142 | $expr = array( |
| 143 | - $search->compare( '==', 'supplier.lists.parentid', array_keys( $items ) ), |
|
| 144 | - $search->compare( '==', 'supplier.lists.domain', $include ), |
|
| 143 | + $search->compare('==', 'supplier.lists.parentid', array_keys($items)), |
|
| 144 | + $search->compare('==', 'supplier.lists.domain', $include), |
|
| 145 | 145 | ); |
| 146 | - $search->setConditions( $search->combine( '&&', $expr ) ); |
|
| 146 | + $search->setConditions($search->combine('&&', $expr)); |
|
| 147 | 147 | |
| 148 | - return $manager->searchItems( $search ); |
|
| 148 | + return $manager->searchItems($search); |
|
| 149 | 149 | } |
| 150 | 150 | } |
@@ -107,20 +107,20 @@ |
||
| 107 | 107 | * @param array $include List of resource types that should be fetched |
| 108 | 108 | * @return array List of items implementing \Aimeos\MShop\Common\Item\Iface |
| 109 | 109 | */ |
| 110 | - protected function getChildItems( array $items, array $include ) |
|
| 110 | + protected function getChildItems(array $items, array $include) |
|
| 111 | 111 | { |
| 112 | 112 | $list = []; |
| 113 | - $ids = array_keys( $items ); |
|
| 114 | - $include = array_intersect( $include, array( 'coupon/code' ) ); |
|
| 113 | + $ids = array_keys($items); |
|
| 114 | + $include = array_intersect($include, array('coupon/code')); |
|
| 115 | 115 | |
| 116 | - foreach( $include as $type ) |
|
| 116 | + foreach ($include as $type) |
|
| 117 | 117 | { |
| 118 | - $manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), $type ); |
|
| 118 | + $manager = \Aimeos\MShop\Factory::createManager($this->getContext(), $type); |
|
| 119 | 119 | |
| 120 | 120 | $search = $manager->createSearch(); |
| 121 | - $search->setConditions( $search->compare( '==', str_replace( '/', '.', $type ) . '.parentid', $ids ) ); |
|
| 121 | + $search->setConditions($search->compare('==', str_replace('/', '.', $type) . '.parentid', $ids)); |
|
| 122 | 122 | |
| 123 | - $list = array_merge( $list, $manager->searchItems( $search ) ); |
|
| 123 | + $list = array_merge($list, $manager->searchItems($search)); |
|
| 124 | 124 | } |
| 125 | 125 | |
| 126 | 126 | return $list; |
@@ -110,7 +110,7 @@ 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 | /** admin/jsonadm/partials/order/base/template-data |
| 116 | 116 | * Relative path to the data partial template file for the order base client |
@@ -127,9 +127,9 @@ discard block |
||
| 127 | 127 | * @since 2016.01 |
| 128 | 128 | * @category Developer |
| 129 | 129 | */ |
| 130 | - $this->getView()->assign( array( 'partial-data' => 'admin/jsonadm/partials/order/base/template-data' ) ); |
|
| 130 | + $this->getView()->assign(array('partial-data' => 'admin/jsonadm/partials/order/base/template-data')); |
|
| 131 | 131 | |
| 132 | - return parent::get( $request, $response ); |
|
| 132 | + return parent::get($request, $response); |
|
| 133 | 133 | } |
| 134 | 134 | |
| 135 | 135 | |
@@ -140,21 +140,21 @@ discard block |
||
| 140 | 140 | * @param array $include List of resource types that should be fetched |
| 141 | 141 | * @return array List of items implementing \Aimeos\MShop\Common\Item\Iface |
| 142 | 142 | */ |
| 143 | - protected function getChildItems( array $items, array $include ) |
|
| 143 | + protected function getChildItems(array $items, array $include) |
|
| 144 | 144 | { |
| 145 | 145 | $list = []; |
| 146 | - $ids = array_keys( $items ); |
|
| 147 | - $keys = array( 'order/base/address', 'order/base/coupon', 'order/base/product', 'order/base/service' ); |
|
| 148 | - $include = array_intersect( $include, $keys ); |
|
| 146 | + $ids = array_keys($items); |
|
| 147 | + $keys = array('order/base/address', 'order/base/coupon', 'order/base/product', 'order/base/service'); |
|
| 148 | + $include = array_intersect($include, $keys); |
|
| 149 | 149 | |
| 150 | - foreach( $include as $type ) |
|
| 150 | + foreach ($include as $type) |
|
| 151 | 151 | { |
| 152 | - $manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), $type ); |
|
| 152 | + $manager = \Aimeos\MShop\Factory::createManager($this->getContext(), $type); |
|
| 153 | 153 | |
| 154 | 154 | $search = $manager->createSearch(); |
| 155 | - $search->setConditions( $search->compare( '==', str_replace( '/', '.', $type ) . '.baseid', $ids ) ); |
|
| 155 | + $search->setConditions($search->compare('==', str_replace('/', '.', $type) . '.baseid', $ids)); |
|
| 156 | 156 | |
| 157 | - $list = array_merge( $list, $manager->searchItems( $search ) ); |
|
| 157 | + $list = array_merge($list, $manager->searchItems($search)); |
|
| 158 | 158 | } |
| 159 | 159 | |
| 160 | 160 | return $list; |
@@ -110,7 +110,7 @@ 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 | /** admin/jsonadm/partials/order/template-data |
| 116 | 116 | * Relative path to the data partial template file for the order client |
@@ -127,9 +127,9 @@ discard block |
||
| 127 | 127 | * @since 2016.01 |
| 128 | 128 | * @category Developer |
| 129 | 129 | */ |
| 130 | - $this->getView()->assign( array( 'partial-data' => 'admin/jsonadm/partials/order/template-data' ) ); |
|
| 130 | + $this->getView()->assign(array('partial-data' => 'admin/jsonadm/partials/order/template-data')); |
|
| 131 | 131 | |
| 132 | - return parent::get( $request, $response ); |
|
| 132 | + return parent::get($request, $response); |
|
| 133 | 133 | } |
| 134 | 134 | |
| 135 | 135 | |
@@ -140,35 +140,35 @@ discard block |
||
| 140 | 140 | * @param array $include List of resource types that should be fetched |
| 141 | 141 | * @return array List of items implementing \Aimeos\MShop\Common\Item\Iface |
| 142 | 142 | */ |
| 143 | - protected function getChildItems( array $items, array $include ) |
|
| 143 | + protected function getChildItems(array $items, array $include) |
|
| 144 | 144 | { |
| 145 | 145 | $list = []; |
| 146 | 146 | |
| 147 | - if( in_array( 'order/base', $include ) ) |
|
| 147 | + if (in_array('order/base', $include)) |
|
| 148 | 148 | { |
| 149 | 149 | $ids = []; |
| 150 | 150 | |
| 151 | - foreach( $items as $item ) { |
|
| 151 | + foreach ($items as $item) { |
|
| 152 | 152 | $ids[] = $item->getBaseId(); |
| 153 | 153 | } |
| 154 | 154 | |
| 155 | - $manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'order/base' ); |
|
| 155 | + $manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'order/base'); |
|
| 156 | 156 | |
| 157 | 157 | $search = $manager->createSearch(); |
| 158 | - $search->setConditions( $search->compare( '==', 'order.base.id', $ids ) ); |
|
| 158 | + $search->setConditions($search->compare('==', 'order.base.id', $ids)); |
|
| 159 | 159 | |
| 160 | - $list = array_merge( $list, $manager->searchItems( $search ) ); |
|
| 160 | + $list = array_merge($list, $manager->searchItems($search)); |
|
| 161 | 161 | } |
| 162 | 162 | |
| 163 | - if( in_array( 'order/status', $include ) ) |
|
| 163 | + if (in_array('order/status', $include)) |
|
| 164 | 164 | { |
| 165 | - $ids = array_keys( $items ); |
|
| 166 | - $manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'order/status' ); |
|
| 165 | + $ids = array_keys($items); |
|
| 166 | + $manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'order/status'); |
|
| 167 | 167 | |
| 168 | 168 | $search = $manager->createSearch(); |
| 169 | - $search->setConditions( $search->compare( '==', 'order.status.parentid', $ids ) ); |
|
| 169 | + $search->setConditions($search->compare('==', 'order.status.parentid', $ids)); |
|
| 170 | 170 | |
| 171 | - $list = array_merge( $list, $manager->searchItems( $search ) ); |
|
| 171 | + $list = array_merge($list, $manager->searchItems($search)); |
|
| 172 | 172 | } |
| 173 | 173 | |
| 174 | 174 | return $list; |
@@ -39,24 +39,21 @@ discard block |
||
| 39 | 39 | { |
| 40 | 40 | $response = $this->deleteItems( $view, $request, $response ); |
| 41 | 41 | $status = 200; |
| 42 | - } |
|
| 43 | - catch( \Aimeos\Admin\JsonAdm\Exception $e ) |
|
| 42 | + } catch( \Aimeos\Admin\JsonAdm\Exception $e ) |
|
| 44 | 43 | { |
| 45 | 44 | $status = $e->getCode(); |
| 46 | 45 | $view->errors = array( array( |
| 47 | 46 | 'title' => $this->getContext()->getI18n()->dt( 'admin/jsonadm', $e->getMessage() ), |
| 48 | 47 | 'detail' => $e->getTraceAsString(), |
| 49 | 48 | ) ); |
| 50 | - } |
|
| 51 | - catch( \Aimeos\MShop\Exception $e ) |
|
| 49 | + } catch( \Aimeos\MShop\Exception $e ) |
|
| 52 | 50 | { |
| 53 | 51 | $status = 404; |
| 54 | 52 | $view->errors = array( array( |
| 55 | 53 | 'title' => $this->getContext()->getI18n()->dt( 'mshop', $e->getMessage() ), |
| 56 | 54 | 'detail' => $e->getTraceAsString(), |
| 57 | 55 | ) ); |
| 58 | - } |
|
| 59 | - catch( \Exception $e ) |
|
| 56 | + } catch( \Exception $e ) |
|
| 60 | 57 | { |
| 61 | 58 | $status = 500; |
| 62 | 59 | $view->errors = array( array( |
@@ -116,16 +113,14 @@ discard block |
||
| 116 | 113 | { |
| 117 | 114 | $response = $this->getItems( $view, $request, $response ); |
| 118 | 115 | $status = 200; |
| 119 | - } |
|
| 120 | - catch( \Aimeos\MShop\Exception $e ) |
|
| 116 | + } catch( \Aimeos\MShop\Exception $e ) |
|
| 121 | 117 | { |
| 122 | 118 | $status = 404; |
| 123 | 119 | $view->errors = array( array( |
| 124 | 120 | 'title' => $this->getContext()->getI18n()->dt( 'mshop', $e->getMessage() ), |
| 125 | 121 | 'detail' => $e->getTraceAsString(), |
| 126 | 122 | ) ); |
| 127 | - } |
|
| 128 | - catch( \Exception $e ) |
|
| 123 | + } catch( \Exception $e ) |
|
| 129 | 124 | { |
| 130 | 125 | $status = 500; |
| 131 | 126 | $view->errors = array( array( |
@@ -163,8 +158,7 @@ discard block |
||
| 163 | 158 | */ |
| 164 | 159 | $tplconf = 'admin/jsonadm/standard/template-aggregate'; |
| 165 | 160 | $default = 'aggregate-default.php'; |
| 166 | - } |
|
| 167 | - else |
|
| 161 | + } else |
|
| 168 | 162 | { |
| 169 | 163 | /** admin/jsonadm/standard/template-get |
| 170 | 164 | * Relative path to the JSON API template for GET requests |
@@ -218,24 +212,21 @@ discard block |
||
| 218 | 212 | { |
| 219 | 213 | $response = $this->patchItems( $view, $request, $response ); |
| 220 | 214 | $status = 200; |
| 221 | - } |
|
| 222 | - catch( \Aimeos\Admin\JsonAdm\Exception $e ) |
|
| 215 | + } catch( \Aimeos\Admin\JsonAdm\Exception $e ) |
|
| 223 | 216 | { |
| 224 | 217 | $status = $e->getCode(); |
| 225 | 218 | $view->errors = array( array( |
| 226 | 219 | 'title' => $this->getContext()->getI18n()->dt( 'admin/jsonadm', $e->getMessage() ), |
| 227 | 220 | 'detail' => $e->getTraceAsString(), |
| 228 | 221 | ) ); |
| 229 | - } |
|
| 230 | - catch( \Aimeos\MShop\Exception $e ) |
|
| 222 | + } catch( \Aimeos\MShop\Exception $e ) |
|
| 231 | 223 | { |
| 232 | 224 | $status = 404; |
| 233 | 225 | $view->errors = array( array( |
| 234 | 226 | 'title' => $this->getContext()->getI18n()->dt( 'mshop', $e->getMessage() ), |
| 235 | 227 | 'detail' => $e->getTraceAsString(), |
| 236 | 228 | ) ); |
| 237 | - } |
|
| 238 | - catch( \Exception $e ) |
|
| 229 | + } catch( \Exception $e ) |
|
| 239 | 230 | { |
| 240 | 231 | $status = 500; |
| 241 | 232 | $view->errors = array( array( |
@@ -295,24 +286,21 @@ discard block |
||
| 295 | 286 | { |
| 296 | 287 | $response = $this->postItems( $view, $request, $response ); |
| 297 | 288 | $status = 201; |
| 298 | - } |
|
| 299 | - catch( \Aimeos\Admin\JsonAdm\Exception $e ) |
|
| 289 | + } catch( \Aimeos\Admin\JsonAdm\Exception $e ) |
|
| 300 | 290 | { |
| 301 | 291 | $status = $e->getCode(); |
| 302 | 292 | $view->errors = array( array( |
| 303 | 293 | 'title' => $this->getContext()->getI18n()->dt( 'admin/jsonadm', $e->getMessage() ), |
| 304 | 294 | 'detail' => $e->getTraceAsString(), |
| 305 | 295 | ) ); |
| 306 | - } |
|
| 307 | - catch( \Aimeos\MShop\Exception $e ) |
|
| 296 | + } catch( \Aimeos\MShop\Exception $e ) |
|
| 308 | 297 | { |
| 309 | 298 | $status = 404; |
| 310 | 299 | $view->errors = array( array( |
| 311 | 300 | 'title' => $this->getContext()->getI18n()->dt( 'mshop', $e->getMessage() ), |
| 312 | 301 | 'detail' => $e->getTraceAsString(), |
| 313 | 302 | ) ); |
| 314 | - } |
|
| 315 | - catch( \Exception $e ) |
|
| 303 | + } catch( \Exception $e ) |
|
| 316 | 304 | { |
| 317 | 305 | $status = 500; |
| 318 | 306 | $view->errors = array( array( |
@@ -438,16 +426,14 @@ discard block |
||
| 438 | 426 | $view->attributes = $attributes; |
| 439 | 427 | |
| 440 | 428 | $status = 200; |
| 441 | - } |
|
| 442 | - catch( \Aimeos\MShop\Exception $e ) |
|
| 429 | + } catch( \Aimeos\MShop\Exception $e ) |
|
| 443 | 430 | { |
| 444 | 431 | $status = 404; |
| 445 | 432 | $view->errors = array( array( |
| 446 | 433 | 'title' => $context->getI18n()->dt( 'mshop', $e->getMessage() ), |
| 447 | 434 | 'detail' => $e->getTraceAsString(), |
| 448 | 435 | ) ); |
| 449 | - } |
|
| 450 | - catch( \Exception $e ) |
|
| 436 | + } catch( \Exception $e ) |
|
| 451 | 437 | { |
| 452 | 438 | $status = 500; |
| 453 | 439 | $view->errors = array( array( |
@@ -517,8 +503,7 @@ discard block |
||
| 517 | 503 | $ids = $this->getIds( $payload ); |
| 518 | 504 | $manager->deleteItems( $ids ); |
| 519 | 505 | $view->total = count( $ids ); |
| 520 | - } |
|
| 521 | - else |
|
| 506 | + } else |
|
| 522 | 507 | { |
| 523 | 508 | $manager->deleteItem( $id ); |
| 524 | 509 | $view->total = 1; |
@@ -556,8 +541,7 @@ discard block |
||
| 556 | 541 | $view->data = $manager->searchItems( $search, [], $total ); |
| 557 | 542 | $view->childItems = $this->getChildItems( $view->data, $include ); |
| 558 | 543 | $view->listItems = $this->getListItems( $view->data, $include ); |
| 559 | - } |
|
| 560 | - else |
|
| 544 | + } else |
|
| 561 | 545 | { |
| 562 | 546 | $view->data = $manager->getItem( $id, [] ); |
| 563 | 547 | $view->childItems = $this->getChildItems( array( $id => $view->data ), $include ); |
@@ -597,16 +581,14 @@ discard block |
||
| 597 | 581 | $view->data = $data; |
| 598 | 582 | $view->total = count( $data ); |
| 599 | 583 | $response = $response->withHeader( 'Content-Type', 'application/vnd.api+json; ext="bulk"; supported-ext="bulk"' ); |
| 600 | - } |
|
| 601 | - elseif( ( $id = $view->param( 'id' ) ) != null ) |
|
| 584 | + } elseif( ( $id = $view->param( 'id' ) ) != null ) |
|
| 602 | 585 | { |
| 603 | 586 | $payload->data->id = $id; |
| 604 | 587 | $data = $this->saveEntry( $manager, $payload->data ); |
| 605 | 588 | |
| 606 | 589 | $view->data = $data; |
| 607 | 590 | $view->total = 1; |
| 608 | - } |
|
| 609 | - else |
|
| 591 | + } else |
|
| 610 | 592 | { |
| 611 | 593 | throw new \Aimeos\Admin\JsonAdm\Exception( sprintf( 'No ID given' ), 400 ); |
| 612 | 594 | } |
@@ -645,8 +627,7 @@ discard block |
||
| 645 | 627 | $view->data = $data; |
| 646 | 628 | $view->total = count( $data ); |
| 647 | 629 | $response = $response->withHeader( 'Content-Type', 'application/vnd.api+json; ext="bulk"; supported-ext="bulk"' ); |
| 648 | - } |
|
| 649 | - else |
|
| 630 | + } else |
|
| 650 | 631 | { |
| 651 | 632 | $payload->data->id = null; |
| 652 | 633 | $data = $this->saveEntry( $manager, $payload->data ); |
@@ -31,38 +31,38 @@ discard block |
||
| 31 | 31 | * @param \Psr\Http\Message\ResponseInterface $response Response object |
| 32 | 32 | * @return \Psr\Http\Message\ResponseInterface Modified response object |
| 33 | 33 | */ |
| 34 | - public function delete( ServerRequestInterface $request, ResponseInterface $response ) |
|
| 34 | + public function delete(ServerRequestInterface $request, ResponseInterface $response) |
|
| 35 | 35 | { |
| 36 | 36 | $view = $this->getView(); |
| 37 | 37 | |
| 38 | 38 | try |
| 39 | 39 | { |
| 40 | - $response = $this->deleteItems( $view, $request, $response ); |
|
| 40 | + $response = $this->deleteItems($view, $request, $response); |
|
| 41 | 41 | $status = 200; |
| 42 | 42 | } |
| 43 | - catch( \Aimeos\Admin\JsonAdm\Exception $e ) |
|
| 43 | + catch (\Aimeos\Admin\JsonAdm\Exception $e) |
|
| 44 | 44 | { |
| 45 | 45 | $status = $e->getCode(); |
| 46 | - $view->errors = array( array( |
|
| 47 | - 'title' => $this->getContext()->getI18n()->dt( 'admin/jsonadm', $e->getMessage() ), |
|
| 46 | + $view->errors = array(array( |
|
| 47 | + 'title' => $this->getContext()->getI18n()->dt('admin/jsonadm', $e->getMessage()), |
|
| 48 | 48 | 'detail' => $e->getTraceAsString(), |
| 49 | - ) ); |
|
| 49 | + )); |
|
| 50 | 50 | } |
| 51 | - catch( \Aimeos\MShop\Exception $e ) |
|
| 51 | + catch (\Aimeos\MShop\Exception $e) |
|
| 52 | 52 | { |
| 53 | 53 | $status = 404; |
| 54 | - $view->errors = array( array( |
|
| 55 | - 'title' => $this->getContext()->getI18n()->dt( 'mshop', $e->getMessage() ), |
|
| 54 | + $view->errors = array(array( |
|
| 55 | + 'title' => $this->getContext()->getI18n()->dt('mshop', $e->getMessage()), |
|
| 56 | 56 | 'detail' => $e->getTraceAsString(), |
| 57 | - ) ); |
|
| 57 | + )); |
|
| 58 | 58 | } |
| 59 | - catch( \Exception $e ) |
|
| 59 | + catch (\Exception $e) |
|
| 60 | 60 | { |
| 61 | 61 | $status = 500; |
| 62 | - $view->errors = array( array( |
|
| 62 | + $view->errors = array(array( |
|
| 63 | 63 | 'title' => $e->getMessage(), |
| 64 | 64 | 'detail' => $e->getTraceAsString(), |
| 65 | - ) ); |
|
| 65 | + )); |
|
| 66 | 66 | } |
| 67 | 67 | |
| 68 | 68 | /** admin/jsonadm/standard/template-delete |
@@ -93,11 +93,11 @@ discard block |
||
| 93 | 93 | $tplconf = 'admin/jsonadm/standard/template-delete'; |
| 94 | 94 | $default = 'delete-default.php'; |
| 95 | 95 | |
| 96 | - $body = $view->render( $view->config( $tplconf, $default ) ); |
|
| 96 | + $body = $view->render($view->config($tplconf, $default)); |
|
| 97 | 97 | |
| 98 | - return $response->withHeader( 'Content-Type', 'application/vnd.api+json; supported-ext="bulk"' ) |
|
| 99 | - ->withBody( $view->response()->createStreamFromString( $body ) ) |
|
| 100 | - ->withStatus( $status ); |
|
| 98 | + return $response->withHeader('Content-Type', 'application/vnd.api+json; supported-ext="bulk"') |
|
| 99 | + ->withBody($view->response()->createStreamFromString($body)) |
|
| 100 | + ->withStatus($status); |
|
| 101 | 101 | } |
| 102 | 102 | |
| 103 | 103 | |
@@ -108,33 +108,33 @@ discard block |
||
| 108 | 108 | * @param \Psr\Http\Message\ResponseInterface $response Response object |
| 109 | 109 | * @return \Psr\Http\Message\ResponseInterface Modified response object |
| 110 | 110 | */ |
| 111 | - public function get( ServerRequestInterface $request, ResponseInterface $response ) |
|
| 111 | + public function get(ServerRequestInterface $request, ResponseInterface $response) |
|
| 112 | 112 | { |
| 113 | 113 | $view = $this->getView(); |
| 114 | 114 | |
| 115 | 115 | try |
| 116 | 116 | { |
| 117 | - $response = $this->getItems( $view, $request, $response ); |
|
| 117 | + $response = $this->getItems($view, $request, $response); |
|
| 118 | 118 | $status = 200; |
| 119 | 119 | } |
| 120 | - catch( \Aimeos\MShop\Exception $e ) |
|
| 120 | + catch (\Aimeos\MShop\Exception $e) |
|
| 121 | 121 | { |
| 122 | 122 | $status = 404; |
| 123 | - $view->errors = array( array( |
|
| 124 | - 'title' => $this->getContext()->getI18n()->dt( 'mshop', $e->getMessage() ), |
|
| 123 | + $view->errors = array(array( |
|
| 124 | + 'title' => $this->getContext()->getI18n()->dt('mshop', $e->getMessage()), |
|
| 125 | 125 | 'detail' => $e->getTraceAsString(), |
| 126 | - ) ); |
|
| 126 | + )); |
|
| 127 | 127 | } |
| 128 | - catch( \Exception $e ) |
|
| 128 | + catch (\Exception $e) |
|
| 129 | 129 | { |
| 130 | 130 | $status = 500; |
| 131 | - $view->errors = array( array( |
|
| 131 | + $view->errors = array(array( |
|
| 132 | 132 | 'title' => $e->getMessage(), |
| 133 | 133 | 'detail' => $e->getTraceAsString(), |
| 134 | - ) ); |
|
| 134 | + )); |
|
| 135 | 135 | } |
| 136 | 136 | |
| 137 | - if( $view->param( 'aggregate' ) !== null ) |
|
| 137 | + if ($view->param('aggregate') !== null) |
|
| 138 | 138 | { |
| 139 | 139 | /** admin/jsonadm/standard/template-aggregate |
| 140 | 140 | * Relative path to the JSON API template for GET aggregate requests |
@@ -195,11 +195,11 @@ discard block |
||
| 195 | 195 | $default = 'get-default.php'; |
| 196 | 196 | } |
| 197 | 197 | |
| 198 | - $body = $view->render( $view->config( $tplconf, $default ) ); |
|
| 198 | + $body = $view->render($view->config($tplconf, $default)); |
|
| 199 | 199 | |
| 200 | - return $response->withHeader( 'Content-Type', 'application/vnd.api+json; supported-ext="bulk"' ) |
|
| 201 | - ->withBody( $view->response()->createStreamFromString( $body ) ) |
|
| 202 | - ->withStatus( $status ); |
|
| 200 | + return $response->withHeader('Content-Type', 'application/vnd.api+json; supported-ext="bulk"') |
|
| 201 | + ->withBody($view->response()->createStreamFromString($body)) |
|
| 202 | + ->withStatus($status); |
|
| 203 | 203 | } |
| 204 | 204 | |
| 205 | 205 | |
@@ -210,38 +210,38 @@ discard block |
||
| 210 | 210 | * @param \Psr\Http\Message\ResponseInterface $response Response object |
| 211 | 211 | * @return \Psr\Http\Message\ResponseInterface Modified response object |
| 212 | 212 | */ |
| 213 | - public function patch( ServerRequestInterface $request, ResponseInterface $response ) |
|
| 213 | + public function patch(ServerRequestInterface $request, ResponseInterface $response) |
|
| 214 | 214 | { |
| 215 | 215 | $view = $this->getView(); |
| 216 | 216 | |
| 217 | 217 | try |
| 218 | 218 | { |
| 219 | - $response = $this->patchItems( $view, $request, $response ); |
|
| 219 | + $response = $this->patchItems($view, $request, $response); |
|
| 220 | 220 | $status = 200; |
| 221 | 221 | } |
| 222 | - catch( \Aimeos\Admin\JsonAdm\Exception $e ) |
|
| 222 | + catch (\Aimeos\Admin\JsonAdm\Exception $e) |
|
| 223 | 223 | { |
| 224 | 224 | $status = $e->getCode(); |
| 225 | - $view->errors = array( array( |
|
| 226 | - 'title' => $this->getContext()->getI18n()->dt( 'admin/jsonadm', $e->getMessage() ), |
|
| 225 | + $view->errors = array(array( |
|
| 226 | + 'title' => $this->getContext()->getI18n()->dt('admin/jsonadm', $e->getMessage()), |
|
| 227 | 227 | 'detail' => $e->getTraceAsString(), |
| 228 | - ) ); |
|
| 228 | + )); |
|
| 229 | 229 | } |
| 230 | - catch( \Aimeos\MShop\Exception $e ) |
|
| 230 | + catch (\Aimeos\MShop\Exception $e) |
|
| 231 | 231 | { |
| 232 | 232 | $status = 404; |
| 233 | - $view->errors = array( array( |
|
| 234 | - 'title' => $this->getContext()->getI18n()->dt( 'mshop', $e->getMessage() ), |
|
| 233 | + $view->errors = array(array( |
|
| 234 | + 'title' => $this->getContext()->getI18n()->dt('mshop', $e->getMessage()), |
|
| 235 | 235 | 'detail' => $e->getTraceAsString(), |
| 236 | - ) ); |
|
| 236 | + )); |
|
| 237 | 237 | } |
| 238 | - catch( \Exception $e ) |
|
| 238 | + catch (\Exception $e) |
|
| 239 | 239 | { |
| 240 | 240 | $status = 500; |
| 241 | - $view->errors = array( array( |
|
| 241 | + $view->errors = array(array( |
|
| 242 | 242 | 'title' => $e->getMessage(), |
| 243 | 243 | 'detail' => $e->getTraceAsString(), |
| 244 | - ) ); |
|
| 244 | + )); |
|
| 245 | 245 | } |
| 246 | 246 | |
| 247 | 247 | /** admin/jsonadm/standard/template-patch |
@@ -272,11 +272,11 @@ discard block |
||
| 272 | 272 | $tplconf = 'admin/jsonadm/standard/template-patch'; |
| 273 | 273 | $default = 'patch-default.php'; |
| 274 | 274 | |
| 275 | - $body = $view->render( $view->config( $tplconf, $default ) ); |
|
| 275 | + $body = $view->render($view->config($tplconf, $default)); |
|
| 276 | 276 | |
| 277 | - return $response->withHeader( 'Content-Type', 'application/vnd.api+json; supported-ext="bulk"' ) |
|
| 278 | - ->withBody( $view->response()->createStreamFromString( $body ) ) |
|
| 279 | - ->withStatus( $status ); |
|
| 277 | + return $response->withHeader('Content-Type', 'application/vnd.api+json; supported-ext="bulk"') |
|
| 278 | + ->withBody($view->response()->createStreamFromString($body)) |
|
| 279 | + ->withStatus($status); |
|
| 280 | 280 | } |
| 281 | 281 | |
| 282 | 282 | |
@@ -287,38 +287,38 @@ discard block |
||
| 287 | 287 | * @param \Psr\Http\Message\ResponseInterface $response Response object |
| 288 | 288 | * @return \Psr\Http\Message\ResponseInterface Modified response object |
| 289 | 289 | */ |
| 290 | - public function post( ServerRequestInterface $request, ResponseInterface $response ) |
|
| 290 | + public function post(ServerRequestInterface $request, ResponseInterface $response) |
|
| 291 | 291 | { |
| 292 | 292 | $view = $this->getView(); |
| 293 | 293 | |
| 294 | 294 | try |
| 295 | 295 | { |
| 296 | - $response = $this->postItems( $view, $request, $response ); |
|
| 296 | + $response = $this->postItems($view, $request, $response); |
|
| 297 | 297 | $status = 201; |
| 298 | 298 | } |
| 299 | - catch( \Aimeos\Admin\JsonAdm\Exception $e ) |
|
| 299 | + catch (\Aimeos\Admin\JsonAdm\Exception $e) |
|
| 300 | 300 | { |
| 301 | 301 | $status = $e->getCode(); |
| 302 | - $view->errors = array( array( |
|
| 303 | - 'title' => $this->getContext()->getI18n()->dt( 'admin/jsonadm', $e->getMessage() ), |
|
| 302 | + $view->errors = array(array( |
|
| 303 | + 'title' => $this->getContext()->getI18n()->dt('admin/jsonadm', $e->getMessage()), |
|
| 304 | 304 | 'detail' => $e->getTraceAsString(), |
| 305 | - ) ); |
|
| 305 | + )); |
|
| 306 | 306 | } |
| 307 | - catch( \Aimeos\MShop\Exception $e ) |
|
| 307 | + catch (\Aimeos\MShop\Exception $e) |
|
| 308 | 308 | { |
| 309 | 309 | $status = 404; |
| 310 | - $view->errors = array( array( |
|
| 311 | - 'title' => $this->getContext()->getI18n()->dt( 'mshop', $e->getMessage() ), |
|
| 310 | + $view->errors = array(array( |
|
| 311 | + 'title' => $this->getContext()->getI18n()->dt('mshop', $e->getMessage()), |
|
| 312 | 312 | 'detail' => $e->getTraceAsString(), |
| 313 | - ) ); |
|
| 313 | + )); |
|
| 314 | 314 | } |
| 315 | - catch( \Exception $e ) |
|
| 315 | + catch (\Exception $e) |
|
| 316 | 316 | { |
| 317 | 317 | $status = 500; |
| 318 | - $view->errors = array( array( |
|
| 318 | + $view->errors = array(array( |
|
| 319 | 319 | 'title' => $e->getMessage(), |
| 320 | 320 | 'detail' => $e->getTraceAsString(), |
| 321 | - ) ); |
|
| 321 | + )); |
|
| 322 | 322 | } |
| 323 | 323 | |
| 324 | 324 | /** admin/jsonadm/standard/template-post |
@@ -349,11 +349,11 @@ discard block |
||
| 349 | 349 | $tplconf = 'admin/jsonadm/standard/template-post'; |
| 350 | 350 | $default = 'post-default.php'; |
| 351 | 351 | |
| 352 | - $body = $view->render( $view->config( $tplconf, $default ) ); |
|
| 352 | + $body = $view->render($view->config($tplconf, $default)); |
|
| 353 | 353 | |
| 354 | - return $response->withHeader( 'Content-Type', 'application/vnd.api+json; supported-ext="bulk"' ) |
|
| 355 | - ->withBody( $view->response()->createStreamFromString( $body ) ) |
|
| 356 | - ->withStatus( $status ); |
|
| 354 | + return $response->withHeader('Content-Type', 'application/vnd.api+json; supported-ext="bulk"') |
|
| 355 | + ->withBody($view->response()->createStreamFromString($body)) |
|
| 356 | + ->withStatus($status); |
|
| 357 | 357 | } |
| 358 | 358 | |
| 359 | 359 | |
@@ -364,14 +364,14 @@ discard block |
||
| 364 | 364 | * @param \Psr\Http\Message\ResponseInterface $response Response object |
| 365 | 365 | * @return \Psr\Http\Message\ResponseInterface Modified response object |
| 366 | 366 | */ |
| 367 | - public function put( ServerRequestInterface $request, ResponseInterface $response ) |
|
| 367 | + public function put(ServerRequestInterface $request, ResponseInterface $response) |
|
| 368 | 368 | { |
| 369 | 369 | $status = 501; |
| 370 | 370 | $view = $this->getView(); |
| 371 | 371 | |
| 372 | - $view->errors = array( array( |
|
| 373 | - 'title' => $this->getContext()->getI18n()->dt( 'admin/jsonadm', 'Not implemented, use PATCH instead' ), |
|
| 374 | - ) ); |
|
| 372 | + $view->errors = array(array( |
|
| 373 | + 'title' => $this->getContext()->getI18n()->dt('admin/jsonadm', 'Not implemented, use PATCH instead'), |
|
| 374 | + )); |
|
| 375 | 375 | |
| 376 | 376 | /** admin/jsonadm/standard/template-put |
| 377 | 377 | * Relative path to the JSON API template for PUT requests |
@@ -401,11 +401,11 @@ discard block |
||
| 401 | 401 | $tplconf = 'admin/jsonadm/standard/template-put'; |
| 402 | 402 | $default = 'put-default.php'; |
| 403 | 403 | |
| 404 | - $body = $view->render( $view->config( $tplconf, $default ) ); |
|
| 404 | + $body = $view->render($view->config($tplconf, $default)); |
|
| 405 | 405 | |
| 406 | - return $response->withHeader( 'Content-Type', 'application/vnd.api+json; supported-ext="bulk"' ) |
|
| 407 | - ->withBody( $view->response()->createStreamFromString( $body ) ) |
|
| 408 | - ->withStatus( $status ); |
|
| 406 | + return $response->withHeader('Content-Type', 'application/vnd.api+json; supported-ext="bulk"') |
|
| 407 | + ->withBody($view->response()->createStreamFromString($body)) |
|
| 408 | + ->withStatus($status); |
|
| 409 | 409 | } |
| 410 | 410 | |
| 411 | 411 | |
@@ -416,7 +416,7 @@ discard block |
||
| 416 | 416 | * @param \Psr\Http\Message\ResponseInterface $response Response object |
| 417 | 417 | * @return \Psr\Http\Message\ResponseInterface Modified response object |
| 418 | 418 | */ |
| 419 | - public function options( ServerRequestInterface $request, ResponseInterface $response ) |
|
| 419 | + public function options(ServerRequestInterface $request, ResponseInterface $response) |
|
| 420 | 420 | { |
| 421 | 421 | $context = $this->getContext(); |
| 422 | 422 | $view = $this->getView(); |
@@ -425,14 +425,14 @@ discard block |
||
| 425 | 425 | { |
| 426 | 426 | $resources = $attributes = []; |
| 427 | 427 | |
| 428 | - foreach( $this->getDomains( $view ) as $domain ) |
|
| 428 | + foreach ($this->getDomains($view) as $domain) |
|
| 429 | 429 | { |
| 430 | - $manager = \Aimeos\MShop\Factory::createManager( $context, $domain ); |
|
| 431 | - $resources = array_merge( $resources, $manager->getResourceType( true ) ); |
|
| 432 | - $attributes = array_merge( $attributes, $manager->getSearchAttributes( true ) ); |
|
| 430 | + $manager = \Aimeos\MShop\Factory::createManager($context, $domain); |
|
| 431 | + $resources = array_merge($resources, $manager->getResourceType(true)); |
|
| 432 | + $attributes = array_merge($attributes, $manager->getSearchAttributes(true)); |
|
| 433 | 433 | } |
| 434 | 434 | |
| 435 | - foreach( $this->getResources( $view ) as $resource ) { |
|
| 435 | + foreach ($this->getResources($view) as $resource) { |
|
| 436 | 436 | $resources[] = $resource; |
| 437 | 437 | } |
| 438 | 438 | |
@@ -441,21 +441,21 @@ discard block |
||
| 441 | 441 | |
| 442 | 442 | $status = 200; |
| 443 | 443 | } |
| 444 | - catch( \Aimeos\MShop\Exception $e ) |
|
| 444 | + catch (\Aimeos\MShop\Exception $e) |
|
| 445 | 445 | { |
| 446 | 446 | $status = 404; |
| 447 | - $view->errors = array( array( |
|
| 448 | - 'title' => $context->getI18n()->dt( 'mshop', $e->getMessage() ), |
|
| 447 | + $view->errors = array(array( |
|
| 448 | + 'title' => $context->getI18n()->dt('mshop', $e->getMessage()), |
|
| 449 | 449 | 'detail' => $e->getTraceAsString(), |
| 450 | - ) ); |
|
| 450 | + )); |
|
| 451 | 451 | } |
| 452 | - catch( \Exception $e ) |
|
| 452 | + catch (\Exception $e) |
|
| 453 | 453 | { |
| 454 | 454 | $status = 500; |
| 455 | - $view->errors = array( array( |
|
| 455 | + $view->errors = array(array( |
|
| 456 | 456 | 'title' => $e->getMessage(), |
| 457 | 457 | 'detail' => $e->getTraceAsString(), |
| 458 | - ) ); |
|
| 458 | + )); |
|
| 459 | 459 | } |
| 460 | 460 | |
| 461 | 461 | /** admin/jsonadm/standard/template-options |
@@ -486,12 +486,12 @@ discard block |
||
| 486 | 486 | $tplconf = 'admin/jsonadm/standard/template-options'; |
| 487 | 487 | $default = 'options-default.php'; |
| 488 | 488 | |
| 489 | - $body = $view->render( $view->config( $tplconf, $default ) ); |
|
| 489 | + $body = $view->render($view->config($tplconf, $default)); |
|
| 490 | 490 | |
| 491 | - return $response->withHeader( 'Allow', 'DELETE,GET,PATCH,POST,OPTIONS' ) |
|
| 492 | - ->withHeader( 'Content-Type', 'application/vnd.api+json; supported-ext="bulk"' ) |
|
| 493 | - ->withBody( $view->response()->createStreamFromString( $body ) ) |
|
| 494 | - ->withStatus( $status ); |
|
| 491 | + return $response->withHeader('Allow', 'DELETE,GET,PATCH,POST,OPTIONS') |
|
| 492 | + ->withHeader('Content-Type', 'application/vnd.api+json; supported-ext="bulk"') |
|
| 493 | + ->withBody($view->response()->createStreamFromString($body)) |
|
| 494 | + ->withStatus($status); |
|
| 495 | 495 | } |
| 496 | 496 | |
| 497 | 497 | |
@@ -504,25 +504,25 @@ discard block |
||
| 504 | 504 | * @return \Psr\Http\Message\ResponseInterface Modified response object |
| 505 | 505 | * @throws \Aimeos\Admin\JsonAdm\Exception If the request body is invalid |
| 506 | 506 | */ |
| 507 | - protected function deleteItems( \Aimeos\MW\View\Iface $view, ServerRequestInterface $request, ResponseInterface $response ) |
|
| 507 | + protected function deleteItems(\Aimeos\MW\View\Iface $view, ServerRequestInterface $request, ResponseInterface $response) |
|
| 508 | 508 | { |
| 509 | - $manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), $this->getPath() ); |
|
| 509 | + $manager = \Aimeos\MShop\Factory::createManager($this->getContext(), $this->getPath()); |
|
| 510 | 510 | |
| 511 | - if( ( $id = $view->param( 'id' ) ) == null ) |
|
| 511 | + if (($id = $view->param('id')) == null) |
|
| 512 | 512 | { |
| 513 | 513 | $body = (string) $request->getBody(); |
| 514 | 514 | |
| 515 | - if( ( $payload = json_decode( $body ) ) === null || !isset( $payload->data ) || !is_array( $payload->data ) ) { |
|
| 516 | - throw new \Aimeos\Admin\JsonAdm\Exception( sprintf( 'Invalid JSON in body' ), 400 ); |
|
| 515 | + if (($payload = json_decode($body)) === null || !isset($payload->data) || !is_array($payload->data)) { |
|
| 516 | + throw new \Aimeos\Admin\JsonAdm\Exception(sprintf('Invalid JSON in body'), 400); |
|
| 517 | 517 | } |
| 518 | 518 | |
| 519 | - $ids = $this->getIds( $payload ); |
|
| 520 | - $manager->deleteItems( $ids ); |
|
| 521 | - $view->total = count( $ids ); |
|
| 519 | + $ids = $this->getIds($payload); |
|
| 520 | + $manager->deleteItems($ids); |
|
| 521 | + $view->total = count($ids); |
|
| 522 | 522 | } |
| 523 | 523 | else |
| 524 | 524 | { |
| 525 | - $manager->deleteItem( $id ); |
|
| 525 | + $manager->deleteItem($id); |
|
| 526 | 526 | $view->total = 1; |
| 527 | 527 | } |
| 528 | 528 | |
@@ -538,35 +538,35 @@ discard block |
||
| 538 | 538 | * @param \Psr\Http\Message\ResponseInterface $response Response object |
| 539 | 539 | * @return \Psr\Http\Message\ResponseInterface Modified response object |
| 540 | 540 | */ |
| 541 | - protected function getItems( \Aimeos\MW\View\Iface $view, ServerRequestInterface $request, ResponseInterface $response ) |
|
| 541 | + protected function getItems(\Aimeos\MW\View\Iface $view, ServerRequestInterface $request, ResponseInterface $response) |
|
| 542 | 542 | { |
| 543 | - $manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), $this->getPath() ); |
|
| 543 | + $manager = \Aimeos\MShop\Factory::createManager($this->getContext(), $this->getPath()); |
|
| 544 | 544 | |
| 545 | - if( ( $key = $view->param( 'aggregate' ) ) !== null ) |
|
| 545 | + if (($key = $view->param('aggregate')) !== null) |
|
| 546 | 546 | { |
| 547 | - $search = $this->initCriteria( $manager->createSearch(), $view->param() ); |
|
| 548 | - $view->data = $manager->aggregate( $search, $key, $view->param( 'value' ), $view->param( 'type' ) ); |
|
| 547 | + $search = $this->initCriteria($manager->createSearch(), $view->param()); |
|
| 548 | + $view->data = $manager->aggregate($search, $key, $view->param('value'), $view->param('type')); |
|
| 549 | 549 | return $response; |
| 550 | 550 | } |
| 551 | 551 | |
| 552 | 552 | $total = 1; |
| 553 | - $include = ( ( $include = $view->param( 'include' ) ) !== null ? explode( ',', $include ) : [] ); |
|
| 553 | + $include = (($include = $view->param('include')) !== null ? explode(',', $include) : []); |
|
| 554 | 554 | |
| 555 | - if( ( $id = $view->param( 'id' ) ) == null ) |
|
| 555 | + if (($id = $view->param('id')) == null) |
|
| 556 | 556 | { |
| 557 | - $search = $this->initCriteria( $manager->createSearch(), $view->param() ); |
|
| 558 | - $view->data = $manager->searchItems( $search, [], $total ); |
|
| 559 | - $view->childItems = $this->getChildItems( $view->data, $include ); |
|
| 560 | - $view->listItems = $this->getListItems( $view->data, $include ); |
|
| 557 | + $search = $this->initCriteria($manager->createSearch(), $view->param()); |
|
| 558 | + $view->data = $manager->searchItems($search, [], $total); |
|
| 559 | + $view->childItems = $this->getChildItems($view->data, $include); |
|
| 560 | + $view->listItems = $this->getListItems($view->data, $include); |
|
| 561 | 561 | } |
| 562 | 562 | else |
| 563 | 563 | { |
| 564 | - $view->data = $manager->getItem( $id, [] ); |
|
| 565 | - $view->childItems = $this->getChildItems( array( $id => $view->data ), $include ); |
|
| 566 | - $view->listItems = $this->getListItems( array( $id => $view->data ), $include ); |
|
| 564 | + $view->data = $manager->getItem($id, []); |
|
| 565 | + $view->childItems = $this->getChildItems(array($id => $view->data), $include); |
|
| 566 | + $view->listItems = $this->getListItems(array($id => $view->data), $include); |
|
| 567 | 567 | } |
| 568 | 568 | |
| 569 | - $view->refItems = $this->getRefItems( $view->listItems ); |
|
| 569 | + $view->refItems = $this->getRefItems($view->listItems); |
|
| 570 | 570 | $view->total = $total; |
| 571 | 571 | |
| 572 | 572 | return $response; |
@@ -582,35 +582,35 @@ discard block |
||
| 582 | 582 | * @return \Psr\Http\Message\ResponseInterface Modified response object |
| 583 | 583 | * @throws \Aimeos\Admin\JsonAdm\Exception If "id" parameter isn't available or the body is invalid |
| 584 | 584 | */ |
| 585 | - protected function patchItems( \Aimeos\MW\View\Iface $view, ServerRequestInterface $request, ResponseInterface $response ) |
|
| 585 | + protected function patchItems(\Aimeos\MW\View\Iface $view, ServerRequestInterface $request, ResponseInterface $response) |
|
| 586 | 586 | { |
| 587 | 587 | $body = (string) $request->getBody(); |
| 588 | 588 | |
| 589 | - if( ( $payload = json_decode( $body ) ) === null || !isset( $payload->data ) ) { |
|
| 590 | - throw new \Aimeos\Admin\JsonAdm\Exception( sprintf( 'Invalid JSON in body' ), 400 ); |
|
| 589 | + if (($payload = json_decode($body)) === null || !isset($payload->data)) { |
|
| 590 | + throw new \Aimeos\Admin\JsonAdm\Exception(sprintf('Invalid JSON in body'), 400); |
|
| 591 | 591 | } |
| 592 | 592 | |
| 593 | - $manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), $this->getPath() ); |
|
| 593 | + $manager = \Aimeos\MShop\Factory::createManager($this->getContext(), $this->getPath()); |
|
| 594 | 594 | |
| 595 | - if( is_array( $payload->data ) ) |
|
| 595 | + if (is_array($payload->data)) |
|
| 596 | 596 | { |
| 597 | - $data = $this->saveData( $manager, $payload ); |
|
| 597 | + $data = $this->saveData($manager, $payload); |
|
| 598 | 598 | |
| 599 | 599 | $view->data = $data; |
| 600 | - $view->total = count( $data ); |
|
| 601 | - $response = $response->withHeader( 'Content-Type', 'application/vnd.api+json; ext="bulk"; supported-ext="bulk"' ); |
|
| 600 | + $view->total = count($data); |
|
| 601 | + $response = $response->withHeader('Content-Type', 'application/vnd.api+json; ext="bulk"; supported-ext="bulk"'); |
|
| 602 | 602 | } |
| 603 | - elseif( ( $id = $view->param( 'id' ) ) != null ) |
|
| 603 | + elseif (($id = $view->param('id')) != null) |
|
| 604 | 604 | { |
| 605 | 605 | $payload->data->id = $id; |
| 606 | - $data = $this->saveEntry( $manager, $payload->data ); |
|
| 606 | + $data = $this->saveEntry($manager, $payload->data); |
|
| 607 | 607 | |
| 608 | 608 | $view->data = $data; |
| 609 | 609 | $view->total = 1; |
| 610 | 610 | } |
| 611 | 611 | else |
| 612 | 612 | { |
| 613 | - throw new \Aimeos\Admin\JsonAdm\Exception( sprintf( 'No ID given' ), 400 ); |
|
| 613 | + throw new \Aimeos\Admin\JsonAdm\Exception(sprintf('No ID given'), 400); |
|
| 614 | 614 | } |
| 615 | 615 | |
| 616 | 616 | return $response; |
@@ -625,33 +625,33 @@ discard block |
||
| 625 | 625 | * @param \Psr\Http\Message\ResponseInterface $response Response object |
| 626 | 626 | * @return \Psr\Http\Message\ResponseInterface Modified response object |
| 627 | 627 | */ |
| 628 | - protected function postItems( \Aimeos\MW\View\Iface $view, ServerRequestInterface $request, ResponseInterface $response ) |
|
| 628 | + protected function postItems(\Aimeos\MW\View\Iface $view, ServerRequestInterface $request, ResponseInterface $response) |
|
| 629 | 629 | { |
| 630 | 630 | $body = (string) $request->getBody(); |
| 631 | 631 | |
| 632 | - if( ( $payload = json_decode( $body ) ) === null || !isset( $payload->data ) ) { |
|
| 633 | - throw new \Aimeos\Admin\JsonAdm\Exception( sprintf( 'Invalid JSON in body' ), 400 ); |
|
| 632 | + if (($payload = json_decode($body)) === null || !isset($payload->data)) { |
|
| 633 | + throw new \Aimeos\Admin\JsonAdm\Exception(sprintf('Invalid JSON in body'), 400); |
|
| 634 | 634 | } |
| 635 | 635 | |
| 636 | - if( isset( $payload->data->id ) || $view->param( 'id' ) != null ) { |
|
| 637 | - throw new \Aimeos\Admin\JsonAdm\Exception( sprintf( 'Client generated IDs are not supported' ), 403 ); |
|
| 636 | + if (isset($payload->data->id) || $view->param('id') != null) { |
|
| 637 | + throw new \Aimeos\Admin\JsonAdm\Exception(sprintf('Client generated IDs are not supported'), 403); |
|
| 638 | 638 | } |
| 639 | 639 | |
| 640 | 640 | |
| 641 | - $manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), $this->getPath() ); |
|
| 641 | + $manager = \Aimeos\MShop\Factory::createManager($this->getContext(), $this->getPath()); |
|
| 642 | 642 | |
| 643 | - if( is_array( $payload->data ) ) |
|
| 643 | + if (is_array($payload->data)) |
|
| 644 | 644 | { |
| 645 | - $data = $this->saveData( $manager, $payload ); |
|
| 645 | + $data = $this->saveData($manager, $payload); |
|
| 646 | 646 | |
| 647 | 647 | $view->data = $data; |
| 648 | - $view->total = count( $data ); |
|
| 649 | - $response = $response->withHeader( 'Content-Type', 'application/vnd.api+json; ext="bulk"; supported-ext="bulk"' ); |
|
| 648 | + $view->total = count($data); |
|
| 649 | + $response = $response->withHeader('Content-Type', 'application/vnd.api+json; ext="bulk"; supported-ext="bulk"'); |
|
| 650 | 650 | } |
| 651 | 651 | else |
| 652 | 652 | { |
| 653 | 653 | $payload->data->id = null; |
| 654 | - $data = $this->saveEntry( $manager, $payload->data ); |
|
| 654 | + $data = $this->saveEntry($manager, $payload->data); |
|
| 655 | 655 | |
| 656 | 656 | $view->data = $data; |
| 657 | 657 | $view->total = 1; |
@@ -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 |
@@ -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 | } |
@@ -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 | - $id = strtoupper( $item->getId() ); |
|
| 26 | + $id = strtoupper($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 |
@@ -9,33 +9,33 @@ 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\Order\Item\Iface $item, array $childItems ) use ( $fields ) |
|
| 24 | +$build = function(\Aimeos\MShop\Order\Item\Iface $item, array $childItems) use ($fields) |
|
| 25 | 25 | { |
| 26 | 26 | $id = $item->getId(); |
| 27 | 27 | $baseId = $item->getBaseId(); |
| 28 | 28 | $type = $item->getResourceType(); |
| 29 | - $params = array( 'resource' => $item->getResourceType(), 'id' => $id ); |
|
| 30 | - $attributes = $item->toArray( true ); |
|
| 29 | + $params = array('resource' => $item->getResourceType(), 'id' => $id); |
|
| 30 | + $attributes = $item->toArray(true); |
|
| 31 | 31 | |
| 32 | - $target = $this->config( 'admin/jsonadm/url/target' ); |
|
| 33 | - $cntl = $this->config( 'admin/jsonadm/url/controller', 'jsonadm' ); |
|
| 34 | - $action = $this->config( 'admin/jsonadm/url/action', 'get' ); |
|
| 35 | - $config = $this->config( 'admin/jsonadm/url/config', [] ); |
|
| 32 | + $target = $this->config('admin/jsonadm/url/target'); |
|
| 33 | + $cntl = $this->config('admin/jsonadm/url/controller', 'jsonadm'); |
|
| 34 | + $action = $this->config('admin/jsonadm/url/action', 'get'); |
|
| 35 | + $config = $this->config('admin/jsonadm/url/config', []); |
|
| 36 | 36 | |
| 37 | - if( isset( $fields[$type] ) ) { |
|
| 38 | - $attributes = array_intersect_key( $attributes, $fields[$type] ); |
|
| 37 | + if (isset($fields[$type])) { |
|
| 38 | + $attributes = array_intersect_key($attributes, $fields[$type]); |
|
| 39 | 39 | } |
| 40 | 40 | |
| 41 | 41 | $result = array( |
@@ -43,25 +43,25 @@ discard block |
||
| 43 | 43 | 'type' => $type, |
| 44 | 44 | 'attributes' => $attributes, |
| 45 | 45 | 'links' => array( |
| 46 | - 'self' => $this->url( $target, $cntl, $action, $params, [], $config ) |
|
| 46 | + 'self' => $this->url($target, $cntl, $action, $params, [], $config) |
|
| 47 | 47 | ), |
| 48 | 48 | 'relationships' => [] |
| 49 | 49 | ); |
| 50 | 50 | |
| 51 | - foreach( $childItems as $childId => $childItem ) |
|
| 51 | + foreach ($childItems as $childId => $childItem) |
|
| 52 | 52 | { |
| 53 | - if( $childItem instanceof \Aimeos\MShop\Order\Item\Status\Iface && $childItem->getParentId() == $id |
|
| 53 | + if ($childItem instanceof \Aimeos\MShop\Order\Item\Status\Iface && $childItem->getParentId() == $id |
|
| 54 | 54 | || $childItem instanceof \Aimeos\MShop\Order\Item\Base\Iface && $childItem->getId() == $baseId |
| 55 | 55 | ) { |
| 56 | 56 | $type = $childItem->getResourceType(); |
| 57 | - $params = array( 'resource' => $childItem->getResourceType(), 'id' => $childId ); |
|
| 57 | + $params = array('resource' => $childItem->getResourceType(), 'id' => $childId); |
|
| 58 | 58 | |
| 59 | - $result['relationships'][$type][] = array( 'data' => array( |
|
| 59 | + $result['relationships'][$type][] = array('data' => array( |
|
| 60 | 60 | 'id' => $childId, 'type' => $type, |
| 61 | 61 | 'links' => array( |
| 62 | - 'self' => $this->url( $target, $cntl, $action, $params, [], $config ) |
|
| 62 | + 'self' => $this->url($target, $cntl, $action, $params, [], $config) |
|
| 63 | 63 | ) |
| 64 | - ) ); |
|
| 64 | + )); |
|
| 65 | 65 | } |
| 66 | 66 | } |
| 67 | 67 | |
@@ -69,20 +69,20 @@ discard block |
||
| 69 | 69 | }; |
| 70 | 70 | |
| 71 | 71 | |
| 72 | -$data = $this->get( 'data', [] ); |
|
| 73 | -$childItems = $this->get( 'childItems', [] ); |
|
| 72 | +$data = $this->get('data', []); |
|
| 73 | +$childItems = $this->get('childItems', []); |
|
| 74 | 74 | |
| 75 | -if( is_array( $data ) ) |
|
| 75 | +if (is_array($data)) |
|
| 76 | 76 | { |
| 77 | 77 | $response = []; |
| 78 | 78 | |
| 79 | - foreach( $data as $item ) { |
|
| 80 | - $response[] = $build( $item, $childItems ); |
|
| 79 | + foreach ($data as $item) { |
|
| 80 | + $response[] = $build($item, $childItems); |
|
| 81 | 81 | } |
| 82 | 82 | } |
| 83 | -elseif( $data !== null ) |
|
| 83 | +elseif ($data !== null) |
|
| 84 | 84 | { |
| 85 | - $response = $build( $data, $childItems ); |
|
| 85 | + $response = $build($data, $childItems); |
|
| 86 | 86 | } |
| 87 | 87 | else |
| 88 | 88 | { |
@@ -90,4 +90,4 @@ discard block |
||
| 90 | 90 | } |
| 91 | 91 | |
| 92 | 92 | |
| 93 | -echo json_encode( $response, $options ); |
|
| 94 | 93 | \ No newline at end of file |
| 94 | +echo json_encode($response, $options); |
|
| 95 | 95 | \ No newline at end of file |
@@ -79,12 +79,10 @@ |
||
| 79 | 79 | foreach( $data as $item ) { |
| 80 | 80 | $response[] = $build( $item, $childItems ); |
| 81 | 81 | } |
| 82 | -} |
|
| 83 | -elseif( $data !== null ) |
|
| 82 | +} elseif( $data !== null ) |
|
| 84 | 83 | { |
| 85 | 84 | $response = $build( $data, $childItems ); |
| 86 | -} |
|
| 87 | -else |
|
| 85 | +} else |
|
| 88 | 86 | { |
| 89 | 87 | $response = null; |
| 90 | 88 | } |
