From 0f397efa21136117ed0db01975f09db3b4d68eb6 Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Wed, 30 Aug 2023 12:08:10 +0000 Subject: [PATCH] autofixes --- Admin/Installer.php | 4 +- Controller/ApiAttributeController.php | 2 - Controller/ApiController.php | 2 - Controller/ApiStockTypeController.php | 2 +- Models/Attribute/LotAttributeMapper.php | 2 +- Models/StockLocationMapper.php | 2 +- Models/StockMapper.php | 6 +-- Models/StockShelfMapper.php | 2 +- Models/StockTypeMapper.php | 1 - Theme/Backend/Lang/en.lang.php | 60 ++++++++++++------------- 10 files changed, 39 insertions(+), 44 deletions(-) diff --git a/Admin/Installer.php b/Admin/Installer.php index 1960427..a9eff20 100755 --- a/Admin/Installer.php +++ b/Admin/Installer.php @@ -89,8 +89,8 @@ final class Installer extends InstallerAbstract /** * Install default stock types * - * @param ApplicationAbstract $app Application - * @param array $types Stock types + * @param ApplicationAbstract $app Application + * @param array $types Stock types * * @return array * diff --git a/Controller/ApiAttributeController.php b/Controller/ApiAttributeController.php index 44ef5d8..30b9a6d 100644 --- a/Controller/ApiAttributeController.php +++ b/Controller/ApiAttributeController.php @@ -27,10 +27,8 @@ use Modules\WarehouseManagement\Models\Attribute\LotAttributeValueMapper; use phpOMS\Localization\BaseStringL11n; use phpOMS\Localization\ISO639x1Enum; use phpOMS\Message\Http\RequestStatusCode; -use phpOMS\Message\NotificationLevel; use phpOMS\Message\RequestAbstract; use phpOMS\Message\ResponseAbstract; -use phpOMS\Model\Message\FormValidation; /** * WarehouseManagement class. diff --git a/Controller/ApiController.php b/Controller/ApiController.php index 4044727..ed85db7 100755 --- a/Controller/ApiController.php +++ b/Controller/ApiController.php @@ -125,6 +125,4 @@ final class ApiController extends Controller return; } } - - } diff --git a/Controller/ApiStockTypeController.php b/Controller/ApiStockTypeController.php index fdef4b6..e5b63ce 100644 --- a/Controller/ApiStockTypeController.php +++ b/Controller/ApiStockTypeController.php @@ -73,7 +73,7 @@ final class ApiStockTypeController extends Controller */ private function createStockTypeFromRequest(RequestAbstract $request) : StockType { - $stockType = new StockType(); + $stockType = new StockType(); $stockType->name = $request->getDataString('name') ?? ''; $stockType->setL11n($request->getDataString('title') ?? '', $request->getDataString('language') ?? ISO639x1Enum::_EN); diff --git a/Models/Attribute/LotAttributeMapper.php b/Models/Attribute/LotAttributeMapper.php index c65e3ec..3e4d300 100644 --- a/Models/Attribute/LotAttributeMapper.php +++ b/Models/Attribute/LotAttributeMapper.php @@ -38,7 +38,7 @@ final class LotAttributeMapper extends DataMapperFactory */ public const COLUMNS = [ 'warehousemgmt_lot_attr_id' => ['name' => 'warehousemgmt_lot_attr_id', 'type' => 'int', 'internal' => 'id'], - 'warehousemgmt_lot_attr_lot' => ['name' => 'warehousemgmt_lot_attr_lot', 'type' => 'int', 'internal' => 'ref'], + 'warehousemgmt_lot_attr_lot' => ['name' => 'warehousemgmt_lot_attr_lot', 'type' => 'int', 'internal' => 'ref'], 'warehousemgmt_lot_attr_type' => ['name' => 'warehousemgmt_lot_attr_type', 'type' => 'int', 'internal' => 'type'], 'warehousemgmt_lot_attr_value' => ['name' => 'warehousemgmt_lot_attr_value', 'type' => 'int', 'internal' => 'value'], ]; diff --git a/Models/StockLocationMapper.php b/Models/StockLocationMapper.php index 177dec6..8082eb5 100755 --- a/Models/StockLocationMapper.php +++ b/Models/StockLocationMapper.php @@ -39,7 +39,7 @@ final class StockLocationMapper extends DataMapperFactory 'warehousemgmt_stocklocation_id' => ['name' => 'warehousemgmt_stocklocation_id', 'type' => 'int', 'internal' => 'id'], 'warehousemgmt_stocklocation_name' => ['name' => 'warehousemgmt_stocklocation_name', 'type' => 'string', 'internal' => 'name'], 'warehousemgmt_stocklocation_stock' => ['name' => 'warehousemgmt_stocklocation_stock', 'type' => 'int', 'internal' => 'stock'], - 'warehousemgmt_stocklocation_type' => ['name' => 'warehousemgmt_stocklocation_type', 'type' => 'int', 'internal' => 'type'], + 'warehousemgmt_stocklocation_type' => ['name' => 'warehousemgmt_stocklocation_type', 'type' => 'int', 'internal' => 'type'], 'warehousemgmt_stocklocation_x' => ['name' => 'warehousemgmt_stocklocation_x', 'type' => 'int', 'internal' => 'x'], 'warehousemgmt_stocklocation_y' => ['name' => 'warehousemgmt_stocklocation_y', 'type' => 'int', 'internal' => 'y'], 'warehousemgmt_stocklocation_z' => ['name' => 'warehousemgmt_stocklocation_z', 'type' => 'int', 'internal' => 'z'], diff --git a/Models/StockMapper.php b/Models/StockMapper.php index 4bb8737..a6e798a 100755 --- a/Models/StockMapper.php +++ b/Models/StockMapper.php @@ -37,9 +37,9 @@ final class StockMapper extends DataMapperFactory * @since 1.0.0 */ public const COLUMNS = [ - 'warehousemgmt_stock_id' => ['name' => 'warehousemgmt_stock_id', 'type' => 'int', 'internal' => 'id'], - 'warehousemgmt_stock_name' => ['name' => 'warehousemgmt_stock_name', 'type' => 'string', 'internal' => 'name'], - 'warehousemgmt_stock_unit' => ['name' => 'warehousemgmt_stock_unit', 'type' => 'int', 'internal' => 'unit'], + 'warehousemgmt_stock_id' => ['name' => 'warehousemgmt_stock_id', 'type' => 'int', 'internal' => 'id'], + 'warehousemgmt_stock_name' => ['name' => 'warehousemgmt_stock_name', 'type' => 'string', 'internal' => 'name'], + 'warehousemgmt_stock_unit' => ['name' => 'warehousemgmt_stock_unit', 'type' => 'int', 'internal' => 'unit'], 'warehousemgmt_stock_address' => ['name' => 'warehousemgmt_stock_address', 'type' => 'int', 'internal' => 'address'], ]; diff --git a/Models/StockShelfMapper.php b/Models/StockShelfMapper.php index 011cafa..916f203 100755 --- a/Models/StockShelfMapper.php +++ b/Models/StockShelfMapper.php @@ -39,7 +39,7 @@ final class StockShelfMapper extends DataMapperFactory 'warehousemgmt_stockshelf_id' => ['name' => 'warehousemgmt_stockshelf_id', 'type' => 'int', 'internal' => 'id'], 'warehousemgmt_stockshelf_name' => ['name' => 'warehousemgmt_stockshelf_name', 'type' => 'string', 'internal' => 'name'], 'warehousemgmt_stockshelf_location' => ['name' => 'warehousemgmt_stockshelf_location', 'type' => 'int', 'internal' => 'location'], - 'warehousemgmt_stockshelf_type' => ['name' => 'warehousemgmt_stockshelf_type', 'type' => 'int', 'internal' => 'type'], + 'warehousemgmt_stockshelf_type' => ['name' => 'warehousemgmt_stockshelf_type', 'type' => 'int', 'internal' => 'type'], 'warehousemgmt_stockshelf_x' => ['name' => 'warehousemgmt_stockshelf_x', 'type' => 'int', 'internal' => 'x'], 'warehousemgmt_stockshelf_y' => ['name' => 'warehousemgmt_stockshelf_y', 'type' => 'int', 'internal' => 'y'], 'warehousemgmt_stockshelf_z' => ['name' => 'warehousemgmt_stockshelf_z', 'type' => 'int', 'internal' => 'z'], diff --git a/Models/StockTypeMapper.php b/Models/StockTypeMapper.php index edbf0b0..08b6353 100644 --- a/Models/StockTypeMapper.php +++ b/Models/StockTypeMapper.php @@ -14,7 +14,6 @@ declare(strict_types=1); namespace Modules\WarehouseManagement\Models; -use Modules\Admin\Models\AddressMapper; use phpOMS\DataStorage\Database\Mapper\DataMapperFactory; /** diff --git a/Theme/Backend/Lang/en.lang.php b/Theme/Backend/Lang/en.lang.php index 5ea67f2..4b2be17 100755 --- a/Theme/Backend/Lang/en.lang.php +++ b/Theme/Backend/Lang/en.lang.php @@ -13,35 +13,35 @@ declare(strict_types=1); return ['WarehouseManagement' => [ - 'All' => 'All', - 'Amount' => 'Amount', - 'Arrivals' => 'Arrivals', - 'Article' => 'Article', - 'Articles' => 'Articles', - 'City' => 'City', - 'Consignee' => 'Consignee', - 'Consignor' => 'Consignor', - 'Country' => 'Country', - 'Date' => 'Date', - 'Description' => 'Description', - 'Interval' => 'Interval', - 'Location' => 'Location', - 'Locations' => 'Locations', - 'Matchcode' => 'Matchcode', - 'Month' => 'Month', - 'Name' => 'Name', - 'Order' => 'Order', - 'Quantity' => 'Quantity', - 'Reference' => 'Reference', - 'Shipping' => 'Shipping', - 'Statistics' => 'Statistics', - 'Stock' => 'Stock', - 'Stocks' => 'Stocks', - 'Street' => 'Street', - 'Today' => 'Today', - 'Type' => 'Type', - 'Week' => 'Week', - 'Year' => 'Year', - 'Zip' => 'Zip', + 'All' => 'All', + 'Amount' => 'Amount', + 'Arrivals' => 'Arrivals', + 'Article' => 'Article', + 'Articles' => 'Articles', + 'City' => 'City', + 'Consignee' => 'Consignee', + 'Consignor' => 'Consignor', + 'Country' => 'Country', + 'Date' => 'Date', + 'Description' => 'Description', + 'Interval' => 'Interval', + 'Location' => 'Location', + 'Locations' => 'Locations', + 'Matchcode' => 'Matchcode', + 'Month' => 'Month', + 'Name' => 'Name', + 'Order' => 'Order', + 'Quantity' => 'Quantity', + 'Reference' => 'Reference', + 'Shipping' => 'Shipping', + 'Statistics' => 'Statistics', + 'Stock' => 'Stock', + 'Stocks' => 'Stocks', + 'Street' => 'Street', + 'Today' => 'Today', + 'Type' => 'Type', + 'Week' => 'Week', + 'Year' => 'Year', + 'Zip' => 'Zip', 'Types' => 'Types', ]];