From 93a21d9925c67fb5bab4eacac4ac97329dd8ed63 Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Sat, 14 May 2016 14:58:33 +0200 Subject: [PATCH] Making datamapper static --- Controller.php | 10 +++------- Models/EventMapper.php | 12 ++++++------ 2 files changed, 9 insertions(+), 13 deletions(-) diff --git a/Controller.php b/Controller.php index d081297..c194cef 100644 --- a/Controller.php +++ b/Controller.php @@ -15,15 +15,11 @@ */ namespace Modules\EventManagement; -use Modules\Navigation\Models\Navigation; -use Modules\Navigation\Views\NavigationView; -use phpOMS\Contract\RenderableInterface; use phpOMS\Message\RequestAbstract; use phpOMS\Message\ResponseAbstract; use phpOMS\Module\ModuleAbstract; use phpOMS\Module\WebInterface; use phpOMS\Views\View; -use phpOMS\Views\ViewLayout; /** * Event Management controller class. @@ -85,7 +81,7 @@ class Controller extends ModuleAbstract implements WebInterface * @param ResponseAbstract $response Response * @param mixed $data Generic data * - * @return RenderableInterface + * @return \Serializable * * @since 1.0.0 * @author Dennis Eichhorn @@ -104,7 +100,7 @@ class Controller extends ModuleAbstract implements WebInterface * @param ResponseAbstract $response Response * @param mixed $data Generic data * - * @return RenderableInterface + * @return \Serializable * * @since 1.0.0 * @author Dennis Eichhorn @@ -123,7 +119,7 @@ class Controller extends ModuleAbstract implements WebInterface * @param ResponseAbstract $response Response * @param mixed $data Generic data * - * @return RenderableInterface + * @return \Serializable * * @since 1.0.0 * @author Dennis Eichhorn diff --git a/Models/EventMapper.php b/Models/EventMapper.php index 288a005..3e81d1a 100644 --- a/Models/EventMapper.php +++ b/Models/EventMapper.php @@ -106,13 +106,13 @@ class EventMapper extends DataMapperAbstract * @since 1.0.0 * @author Dennis Eichhorn */ - public function create($obj) + public static function create($obj, bool $relations = true) { try { - $objId = parent::create($obj); + $objId = parent::create($obj, $relations); - $query = new Builder($this->db); - $query->prefix($this->db->getPrefix()) + $query = new Builder(self::$db); + $query->prefix(self::$db->getPrefix()) ->insert( 'account_permission_account', 'account_permission_from', @@ -128,7 +128,7 @@ class EventMapper extends DataMapperAbstract ->into('account_permission') ->values($obj->getCreatedBy(), 'eventmanagement_event', 'eventmanagement_event', 1, $objId, 1, 1, 1, 1, 1); - $this->db->con->prepare($query->toSql())->execute(); + self::$db->con->prepare($query->toSql())->execute(); } catch (\Exception $e) { var_dump($e->getMessage()); @@ -148,7 +148,7 @@ class EventMapper extends DataMapperAbstract * @since 1.0.0 * @author Dennis Eichhorn */ - public function find(...$columns) : Builder + public static function find(...$columns) : Builder { return parent::find(...$columns)->from('account_permission') ->where('account_permission.account_permission_for', '=', 'calendar_event')