From 6cca68544fbf6edcdd783d0d00b07edc88dcc1fd Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Fri, 21 Mar 2025 02:48:18 +0000 Subject: [PATCH] crash backup --- Controller/ApiAttributeController.php | 20 ++++++++++---------- Controller/ApiContractTypeController.php | 8 ++++---- Controller/ApiController.php | 4 ++-- Controller/BackendController.php | 10 +++++----- 4 files changed, 21 insertions(+), 21 deletions(-) diff --git a/Controller/ApiAttributeController.php b/Controller/ApiAttributeController.php index 04e58be..aec00d7 100644 --- a/Controller/ApiAttributeController.php +++ b/Controller/ApiAttributeController.php @@ -224,7 +224,7 @@ final class ApiAttributeController 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); @@ -272,7 +272,7 @@ final class ApiAttributeController extends Controller $contractAttribute = ContractAttributeMapper::get() ->with('type') - ->where('id', (int) $request->getData('id')) + ->where('id', $request->getDataInt('id') ?? 0) ->execute(); if ($contractAttribute->type->isRequired) { @@ -308,7 +308,7 @@ final class ApiAttributeController extends Controller } /** @var BaseStringL11n $old */ - $old = ContractAttributeTypeL11nMapper::get()->where('id', (int) $request->getData('id'))->execute(); + $old = ContractAttributeTypeL11nMapper::get()->where('id', $request->getDataInt('id') ?? 0)->execute(); $new = $this->updateAttributeTypeL11nFromRequest($request, clone $old); $this->updateModel($request->header->account, $old, $new, ContractAttributeTypeL11nMapper::class, 'contract_attribute_type_l11n', $request->getOrigin()); @@ -338,7 +338,7 @@ final class ApiAttributeController extends Controller } /** @var BaseStringL11n $contractAttributeTypeL11n */ - $contractAttributeTypeL11n = ContractAttributeTypeL11nMapper::get()->where('id', (int) $request->getData('id'))->execute(); + $contractAttributeTypeL11n = ContractAttributeTypeL11nMapper::get()->where('id', $request->getDataInt('id') ?? 0)->execute(); $this->deleteModel($request->header->account, $contractAttributeTypeL11n, ContractAttributeTypeL11nMapper::class, 'contract_attribute_type_l11n', $request->getOrigin()); $this->createStandardDeleteResponse($request, $response, $contractAttributeTypeL11n); } @@ -366,7 +366,7 @@ final class ApiAttributeController extends Controller } /** @var AttributeType $old */ - $old = ContractAttributeTypeMapper::get()->with('defaults')->where('id', (int) $request->getData('id'))->execute(); + $old = ContractAttributeTypeMapper::get()->with('defaults')->where('id', $request->getDataInt('id') ?? 0)->execute(); $new = $this->updateAttributeTypeFromRequest($request, clone $old); $this->updateModel($request->header->account, $old, $new, ContractAttributeTypeMapper::class, 'contract_attribute_type', $request->getOrigin()); @@ -398,7 +398,7 @@ final class ApiAttributeController extends Controller } /** @var AttributeType $contractAttributeType */ - $contractAttributeType = ContractAttributeTypeMapper::get()->with('defaults')->where('id', (int) $request->getData('id'))->execute(); + $contractAttributeType = ContractAttributeTypeMapper::get()->with('defaults')->where('id', $request->getDataInt('id') ?? 0)->execute(); $this->deleteModel($request->header->account, $contractAttributeType, ContractAttributeTypeMapper::class, 'contract_attribute_type', $request->getOrigin()); $this->createStandardDeleteResponse($request, $response, $contractAttributeType); } @@ -426,7 +426,7 @@ final class ApiAttributeController extends Controller } /** @var AttributeValue $old */ - $old = ContractAttributeValueMapper::get()->where('id', (int) $request->getData('id'))->execute(); + $old = ContractAttributeValueMapper::get()->where('id', $request->getDataInt('id') ?? 0)->execute(); /** @var \Modules\Attribute\Models\Attribute $attr */ $attr = ContractAttributeMapper::get() @@ -466,7 +466,7 @@ final class ApiAttributeController extends Controller // } // /** @var AttributeValue $contractAttributeValue */ - // $contractAttributeValue = ContractAttributeValueMapper::get()->where('id', (int) $request->getData('id'))->execute(); + // $contractAttributeValue = ContractAttributeValueMapper::get()->where('id', $request->getDataInt('id') ?? 0)->execute(); // $this->deleteModel($request->header->account, $contractAttributeValue, ContractAttributeValueMapper::class, 'contract_attribute_value', $request->getOrigin()); // $this->createStandardDeleteResponse($request, $response, $contractAttributeValue); } @@ -494,7 +494,7 @@ final class ApiAttributeController extends Controller } /** @var BaseStringL11n $old */ - $old = ContractAttributeValueL11nMapper::get()->where('id', (int) $request->getData('id')); + $old = ContractAttributeValueL11nMapper::get()->where('id', $request->getDataInt('id') ?? 0); $new = $this->updateAttributeValueL11nFromRequest($request, clone $old); $this->updateModel($request->header->account, $old, $new, ContractAttributeValueL11nMapper::class, 'contract_attribute_value_l11n', $request->getOrigin()); @@ -524,7 +524,7 @@ final class ApiAttributeController extends Controller } /** @var BaseStringL11n $contractAttributeValueL11n */ - $contractAttributeValueL11n = ContractAttributeValueL11nMapper::get()->where('id', (int) $request->getData('id'))->execute(); + $contractAttributeValueL11n = ContractAttributeValueL11nMapper::get()->where('id', $request->getDataInt('id') ?? 0)->execute(); $this->deleteModel($request->header->account, $contractAttributeValueL11n, ContractAttributeValueL11nMapper::class, 'contract_attribute_value_l11n', $request->getOrigin()); $this->createStandardDeleteResponse($request, $response, $contractAttributeValueL11n); } diff --git a/Controller/ApiContractTypeController.php b/Controller/ApiContractTypeController.php index dbb0358..de3e14c 100644 --- a/Controller/ApiContractTypeController.php +++ b/Controller/ApiContractTypeController.php @@ -192,7 +192,7 @@ final class ApiContractTypeController extends Controller } /** @var BaseStringL11nType $old */ - $old = ContractTypeMapper::get()->where('id', (int) $request->getData('id')); + $old = ContractTypeMapper::get()->where('id', $request->getDataInt('id') ?? 0); $new = $this->updateContractTypeFromRequest($request, clone $old); $this->updateModel($request->header->account, $old, $new, ContractTypeMapper::class, 'contract_type', $request->getOrigin()); @@ -262,7 +262,7 @@ final class ApiContractTypeController extends Controller } /** @var BaseStringL11nType $contractType */ - $contractType = ContractTypeMapper::get()->where('id', (int) $request->getData('id'))->execute(); + $contractType = ContractTypeMapper::get()->where('id', $request->getDataInt('id') ?? 0)->execute(); $this->deleteModel($request->header->account, $contractType, ContractTypeMapper::class, 'contract_type', $request->getOrigin()); $this->createStandardDeleteResponse($request, $response, $contractType); } @@ -309,7 +309,7 @@ final class ApiContractTypeController extends Controller } /** @var BaseStringL11n $old */ - $old = ContractTypeL11nMapper::get()->where('id', (int) $request->getData('id')); + $old = ContractTypeL11nMapper::get()->where('id', $request->getDataInt('id') ?? 0); $new = $this->updateContractTypeL11nFromRequest($request, clone $old); $this->updateModel($request->header->account, $old, $new, ContractTypeL11nMapper::class, 'contract_type_l11n', $request->getOrigin()); @@ -376,7 +376,7 @@ final class ApiContractTypeController extends Controller } /** @var BaseStringL11n $contractTypeL11n */ - $contractTypeL11n = ContractTypeL11nMapper::get()->where('id', (int) $request->getData('id'))->execute(); + $contractTypeL11n = ContractTypeL11nMapper::get()->where('id', $request->getDataInt('id') ?? 0)->execute(); $this->deleteModel($request->header->account, $contractTypeL11n, ContractTypeL11nMapper::class, 'contract_type_l11n', $request->getOrigin()); $this->createStandardDeleteResponse($request, $response, $contractTypeL11n); } diff --git a/Controller/ApiController.php b/Controller/ApiController.php index ce10fc8..f3516dd 100755 --- a/Controller/ApiController.php +++ b/Controller/ApiController.php @@ -212,7 +212,7 @@ final class ApiController extends Controller } /** @var \Modules\ContractManagement\Models\Contract $old */ - $old = ContractMapper::get()->where('id', (int) $request->getData('id'))->execute(); + $old = ContractMapper::get()->where('id', $request->getDataInt('id') ?? 0)->execute(); $new = $this->updateContractFromRequest($request, clone $old); $this->updateModel($request->header->account, $old, $new, ContractMapper::class, 'contract', $request->getOrigin()); @@ -290,7 +290,7 @@ final class ApiController extends Controller } /** @var \Modules\ContractManagement\Models\Contract $contract */ - $contract = ContractMapper::get()->where('id', (int) $request->getData('id'))->execute(); + $contract = ContractMapper::get()->where('id', $request->getDataInt('id') ?? 0)->execute(); $this->deleteModel($request->header->account, $contract, ContractMapper::class, 'contract', $request->getOrigin()); $this->createStandardDeleteResponse($request, $response, $contract); } diff --git a/Controller/BackendController.php b/Controller/BackendController.php index 9aa041f..0919fea 100755 --- a/Controller/BackendController.php +++ b/Controller/BackendController.php @@ -131,7 +131,7 @@ final class BackendController extends Controller $view->data['type'] = ContractTypeMapper::get() ->with('l11n') ->where('l11n/language', $response->header->l11n->language) - ->where('id', (int) $request->getData('id')) + ->where('id', $request->getDataInt('id') ?? 0) ->execute(); $view->data['l11nView'] = new \Web\Backend\Views\L11nView($this->app->l11nManager, $request, $response); @@ -219,7 +219,7 @@ final class BackendController extends Controller ->with('attributes/value/l11n') ->with('files') ->with('notes') - ->where('id', (int) $request->getData('id')) + ->where('id', $request->getDataInt('id') ?? 0) ->where('attributes/type/l11n/language', $response->header->l11n->language) ->where('attributes/value/l11n/language', [$response->header->l11n->language, null]) ->sort('files/id', OrderType::DESC) @@ -227,7 +227,7 @@ final class BackendController extends Controller $view->data['children'] = ContractMapper::getAll() ->with('account') - ->where('parent', (int) $request->getData('id')) + ->where('parent', $request->getDataInt('id') ?? 0) ->sort('createdAt', OrderType::DESC) ->executeGetArray(); @@ -302,7 +302,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(); @@ -386,7 +386,7 @@ final class BackendController extends Controller $view->attribute = ContractAttributeValueMapper::get() ->with('l11n') - ->where('id', (int) $request->getData('id')) + ->where('id', $request->getDataInt('id') ?? 0) ->where('l11n/language', [$response->header->l11n->language, null]) ->execute();