From 2aa7192cc30f9d53f67d33572656a0faf74a998d Mon Sep 17 00:00:00 2001 From: Formatter Bot Date: Sun, 4 Apr 2021 15:14:23 +0000 Subject: [PATCH] Automated formatting changes --- Controller/ApiController.php | 30 +++++++++++++------------- Controller/BackendController.php | 2 +- Models/Supplier.php | 2 +- Models/SupplierAttributeMapper.php | 6 +++--- Models/SupplierAttributeType.php | 6 ++++-- Models/SupplierAttributeTypeL11n.php | 4 ++-- Models/SupplierAttributeTypeMapper.php | 10 ++++----- 7 files changed, 31 insertions(+), 29 deletions(-) diff --git a/Controller/ApiController.php b/Controller/ApiController.php index eafe965..dbb4ada 100755 --- a/Controller/ApiController.php +++ b/Controller/ApiController.php @@ -19,25 +19,25 @@ use Modules\Admin\Models\Address; use Modules\Media\Models\PathSettings; use Modules\Profile\Models\ContactElementMapper; use Modules\Profile\Models\Profile; +use Modules\SupplierManagement\Models\AttributeValueType; +use Modules\SupplierManagement\Models\NullSupplierAttributeType; +use Modules\SupplierManagement\Models\NullSupplierAttributeValue; use Modules\SupplierManagement\Models\Supplier; +use Modules\SupplierManagement\Models\SupplierAttribute; +use Modules\SupplierManagement\Models\SupplierAttributeMapper; +use Modules\SupplierManagement\Models\SupplierAttributeType; +use Modules\SupplierManagement\Models\SupplierAttributeTypeL11n; +use Modules\SupplierManagement\Models\SupplierAttributeTypeL11nMapper; +use Modules\SupplierManagement\Models\SupplierAttributeTypeMapper; +use Modules\SupplierManagement\Models\SupplierAttributeValue; +use Modules\SupplierManagement\Models\SupplierAttributeValueMapper; use Modules\SupplierManagement\Models\SupplierMapper; +use phpOMS\Message\Http\HttpRequest; use phpOMS\Message\Http\RequestStatusCode; use phpOMS\Message\NotificationLevel; use phpOMS\Message\RequestAbstract; use phpOMS\Message\ResponseAbstract; use phpOMS\Model\Message\FormValidation; -use Modules\SupplierManagement\Models\SupplierAttribute; -use Modules\SupplierManagement\Models\NullSupplierAttributeValue; -use Modules\SupplierManagement\Models\SupplierAttributeTypeL11n; -use phpOMS\Message\Http\HttpRequest; -use Modules\SupplierManagement\Models\SupplierAttributeType; -use Modules\SupplierManagement\Models\SupplierAttributeValue; -use Modules\SupplierManagement\Models\AttributeValueType; -use Modules\SupplierManagement\Models\NullSupplierAttributeType; -use Modules\SupplierManagement\Models\SupplierAttributeTypeMapper; -use Modules\SupplierManagement\Models\SupplierAttributeTypeL11nMapper; -use Modules\SupplierManagement\Models\SupplierAttributeValueMapper; -use Modules\SupplierManagement\Models\SupplierAttributeMapper; /** * SupplierManagement class. @@ -202,10 +202,10 @@ final class ApiController extends Controller */ private function createSupplierAttributeFromRequest(RequestAbstract $request) : SupplierAttribute { - $attribute = new SupplierAttribute(); + $attribute = new SupplierAttribute(); $attribute->supplier = (int) $request->getData('supplier'); - $attribute->type = new NullSupplierAttributeType((int) $request->getData('type')); - $attribute->value = new NullSupplierAttributeValue((int) $request->getData('value')); + $attribute->type = new NullSupplierAttributeType((int) $request->getData('type')); + $attribute->value = new NullSupplierAttributeValue((int) $request->getData('value')); return $attribute; } diff --git a/Controller/BackendController.php b/Controller/BackendController.php index a34eb21..214eefe 100755 --- a/Controller/BackendController.php +++ b/Controller/BackendController.php @@ -16,6 +16,7 @@ namespace Modules\SupplierManagement\Controller; use Modules\Billing\Models\BillTypeL11n; use Modules\Billing\Models\PurchaseBillMapper; +use Modules\Media\Models\Media; use Modules\SupplierManagement\Models\SupplierMapper; use phpOMS\Asset\AssetType; use phpOMS\Contract\RenderableInterface; @@ -24,7 +25,6 @@ use phpOMS\Message\RequestAbstract; use phpOMS\Message\ResponseAbstract; use phpOMS\Stdlib\Base\SmartDateTime; use phpOMS\Views\View; -use Modules\Media\Models\Media; /** * SupplierManagement controller class. diff --git a/Models/Supplier.php b/Models/Supplier.php index 0e6d0d7..91f8072 100755 --- a/Models/Supplier.php +++ b/Models/Supplier.php @@ -18,10 +18,10 @@ use Modules\Admin\Models\Address; use Modules\Admin\Models\NullAddress; use Modules\Editor\Models\EditorDoc; use Modules\Media\Models\Media; +use Modules\Media\Models\NullMedia; use Modules\Profile\Models\ContactElement; use Modules\Profile\Models\NullContactElement; use Modules\Profile\Models\Profile; -use Modules\Media\Models\NullMedia; /** * Supplier class. diff --git a/Models/SupplierAttributeMapper.php b/Models/SupplierAttributeMapper.php index e1416ec..ec8ca76 100755 --- a/Models/SupplierAttributeMapper.php +++ b/Models/SupplierAttributeMapper.php @@ -33,10 +33,10 @@ final class SupplierAttributeMapper extends DataMapperAbstract * @since 1.0.0 */ protected static array $columns = [ - 'suppliermgmt_supplier_attr_id' => ['name' => 'suppliermgmt_supplier_attr_id', 'type' => 'int', 'internal' => 'id'], + 'suppliermgmt_supplier_attr_id' => ['name' => 'suppliermgmt_supplier_attr_id', 'type' => 'int', 'internal' => 'id'], 'suppliermgmt_supplier_attr_supplier' => ['name' => 'suppliermgmt_supplier_attr_supplier', 'type' => 'int', 'internal' => 'supplier'], - 'suppliermgmt_supplier_attr_type' => ['name' => 'suppliermgmt_supplier_attr_type', 'type' => 'int', 'internal' => 'type'], - 'suppliermgmt_supplier_attr_value' => ['name' => 'suppliermgmt_supplier_attr_value', 'type' => 'int', 'internal' => 'value'], + 'suppliermgmt_supplier_attr_type' => ['name' => 'suppliermgmt_supplier_attr_type', 'type' => 'int', 'internal' => 'type'], + 'suppliermgmt_supplier_attr_value' => ['name' => 'suppliermgmt_supplier_attr_value', 'type' => 'int', 'internal' => 'value'], ]; /** diff --git a/Models/SupplierAttributeType.php b/Models/SupplierAttributeType.php index 9eb69fa..43aeb04 100755 --- a/Models/SupplierAttributeType.php +++ b/Models/SupplierAttributeType.php @@ -68,7 +68,9 @@ class SupplierAttributeType implements \JsonSerializable, ArrayableInterface * * @var string | SupplierAttributeTypeL11n */ - protected string | SupplierAttributeTypeL11n $l11n; + protected string | + + SupplierAttributeTypeL11n $l11n; /** * Possible default attribute values @@ -105,7 +107,7 @@ class SupplierAttributeType implements \JsonSerializable, ArrayableInterface * Set l11n * * @param string|SupplierAttributeTypeL11n $l11n Tag article l11n - * @param string $lang Language + * @param string $lang Language * * @return void * diff --git a/Models/SupplierAttributeTypeL11n.php b/Models/SupplierAttributeTypeL11n.php index 258cf95..e5cdd98 100755 --- a/Models/SupplierAttributeTypeL11n.php +++ b/Models/SupplierAttributeTypeL11n.php @@ -65,8 +65,8 @@ SupplierAttributeType $type = 0; * Constructor. * * @param int|SupplierAttributeType $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/SupplierAttributeTypeMapper.php b/Models/SupplierAttributeTypeMapper.php index 72190b4..b260123 100755 --- a/Models/SupplierAttributeTypeMapper.php +++ b/Models/SupplierAttributeTypeMapper.php @@ -33,11 +33,11 @@ final class SupplierAttributeTypeMapper extends DataMapperAbstract * @since 1.0.0 */ protected static array $columns = [ - 'suppliermgmt_attr_type_id' => ['name' => 'suppliermgmt_attr_type_id', 'type' => 'int', 'internal' => 'id'], - 'suppliermgmt_attr_type_name' => ['name' => 'suppliermgmt_attr_type_name', 'type' => 'string', 'internal' => 'name', 'autocomplete' => true], - 'suppliermgmt_attr_type_fields' => ['name' => 'suppliermgmt_attr_type_fields', 'type' => 'int', 'internal' => 'fields'], - 'suppliermgmt_attr_type_custom' => ['name' => 'suppliermgmt_attr_type_custom', 'type' => 'bool', 'internal' => 'custom'], - 'suppliermgmt_attr_type_pattern' => ['name' => 'suppliermgmt_attr_type_pattern', 'type' => 'bool', 'internal' => 'validationPattern'], + 'suppliermgmt_attr_type_id' => ['name' => 'suppliermgmt_attr_type_id', 'type' => 'int', 'internal' => 'id'], + 'suppliermgmt_attr_type_name' => ['name' => 'suppliermgmt_attr_type_name', 'type' => 'string', 'internal' => 'name', 'autocomplete' => true], + 'suppliermgmt_attr_type_fields' => ['name' => 'suppliermgmt_attr_type_fields', 'type' => 'int', 'internal' => 'fields'], + 'suppliermgmt_attr_type_custom' => ['name' => 'suppliermgmt_attr_type_custom', 'type' => 'bool', 'internal' => 'custom'], + 'suppliermgmt_attr_type_pattern' => ['name' => 'suppliermgmt_attr_type_pattern', 'type' => 'bool', 'internal' => 'validationPattern'], 'suppliermgmt_attr_type_required' => ['name' => 'suppliermgmt_attr_type_required', 'type' => 'bool', 'internal' => 'isRequired'], ];