From 7b9dd3770100d54036da7726aab59ac0bd8676f3 Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Wed, 30 Aug 2023 12:08:09 +0000 Subject: [PATCH] autofixes --- Admin/Installer.php | 2 +- .../ApiEquipmentAttributeController.php | 1 - Controller/ApiEquipmentController.php | 11 ++-- Controller/ApiEquipmentTypeController.php | 8 +-- Controller/ApiInspectionTypeController.php | 8 +-- Controller/BackendController.php | 4 +- Models/Attribute/EquipmentAttributeMapper.php | 6 +- Models/EquipmentMapper.php | 4 +- Models/InspectionMapper.php | 2 +- Theme/Backend/Lang/Navigation.en.lang.php | 8 +-- Theme/Backend/Lang/en.lang.php | 56 +++++++++---------- Theme/Backend/equipment-profile.tpl.php | 12 ++-- 12 files changed, 60 insertions(+), 62 deletions(-) diff --git a/Admin/Installer.php b/Admin/Installer.php index 9dc05c1..9c66cf0 100755 --- a/Admin/Installer.php +++ b/Admin/Installer.php @@ -65,7 +65,7 @@ final class Installer extends InstallerAbstract } /** @var array $types */ - $types = \json_decode($fileContent, true); + $types = \json_decode($fileContent, true); $equipmentTypes = self::createEquipmentTypes($app, $types); /* Inspection types */ diff --git a/Controller/ApiEquipmentAttributeController.php b/Controller/ApiEquipmentAttributeController.php index 43be7b1..833c26c 100644 --- a/Controller/ApiEquipmentAttributeController.php +++ b/Controller/ApiEquipmentAttributeController.php @@ -446,7 +446,6 @@ final class ApiEquipmentAttributeController extends Controller public function apiEquipmentAttributeValueDelete(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void { return; - // @todo: I don't think values can be deleted? Only Attributes // However, It should be possible to remove UNUSED default values // either here or other function? diff --git a/Controller/ApiEquipmentController.php b/Controller/ApiEquipmentController.php index 3220c61..29973fe 100755 --- a/Controller/ApiEquipmentController.php +++ b/Controller/ApiEquipmentController.php @@ -40,7 +40,6 @@ use phpOMS\Message\ResponseAbstract; */ final class ApiEquipmentController extends Controller { - /** * Api method to create a equipment * @@ -100,8 +99,8 @@ final class ApiEquipmentController extends Controller /** * Create media files for equipment * - * @param Equipment $equipment Equipment - * @param RequestAbstract $request Request incl. media do upload + * @param Equipment $equipment Equipment + * @param RequestAbstract $request Request incl. media do upload * * @return void * @@ -255,7 +254,7 @@ final class ApiEquipmentController extends Controller /** @var \Modules\EquipmentManagement\Models\Equipment $equipment */ $equipment = EquipmentMapper::get()->where('id', (int) $request->getData('equipment'))->execute(); - $path = $this->createEquipmentDir($equipment); + $path = $this->createEquipmentDir($equipment); $uploaded = []; if (!empty($uploadedFiles = $request->files)) { @@ -468,8 +467,8 @@ final class ApiEquipmentController extends Controller /** * Method to update Equipment from request. * - * @param RequestAbstract $request Request - * @param Equipment $new Model to modify + * @param RequestAbstract $request Request + * @param Equipment $new Model to modify * * @return Equipment * diff --git a/Controller/ApiEquipmentTypeController.php b/Controller/ApiEquipmentTypeController.php index d292d20..b848419 100644 --- a/Controller/ApiEquipmentTypeController.php +++ b/Controller/ApiEquipmentTypeController.php @@ -202,8 +202,8 @@ final class ApiEquipmentTypeController extends Controller /** * Method to update EquipmentType from request. * - * @param RequestAbstract $request Request - * @param BaseStringL11nType $new Model to modify + * @param RequestAbstract $request Request + * @param BaseStringL11nType $new Model to modify * * @return BaseStringL11nType * @@ -319,8 +319,8 @@ final class ApiEquipmentTypeController extends Controller /** * Method to update EquipmentTypeL11n from request. * - * @param RequestAbstract $request Request - * @param BaseStringL11n $new Model to modify + * @param RequestAbstract $request Request + * @param BaseStringL11n $new Model to modify * * @return BaseStringL11n * diff --git a/Controller/ApiInspectionTypeController.php b/Controller/ApiInspectionTypeController.php index 85909f7..a7a6078 100644 --- a/Controller/ApiInspectionTypeController.php +++ b/Controller/ApiInspectionTypeController.php @@ -202,8 +202,8 @@ final class ApiInspectionTypeController extends Controller /** * Method to update InspectionType from request. * - * @param RequestAbstract $request Request - * @param BaseStringL11nType $new Model to modify + * @param RequestAbstract $request Request + * @param BaseStringL11nType $new Model to modify * * @return BaseStringL11nType * @@ -319,8 +319,8 @@ final class ApiInspectionTypeController extends Controller /** * Method to update InspectionTypeL11n from request. * - * @param RequestAbstract $request Request - * @param BaseStringL11n $new Model to modify + * @param RequestAbstract $request Request + * @param BaseStringL11n $new Model to modify * * @return BaseStringL11n * diff --git a/Controller/BackendController.php b/Controller/BackendController.php index 461ba01..c29129d 100755 --- a/Controller/BackendController.php +++ b/Controller/BackendController.php @@ -162,7 +162,7 @@ final class BackendController extends Controller $view->data['attributeView'] = new \Modules\Attribute\Theme\Backend\Components\AttributeView($this->app->l11nManager, $request, $response); $view->data['attributeView']->data['defaultlocalization'] = LocalizationMapper::get()->where('id', (int) $settings->id)->execute(); - $view->data['media-upload'] = new \Modules\Media\Theme\Backend\Components\Upload\BaseView($this->app->l11nManager, $request, $response); + $view->data['media-upload'] = new \Modules\Media\Theme\Backend\Components\Upload\BaseView($this->app->l11nManager, $request, $response); $view->data['equipment-notes'] = new \Modules\Editor\Theme\Backend\Components\Compound\BaseView($this->app->l11nManager, $request, $response); return $view; @@ -249,7 +249,7 @@ final class BackendController extends Controller $view->data['attributeView'] = new \Modules\Attribute\Theme\Backend\Components\AttributeView($this->app->l11nManager, $request, $response); $view->data['attributeView']->data['defaultlocalization'] = LocalizationMapper::get()->where('id', (int) $settings->id)->execute(); - $view->data['media-upload'] = new \Modules\Media\Theme\Backend\Components\Upload\BaseView($this->app->l11nManager, $request, $response); + $view->data['media-upload'] = new \Modules\Media\Theme\Backend\Components\Upload\BaseView($this->app->l11nManager, $request, $response); $view->data['equipment-notes'] = new \Modules\Editor\Theme\Backend\Components\Compound\BaseView($this->app->l11nManager, $request, $response); return $view; diff --git a/Models/Attribute/EquipmentAttributeMapper.php b/Models/Attribute/EquipmentAttributeMapper.php index 5d43985..f50ea82 100644 --- a/Models/Attribute/EquipmentAttributeMapper.php +++ b/Models/Attribute/EquipmentAttributeMapper.php @@ -37,10 +37,10 @@ final class EquipmentAttributeMapper extends DataMapperFactory * @since 1.0.0 */ public const COLUMNS = [ - 'equipmgmt_equipment_attr_id' => ['name' => 'equipmgmt_equipment_attr_id', 'type' => 'int', 'internal' => 'id'], + 'equipmgmt_equipment_attr_id' => ['name' => 'equipmgmt_equipment_attr_id', 'type' => 'int', 'internal' => 'id'], 'equipmgmt_equipment_attr_equipment' => ['name' => 'equipmgmt_equipment_attr_equipment', 'type' => 'int', 'internal' => 'ref'], - 'equipmgmt_equipment_attr_type' => ['name' => 'equipmgmt_equipment_attr_type', 'type' => 'int', 'internal' => 'type'], - 'equipmgmt_equipment_attr_value' => ['name' => 'equipmgmt_equipment_attr_value', 'type' => 'int', 'internal' => 'value'], + 'equipmgmt_equipment_attr_type' => ['name' => 'equipmgmt_equipment_attr_type', 'type' => 'int', 'internal' => 'type'], + 'equipmgmt_equipment_attr_value' => ['name' => 'equipmgmt_equipment_attr_value', 'type' => 'int', 'internal' => 'value'], ]; /** diff --git a/Models/EquipmentMapper.php b/Models/EquipmentMapper.php index 6cba225..85e3ecd 100644 --- a/Models/EquipmentMapper.php +++ b/Models/EquipmentMapper.php @@ -14,10 +14,10 @@ declare(strict_types=1); namespace Modules\EquipmentManagement\Models; -use Modules\Media\Models\MediaMapper; -use phpOMS\DataStorage\Database\Mapper\DataMapperFactory; use Modules\Editor\Models\EditorDocMapper; use Modules\EquipmentManagement\Models\Attribute\EquipmentAttributeMapper; +use Modules\Media\Models\MediaMapper; +use phpOMS\DataStorage\Database\Mapper\DataMapperFactory; /** * Mapper class. diff --git a/Models/InspectionMapper.php b/Models/InspectionMapper.php index 843ef39..df94cc1 100644 --- a/Models/InspectionMapper.php +++ b/Models/InspectionMapper.php @@ -37,7 +37,7 @@ final class InspectionMapper extends DataMapperFactory */ public const COLUMNS = [ 'equipmgmt_equipment_inspection_id' => ['name' => 'equipmgmt_equipment_inspection_id', 'type' => 'int', 'internal' => 'id'], - 'equipmgmt_equipment_inspection_vehicle' => ['name' => 'equipmgmt_equipment_inspection_vehicle', 'type' => 'int', 'internal' => 'reference'], + 'equipmgmt_equipment_inspection_vehicle' => ['name' => 'equipmgmt_equipment_inspection_vehicle', 'type' => 'int', 'internal' => 'reference'], 'equipmgmt_equipment_inspection_description' => ['name' => 'equipmgmt_equipment_inspection_description', 'type' => 'string', 'internal' => 'description'], 'equipmgmt_equipment_inspection_status' => ['name' => 'equipmgmt_equipment_inspection_status', 'type' => 'int', 'internal' => 'status'], 'equipmgmt_equipment_inspection_interval' => ['name' => 'equipmgmt_equipment_inspection_interval', 'type' => 'int', 'internal' => 'interval'], diff --git a/Theme/Backend/Lang/Navigation.en.lang.php b/Theme/Backend/Lang/Navigation.en.lang.php index 92e715c..43c4f68 100755 --- a/Theme/Backend/Lang/Navigation.en.lang.php +++ b/Theme/Backend/Lang/Navigation.en.lang.php @@ -13,9 +13,9 @@ declare(strict_types=1); return ['Navigation' => [ - 'EquipmentManagement' => 'Equipment Management', - 'Equipments' => 'Equipments', - 'Inspections' => 'Inspections', + 'EquipmentManagement' => 'Equipment Management', + 'Equipments' => 'Equipments', + 'Inspections' => 'Inspections', 'EquipmentInspectionTypes' => 'Equipment Inspection Types', - 'EquipmentAttributes' => 'Equipment Attributes', + 'EquipmentAttributes' => 'Equipment Attributes', ]]; diff --git a/Theme/Backend/Lang/en.lang.php b/Theme/Backend/Lang/en.lang.php index 4ab96ca..6e05e2e 100755 --- a/Theme/Backend/Lang/en.lang.php +++ b/Theme/Backend/Lang/en.lang.php @@ -13,33 +13,33 @@ declare(strict_types=1); return ['EquipmentManagement' => [ - 'Equipment' => 'Equipment', - 'Equipments' => 'Equipments', - 'Status' => 'Status', - 'Name' => 'Name', - 'Type' => 'Type', - 'Make' => 'Make', - 'Model' => 'Model', - 'Start' => 'Start', - 'End' => 'End', - 'Profile' => 'Profile', - 'Attributes' => 'Attributes', - 'Files' => 'Files', - 'Notes' => 'Notes', - 'Costs' => 'Costs', - 'Inspections' => 'Inspections', - 'Drivers' => 'Drivers', - 'Milage' => 'Milage', - 'Driver' => 'Driver', - 'Vin' => 'Vin', - 'History' => 'History', - 'Upcoming' => 'Upcoming', + 'Equipment' => 'Equipment', + 'Equipments' => 'Equipments', + 'Status' => 'Status', + 'Name' => 'Name', + 'Type' => 'Type', + 'Make' => 'Make', + 'Model' => 'Model', + 'Start' => 'Start', + 'End' => 'End', + 'Profile' => 'Profile', + 'Attributes' => 'Attributes', + 'Files' => 'Files', + 'Notes' => 'Notes', + 'Costs' => 'Costs', + 'Inspections' => 'Inspections', + 'Drivers' => 'Drivers', + 'Milage' => 'Milage', + 'Driver' => 'Driver', + 'Vin' => 'Vin', + 'History' => 'History', + 'Upcoming' => 'Upcoming', 'Responsible' => 'Responsible', - 'Date' => 'Date', - 'PurchasePrice' => 'Purchase Price', - 'LeasingFee' => 'Leasing Fee', - ':status1' => 'Active', - ':status2' => 'Inactive', - ':status3' => 'Damaged', - ':status4' => 'Out of order', + 'Date' => 'Date', + 'PurchasePrice' => 'Purchase Price', + 'LeasingFee' => 'Leasing Fee', + ':status1' => 'Active', + ':status2' => 'Inactive', + ':status3' => 'Damaged', + ':status4' => 'Out of order', ]]; diff --git a/Theme/Backend/equipment-profile.tpl.php b/Theme/Backend/equipment-profile.tpl.php index 30def64..6d500be 100755 --- a/Theme/Backend/equipment-profile.tpl.php +++ b/Theme/Backend/equipment-profile.tpl.php @@ -12,23 +12,23 @@ */ declare(strict_types=1); -use Modules\EquipmentManagement\Models\NullEquipment; use Modules\EquipmentManagement\Models\EquipmentStatus; +use Modules\EquipmentManagement\Models\NullEquipment; use Modules\Media\Models\NullMedia; use phpOMS\Uri\UriFactory; -$countryCodes = \phpOMS\Localization\ISO3166TwoEnum::getConstants(); -$countries = \phpOMS\Localization\ISO3166NameEnum::getConstants(); +$countryCodes = \phpOMS\Localization\ISO3166TwoEnum::getConstants(); +$countries = \phpOMS\Localization\ISO3166NameEnum::getConstants(); $equipmentStatus = EquipmentStatus::getConstants(); /** * @var \Modules\EquipmentManagement\Models\Equipment $equipment */ $equipment = $this->data['equipment'] ?? new NullEquipment(); -$files = $equipment->files; +$files = $equipment->files; $equipmentImage = $this->data['equipmentImage'] ?? new NullMedia(); $equipmentTypes = $this->data['types'] ?? []; -$attributeView = $this->data['attributeView']; +$attributeView = $this->data['attributeView']; /** * @var \phpOMS\Views\View $this @@ -165,7 +165,7 @@ echo $this->data['nav']->render(); request->uri->fragment === 'c-tab-5' ? ' checked' : ''; ?>>
- getHtml('Create', '0', '0'); ?> + getHtml('Create', '0', '0'); ?>