phpstan, phpcs, phpunit fixes

This commit is contained in:
Dennis Eichhorn 2023-01-27 22:12:09 +01:00
parent 0a6365ce37
commit d6f0b449bb
10 changed files with 50 additions and 35 deletions

View File

@ -253,11 +253,6 @@
"type": "TINYINT(1)", "type": "TINYINT(1)",
"null": false "null": false
}, },
"eventmanagement_event_attr_value_type": {
"name": "eventmanagement_event_attr_value_type",
"type": "INT(11)",
"null": false
},
"eventmanagement_event_attr_value_valueStr": { "eventmanagement_event_attr_value_valueStr": {
"name": "eventmanagement_event_attr_value_valueStr", "name": "eventmanagement_event_attr_value_valueStr",
"type": "VARCHAR(255)", "type": "VARCHAR(255)",

View File

@ -42,7 +42,7 @@ final class AccountRelationMapper extends DataMapperFactory
/** /**
* Has one relation. * Has one relation.
* *
* @var array<string, array{mapper:string, external:string, by?:string, column?:string, conditional?:bool}> * @var array<string, array{mapper:class-string, external:string, by?:string, column?:string, conditional?:bool}>
* @since 1.0.0 * @since 1.0.0
*/ */
public const OWNS_ONE = [ public const OWNS_ONE = [

View File

@ -42,7 +42,7 @@ final class EventAttributeMapper extends DataMapperFactory
/** /**
* Has one relation. * Has one relation.
* *
* @var array<string, array{mapper:string, external:string, by?:string, column?:string, conditional?:bool}> * @var array<string, array{mapper:class-string, external:string, by?:string, column?:string, conditional?:bool}>
* @since 1.0.0 * @since 1.0.0
*/ */
public const OWNS_ONE = [ public const OWNS_ONE = [

View File

@ -10,10 +10,12 @@
* @version 1.0.0 * @version 1.0.0
* @link https://jingga.app * @link https://jingga.app
*/ */
declare(strict_types=1); declare(strict_types=1);
namespace Modules\EventManagement\Models; namespace Modules\EventManagement\Models;
use phpOMS\Localization\BaseStringL11n;
use phpOMS\Localization\ISO639x1Enum; use phpOMS\Localization\ISO639x1Enum;
/** /**
@ -65,9 +67,9 @@ class EventAttributeType implements \JsonSerializable
/** /**
* Localization * Localization
* *
* @var EventAttributeTypeL11n * @var BaseStringL11n
*/ */
private string | EventAttributeTypeL11n $l11n; private string | BaseStringL11n $l11n;
/** /**
* Possible default attribute values * Possible default attribute values
@ -95,7 +97,7 @@ class EventAttributeType implements \JsonSerializable
* *
* @since 1.0.0 * @since 1.0.0
*/ */
public function getId() : int public function getId(): int
{ {
return $this->id; return $this->id;
} }
@ -103,22 +105,23 @@ class EventAttributeType implements \JsonSerializable
/** /**
* Set l11n * Set l11n
* *
* @param string|EventAttributeTypeL11n $l11n Tag article l11n * @param string|BaseStringL11n $l11n Tag article l11n
* @param string $lang Language * @param string $lang Language
* *
* @return void * @return void
* *
* @since 1.0.0 * @since 1.0.0
*/ */
public function setL11n(string | EventAttributeTypeL11n $l11n, string $lang = ISO639x1Enum::_EN) : void public function setL11n(string | BaseStringL11n $l11n, string $lang = ISO639x1Enum::_EN): void
{ {
if ($l11n instanceof EventAttributeTypeL11n) { if ($l11n instanceof BaseStringL11n) {
$this->l11n = $l11n; $this->l11n = $l11n;
} elseif (isset($this->l11n) && $this->l11n instanceof EventAttributeTypeL11n) { } elseif (isset($this->l11n) && $this->l11n instanceof BaseStringL11n) {
$this->l11n->title = $l11n; $this->l11n->content = $l11n;
$this->l11n->setLanguage($lang);
} else { } else {
$this->l11n = new EventAttributeTypeL11n(); $this->l11n = new BaseStringL11n();
$this->l11n->title = $l11n; $this->l11n->content = $l11n;
$this->l11n->setLanguage($lang); $this->l11n->setLanguage($lang);
} }
} }
@ -128,9 +131,9 @@ class EventAttributeType implements \JsonSerializable
* *
* @since 1.0.0 * @since 1.0.0
*/ */
public function getL11n() : string public function getL11n(): string
{ {
return $this->l11n instanceof EventAttributeTypeL11n ? $this->l11n->title : $this->l11n; return $this->l11n instanceof BaseStringL11n ? $this->l11n->content : $this->l11n;
} }
/** /**
@ -142,7 +145,7 @@ class EventAttributeType implements \JsonSerializable
* *
* @since 1.0.0 * @since 1.0.0
*/ */
public function setFields(int $fields) : void public function setFields(int $fields): void
{ {
$this->fields = $fields; $this->fields = $fields;
} }
@ -154,7 +157,7 @@ class EventAttributeType implements \JsonSerializable
* *
* @sicne 1.0.0 * @sicne 1.0.0
*/ */
public function getDefaults() : array public function getDefaults(): array
{ {
return $this->defaults; return $this->defaults;
} }
@ -162,7 +165,7 @@ class EventAttributeType implements \JsonSerializable
/** /**
* {@inheritdoc} * {@inheritdoc}
*/ */
public function toArray() : array public function toArray(): array
{ {
return [ return [
'id' => $this->id, 'id' => $this->id,
@ -176,7 +179,7 @@ class EventAttributeType implements \JsonSerializable
/** /**
* {@inheritdoc} * {@inheritdoc}
*/ */
public function jsonSerialize() : mixed public function jsonSerialize(): mixed
{ {
return $this->toArray(); return $this->toArray();
} }

View File

@ -59,7 +59,7 @@ final class EventAttributeTypeL11nMapper extends DataMapperFactory
/** /**
* Model to use by the mapper. * Model to use by the mapper.
* *
* @var string * @var class-string
* @since 1.0.0 * @since 1.0.0
*/ */
public const MODEL = BaseStringL11n::class; public const MODEL = BaseStringL11n::class;

View File

@ -44,7 +44,7 @@ final class EventAttributeTypeMapper extends DataMapperFactory
/** /**
* Has many relation. * Has many relation.
* *
* @var array<string, array{mapper:string, table:string, self?:?string, external?:?string, column?:string}> * @var array<string, array{mapper:class-string, table:string, self?:?string, external?:?string, column?:string}>
* @since 1.0.0 * @since 1.0.0
*/ */
public const HAS_MANY = [ public const HAS_MANY = [

View File

@ -124,7 +124,7 @@ class EventAttributeValue implements \JsonSerializable
/** /**
* Set value * Set value
* *
* @param int|string|float|\DateTimeInterface $value Value * @param int|string|float $value Value
* *
* @return void * @return void
* *
@ -142,7 +142,7 @@ class EventAttributeValue implements \JsonSerializable
} elseif ($datatype === AttributeValueType::_FLOAT) { } elseif ($datatype === AttributeValueType::_FLOAT) {
$this->valueDec = (float) $value; $this->valueDec = (float) $value;
} elseif ($datatype === AttributeValueType::_DATETIME) { } elseif ($datatype === AttributeValueType::_DATETIME) {
$this->valueDat = new \DateTime($value); $this->valueDat = new \DateTime((string) $value);
} }
} }
@ -172,7 +172,7 @@ class EventAttributeValue implements \JsonSerializable
* Set l11n * Set l11n
* *
* @param string|BaseStringL11n $l11n Tag article l11n * @param string|BaseStringL11n $l11n Tag article l11n
* @param string $lang Language * @param string $lang Language
* *
* @return void * @return void
* *
@ -183,11 +183,12 @@ class EventAttributeValue implements \JsonSerializable
if ($l11n instanceof BaseStringL11n) { if ($l11n instanceof BaseStringL11n) {
$this->l11n = $l11n; $this->l11n = $l11n;
} elseif (isset($this->l11n) && $this->l11n instanceof BaseStringL11n) { } elseif (isset($this->l11n) && $this->l11n instanceof BaseStringL11n) {
$this->l11n->content = $l11n; $this->l11n->content = $l11n;
$this->l11n->setLanguage($lang);
} else { } else {
$this->l11n = new BaseStringL11n(); $this->l11n = new BaseStringL11n();
$this->l11n->content = $l11n; $this->l11n->content = $l11n;
$this->l11n->ref = $this->id; $this->l11n->ref = $this->id;
$this->l11n->setLanguage($lang); $this->l11n->setLanguage($lang);
} }
} }

View File

@ -44,7 +44,7 @@ final class EventAttributeValueMapper extends DataMapperFactory
/** /**
* Has many relation. * Has many relation.
* *
* @var array<string, array{mapper:string, table:string, self?:?string, external?:?string, column?:string}> * @var array<string, array{mapper:class-string, table:string, self?:?string, external?:?string, column?:string}>
* @since 1.0.0 * @since 1.0.0
*/ */
/* /*

View File

@ -56,7 +56,7 @@ final class EventMapper extends DataMapperFactory
/** /**
* Has many relation. * Has many relation.
* *
* @var array<string, array{mapper:string, table:string, self?:?string, external?:?string, column?:string}> * @var array<string, array{mapper:class-string, table:string, self?:?string, external?:?string, column?:string}>
* @since 1.0.0 * @since 1.0.0
*/ */
public const HAS_MANY = [ public const HAS_MANY = [
@ -84,7 +84,7 @@ final class EventMapper extends DataMapperFactory
/** /**
* Has one relation. * Has one relation.
* *
* @var array<string, array{mapper:string, external:string, by?:string, column?:string, conditional?:bool}> * @var array<string, array{mapper:class-string, external:string, by?:string, column?:string, conditional?:bool}>
* @since 1.0.0 * @since 1.0.0
*/ */
public const OWNS_ONE = [ public const OWNS_ONE = [
@ -97,7 +97,7 @@ final class EventMapper extends DataMapperFactory
/** /**
* Belongs to. * Belongs to.
* *
* @var array<string, array{mapper:string, external:string, column?:string, by?:string}> * @var array<string, array{mapper:class-string, external:string, column?:string, by?:string}>
* @since 1.0.0 * @since 1.0.0
*/ */
public const BELONGS_TO = [ public const BELONGS_TO = [

View File

@ -0,0 +1,16 @@
<?php
/**
* Karaka
*
* PHP Version 8.1
*
* @package Modules\EventManagement
* @copyright Dennis Eichhorn
* @license OMS License 1.0
* @version 1.0.0
* @link https://jingga.app
*/
declare(strict_types=1);
return ['EventManagement' => [
]];