From 78547922f379f54d730c8d05493597b4fb07e9c7 Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Thu, 15 Aug 2019 21:55:12 +0200 Subject: [PATCH] Implement php 7.4 type hints --- Controller/Controller.php | 4 ++-- Models/AccountRelationMapper.php | 8 ++++---- Models/GroupRelationMapper.php | 8 ++++---- Models/Task.php | 8 ++++---- Models/TaskElement.php | 4 ++-- Models/TaskElementMapper.php | 12 ++++++------ Models/TaskMapper.php | 14 +++++++------- 7 files changed, 29 insertions(+), 29 deletions(-) diff --git a/Controller/Controller.php b/Controller/Controller.php index f944248..4d6ca3b 100644 --- a/Controller/Controller.php +++ b/Controller/Controller.php @@ -66,7 +66,7 @@ class Controller extends ModuleAbstract implements WebInterface * @var string[] * @since 1.0.0 */ - protected static $providing = [ + protected static array $providing = [ 'Navigation', ]; @@ -76,5 +76,5 @@ class Controller extends ModuleAbstract implements WebInterface * @var string[] * @since 1.0.0 */ - protected static $dependencies = []; + protected static array $dependencies = []; } diff --git a/Models/AccountRelationMapper.php b/Models/AccountRelationMapper.php index 1e34689..4816db9 100644 --- a/Models/AccountRelationMapper.php +++ b/Models/AccountRelationMapper.php @@ -34,7 +34,7 @@ final class AccountRelationMapper extends DataMapperAbstract * @var array> * @since 1.0.0 */ - protected static $columns = [ + protected static array $columns = [ 'task_account_id' => ['name' => 'task_account_id', 'type' => 'int', 'internal' => 'id'], 'task_account_duty' => ['name' => 'task_account_duty', 'type' => 'int', 'internal' => 'duty'], 'task_account_account' => ['name' => 'task_account_account', 'type' => 'int', 'internal' => 'relation'], @@ -47,7 +47,7 @@ final class AccountRelationMapper extends DataMapperAbstract * @var array> * @since 1.0.0 */ - protected static $ownsOne = [ + protected static array $ownsOne = [ 'relation' => [ 'mapper' => AccountMapper::class, 'src' => 'task_account_account', @@ -60,7 +60,7 @@ final class AccountRelationMapper extends DataMapperAbstract * @var string * @since 1.0.0 */ - protected static $table = 'task_account'; + protected static string $table = 'task_account'; /** * Primary field name. @@ -68,5 +68,5 @@ final class AccountRelationMapper extends DataMapperAbstract * @var string * @since 1.0.0 */ - protected static $primaryField = 'task_account_id'; + protected static string $primaryField = 'task_account_id'; } diff --git a/Models/GroupRelationMapper.php b/Models/GroupRelationMapper.php index 797b4ae..e162b45 100644 --- a/Models/GroupRelationMapper.php +++ b/Models/GroupRelationMapper.php @@ -34,7 +34,7 @@ final class GroupRelationMapper extends DataMapperAbstract * @var array> * @since 1.0.0 */ - protected static $columns = [ + protected static array $columns = [ 'task_group_id' => ['name' => 'task_group_id', 'type' => 'int', 'internal' => 'id'], 'task_group_duty' => ['name' => 'task_group_duty', 'type' => 'int', 'internal' => 'duty'], 'task_group_group' => ['name' => 'task_group_group', 'type' => 'int', 'internal' => 'relation'], @@ -47,7 +47,7 @@ final class GroupRelationMapper extends DataMapperAbstract * @var array> * @since 1.0.0 */ - protected static $ownsOne = [ + protected static array $ownsOne = [ 'relation' => [ 'mapper' => GroupMapper::class, 'src' => 'task_group_group', @@ -60,7 +60,7 @@ final class GroupRelationMapper extends DataMapperAbstract * @var string * @since 1.0.0 */ - protected static $table = 'task_group'; + protected static string $table = 'task_group'; /** * Primary field name. @@ -68,5 +68,5 @@ final class GroupRelationMapper extends DataMapperAbstract * @var string * @since 1.0.0 */ - protected static $primaryField = 'task_group_id'; + protected static string $primaryField = 'task_group_id'; } diff --git a/Models/Task.php b/Models/Task.php index bd4ea1b..ec36a98 100644 --- a/Models/Task.php +++ b/Models/Task.php @@ -57,7 +57,7 @@ class Task implements \JsonSerializable /** * Created. * - * @var \DateTime + * @var null|\DateTime * @since 1.0.0 */ protected $createdAt = null; @@ -113,7 +113,7 @@ class Task implements \JsonSerializable /** * Start. * - * @var \DateTime + * @var null|\DateTime * @since 1.0.0 */ protected $start = null; @@ -121,7 +121,7 @@ class Task implements \JsonSerializable /** * Due. * - * @var \DateTime + * @var null|\DateTime * @since 1.0.0 */ protected $due = null; @@ -129,7 +129,7 @@ class Task implements \JsonSerializable /** * Done. * - * @var \DateTime + * @var null|\DateTime * @since 1.0.0 */ protected $done = null; diff --git a/Models/TaskElement.php b/Models/TaskElement.php index 791d704..a862f98 100644 --- a/Models/TaskElement.php +++ b/Models/TaskElement.php @@ -73,7 +73,7 @@ class TaskElement implements \JsonSerializable /** * Created. * - * @var \DateTime + * @var null|\DateTime * @since 1.0.0 */ private $createdAt = null; @@ -89,7 +89,7 @@ class TaskElement implements \JsonSerializable /** * Due. * - * @var \DateTime + * @var null|\DateTime * @since 1.0.0 */ private $due = null; diff --git a/Models/TaskElementMapper.php b/Models/TaskElementMapper.php index 929982d..e93e9bf 100644 --- a/Models/TaskElementMapper.php +++ b/Models/TaskElementMapper.php @@ -35,7 +35,7 @@ final class TaskElementMapper extends DataMapperAbstract * @var array> * @since 1.0.0 */ - protected static $columns = [ + protected static array $columns = [ 'task_element_id' => ['name' => 'task_element_id', 'type' => 'int', 'internal' => 'id'], 'task_element_desc' => ['name' => 'task_element_desc', 'type' => 'string', 'internal' => 'description'], 'task_element_desc_raw' => ['name' => 'task_element_desc_raw', 'type' => 'string', 'internal' => 'descriptionRaw'], @@ -53,7 +53,7 @@ final class TaskElementMapper extends DataMapperAbstract * @var array> * @since 1.0.0 */ - protected static $hasMany = [ + protected static array $hasMany = [ 'media' => [ 'mapper' => MediaMapper::class, 'table' => 'task_element_media', @@ -80,7 +80,7 @@ final class TaskElementMapper extends DataMapperAbstract * @var array> * @since 1.0.0 */ - protected static $belongsTo = [ + protected static array $belongsTo = [ 'createdBy' => [ 'mapper' => AccountMapper::class, 'src' => 'task_element_created_by', @@ -93,7 +93,7 @@ final class TaskElementMapper extends DataMapperAbstract * @var string * @since 1.0.0 */ - protected static $table = 'task_element'; + protected static string $table = 'task_element'; /** * Created at. @@ -101,7 +101,7 @@ final class TaskElementMapper extends DataMapperAbstract * @var string * @since 1.0.0 */ - protected static $createdAt = 'task_element_created_at'; + protected static string $createdAt = 'task_element_created_at'; /** * Primary field name. @@ -109,5 +109,5 @@ final class TaskElementMapper extends DataMapperAbstract * @var string * @since 1.0.0 */ - protected static $primaryField = 'task_element_id'; + protected static string $primaryField = 'task_element_id'; } diff --git a/Models/TaskMapper.php b/Models/TaskMapper.php index 97a84a0..a58c033 100644 --- a/Models/TaskMapper.php +++ b/Models/TaskMapper.php @@ -37,7 +37,7 @@ final class TaskMapper extends DataMapperAbstract * @var array> * @since 1.0.0 */ - protected static $columns = [ + protected static array $columns = [ 'task_id' => ['name' => 'task_id', 'type' => 'int', 'internal' => 'id'], 'task_title' => ['name' => 'task_title', 'type' => 'string', 'internal' => 'title'], 'task_desc' => ['name' => 'task_desc', 'type' => 'string', 'internal' => 'description'], @@ -61,7 +61,7 @@ final class TaskMapper extends DataMapperAbstract * @var array> * @since 1.0.0 */ - protected static $hasMany = [ + protected static array $hasMany = [ 'taskElements' => [ 'mapper' => TaskElementMapper::class, 'table' => 'task_element', @@ -88,7 +88,7 @@ final class TaskMapper extends DataMapperAbstract * @var array> * @since 1.0.0 */ - protected static $belongsTo = [ + protected static array $belongsTo = [ 'createdBy' => [ 'mapper' => AccountMapper::class, 'src' => 'task_created_by', @@ -101,7 +101,7 @@ final class TaskMapper extends DataMapperAbstract * @var array> * @since 1.0.0 */ - protected static $ownsOne = [ + protected static array $ownsOne = [ 'schedule' => [ 'mapper' => ScheduleMapper::class, 'src' => 'task_schedule', @@ -114,7 +114,7 @@ final class TaskMapper extends DataMapperAbstract * @var string * @since 1.0.0 */ - protected static $table = 'task'; + protected static string $table = 'task'; /** * Created at. @@ -122,7 +122,7 @@ final class TaskMapper extends DataMapperAbstract * @var string * @since 1.0.0 */ - protected static $createdAt = 'task_created_at'; + protected static string $createdAt = 'task_created_at'; /** * Primary field name. @@ -130,7 +130,7 @@ final class TaskMapper extends DataMapperAbstract * @var string * @since 1.0.0 */ - protected static $primaryField = 'task_id'; + protected static string $primaryField = 'task_id'; /** * Get open tasks by createdBy