From a6988ceb82e1bb8602847565dd029e8e78984968 Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Sun, 19 Dec 2021 20:20:39 +0100 Subject: [PATCH] bug fixes / dbmapper fixes --- Admin/Installer.php | 10 +++++----- Models/EditorDoc.php | 2 +- Models/EditorDocMapper.php | 16 ++++++++-------- Models/EditorDocTypeMapper.php | 2 +- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/Admin/Installer.php b/Admin/Installer.php index fa029a3..3a67469 100755 --- a/Admin/Installer.php +++ b/Admin/Installer.php @@ -48,12 +48,12 @@ final class Installer extends InstallerAbstract */ public static function install(DatabasePool $dbPool, ModuleInfo $info, SettingsInterface $cfgHandler) : void { - parent::install($dbPool, $info, $cfgHandler); + parent::install($dbPool, $info, $cfgHandler); - $types = include __DIR__ . '/Install/Types/types.php'; - foreach ($types as $type) { - self::createType($dbPool, $type); - } + $types = include __DIR__ . '/Install/Types/types.php'; + foreach ($types as $type) { + self::createType($dbPool, $type); + } } /** diff --git a/Models/EditorDoc.php b/Models/EditorDoc.php index 2970745..2e75504 100755 --- a/Models/EditorDoc.php +++ b/Models/EditorDoc.php @@ -65,7 +65,7 @@ class EditorDoc implements \JsonSerializable, ArrayableInterface /** * Type. * - * @var null|int|EditorDoc + * @var null|int|EditorDocType * @since 1.0.0 */ public null | int | EditorDocType $type = null; diff --git a/Models/EditorDocMapper.php b/Models/EditorDocMapper.php index dfbf1cd..91c8319 100755 --- a/Models/EditorDocMapper.php +++ b/Models/EditorDocMapper.php @@ -37,15 +37,15 @@ final class EditorDocMapper extends DataMapperFactory * @since 1.0.0 */ public const COLUMNS = [ - 'editor_doc_id' => ['name' => 'editor_doc_id', 'type' => 'int', 'internal' => 'id'], - 'editor_doc_created_by' => ['name' => 'editor_doc_created_by', 'type' => 'int', 'internal' => 'createdBy', 'readonly' => true], - 'editor_doc_title' => ['name' => 'editor_doc_title', 'type' => 'string', 'internal' => 'title'], - 'editor_doc_plain' => ['name' => 'editor_doc_plain', 'type' => 'string', 'internal' => 'plain'], - 'editor_doc_content' => ['name' => 'editor_doc_content', 'type' => 'string', 'internal' => 'content'], - 'editor_doc_type' => ['name' => 'editor_doc_type', 'type' => 'int', 'internal' => 'type'], - 'editor_doc_virtual' => ['name' => 'editor_doc_virtual', 'type' => 'string', 'internal' => 'virtualPath'], + 'editor_doc_id' => ['name' => 'editor_doc_id', 'type' => 'int', 'internal' => 'id'], + 'editor_doc_created_by' => ['name' => 'editor_doc_created_by', 'type' => 'int', 'internal' => 'createdBy', 'readonly' => true], + 'editor_doc_title' => ['name' => 'editor_doc_title', 'type' => 'string', 'internal' => 'title'], + 'editor_doc_plain' => ['name' => 'editor_doc_plain', 'type' => 'string', 'internal' => 'plain'], + 'editor_doc_content' => ['name' => 'editor_doc_content', 'type' => 'string', 'internal' => 'content'], + 'editor_doc_type' => ['name' => 'editor_doc_type', 'type' => 'int', 'internal' => 'type'], + 'editor_doc_virtual' => ['name' => 'editor_doc_virtual', 'type' => 'string', 'internal' => 'virtualPath'], 'editor_doc_created_at' => ['name' => 'editor_doc_created_at', 'type' => 'DateTimeImmutable', 'internal' => 'createdAt', 'readonly' => true], - 'editor_doc_visible' => ['name' => 'editor_doc_visible', 'type' => 'bool', 'internal' => 'isVisible'], + 'editor_doc_visible' => ['name' => 'editor_doc_visible', 'type' => 'bool', 'internal' => 'isVisible'], ]; /** diff --git a/Models/EditorDocTypeMapper.php b/Models/EditorDocTypeMapper.php index 5903461..0c5f0b6 100644 --- a/Models/EditorDocTypeMapper.php +++ b/Models/EditorDocTypeMapper.php @@ -33,7 +33,7 @@ final class EditorDocTypeMapper extends DataMapperFactory * @since 1.0.0 */ public const COLUMNS = [ - 'editor_doc_type_id' => ['name' => 'editor_doc_type_id', 'type' => 'int', 'internal' => 'id'], + 'editor_doc_type_id' => ['name' => 'editor_doc_type_id', 'type' => 'int', 'internal' => 'id'], 'editor_doc_type_name' => ['name' => 'editor_doc_type_name', 'type' => 'string', 'internal' => 'name'], ];