From 362bee2b0221a03531cf653cc7dbb88ac49bc62b Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Tue, 26 Feb 2019 00:00:31 +0100 Subject: [PATCH] Mapper/Module/Schema fixes thanks to new tests --- Models/AccountMapper.php | 10 +++++----- Models/AccountPermissionMapper.php | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Models/AccountMapper.php b/Models/AccountMapper.php index c768b1b..ae88ba9 100644 --- a/Models/AccountMapper.php +++ b/Models/AccountMapper.php @@ -32,7 +32,7 @@ final class AccountMapper extends DataMapperAbstract /** * Columns. * - * @var array> + * @var array> * @since 1.0.0 */ protected static $columns = [ @@ -40,11 +40,11 @@ final class AccountMapper extends DataMapperAbstract 'account_status' => ['name' => 'account_status', 'type' => 'int', 'internal' => 'status'], 'account_type' => ['name' => 'account_type', 'type' => 'int', 'internal' => 'type'], 'account_login' => ['name' => 'account_login', 'type' => 'string', 'internal' => 'login', 'autocomplete' => true], - 'account_name1' => ['name' => 'account_name1', 'type' => 'string', 'internal' => 'name1', 'autocomplete' => true], - 'account_name2' => ['name' => 'account_name2', 'type' => 'string', 'internal' => 'name2', 'autocomplete' => true], - 'account_name3' => ['name' => 'account_name3', 'type' => 'string', 'internal' => 'name3', 'autocomplete' => true], + 'account_name1' => ['name' => 'account_name1', 'type' => 'string', 'internal' => 'name1', 'autocomplete' => true, 'annotations' => ['gdpr' => true]], + 'account_name2' => ['name' => 'account_name2', 'type' => 'string', 'internal' => 'name2', 'autocomplete' => true, 'annotations' => ['gdpr' => true]], + 'account_name3' => ['name' => 'account_name3', 'type' => 'string', 'internal' => 'name3', 'autocomplete' => true, 'annotations' => ['gdpr' => true]], 'account_password' => ['name' => 'account_password', 'type' => 'string', 'internal' => 'password'], - 'account_email' => ['name' => 'account_email', 'type' => 'string', 'internal' => 'email', 'autocomplete' => true], + 'account_email' => ['name' => 'account_email', 'type' => 'string', 'internal' => 'email', 'autocomplete' => true, 'annotations' => ['gdpr' => true]], 'account_tries' => ['name' => 'account_tries', 'type' => 'int', 'internal' => 'tries'], 'account_lactive' => ['name' => 'account_lactive', 'type' => 'DateTime', 'internal' => 'lastActive'], 'account_created_at' => ['name' => 'account_created_at', 'type' => 'DateTime', 'internal' => 'createdAt'], diff --git a/Models/AccountPermissionMapper.php b/Models/AccountPermissionMapper.php index f9ccb29..311d4dd 100644 --- a/Models/AccountPermissionMapper.php +++ b/Models/AccountPermissionMapper.php @@ -37,7 +37,7 @@ final class AccountPermissionMapper extends DataMapperAbstract 'account_permission_id' => ['name' => 'account_permission_id', 'type' => 'int', 'internal' => 'id'], 'account_permission_account' => ['name' => 'account_permission_account', 'type' => 'int', 'internal' => 'account'], 'account_permission_unit' => ['name' => 'account_permission_unit', 'type' => 'int', 'internal' => 'unit'], - 'account_permission_app' => ['name' => 'account_permission_app', 'type' => 'int', 'internal' => 'app'], + 'account_permission_app' => ['name' => 'account_permission_app', 'type' => 'string', 'internal' => 'app'], 'account_permission_module' => ['name' => 'account_permission_module', 'type' => 'string', 'internal' => 'module'], 'account_permission_from' => ['name' => 'account_permission_from', 'type' => 'int', 'internal' => 'from'], 'account_permission_type' => ['name' => 'account_permission_type', 'type' => 'int', 'internal' => 'type'],