From e56bd8dbf69a964d07a284ef1c5deacd867c8645 Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Thu, 17 Mar 2022 22:39:51 +0100 Subject: [PATCH] always use and many other todo implementations --- Admin/Install/Navigation.php | 4 ++-- Admin/Installer.php | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Admin/Install/Navigation.php b/Admin/Install/Navigation.php index 9840513..4caf7cc 100755 --- a/Admin/Install/Navigation.php +++ b/Admin/Install/Navigation.php @@ -29,14 +29,14 @@ class Navigation /** * Install navigation providing * - * @param string $path Module path * @param ApplicationAbstract $app Application + * @param string $path Module path * * @return void * * @since 1.0.0 */ - public static function install(string $path, ApplicationAbstract $app) : void + public static function install(ApplicationAbstract $app, string $path) : void { \Modules\Navigation\Admin\Installer::installExternal($app, ['path' => __DIR__ . '/Navigation.install.json']); } diff --git a/Admin/Installer.php b/Admin/Installer.php index 31d35ec..fe33301b 100755 --- a/Admin/Installer.php +++ b/Admin/Installer.php @@ -48,15 +48,15 @@ final class Installer extends InstallerAbstract /** * {@inheritdoc} */ - public static function install(DatabasePool $dbPool, ModuleInfo $info, SettingsInterface $cfgHandler) : void + public static function install(ApplicationAbstract $app, ModuleInfo $info, SettingsInterface $cfgHandler) : void { - parent::install($dbPool, $info, $cfgHandler); + parent::install($app, $info, $cfgHandler); // Install bill type templates - $app = new class() extends ApplicationAbstract {}; - $app->dbPool = $dbPool; + $newApp = new class() extends ApplicationAbstract {}; + $newApp->dbPool = $app->dbPool; - $media = \Modules\Media\Admin\Installer::installExternal($app, ['path' => __DIR__ . '/Install/Media2.install.json']); + $media = \Modules\Media\Admin\Installer::installExternal($newApp, ['path' => __DIR__ . '/Install/Media2.install.json']); /** @var int $defaultTemplate */ $defaultTemplate = (int) \reset($media['upload'][0])->getId();