Jingga/phpOMS
1
0
Fork 0
mirror of https://github.com/Karaka-Management/phpOMS.git synced 2026-02-13 23:28:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix self/static bug

Browse Source
This commit is contained in:
Dennis Eichhorn 2019-01-20 12:03:10 +01:00
parent d3cfe29e14
commit c959e5e5de
1 changed files with 23 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
Module/ModuleAbstract.php
View File

@ -211,9 +211,9 @@ abstract class ModuleAbstract
{ {
$response->getHeader()->set('Content-Type', MimeType::M_JSON . '; charset=utf-8', true); $response->getHeader()->set('Content-Type', MimeType::M_JSON . '; charset=utf-8', true);
$response->set($request->getUri()->__toString(), [ $response->set($request->getUri()->__toString(), [
'status' => $status, 'status' => $status,
'title' => $title, 'title' => $title,
'message' => $message, 'message' => $message,
'response' => $obj, 'response' => $obj,
]); ]);
} }
@ -249,12 +249,13 @@ abstract class ModuleAbstract
*/ */
protected function createModel(RequestAbstract $request, $obj, string $mapper, string $trigger) : void protected function createModel(RequestAbstract $request, $obj, string $mapper, string $trigger) : void
{ {
$this->app->eventManager->trigger('PRE:Module:' . self::MODULE_NAME . '-' . $trigger . '-create', '', $obj); $this->app->eventManager->trigger('PRE:Module:' . static::MODULE_NAME . '-' . $trigger . '-create', '', $obj);
$mapper::create($obj); $mapper::create($obj);
$this->app->eventManager->trigger('POST:Module:' . self::MODULE_NAME . '-' . $trigger . '-create', '', [ $this->app->eventManager->trigger('POST:Module:' . static::MODULE_NAME . '-' . $trigger . '-create', '', [
$request->getHEader()->getAccount(), $request->getHEader()->getAccount(),
null, null, $obj,
$obj, 0, 0,
static::MODULE_NAME,
]); ]);
} }
@ -273,16 +274,17 @@ abstract class ModuleAbstract
*/ */
protected function updateModel(RequestAbstract $request, $old, $new, $mapper, string $trigger) : void protected function updateModel(RequestAbstract $request, $old, $new, $mapper, string $trigger) : void
{ {
$this->app->eventManager->trigger('PRE:Module:' . self::MODULE_NAME . '-' . $trigger . '-update', '', $old); $this->app->eventManager->trigger('PRE:Module:' . static::MODULE_NAME . '-' . $trigger . '-update', '', $old);
if (\is_string($mapper)) { if (\is_string($mapper)) {
$mapper::update($new); $mapper::update($new);
} elseif ($mapper instanceof \Closure) { } elseif ($mapper instanceof \Closure) {
$mapper(); $mapper();
} }
$this->app->eventManager->trigger('POST:Module:' . self::MODULE_NAME . '-' . $trigger . '-update', '', [ $this->app->eventManager->trigger('POST:Module:' . static::MODULE_NAME . '-' . $trigger . '-update', '', [
$request->getHEader()->getAccount(), $request->getHEader()->getAccount(),
$old, $old, $new,
$new, 0, 0,
static::MODULE_NAME,
]); ]);
} }
@ -300,12 +302,13 @@ abstract class ModuleAbstract
*/ */
protected function deleteModel(RequestAbstract $request, $obj, string $mapper, string $trigger) : void protected function deleteModel(RequestAbstract $request, $obj, string $mapper, string $trigger) : void
{ {
$this->app->eventManager->trigger('PRE:Module:' . self::MODULE_NAME . '-' . $trigger . '-delete', '', $obj); $this->app->eventManager->trigger('PRE:Module:' . static::MODULE_NAME . '-' . $trigger . '-delete', '', $obj);
$mapper::delete($obj); $mapper::delete($obj);
$this->app->eventManager->trigger('POST:Module:' . self::MODULE_NAME . '-' . $trigger . '-delete', '', [ $this->app->eventManager->trigger('POST:Module:' . static::MODULE_NAME . '-' . $trigger . '-delete', '', [
$request->getHEader()->getAccount(), $request->getHEader()->getAccount(),
$obj, $obj, null,
null, 0, 0,
static::MODULE_NAME,
]); ]);
} }
@ -325,12 +328,13 @@ abstract class ModuleAbstract
*/ */
protected function createModelRelation(RequestAbstract $request, $rel1, $rel2, string $mapper, string $field, string $trigger) : void protected function createModelRelation(RequestAbstract $request, $rel1, $rel2, string $mapper, string $field, string $trigger) : void
{ {
$this->app->eventManager->trigger('PRE:Module:' . self::MODULE_NAME . '-' . $trigger . '-relation', '', $rel1); $this->app->eventManager->trigger('PRE:Module:' . static::MODULE_NAME . '-' . $trigger . '-relation', '', $rel1);
$mapper::createRelation($field, $rel1, $rel2); $mapper::createRelation($field, $rel1, $rel2);
$this->app->eventManager->trigger('POST:Module:' . self::MODULE_NAME . '-' . $trigger . '-relation', '', [ $this->app->eventManager->trigger('POST:Module:' . static::MODULE_NAME . '-' . $trigger . '-relation', '', [
$request->getHEader()->getAccount(), $request->getHEader()->getAccount(),
$rel1, $rel1, $rel2,
$rel2, 0, 0,
static::MODULE_NAME,
]); ]);
} }
} }