Jingga/oms-EquipmentManagement
1
0
Fork 0
mirror of https://github.com/Karaka-Management/oms-EquipmentManagement.git synced 2026-02-15 17:58:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

automated phpcs fixes

Browse Source
This commit is contained in:
Dennis Eichhorn 2023-05-31 13:21:47 +00:00
parent c4364e243b
commit c22b2890a7
4 changed files with 26 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
Controller/ApiController.php
View File

@ -32,8 +32,6 @@ use Modules\FleetManagement\Models\VehicleAttributeValueL11nMapper;
use Modules\FleetManagement\Models\VehicleAttributeValueMapper; use Modules\FleetManagement\Models\VehicleAttributeValueMapper;
use Modules\FleetManagement\Models\VehicleMapper; use Modules\FleetManagement\Models\VehicleMapper;
use Modules\FleetManagement\Models\VehicleStatus; use Modules\FleetManagement\Models\VehicleStatus;
use phpOMS\Localization\NullBaseStringL11nType;
use phpOMS\Localization\BaseStringL11nType;
use Modules\FleetManagement\Models\VehicleTypeL11nMapper; use Modules\FleetManagement\Models\VehicleTypeL11nMapper;
use Modules\FleetManagement\Models\VehicleTypeMapper; use Modules\FleetManagement\Models\VehicleTypeMapper;
use Modules\Media\Models\CollectionMapper; use Modules\Media\Models\CollectionMapper;
@ -42,7 +40,9 @@ use Modules\Media\Models\NullMedia;
use Modules\Media\Models\PathSettings; use Modules\Media\Models\PathSettings;
use Modules\Media\Models\Reference; use Modules\Media\Models\Reference;
use phpOMS\Localization\BaseStringL11n; use phpOMS\Localization\BaseStringL11n;
use phpOMS\Localization\BaseStringL11nType;
use phpOMS\Localization\ISO639x1Enum; use phpOMS\Localization\ISO639x1Enum;
use phpOMS\Localization\NullBaseStringL11nType;
use phpOMS\Message\Http\RequestStatusCode; use phpOMS\Message\Http\RequestStatusCode;
use phpOMS\Message\NotificationLevel; use phpOMS\Message\NotificationLevel;
use phpOMS\Message\RequestAbstract; use phpOMS\Message\RequestAbstract;
@ -76,7 +76,7 @@ final class ApiController extends Controller
{ {
if (!empty($val = $this->validateVehicleTypeCreate($request))) { if (!empty($val = $this->validateVehicleTypeCreate($request))) {
$response->data[$request->uri->__toString()] = new FormValidation($val); $response->data[$request->uri->__toString()] = new FormValidation($val);
$response->header->status = RequestStatusCode::R_400; $response->header->status = RequestStatusCode::R_400;
return; return;
} }
@ -106,7 +106,7 @@ final class ApiController extends Controller
*/ */
public function createVehicleTypeFromRequest(RequestAbstract $request) : BaseStringL11nType public function createVehicleTypeFromRequest(RequestAbstract $request) : BaseStringL11nType
{ {
$type = new BaseStringL11nType(); $type = new BaseStringL11nType();
$type->title = $request->getDataString('name') ?? ''; $type->title = $request->getDataString('name') ?? '';
$type->setL11n($request->getDataString('title') ?? '', $request->getDataString('language') ?? ISO639x1Enum::_EN); $type->setL11n($request->getDataString('title') ?? '', $request->getDataString('language') ?? ISO639x1Enum::_EN);
@ -151,7 +151,7 @@ final class ApiController extends Controller
{ {
if (!empty($val = $this->validateVehicleTypeL11nCreate($request))) { if (!empty($val = $this->validateVehicleTypeL11nCreate($request))) {
$response->data['vehicle_type_l11n_create'] = new FormValidation($val); $response->data['vehicle_type_l11n_create'] = new FormValidation($val);
$response->header->status = RequestStatusCode::R_400; $response->header->status = RequestStatusCode::R_400;
return; return;
} }
@ -220,7 +220,7 @@ final class ApiController extends Controller
{ {
if (!empty($val = $this->validateFuelTypeCreate($request))) { if (!empty($val = $this->validateFuelTypeCreate($request))) {
$response->data[$request->uri->__toString()] = new FormValidation($val); $response->data[$request->uri->__toString()] = new FormValidation($val);
$response->header->status = RequestStatusCode::R_400; $response->header->status = RequestStatusCode::R_400;
return; return;
} }
@ -250,7 +250,7 @@ final class ApiController extends Controller
*/ */
public function createFuelTypeFromRequest(RequestAbstract $request) : BaseStringL11nType public function createFuelTypeFromRequest(RequestAbstract $request) : BaseStringL11nType
{ {
$type = new BaseStringL11nType(); $type = new BaseStringL11nType();
$type->title = $request->getDataString('name') ?? ''; $type->title = $request->getDataString('name') ?? '';
$type->setL11n($request->getDataString('title') ?? '', $request->getDataString('language') ?? ISO639x1Enum::_EN); $type->setL11n($request->getDataString('title') ?? '', $request->getDataString('language') ?? ISO639x1Enum::_EN);
@ -295,7 +295,7 @@ final class ApiController extends Controller
{ {
if (!empty($val = $this->validateFuelTypeL11nCreate($request))) { if (!empty($val = $this->validateFuelTypeL11nCreate($request))) {
$response->data['fuel_type_l11n_create'] = new FormValidation($val); $response->data['fuel_type_l11n_create'] = new FormValidation($val);
$response->header->status = RequestStatusCode::R_400; $response->header->status = RequestStatusCode::R_400;
return; return;
} }
@ -364,7 +364,7 @@ final class ApiController extends Controller
{ {
if (!empty($val = $this->validateVehicleCreate($request))) { if (!empty($val = $this->validateVehicleCreate($request))) {
$response->data[$request->uri->__toString()] = new FormValidation($val); $response->data[$request->uri->__toString()] = new FormValidation($val);
$response->header->status = RequestStatusCode::R_400; $response->header->status = RequestStatusCode::R_400;
return; return;
} }
@ -562,7 +562,7 @@ final class ApiController extends Controller
{ {
if (!empty($val = $this->validateVehicleAttributeCreate($request))) { if (!empty($val = $this->validateVehicleAttributeCreate($request))) {
$response->data['attribute_create'] = new FormValidation($val); $response->data['attribute_create'] = new FormValidation($val);
$response->header->status = RequestStatusCode::R_400; $response->header->status = RequestStatusCode::R_400;
return; return;
} }
@ -641,7 +641,7 @@ final class ApiController extends Controller
{ {
if (!empty($val = $this->validateVehicleAttributeUpdate($request))) { if (!empty($val = $this->validateVehicleAttributeUpdate($request))) {
$response->data['attribute_update'] = new FormValidation($val); $response->data['attribute_update'] = new FormValidation($val);
$response->header->status = RequestStatusCode::R_400; $response->header->status = RequestStatusCode::R_400;
return; return;
} }
@ -731,7 +731,7 @@ final class ApiController extends Controller
{ {
if (!empty($val = $this->validateVehicleAttributeTypeL11nCreate($request))) { if (!empty($val = $this->validateVehicleAttributeTypeL11nCreate($request))) {
$response->data['attr_type_l11n_create'] = new FormValidation($val); $response->data['attr_type_l11n_create'] = new FormValidation($val);
$response->header->status = RequestStatusCode::R_400; $response->header->status = RequestStatusCode::R_400;
return; return;
} }
@ -800,7 +800,7 @@ final class ApiController extends Controller
{ {
if (!empty($val = $this->validateVehicleAttributeTypeCreate($request))) { if (!empty($val = $this->validateVehicleAttributeTypeCreate($request))) {
$response->data['attr_type_create'] = new FormValidation($val); $response->data['attr_type_create'] = new FormValidation($val);
$response->header->status = RequestStatusCode::R_400; $response->header->status = RequestStatusCode::R_400;
return; return;
} }
@ -871,7 +871,7 @@ final class ApiController extends Controller
{ {
if (!empty($val = $this->validateVehicleAttributeValueCreate($request))) { if (!empty($val = $this->validateVehicleAttributeValueCreate($request))) {
$response->data['attr_value_create'] = new FormValidation($val); $response->data['attr_value_create'] = new FormValidation($val);
$response->header->status = RequestStatusCode::R_400; $response->header->status = RequestStatusCode::R_400;
return; return;
} }
@ -956,7 +956,7 @@ final class ApiController extends Controller
{ {
if (!empty($val = $this->validateVehicleAttributeValueL11nCreate($request))) { if (!empty($val = $this->validateVehicleAttributeValueL11nCreate($request))) {
$response->data['attr_value_l11n_create'] = new FormValidation($val); $response->data['attr_value_l11n_create'] = new FormValidation($val);
$response->header->status = RequestStatusCode::R_400; $response->header->status = RequestStatusCode::R_400;
return; return;
} }
@ -1025,7 +1025,7 @@ final class ApiController extends Controller
{ {
if (!empty($val = $this->validateVehicleAttributeValueL11nCreate($request))) { if (!empty($val = $this->validateVehicleAttributeValueL11nCreate($request))) {
$response->data['attr_value_l11n_create'] = new FormValidation($val); $response->data['attr_value_l11n_create'] = new FormValidation($val);
$response->header->status = RequestStatusCode::R_400; $response->header->status = RequestStatusCode::R_400;
return; return;
} }
@ -1052,7 +1052,7 @@ final class ApiController extends Controller
{ {
if (!empty($val = $this->validateMediaAddToVehicle($request))) { if (!empty($val = $this->validateMediaAddToVehicle($request))) {
$response->data[$request->uri->__toString()] = new FormValidation($val); $response->data[$request->uri->__toString()] = new FormValidation($val);
$response->header->status = RequestStatusCode::R_400; $response->header->status = RequestStatusCode::R_400;
return; return;
} }
@ -1197,7 +1197,7 @@ final class ApiController extends Controller
{ {
if (!empty($val = $this->validateInspectionTypeCreate($request))) { if (!empty($val = $this->validateInspectionTypeCreate($request))) {
$response->data[$request->uri->__toString()] = new FormValidation($val); $response->data[$request->uri->__toString()] = new FormValidation($val);
$response->header->status = RequestStatusCode::R_400; $response->header->status = RequestStatusCode::R_400;
return; return;
} }
@ -1227,7 +1227,7 @@ final class ApiController extends Controller
*/ */
public function createInspectionTypeFromRequest(RequestAbstract $request) : BaseStringL11nType public function createInspectionTypeFromRequest(RequestAbstract $request) : BaseStringL11nType
{ {
$type = new BaseStringL11nType(); $type = new BaseStringL11nType();
$type->title = $request->getDataString('name') ?? ''; $type->title = $request->getDataString('name') ?? '';
$type->setL11n($request->getDataString('title') ?? '', $request->getDataString('language') ?? ISO639x1Enum::_EN); $type->setL11n($request->getDataString('title') ?? '', $request->getDataString('language') ?? ISO639x1Enum::_EN);
@ -1272,7 +1272,7 @@ final class ApiController extends Controller
{ {
if (!empty($val = $this->validateInspectionTypeL11nCreate($request))) { if (!empty($val = $this->validateInspectionTypeL11nCreate($request))) {
$response->data['inspection_type_l11n_create'] = new FormValidation($val); $response->data['inspection_type_l11n_create'] = new FormValidation($val);
$response->header->status = RequestStatusCode::R_400; $response->header->status = RequestStatusCode::R_400;
return; return;
} }

2
Controller/BackendController.php
View File

@ -127,7 +127,7 @@ final class BackendController extends Controller
->execute(); ->execute();
$view->data['attribute'] = $attribute; $view->data['attribute'] = $attribute;
$view->data['l11ns'] = $l11ns; $view->data['l11ns'] = $l11ns;
return $view; return $view;
} }

1
Models/Inspection.php
View File

@ -44,7 +44,6 @@ class Inspection implements \JsonSerializable
*/ */
public int $interval = 0; public int $interval = 0;
public function __construct() public function __construct()
{ {
$this->type = new BaseStringL11nType(); $this->type = new BaseStringL11nType();

10
Models/InspectionMapper.php
View File

@ -37,12 +37,12 @@ final class InspectionMapper extends DataMapperFactory
* @since 1.0.0 * @since 1.0.0
*/ */
public const COLUMNS = [ public const COLUMNS = [
'fleetmgmt_vehicle_inspection_id' => ['name' => 'fleetmgmt_vehicle_inspection_id', 'type' => 'int', 'internal' => 'id'], 'fleetmgmt_vehicle_inspection_id' => ['name' => 'fleetmgmt_vehicle_inspection_id', 'type' => 'int', 'internal' => 'id'],
'fleetmgmt_vehicle_inspection_description' => ['name' => 'fleetmgmt_vehicle_inspection_description', 'type' => 'string', 'internal' => 'description'], 'fleetmgmt_vehicle_inspection_description' => ['name' => 'fleetmgmt_vehicle_inspection_description', 'type' => 'string', 'internal' => 'description'],
'fleetmgmt_vehicle_inspection_status' => ['name' => 'fleetmgmt_vehicle_inspection_status', 'type' => 'int', 'internal' => 'status'], 'fleetmgmt_vehicle_inspection_status' => ['name' => 'fleetmgmt_vehicle_inspection_status', 'type' => 'int', 'internal' => 'status'],
'fleetmgmt_vehicle_inspection_interval' => ['name' => 'fleetmgmt_vehicle_inspection_interval', 'type' => 'int', 'internal' => 'interval'], 'fleetmgmt_vehicle_inspection_interval' => ['name' => 'fleetmgmt_vehicle_inspection_interval', 'type' => 'int', 'internal' => 'interval'],
'fleetmgmt_vehicle_inspection_next' => ['name' => 'fleetmgmt_vehicle_inspection_next', 'type' => 'DateTime', 'internal' => 'next'], 'fleetmgmt_vehicle_inspection_next' => ['name' => 'fleetmgmt_vehicle_inspection_next', 'type' => 'DateTime', 'internal' => 'next'],
'fleetmgmt_vehicle_inspection_type' => ['name' => 'fleetmgmt_vehicle_inspection_type', 'type' => 'int', 'internal' => 'type'], 'fleetmgmt_vehicle_inspection_type' => ['name' => 'fleetmgmt_vehicle_inspection_type', 'type' => 'int', 'internal' => 'type'],
]; ];
/** /**