From b4e3214dc3fe7522486d6bb659395cec15da62b8 Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Mon, 26 Dec 2022 20:52:57 +0100 Subject: [PATCH] fix phpstan lvl 9 bugs --- Controller/ApiController.php | 11 +++++++--- Controller/BackendController.php | 35 ++++++++++++++++++-------------- Models/SalesBillMapper.php | 6 +++--- 3 files changed, 31 insertions(+), 21 deletions(-) diff --git a/Controller/ApiController.php b/Controller/ApiController.php index bfe70a9..048986f 100755 --- a/Controller/ApiController.php +++ b/Controller/ApiController.php @@ -27,6 +27,7 @@ use Modules\Billing\Models\BillTypeMapper; use Modules\Billing\Models\SettingsEnum; use Modules\ClientManagement\Models\ClientMapper; use Modules\ItemManagement\Models\ItemMapper; +use Modules\ItemManagement\Models\NullItem; use Modules\Media\Models\CollectionMapper; use Modules\Media\Models\MediaMapper; use Modules\Media\Models\NullCollection; @@ -169,8 +170,10 @@ final class ApiController extends Controller */ public function createBillFromRequest(RequestAbstract $request, ResponseAbstract $response, $data = null) : Bill { + /** @var \Modules\ClientManagement\Models\Client|\Modules\SupplierManagement\Models\Supplier $account */ $account = null; if ($request->getData('client') !== null) { + /** @var \Modules\ClientManagement\Models\Client $account */ $account = ClientMapper::get() ->with('profile') ->with('profile/account') @@ -178,8 +181,10 @@ final class ApiController extends Controller ->where('id', (int) $request->getData('client')) ->execute(); } elseif (((int) ($request->getData('supplier') ?? -1)) === 0) { + /** @var \Modules\SupplierManagement\Models\Supplier $account */ $account = new NullSupplier(); } elseif ($request->getData('supplier') !== null) { + /** @var \Modules\SupplierManagement\Models\Supplier $account */ $account = SupplierMapper::get() ->with('profile') ->with('profile/account') @@ -206,8 +211,8 @@ final class ApiController extends Controller $bill->billZip = $request->getData('billtopostal') ?? $account->mainAddress->postal; $bill->billCity = $request->getData('billtocity') ?? $account->mainAddress->city; $bill->billCountry = $request->getData('billtocountry') ?? $account->mainAddress->getCountry(); - $bill->client = $request->getData('client') === null ? null : $account; - $bill->supplier = $request->getData('supplier') === null ? null : $account; + $bill->client = !$request->hasData('client') ? null : $account; + $bill->supplier = !$request->hasData('supplier') ? null : $account; $bill->performanceDate = new \DateTime($request->getData('performancedate') ?? 'now'); $bill->setStatus((int) ($request->getData('status') ?? BillStatus::ACTIVE)); @@ -414,7 +419,7 @@ final class ApiController extends Controller { $element = new BillElement(); $element->bill = (int) $request->getData('bill'); - $element->item = $request->getData('item', 'int'); + $element->item = (int) ($request->getData('item') ?? 0); if ($element->item === null) { return $element; diff --git a/Controller/BackendController.php b/Controller/BackendController.php index 411dfdf..8bb8dae 100755 --- a/Controller/BackendController.php +++ b/Controller/BackendController.php @@ -120,12 +120,13 @@ final class BackendController extends Controller $view->setData('bill', $bill); - $previewType = (int) $this->app->appSettings->get( + /** @var \Model\Setting $previewType */ + $previewType = $this->app->appSettings->get( names: SettingsEnum::PREVIEW_MEDIA_TYPE, module: self::NAME - )->content; + ); - $view->setData('previewType', $previewType); + $view->setData('previewType', (int) $previewType->content); return $view; } @@ -273,19 +274,21 @@ final class BackendController extends Controller $view->setData('bill', $bill); - $previewType = (int) $this->app->appSettings->get( + /** @var \Model\Setting $previewType */ + $previewType = $this->app->appSettings->get( names: SettingsEnum::PREVIEW_MEDIA_TYPE, module: self::NAME - )->content; + ); - $view->setData('previewType', $previewType); + $view->setData('previewType', (int) $previewType->content); - $originalType = (int) $this->app->appSettings->get( + /** @var \Model\Setting $originalType */ + $originalType = $this->app->appSettings->get( names: SettingsEnum::ORIGINAL_MEDIA_TYPE, module: self::NAME - )->content; + ); - $view->setData('originalType', $originalType); + $view->setData('originalType', (int) $originalType->content); return $view; } @@ -778,19 +781,21 @@ final class BackendController extends Controller $view->setData('bill', $bill); - $previewType = (int) $this->app->appSettings->get( + /** @var \Model\Setting $previewType */ + $previewType = $this->app->appSettings->get( names: SettingsEnum::PREVIEW_MEDIA_TYPE, module: self::NAME - )->content; + ); - $view->setData('previewType', $previewType); + $view->setData('previewType', (int) $previewType->content); - $originalType = (int) $this->app->appSettings->get( + /** @var \Model\Setting $originalType */ + $originalType = $this->app->appSettings->get( names: SettingsEnum::ORIGINAL_MEDIA_TYPE, module: self::NAME - )->content; + ); - $view->setData('originalType', $originalType); + $view->setData('originalType', (int) $originalType->content); return $view; } diff --git a/Models/SalesBillMapper.php b/Models/SalesBillMapper.php index b76ed20..9360d3f 100755 --- a/Models/SalesBillMapper.php +++ b/Models/SalesBillMapper.php @@ -91,7 +91,7 @@ final class SalesBillMapper extends BillMapper ->execute() ?->fetch(); - return new Money((int) $result[0]); + return new Money((int) $result[0] ?? 0); } /** @@ -108,7 +108,7 @@ final class SalesBillMapper extends BillMapper ->execute() ?->fetch(); - return new Money((int) $result[0]); + return new Money((int) $result[0] ?? 0); } /** @@ -127,7 +127,7 @@ final class SalesBillMapper extends BillMapper ->execute() ?->fetch(); - return new Money($result === false || $result[1] == 0 ? 0 : (int) (((int) $result[0]) / ((int) $result[1]))); + return new Money($result === false || $result[1] ?? 0 === 0 ? 0 : (int) (((int) $result[0] ?? 0) / ((int) $result[1] ?? 0))); } /**