diff --git a/Controller/ApiAssetAttributeController.php b/Controller/ApiAssetAttributeController.php index 3279459..87cdd59 100644 --- a/Controller/ApiAssetAttributeController.php +++ b/Controller/ApiAssetAttributeController.php @@ -63,14 +63,14 @@ final class ApiAssetAttributeController extends Controller $type = AssetAttributeTypeMapper::get() ->with('defaults') - ->where('id', (int) $request->getData('type')) + ->where('id', $request->getDataInt('type') ?? 0) ->execute(); if (!$type->isRepeatable) { $attr = AssetAttributeMapper::count() ->with('type') ->where('type/id', $type->id) - ->where('ref', (int) $request->getData('ref')) + ->where('ref', $request->getDataInt('ref') ?? 0) ->executeCount(); if ($attr > 0) { @@ -243,7 +243,7 @@ final class ApiAssetAttributeController extends Controller ->with('type') ->with('type/defaults') ->with('value') - ->where('id', (int) $request->getData('id')) + ->where('id', $request->getDataInt('id') ?? 0) ->execute(); $new = $this->updateAttributeFromRequest($request, clone $old); @@ -291,7 +291,7 @@ final class ApiAssetAttributeController extends Controller $assetAttribute = AssetAttributeMapper::get() ->with('type') - ->where('id', (int) $request->getData('id')) + ->where('id', $request->getDataInt('id') ?? 0) ->execute(); if ($assetAttribute->type->isRequired) { @@ -327,7 +327,7 @@ final class ApiAssetAttributeController extends Controller } /** @var BaseStringL11n $old */ - $old = AssetAttributeTypeL11nMapper::get()->where('id', (int) $request->getData('id'))->execute(); + $old = AssetAttributeTypeL11nMapper::get()->where('id', $request->getDataInt('id') ?? 0)->execute(); $new = $this->updateAttributeTypeL11nFromRequest($request, clone $old); $this->updateModel($request->header->account, $old, $new, AssetAttributeTypeL11nMapper::class, 'asset_attribute_type_l11n', $request->getOrigin()); @@ -357,7 +357,7 @@ final class ApiAssetAttributeController extends Controller } /** @var BaseStringL11n $assetAttributeTypeL11n */ - $assetAttributeTypeL11n = AssetAttributeTypeL11nMapper::get()->where('id', (int) $request->getData('id'))->execute(); + $assetAttributeTypeL11n = AssetAttributeTypeL11nMapper::get()->where('id', $request->getDataInt('id') ?? 0)->execute(); $this->deleteModel($request->header->account, $assetAttributeTypeL11n, AssetAttributeTypeL11nMapper::class, 'asset_attribute_type_l11n', $request->getOrigin()); $this->createStandardDeleteResponse($request, $response, $assetAttributeTypeL11n); } @@ -385,7 +385,7 @@ final class ApiAssetAttributeController extends Controller } /** @var AttributeType $old */ - $old = AssetAttributeTypeMapper::get()->with('defaults')->where('id', (int) $request->getData('id'))->execute(); + $old = AssetAttributeTypeMapper::get()->with('defaults')->where('id', $request->getDataInt('id') ?? 0)->execute(); $new = $this->updateAttributeTypeFromRequest($request, clone $old); $this->updateModel($request->header->account, $old, $new, AssetAttributeTypeMapper::class, 'asset_attribute_type', $request->getOrigin()); @@ -417,7 +417,7 @@ final class ApiAssetAttributeController extends Controller } /** @var AttributeType $assetAttributeType */ - $assetAttributeType = AssetAttributeTypeMapper::get()->with('defaults')->where('id', (int) $request->getData('id'))->execute(); + $assetAttributeType = AssetAttributeTypeMapper::get()->with('defaults')->where('id', $request->getDataInt('id') ?? 0)->execute(); $this->deleteModel($request->header->account, $assetAttributeType, AssetAttributeTypeMapper::class, 'asset_attribute_type', $request->getOrigin()); $this->createStandardDeleteResponse($request, $response, $assetAttributeType); } @@ -445,7 +445,7 @@ final class ApiAssetAttributeController extends Controller } /** @var AttributeValue $old */ - $old = AssetAttributeValueMapper::get()->where('id', (int) $request->getData('id'))->execute(); + $old = AssetAttributeValueMapper::get()->where('id', $request->getDataInt('id') ?? 0)->execute(); /** @var \Modules\Attribute\Models\Attribute $attr */ $attr = AssetAttributeMapper::get() @@ -485,7 +485,7 @@ final class ApiAssetAttributeController extends Controller // } // /** @var \Modules\AssetManagement\Models\AssetAttributeValue $assetAttributeValue */ - // $assetAttributeValue = AssetAttributeValueMapper::get()->where('id', (int) $request->getData('id'))->execute(); + // $assetAttributeValue = AssetAttributeValueMapper::get()->where('id', $request->getDataInt('id') ?? 0)->execute(); // $this->deleteModel($request->header->account, $assetAttributeValue, AssetAttributeValueMapper::class, 'asset_attribute_value', $request->getOrigin()); // $this->createStandardDeleteResponse($request, $response, $assetAttributeValue); } @@ -513,7 +513,7 @@ final class ApiAssetAttributeController extends Controller } /** @var BaseStringL11n $old */ - $old = AssetAttributeValueL11nMapper::get()->where('id', (int) $request->getData('id')); + $old = AssetAttributeValueL11nMapper::get()->where('id', $request->getDataInt('id') ?? 0); $new = $this->updateAttributeValueL11nFromRequest($request, clone $old); $this->updateModel($request->header->account, $old, $new, AssetAttributeValueL11nMapper::class, 'asset_attribute_value_l11n', $request->getOrigin()); @@ -543,7 +543,7 @@ final class ApiAssetAttributeController extends Controller } /** @var BaseStringL11n $assetAttributeValueL11n */ - $assetAttributeValueL11n = AssetAttributeValueL11nMapper::get()->where('id', (int) $request->getData('id'))->execute(); + $assetAttributeValueL11n = AssetAttributeValueL11nMapper::get()->where('id', $request->getDataInt('id') ?? 0)->execute(); $this->deleteModel($request->header->account, $assetAttributeValueL11n, AssetAttributeValueL11nMapper::class, 'asset_attribute_value_l11n', $request->getOrigin()); $this->createStandardDeleteResponse($request, $response, $assetAttributeValueL11n); } diff --git a/Controller/ApiAssetTypeController.php b/Controller/ApiAssetTypeController.php index f8a379e..47615ec 100644 --- a/Controller/ApiAssetTypeController.php +++ b/Controller/ApiAssetTypeController.php @@ -194,7 +194,7 @@ final class ApiAssetTypeController extends Controller } /** @var BaseStringL11nType $old */ - $old = AssetTypeMapper::get()->where('id', (int) $request->getData('id')); + $old = AssetTypeMapper::get()->where('id', $request->getDataInt('id') ?? 0); $new = $this->updateAssetTypeFromRequest($request, clone $old); $this->updateModel($request->header->account, $old, $new, AssetTypeMapper::class, 'asset_type', $request->getOrigin()); @@ -264,7 +264,7 @@ final class ApiAssetTypeController extends Controller } /** @var BaseStringL11nType $assetType */ - $assetType = AssetTypeMapper::get()->where('id', (int) $request->getData('id'))->execute(); + $assetType = AssetTypeMapper::get()->where('id', $request->getDataInt('id') ?? 0)->execute(); $this->deleteModel($request->header->account, $assetType, AssetTypeMapper::class, 'asset_type', $request->getOrigin()); $this->createStandardDeleteResponse($request, $response, $assetType); } @@ -311,7 +311,7 @@ final class ApiAssetTypeController extends Controller } /** @var BaseStringL11n $old */ - $old = AssetTypeL11nMapper::get()->where('id', (int) $request->getData('id')); + $old = AssetTypeL11nMapper::get()->where('id', $request->getDataInt('id') ?? 0); $new = $this->updateAssetTypeL11nFromRequest($request, clone $old); $this->updateModel($request->header->account, $old, $new, AssetTypeL11nMapper::class, 'asset_type_l11n', $request->getOrigin()); @@ -378,7 +378,7 @@ final class ApiAssetTypeController extends Controller } /** @var BaseStringL11n $assetTypeL11n */ - $assetTypeL11n = AssetTypeL11nMapper::get()->where('id', (int) $request->getData('id'))->execute(); + $assetTypeL11n = AssetTypeL11nMapper::get()->where('id', $request->getDataInt('id') ?? 0)->execute(); $this->deleteModel($request->header->account, $assetTypeL11n, AssetTypeL11nMapper::class, 'asset_type_l11n', $request->getOrigin()); $this->createStandardDeleteResponse($request, $response, $assetTypeL11n); } diff --git a/Controller/ApiController.php b/Controller/ApiController.php index 9e8c04b..9a706ed 100644 --- a/Controller/ApiController.php +++ b/Controller/ApiController.php @@ -355,7 +355,7 @@ final class ApiController extends Controller } /** @var \Modules\AssetManagement\Models\Asset $old */ - $old = AssetMapper::get()->where('id', (int) $request->getData('id'))->execute(); + $old = AssetMapper::get()->where('id', $request->getDataInt('id') ?? 0)->execute(); $new = $this->updateAssetFromRequest($request, clone $old); $this->updateModel($request->header->account, $old, $new, AssetMapper::class, 'asset', $request->getOrigin()); @@ -429,7 +429,7 @@ final class ApiController extends Controller } /** @var \Modules\AssetManagement\Models\Asset $asset */ - $asset = AssetMapper::get()->where('id', (int) $request->getData('id'))->execute(); + $asset = AssetMapper::get()->where('id', $request->getDataInt('id') ?? 0)->execute(); $this->deleteModel($request->header->account, $asset, AssetMapper::class, 'asset', $request->getOrigin()); $this->createStandardDeleteResponse($request, $response, $asset); } diff --git a/Controller/BackendController.php b/Controller/BackendController.php index f5ee249..e06f066 100644 --- a/Controller/BackendController.php +++ b/Controller/BackendController.php @@ -97,7 +97,7 @@ final class BackendController extends Controller ->with('files/tags') ->with('type') ->with('type/l11n') - ->where('id', (int) $request->getData('id')) + ->where('id', $request->getDataInt('id') ?? 0) ->where('type/l11n/language', $response->header->l11n->language) ->where('attributes/type/l11n/language', $response->header->l11n->language) ->where('attributes/value/l11n/language', [$response->header->l11n->language, null]) @@ -214,7 +214,7 @@ final class BackendController extends Controller ->with('l11n') ->with('defaults') ->with('defaults/l11n') - ->where('id', (int) $request->getData('id')) + ->where('id', $request->getDataInt('id') ?? 0) ->where('l11n/language', $response->header->l11n->language) ->where('defaults/l11n/language', [$response->header->l11n->language, null]) ->execute();