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

phpcs autofixes

Browse Source
This commit is contained in:
Dennis Eichhorn 2023-05-28 12:19:03 +00:00
parent 43c23df558
commit a208f09732
12 changed files with 65 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/main.yml vendored
View File

@ -26,7 +26,7 @@ jobs:
- name: Setup Composer - name: Setup Composer
run: composer install run: composer install
- name: Autoformat - name: Autoformat
run: 'vendor/bin/php-cs-fixer fix ./ --rules=''{"array_syntax": {"syntax": "short"}, "blank_line_after_namespace": true, "global_namespace_import": {"import_classes": false, "import_constants": false, "import_functions": false}, "binary_operator_spaces": {"operators": {"=": "align", ".=": "align", "+=": "align", "-=": "align", "*=": "align", "/=": "align", "|=": "align", "&=": "align", "=>": "align", "??=": "align"}}, "cast_spaces": {"space": "single"}, "class_attributes_separation": { "elements": {"const": "one", "method": "one", "property": "one"} }, "combine_consecutive_issets": true, "compact_nullable_typehint": true, "declare_strict_types": true, "declare_equal_normalize": {"space": "none"}, "elseif": true, "encoding": true, "explicit_indirect_variable": true, "explicit_string_variable": true, "function_to_constant": true, "implode_call": true, "increment_style": {"style": "pre"}, "is_null": true, "yoda_style": {"equal": false, "identical": false, "less_and_greater": false}, "line_ending": true, "logical_operators": true, "lowercase_cast": true, "constant_case": {"case": "lower"}, "lowercase_keywords": true, "modernize_types_casting": true, "native_constant_invocation": true, "native_function_casing": true, "native_function_invocation": {"include": ["@all"]}, "new_with_braces": true, "no_extra_blank_lines": {"tokens": ["break", "case", "continue", "curly_brace_block", "extra", "return", "switch", "throw", "use"]}, "no_spaces_after_function_name": true, "no_alias_functions": true, "no_closing_tag": true, "no_empty_comment": true, "no_empty_phpdoc": true, "no_empty_statement": true, "no_homoglyph_names": true, "no_mixed_echo_print": {"use": "echo"}, "no_php4_constructor": true, "no_singleline_whitespace_before_semicolons": true, "no_spaces_inside_parenthesis": true, "no_trailing_whitespace": true, "no_unneeded_final_method": true, "no_unused_imports": true, "no_useless_return": true, "no_whitespace_before_comma_in_array": true, "no_whitespace_in_blank_line": true, "non_printable_character": true, "normalize_index_brace": true, "ordered_imports": {"sort_algorithm": "alpha"}, "ordered_interfaces": {"order": "alpha"}, "php_unit_construct": true, "php_unit_internal_class": true, "php_unit_set_up_tear_down_visibility": true, "phpdoc_indent": true, "phpdoc_align": {"align": "vertical"}, "phpdoc_annotation_without_dot": true, "phpdoc_scalar": true, "phpdoc_return_self_reference": {"replacements": {"this": "self"}}, "phpdoc_trim": true, "phpdoc_trim_consecutive_blank_line_separation": true, "random_api_migration": true, "self_accessor": true, "return_type_declaration": {"space_before": "one"}, "semicolon_after_instruction": true, "set_type_to_cast": true, "short_scalar_cast": true, "single_blank_line_at_eof": true, "single_line_after_imports": true, "standardize_increment": true, "trailing_comma_in_multiline": true, "trim_array_spaces": true, "visibility_required": true, "void_return": true}'' --allow-risky=yes' run: 'vendor/bin/php-cs-fixer fix ./ --rules=''{"array_syntax": {"syntax": "short"}, "blank_line_after_namespace": true, "global_namespace_import": {"import_classes": false, "import_constants": false, "import_functions": false}, "binary_operator_spaces": {"operators": {"=": "align", ".=": "align", "+=": "align", "-=": "align", "*=": "align", "/=": "align", "|=": "align", "&=": "align", "=>": "align", "??=": "align", ">>=": "align", "<<=": "align"}}, "cast_spaces": {"space": "single"}, "class_attributes_separation": { "elements": {"const": "one", "method": "one", "property": "one"} }, "combine_consecutive_issets": true, "compact_nullable_typehint": true, "declare_strict_types": true, "declare_equal_normalize": {"space": "none"}, "elseif": true, "encoding": true, "explicit_indirect_variable": true, "explicit_string_variable": true, "function_to_constant": true, "implode_call": true, "increment_style": {"style": "pre"}, "is_null": true, "yoda_style": {"equal": false, "identical": false, "less_and_greater": false}, "line_ending": true, "logical_operators": true, "lowercase_cast": true, "constant_case": {"case": "lower"}, "lowercase_keywords": true, "modernize_types_casting": true, "native_constant_invocation": true, "native_function_casing": true, "native_function_invocation": {"include": ["@all"]}, "new_with_braces": true, "no_extra_blank_lines": {"tokens": ["break", "case", "continue", "curly_brace_block", "extra", "return", "switch", "throw", "use"]}, "no_spaces_after_function_name": true, "no_alias_functions": true, "no_closing_tag": true, "no_empty_comment": true, "no_empty_phpdoc": true, "no_empty_statement": true, "no_homoglyph_names": true, "no_mixed_echo_print": {"use": "echo"}, "no_php4_constructor": true, "no_singleline_whitespace_before_semicolons": true, "no_spaces_inside_parenthesis": true, "no_trailing_whitespace": true, "no_unneeded_final_method": true, "no_unused_imports": true, "no_useless_return": true, "no_whitespace_before_comma_in_array": true, "no_whitespace_in_blank_line": true, "non_printable_character": true, "normalize_index_brace": true, "ordered_imports": {"sort_algorithm": "alpha"}, "ordered_interfaces": {"order": "alpha"}, "php_unit_construct": true, "php_unit_internal_class": true, "php_unit_set_up_tear_down_visibility": true, "phpdoc_indent": true, "phpdoc_align": {"align": "vertical"}, "phpdoc_annotation_without_dot": true, "phpdoc_scalar": true, "phpdoc_return_self_reference": {"replacements": {"this": "self"}}, "phpdoc_trim": true, "phpdoc_trim_consecutive_blank_line_separation": true, "random_api_migration": true, "self_accessor": true, "return_type_declaration": {"space_before": "one"}, "semicolon_after_instruction": true, "set_type_to_cast": true, "short_scalar_cast": true, "single_blank_line_at_eof": true, "single_line_after_imports": true, "standardize_increment": true, "trailing_comma_in_multiline": true, "trim_array_spaces": true, "visibility_required": true, "void_return": true}'' --allow-risky=yes'
- name: Check for modified files - name: Check for modified files
id: git-check id: git-check
run: echo ::set-output name=modified::$(if git diff-index --quiet HEAD --; then echo "false"; else echo "true"; fi) run: echo ::set-output name=modified::$(if git diff-index --quiet HEAD --; then echo "false"; else echo "true"; fi)

4
Admin/Installer.php
View File

@ -65,7 +65,7 @@ final class Installer extends InstallerAbstract
} }
/** @var array $types */ /** @var array $types */
$types = \json_decode($fileContent, true); $types = \json_decode($fileContent, true);
$fuelTypes = self::createFuelTypes($app, $types); $fuelTypes = self::createFuelTypes($app, $types);
/* Fuel types */ /* Fuel types */
@ -75,7 +75,7 @@ final class Installer extends InstallerAbstract
} }
/** @var array $types */ /** @var array $types */
$types = \json_decode($fileContent, true); $types = \json_decode($fileContent, true);
$vehicleTypes = self::createVehicleTypes($app, $types); $vehicleTypes = self::createVehicleTypes($app, $types);
} }

16
Controller/ApiController.php
View File

@ -400,13 +400,13 @@ final class ApiController extends Controller
*/ */
public function createVehicleFromRequest(RequestAbstract $request) : Vehicle public function createVehicleFromRequest(RequestAbstract $request) : Vehicle
{ {
$vehicle = new Vehicle(); $vehicle = new Vehicle();
$vehicle->name = $request->getDataString('name') ?? ''; $vehicle->name = $request->getDataString('name') ?? '';
$vehicle->info = $request->getDataString('info') ?? ''; $vehicle->info = $request->getDataString('info') ?? '';
$vehicle->type = new NullVehicleType((int) ($request->getDataInt('type') ?? 0)); $vehicle->type = new NullVehicleType((int) ($request->getDataInt('type') ?? 0));
$vehicle->fuelType = new NullFuelType((int) ($request->getDataInt('fuel') ?? 0)); $vehicle->fuelType = new NullFuelType((int) ($request->getDataInt('fuel') ?? 0));
$vehicle->status = (int) ($request->getDataInt('status') ?? VehicleStatus::INACTIVE); $vehicle->status = (int) ($request->getDataInt('status') ?? VehicleStatus::INACTIVE);
$vehicle->unit = $request->getDataInt('unit') ?? $this->app->unitId; $vehicle->unit = $request->getDataInt('unit') ?? $this->app->unitId;
return $vehicle; return $vehicle;
} }
@ -414,7 +414,7 @@ final class ApiController extends Controller
/** /**
* Create media files for vehicle * Create media files for vehicle
* *
* @param Vehicle $vehicle Vehicle * @param Vehicle $vehicle Vehicle
* @param RequestAbstract $request Request incl. media do upload * @param RequestAbstract $request Request incl. media do upload
* *
* @return void * @return void
@ -1059,7 +1059,7 @@ final class ApiController extends Controller
/** @var \Modules\FleetManagement\Models\Vehicle $vehicle */ /** @var \Modules\FleetManagement\Models\Vehicle $vehicle */
$vehicle = VehicleMapper::get()->where('id', (int) $request->getData('vehicle'))->execute(); $vehicle = VehicleMapper::get()->where('id', (int) $request->getData('vehicle'))->execute();
$path = $this->createVehicleDir($vehicle); $path = $this->createVehicleDir($vehicle);
$uploaded = []; $uploaded = [];
if (!empty($uploadedFiles = $request->getFiles())) { if (!empty($uploadedFiles = $request->getFiles())) {

4
Models/Vehicle.php
View File

@ -53,8 +53,8 @@ class Vehicle implements \JsonSerializable
public function __construct() public function __construct()
{ {
$this->createdAt = new \DateTimeImmutable('now'); $this->createdAt = new \DateTimeImmutable('now');
$this->type = new VehicleType(); $this->type = new VehicleType();
$this->fuelType = new FuelType(); $this->fuelType = new FuelType();
} }
/** /**

16
Models/VehicleAttributeValueMapper.php
View File

@ -37,14 +37,14 @@ final class VehicleAttributeValueMapper extends DataMapperFactory
* @since 1.0.0 * @since 1.0.0
*/ */
public const COLUMNS = [ public const COLUMNS = [
'fleetmgmt_attr_value_id' => ['name' => 'fleetmgmt_attr_value_id', 'type' => 'int', 'internal' => 'id'], 'fleetmgmt_attr_value_id' => ['name' => 'fleetmgmt_attr_value_id', 'type' => 'int', 'internal' => 'id'],
'fleetmgmt_attr_value_default' => ['name' => 'fleetmgmt_attr_value_default', 'type' => 'bool', 'internal' => 'isDefault'], 'fleetmgmt_attr_value_default' => ['name' => 'fleetmgmt_attr_value_default', 'type' => 'bool', 'internal' => 'isDefault'],
'fleetmgmt_attr_value_valueStr' => ['name' => 'fleetmgmt_attr_value_valueStr', 'type' => 'string', 'internal' => 'valueStr'], 'fleetmgmt_attr_value_valueStr' => ['name' => 'fleetmgmt_attr_value_valueStr', 'type' => 'string', 'internal' => 'valueStr'],
'fleetmgmt_attr_value_valueInt' => ['name' => 'fleetmgmt_attr_value_valueInt', 'type' => 'int', 'internal' => 'valueInt'], 'fleetmgmt_attr_value_valueInt' => ['name' => 'fleetmgmt_attr_value_valueInt', 'type' => 'int', 'internal' => 'valueInt'],
'fleetmgmt_attr_value_valueDec' => ['name' => 'fleetmgmt_attr_value_valueDec', 'type' => 'float', 'internal' => 'valueDec'], 'fleetmgmt_attr_value_valueDec' => ['name' => 'fleetmgmt_attr_value_valueDec', 'type' => 'float', 'internal' => 'valueDec'],
'fleetmgmt_attr_value_valueDat' => ['name' => 'fleetmgmt_attr_value_valueDat', 'type' => 'DateTime', 'internal' => 'valueDat'], 'fleetmgmt_attr_value_valueDat' => ['name' => 'fleetmgmt_attr_value_valueDat', 'type' => 'DateTime', 'internal' => 'valueDat'],
'fleetmgmt_attr_value_unit' => ['name' => 'fleetmgmt_attr_value_unit', 'type' => 'string', 'internal' => 'unit'], 'fleetmgmt_attr_value_unit' => ['name' => 'fleetmgmt_attr_value_unit', 'type' => 'string', 'internal' => 'unit'],
'fleetmgmt_attr_value_deptype' => ['name' => 'fleetmgmt_attr_value_deptype', 'type' => 'int', 'internal' => 'dependingAttributeType'], 'fleetmgmt_attr_value_deptype' => ['name' => 'fleetmgmt_attr_value_deptype', 'type' => 'int', 'internal' => 'dependingAttributeType'],
'fleetmgmt_attr_value_depvalue' => ['name' => 'fleetmgmt_attr_value_depvalue', 'type' => 'int', 'internal' => 'dependingAttributeValue'], 'fleetmgmt_attr_value_depvalue' => ['name' => 'fleetmgmt_attr_value_depvalue', 'type' => 'int', 'internal' => 'dependingAttributeValue'],
]; ];

16
Models/VehicleMapper.php
View File

@ -37,15 +37,15 @@ final class VehicleMapper extends DataMapperFactory
* @since 1.0.0 * @since 1.0.0
*/ */
public const COLUMNS = [ public const COLUMNS = [
'fleetmgmt_vehicle_id' => ['name' => 'fleetmgmt_vehicle_id', 'type' => 'int', 'internal' => 'id'], 'fleetmgmt_vehicle_id' => ['name' => 'fleetmgmt_vehicle_id', 'type' => 'int', 'internal' => 'id'],
'fleetmgmt_vehicle_name' => ['name' => 'fleetmgmt_vehicle_name', 'type' => 'string', 'internal' => 'name'], 'fleetmgmt_vehicle_name' => ['name' => 'fleetmgmt_vehicle_name', 'type' => 'string', 'internal' => 'name'],
'fleetmgmt_vehicle_status' => ['name' => 'fleetmgmt_vehicle_status', 'type' => 'int', 'internal' => 'status'], 'fleetmgmt_vehicle_status' => ['name' => 'fleetmgmt_vehicle_status', 'type' => 'int', 'internal' => 'status'],
'fleetmgmt_vehicle_info' => ['name' => 'fleetmgmt_vehicle_info', 'type' => 'string', 'internal' => 'info'], 'fleetmgmt_vehicle_info' => ['name' => 'fleetmgmt_vehicle_info', 'type' => 'string', 'internal' => 'info'],
'fleetmgmt_vehicle_unit' => ['name' => 'fleetmgmt_vehicle_unit', 'type' => 'int', 'internal' => 'unit'], 'fleetmgmt_vehicle_unit' => ['name' => 'fleetmgmt_vehicle_unit', 'type' => 'int', 'internal' => 'unit'],
'fleetmgmt_vehicle_type' => ['name' => 'fleetmgmt_vehicle_type', 'type' => 'int', 'internal' => 'type'], 'fleetmgmt_vehicle_type' => ['name' => 'fleetmgmt_vehicle_type', 'type' => 'int', 'internal' => 'type'],
'fleetmgmt_vehicle_fuel' => ['name' => 'fleetmgmt_vehicle_fuel', 'type' => 'int', 'internal' => 'fuelType'], 'fleetmgmt_vehicle_fuel' => ['name' => 'fleetmgmt_vehicle_fuel', 'type' => 'int', 'internal' => 'fuelType'],
'fleetmgmt_vehicle_responsible' => ['name' => 'fleetmgmt_vehicle_responsible', 'type' => 'int', 'internal' => 'responsible'], 'fleetmgmt_vehicle_responsible' => ['name' => 'fleetmgmt_vehicle_responsible', 'type' => 'int', 'internal' => 'responsible'],
'fleetmgmt_vehicle_created_at' => ['name' => 'fleetmgmt_vehicle_created_at', 'type' => 'DateTimeImmutable', 'internal' => 'createdAt', 'readonly' => true], 'fleetmgmt_vehicle_created_at' => ['name' => 'fleetmgmt_vehicle_created_at', 'type' => 'DateTimeImmutable', 'internal' => 'createdAt', 'readonly' => true],
]; ];
/** /**

2
Theme/Backend/Lang/Navigation.en.lang.php
View File

@ -14,5 +14,5 @@ declare(strict_types=1);
return ['Navigation' => [ return ['Navigation' => [
'FleetManagement' => 'Fleet Management', 'FleetManagement' => 'Fleet Management',
'Vehicles' => 'Vehicles', 'Vehicles' => 'Vehicles',
]]; ]];

46
Theme/Backend/Lang/en.lang.php
View File

@ -13,28 +13,28 @@
declare(strict_types=1); declare(strict_types=1);
return ['FleetManagement' => [ return ['FleetManagement' => [
'Vehicle' => 'Vehicle', 'Vehicle' => 'Vehicle',
'Vehicles' => 'Vehicles', 'Vehicles' => 'Vehicles',
'Status' => 'Status', 'Status' => 'Status',
'Name' => 'Name', 'Name' => 'Name',
'Type' => 'Type', 'Type' => 'Type',
'Make' => 'Make', 'Make' => 'Make',
'Model' => 'Model', 'Model' => 'Model',
'Start' => 'Start', 'Start' => 'Start',
'End' => 'End', 'End' => 'End',
'Profile' => 'Profile', 'Profile' => 'Profile',
'Attributes' => 'Attributes', 'Attributes' => 'Attributes',
'Files' => 'Files', 'Files' => 'Files',
'Notes' => 'Notes', 'Notes' => 'Notes',
'Inspections' => 'Inspections', 'Inspections' => 'Inspections',
'Drivers' => 'Drivers', 'Drivers' => 'Drivers',
'Milage' => 'Milage', 'Milage' => 'Milage',
'Driver' => 'Driver', 'Driver' => 'Driver',
'Vin' => 'Vin', 'Vin' => 'Vin',
'PurchasePrice' => 'Purchase Price', 'PurchasePrice' => 'Purchase Price',
'LeasingFee' => 'Leasing Fee', 'LeasingFee' => 'Leasing Fee',
':status1' => 'Active', ':status1' => 'Active',
':status2' => 'Inactive', ':status2' => 'Inactive',
':status3' => 'Damaged', ':status3' => 'Damaged',
':status4' => 'Out of order', ':status4' => 'Out of order',
]]; ]];

2
Theme/Backend/attribute-type.tpl.php
View File

@ -18,7 +18,7 @@ use phpOMS\Localization\ISO639Enum;
$types = AttributeValueType::getConstants(); $types = AttributeValueType::getConstants();
$attribute = $this->getData('attribute'); $attribute = $this->getData('attribute');
$l11ns = $this->getData('l11ns'); $l11ns = $this->getData('l11ns');
echo $this->getData('nav')->render(); ?> echo $this->getData('nav')->render(); ?>

8
Theme/Backend/vehicle-profile.tpl.php
View File

@ -17,15 +17,15 @@ use Modules\FleetManagement\Models\VehicleStatus;
use Modules\Media\Models\NullMedia; use Modules\Media\Models\NullMedia;
use phpOMS\Uri\UriFactory; use phpOMS\Uri\UriFactory;
$countryCodes = \phpOMS\Localization\ISO3166TwoEnum::getConstants(); $countryCodes = \phpOMS\Localization\ISO3166TwoEnum::getConstants();
$countries = \phpOMS\Localization\ISO3166NameEnum::getConstants(); $countries = \phpOMS\Localization\ISO3166NameEnum::getConstants();
$vehicleStatus = VehicleStatus::getConstants(); $vehicleStatus = VehicleStatus::getConstants();
/** /**
* @var \Modules\FleetManagement\Models\Vehicle $vehicle * @var \Modules\FleetManagement\Models\Vehicle $vehicle
*/ */
$vehicle = $this->getData('vehicle') ?? new NullVehicle(); $vehicle = $this->getData('vehicle') ?? new NullVehicle();
$files = $vehicle->getFiles(); $files = $vehicle->getFiles();
$vehicleImage = $this->getData('vehicleImage') ?? new NullMedia(); $vehicleImage = $this->getData('vehicleImage') ?? new NullMedia();
$vehicleTypes = $this->getData('types') ?? []; $vehicleTypes = $this->getData('types') ?? [];

12
tests/Controller/ApiControllerTest.php
View File

@ -53,13 +53,13 @@ final class ApiControllerTest extends \PHPUnit\Framework\TestCase
protected string $appName = 'Api'; protected string $appName = 'Api';
}; };
$this->app->dbPool = $GLOBALS['dbpool']; $this->app->dbPool = $GLOBALS['dbpool'];
$this->app->unitId = 1; $this->app->unitId = 1;
$this->app->accountManager = new AccountManager($GLOBALS['session']); $this->app->accountManager = new AccountManager($GLOBALS['session']);
$this->app->appSettings = new CoreSettings(); $this->app->appSettings = new CoreSettings();
$this->app->moduleManager = new ModuleManager($this->app, __DIR__ . '/../../../../Modules/'); $this->app->moduleManager = new ModuleManager($this->app, __DIR__ . '/../../../../Modules/');
$this->app->dispatcher = new Dispatcher($this->app); $this->app->dispatcher = new Dispatcher($this->app);
$this->app->eventManager = new EventManager($this->app->dispatcher); $this->app->eventManager = new EventManager($this->app->dispatcher);
$this->app->eventManager->importFromFile(__DIR__ . '/../../../../Web/Api/Hooks.php'); $this->app->eventManager->importFromFile(__DIR__ . '/../../../../Web/Api/Hooks.php');
$this->app->sessionManager = new HttpSession(36000); $this->app->sessionManager = new HttpSession(36000);
$this->app->l11nManager = new L11nManager(); $this->app->l11nManager = new L11nManager();