diff --git a/Module/ModuleAbstract.php b/Module/ModuleAbstract.php index 5fcc9596e..19ed14aea 100644 --- a/Module/ModuleAbstract.php +++ b/Module/ModuleAbstract.php @@ -211,9 +211,9 @@ abstract class ModuleAbstract { $response->getHeader()->set('Content-Type', MimeType::M_JSON . '; charset=utf-8', true); $response->set($request->getUri()->__toString(), [ - 'status' => $status, - 'title' => $title, - 'message' => $message, + 'status' => $status, + 'title' => $title, + 'message' => $message, 'response' => $obj, ]); } @@ -249,12 +249,13 @@ abstract class ModuleAbstract */ 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); - $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(), - null, - $obj, + null, $obj, + 0, 0, + static::MODULE_NAME, ]); } @@ -273,16 +274,17 @@ abstract class ModuleAbstract */ 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)) { $mapper::update($new); } elseif ($mapper instanceof \Closure) { $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(), - $old, - $new, + $old, $new, + 0, 0, + static::MODULE_NAME, ]); } @@ -300,12 +302,13 @@ abstract class ModuleAbstract */ 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); - $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(), - $obj, - null, + $obj, 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 { - $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); - $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(), - $rel1, - $rel2, + $rel1, $rel2, + 0, 0, + static::MODULE_NAME, ]); } }