From 48bc5fa4026129886716af1344890676e9c02540 Mon Sep 17 00:00:00 2001 From: Formatter Bot Date: Sun, 4 Apr 2021 15:14:53 +0000 Subject: [PATCH] Automated formatting changes --- Controller/BackendController.php | 7 +++---- Models/ItemAttributeType.php | 4 +++- Models/ItemAttributeTypeL11n.php | 4 ++-- Models/ItemAttributeTypeMapper.php | 10 +++++----- Theme/Backend/Lang/Navigation.en.lang.php | 12 ++++++------ Theme/Backend/attribute-type-list.tpl.php | 1 - 6 files changed, 19 insertions(+), 19 deletions(-) diff --git a/Controller/BackendController.php b/Controller/BackendController.php index e039222..b996f1e 100755 --- a/Controller/BackendController.php +++ b/Controller/BackendController.php @@ -15,15 +15,16 @@ declare(strict_types=1); namespace Modules\ItemManagement\Controller; use Model\SettingsEnum; -use Modules\Media\Models\Media; use Modules\Admin\Models\LocalizationMapper; use Modules\Billing\Models\BillTypeL11n; use Modules\Billing\Models\SalesBillMapper; use Modules\ItemManagement\Models\ItemAttributeMapper; use Modules\ItemManagement\Models\ItemAttributeTypeMapper; +use Modules\ItemManagement\Models\ItemAttributeValueMapper; use Modules\ItemManagement\Models\ItemL11nMapper; use Modules\ItemManagement\Models\ItemL11nType; use Modules\ItemManagement\Models\ItemMapper; +use Modules\Media\Models\Media; use phpOMS\Asset\AssetType; use phpOMS\Contract\RenderableInterface; use phpOMS\Localization\Money; @@ -31,7 +32,6 @@ use phpOMS\Message\RequestAbstract; use phpOMS\Message\ResponseAbstract; use phpOMS\Stdlib\Base\SmartDateTime; use phpOMS\Views\View; -use Modules\ItemManagement\Models\ItemAttributeValueMapper; /** * ItemManagement controller class. @@ -43,7 +43,6 @@ use Modules\ItemManagement\Models\ItemAttributeValueMapper; */ final class BackendController extends Controller { - /** * Routing end-point for application behaviour. * @@ -341,7 +340,7 @@ final class BackendController extends Controller // @todo: why is the conditional array necessary, shouldn't the mapper realize when it mustn't use the conditional (when the field doesn't exist in the mapper) $newestInvoices = SalesBillMapper::with('language', $response->getLanguage(), [BillTypeL11n::class])::getNewestItemInvoices($item->getId(), 5); $topCustomers = SalesBillMapper::getItemTopCustomers($item->getId(), new SmartDateTime('Y-01-01'), new SmartDateTime('now'), 5); - $allInvoices = SalesBillMapper::getItemBills($item->getId(), new SmartDateTime('Y-01-01'), new SmartDateTime('now')); + $allInvoices = SalesBillMapper::getItemBills($item->getId(), new SmartDateTime('Y-01-01'), new SmartDateTime('now')); $regionSales = SalesBillMapper::getItemRegionSales($item->getId(), new SmartDateTime('Y-01-01'), new SmartDateTime('now')); $countrySales = SalesBillMapper::getItemCountrySales($item->getId(), new SmartDateTime('Y-01-01'), new SmartDateTime('now'), 5); $monthlySalesCosts = SalesBillMapper::getItemMonthlySalesCosts($item->getId(), (new SmartDateTime('now'))->createModify(-1), new SmartDateTime('now')); diff --git a/Models/ItemAttributeType.php b/Models/ItemAttributeType.php index fe1e935..8cbaaa7 100755 --- a/Models/ItemAttributeType.php +++ b/Models/ItemAttributeType.php @@ -68,7 +68,9 @@ class ItemAttributeType implements \JsonSerializable, ArrayableInterface * * @var ItemAttributeTypeL11n */ - protected string | ItemAttributeTypeL11n $l11n; + protected string | + + ItemAttributeTypeL11n $l11n; /** * Possible default attribute values diff --git a/Models/ItemAttributeTypeL11n.php b/Models/ItemAttributeTypeL11n.php index 9cc06d4..655a60b 100755 --- a/Models/ItemAttributeTypeL11n.php +++ b/Models/ItemAttributeTypeL11n.php @@ -65,8 +65,8 @@ ItemAttributeType $type = 0; * Constructor. * * @param int|ItemAttributeType $type Attribute type - * @param string $title Localized title - * @param string $language Language + * @param string $title Localized title + * @param string $language Language * * @since 1.0.0 */ diff --git a/Models/ItemAttributeTypeMapper.php b/Models/ItemAttributeTypeMapper.php index 813de7c..717d330 100755 --- a/Models/ItemAttributeTypeMapper.php +++ b/Models/ItemAttributeTypeMapper.php @@ -33,11 +33,11 @@ final class ItemAttributeTypeMapper extends DataMapperAbstract * @since 1.0.0 */ protected static array $columns = [ - 'itemmgmt_attr_type_id' => ['name' => 'itemmgmt_attr_type_id', 'type' => 'int', 'internal' => 'id'], - 'itemmgmt_attr_type_name' => ['name' => 'itemmgmt_attr_type_name', 'type' => 'string', 'internal' => 'name', 'autocomplete' => true], - 'itemmgmt_attr_type_fields' => ['name' => 'itemmgmt_attr_type_fields', 'type' => 'int', 'internal' => 'fields'], - 'itemmgmt_attr_type_custom' => ['name' => 'itemmgmt_attr_type_custom', 'type' => 'bool', 'internal' => 'custom'], - 'itemmgmt_attr_type_pattern' => ['name' => 'itemmgmt_attr_type_pattern', 'type' => 'bool', 'internal' => 'validationPattern'], + 'itemmgmt_attr_type_id' => ['name' => 'itemmgmt_attr_type_id', 'type' => 'int', 'internal' => 'id'], + 'itemmgmt_attr_type_name' => ['name' => 'itemmgmt_attr_type_name', 'type' => 'string', 'internal' => 'name', 'autocomplete' => true], + 'itemmgmt_attr_type_fields' => ['name' => 'itemmgmt_attr_type_fields', 'type' => 'int', 'internal' => 'fields'], + 'itemmgmt_attr_type_custom' => ['name' => 'itemmgmt_attr_type_custom', 'type' => 'bool', 'internal' => 'custom'], + 'itemmgmt_attr_type_pattern' => ['name' => 'itemmgmt_attr_type_pattern', 'type' => 'bool', 'internal' => 'validationPattern'], 'itemmgmt_attr_type_required' => ['name' => 'itemmgmt_attr_type_required', 'type' => 'bool', 'internal' => 'isRequired'], ]; diff --git a/Theme/Backend/Lang/Navigation.en.lang.php b/Theme/Backend/Lang/Navigation.en.lang.php index a20bad2..201a610 100755 --- a/Theme/Backend/Lang/Navigation.en.lang.php +++ b/Theme/Backend/Lang/Navigation.en.lang.php @@ -13,11 +13,11 @@ declare(strict_types=1); return ['Navigation' => [ - 'Analyze' => 'Analyze', - 'Attributes' => 'Attributes', - 'Types' => 'Types', - 'Values' => 'Values', - 'Create' => 'Create', - 'List' => 'List', + 'Analyze' => 'Analyze', + 'Attributes' => 'Attributes', + 'Types' => 'Types', + 'Values' => 'Values', + 'Create' => 'Create', + 'List' => 'List', 'ItemManagement' => 'Item Management', ]]; diff --git a/Theme/Backend/attribute-type-list.tpl.php b/Theme/Backend/attribute-type-list.tpl.php index d89d5db..b015614 100644 --- a/Theme/Backend/attribute-type-list.tpl.php +++ b/Theme/Backend/attribute-type-list.tpl.php @@ -12,7 +12,6 @@ */ declare(strict_types=1); -use Modules\Media\Models\NullMedia; use phpOMS\Uri\UriFactory; /** @var \phpOMS\Views\View $this */