diff --git a/Admin/Installer.php b/Admin/Installer.php index 8330d4a..bcc5565 100755 --- a/Admin/Installer.php +++ b/Admin/Installer.php @@ -109,7 +109,7 @@ final class Installer extends InstallerAbstract $module->apiEquipmentTypeCreate($request, $response); - $responseData = $response->get(''); + $responseData = $response->getData(''); if (!\is_array($responseData)) { continue; } @@ -170,7 +170,7 @@ final class Installer extends InstallerAbstract $module->apiInspectionTypeCreate($request, $response); - $responseData = $response->get(''); + $responseData = $response->getData(''); if (!\is_array($responseData)) { continue; } @@ -235,7 +235,7 @@ final class Installer extends InstallerAbstract $module->apiEquipmentAttributeTypeCreate($request, $response); - $responseData = $response->get(''); + $responseData = $response->getData(''); if (!\is_array($responseData)) { continue; } @@ -306,7 +306,7 @@ final class Installer extends InstallerAbstract $module->apiEquipmentAttributeValueCreate($request, $response); - $responseData = $response->get(''); + $responseData = $response->getData(''); if (!\is_array($responseData)) { continue; } diff --git a/Controller/ApiEquipmentAttributeController.php b/Controller/ApiEquipmentAttributeController.php index 568f2c0..08a6185 100755 --- a/Controller/ApiEquipmentAttributeController.php +++ b/Controller/ApiEquipmentAttributeController.php @@ -61,7 +61,8 @@ final class ApiEquipmentAttributeController extends Controller return; } - $attribute = $this->createAttributeFromRequest($request); + $type = EquipmentAttributeTypeMapper::get()->where('id', (int) $request->getData('type'))->execute(); + $attribute = $this->createAttributeFromRequest($request, $type); $this->createModel($request->header->account, $attribute, EquipmentAttributeMapper::class, 'attribute', $request->getOrigin()); $this->createStandardCreateResponse($request, $response, $attribute); } diff --git a/Controller/ApiEquipmentController.php b/Controller/ApiEquipmentController.php index 8b03ffd..bf1d0e9 100755 --- a/Controller/ApiEquipmentController.php +++ b/Controller/ApiEquipmentController.php @@ -405,7 +405,7 @@ final class ApiEquipmentController extends Controller return; } - $responseData = $response->get($request->uri->__toString()); + $responseData = $response->getDataArray($request->uri->__toString()); if (!\is_array($responseData)) { return; } diff --git a/tests/Controller/Api/ApiControllerAttributeTrait.php b/tests/Controller/Api/ApiControllerAttributeTrait.php index d0bd836..e79da9f 100755 --- a/tests/Controller/Api/ApiControllerAttributeTrait.php +++ b/tests/Controller/Api/ApiControllerAttributeTrait.php @@ -38,7 +38,7 @@ trait ApiControllerAttributeTrait $request->setData('language', ISO639x1Enum::_EN); $this->attrModule->apiEquipmentAttributeTypeCreate($request, $response); - self::assertGreaterThan(0, $response->get('')['response']->id); + self::assertGreaterThan(0, $response->getDataArray('')['response']->id); } /** @@ -56,7 +56,7 @@ trait ApiControllerAttributeTrait $request->setData('language', ISO639x1Enum::_DE); $this->attrModule->apiEquipmentAttributeTypeL11nCreate($request, $response); - self::assertGreaterThan(0, $response->get('')['response']->id); + self::assertGreaterThan(0, $response->getDataArray('')['response']->id); } /** @@ -76,7 +76,7 @@ trait ApiControllerAttributeTrait $request->setData('country', ISO3166TwoEnum::_DEU); $this->attrModule->apiEquipmentAttributeValueCreate($request, $response); - self::assertGreaterThan(0, $response->get('')['response']->id); + self::assertGreaterThan(0, $response->getDataArray('')['response']->id); } /** @@ -95,7 +95,7 @@ trait ApiControllerAttributeTrait $request->setData('country', ISO3166TwoEnum::_DEU); $this->attrModule->apiEquipmentAttributeValueCreate($request, $response); - self::assertGreaterThan(0, $response->get('')['response']->id); + self::assertGreaterThan(0, $response->getDataArray('')['response']->id); } /** @@ -114,7 +114,7 @@ trait ApiControllerAttributeTrait $request->setData('country', ISO3166TwoEnum::_DEU); $this->attrModule->apiEquipmentAttributeValueCreate($request, $response); - self::assertGreaterThan(0, $response->get('')['response']->id); + self::assertGreaterThan(0, $response->getDataArray('')['response']->id); } /** @@ -133,7 +133,7 @@ trait ApiControllerAttributeTrait $request->setData('country', ISO3166TwoEnum::_DEU); $this->attrModule->apiEquipmentAttributeValueCreate($request, $response); - self::assertGreaterThan(0, $response->get('')['response']->id); + self::assertGreaterThan(0, $response->getDataArray('')['response']->id); } /** @@ -151,7 +151,7 @@ trait ApiControllerAttributeTrait $request->setData('type', '1'); $this->attrModule->apiEquipmentAttributeCreate($request, $response); - self::assertGreaterThan(0, $response->get('')['response']->id); + self::assertGreaterThan(0, $response->getDataArray('')['response']->id); } /** diff --git a/tests/Controller/Api/ApiControllerEquipmentTrait.php b/tests/Controller/Api/ApiControllerEquipmentTrait.php index b16f77d..46b80c7 100644 --- a/tests/Controller/Api/ApiControllerEquipmentTrait.php +++ b/tests/Controller/Api/ApiControllerEquipmentTrait.php @@ -45,6 +45,6 @@ trait ApiControllerEquipmentTrait $request->setData('status', 1); $this->module->apiEquipmentCreate($request, $response); - self::assertGreaterThan(0, $response->get('')['response']->id); + self::assertGreaterThan(0, $response->getDataArray('')['response']->id); } }