From 5f14c0a45635d96da8080b1ddad275cc2183023f Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Wed, 8 Nov 2017 21:18:31 +0100 Subject: [PATCH] Remove mapper abstract duplication --- Models/AccountMapper.php | 27 +-------------------------- Models/AccountPermissionMapper.php | 16 ---------------- Models/GroupMapper.php | 16 ---------------- Models/ModuleMapper.php | 16 ---------------- 4 files changed, 1 insertion(+), 74 deletions(-) diff --git a/Models/AccountMapper.php b/Models/AccountMapper.php index d414379..7a4179b 100644 --- a/Models/AccountMapper.php +++ b/Models/AccountMapper.php @@ -85,31 +85,6 @@ class AccountMapper extends DataMapperAbstract */ protected static $createdAt = 'account_created_at'; - /** - * Create object. - * - * @param mixed $obj Object - * @param int $relations Behavior for relations creation - * - * @return mixed - * - * @since 1.0.0 - */ - public static function create($obj, int $relations = RelationType::ALL) - { - try { - $objId = parent::create($obj, $relations); - - if ($objId === null || !is_scalar($objId)) { - return $objId; - } - } catch (\Exception $e) { - return false; - } - - return $objId; - } - /** * Login user. * @@ -174,7 +149,7 @@ class AccountMapper extends DataMapperAbstract * @param int $relations Load relations * @param mixed $fill Object to fill * - * @return Account + * @return Account|array * * @since 1.0.0 */ diff --git a/Models/AccountPermissionMapper.php b/Models/AccountPermissionMapper.php index a164dd7..f1f66b3 100644 --- a/Models/AccountPermissionMapper.php +++ b/Models/AccountPermissionMapper.php @@ -54,20 +54,4 @@ class AccountPermissionMapper extends DataMapperAbstract * @since 1.0.0 */ protected static $primaryField = 'account_permission_id'; - - /** - * Get object. - * - * @param mixed $primaryKey Key - * @param int $relations Load relations - * @param mixed $fill Object to fill - * - * @return Group - * - * @since 1.0.0 - */ - public static function get($primaryKey, int $relations = RelationType::ALL, $fill = null) - { - return parent::get($primaryKey, $relations, $fill); - } } diff --git a/Models/GroupMapper.php b/Models/GroupMapper.php index 08b6f54..fea103f 100644 --- a/Models/GroupMapper.php +++ b/Models/GroupMapper.php @@ -57,20 +57,4 @@ class GroupMapper extends DataMapperAbstract * @since 1.0.0 */ protected static $createdAt = 'group_created'; - - /** - * Get object. - * - * @param mixed $primaryKey Key - * @param int $relations Load relations - * @param mixed $fill Object to fill - * - * @return Group - * - * @since 1.0.0 - */ - public static function get($primaryKey, int $relations = RelationType::ALL, $fill = null) - { - return parent::get($primaryKey, $relations, $fill); - } } diff --git a/Models/ModuleMapper.php b/Models/ModuleMapper.php index 36765bd..a8c5022 100644 --- a/Models/ModuleMapper.php +++ b/Models/ModuleMapper.php @@ -46,20 +46,4 @@ class ModuleMapper extends DataMapperAbstract * @since 1.0.0 */ protected static $primaryField = 'module_id'; - - /** - * Get object. - * - * @param mixed $primaryKey Key - * @param int $relations Load relations - * @param mixed $fill Object to fill - * - * @return Group - * - * @since 1.0.0 - */ - public static function get($primaryKey, int $relations = RelationType::ALL, $fill = null) - { - return parent::get($primaryKey, $relations, $fill); - } }