From c5094186eac869f6c67f95139ad8dcad06935e47 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 | 14 +++++--------- Models/TicketMapper.php | 12 ++++++------ 2 files changed, 11 insertions(+), 15 deletions(-) diff --git a/Controller.php b/Controller.php index 238854b..447ee64 100644 --- a/Controller.php +++ b/Controller.php @@ -15,15 +15,11 @@ */ namespace Modules\Support; -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; /** * Support 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 @@ -142,7 +138,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 @@ -161,7 +157,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/TicketMapper.php b/Models/TicketMapper.php index ede9809..819be59 100644 --- a/Models/TicketMapper.php +++ b/Models/TicketMapper.php @@ -83,13 +83,13 @@ class TicketMapper 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); - $query = new Builder($this->db); + $objId = parent::create($obj, $relations); + $query = new Builder(self::$db); - $query->prefix($this->db->getPrefix()) + $query->prefix(self::$db->getPrefix()) ->insert( 'account_permission_account', 'account_permission_from', @@ -105,7 +105,7 @@ class TicketMapper extends DataMapperAbstract ->into('account_permission') ->values($obj->getCreatedBy(), 'task', 'task', 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()); @@ -125,7 +125,7 @@ class TicketMapper 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', '=', 'task')