From b0833bebc4152bcddd4a7aa04723c1c221c413ec Mon Sep 17 00:00:00 2001
From: Dennis Eichhorn <spl1nes.com@googlemail.com>
Date: Thu, 24 Jun 2021 00:03:34 +0200
Subject: [PATCH] add app to installer

---
 Admin/Install/Navigation.php |  8 ++++----
 Admin/Installer.php          | 15 +++++++++------
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/Admin/Install/Navigation.php b/Admin/Install/Navigation.php
index e9a9e31..1d2f950 100755
--- a/Admin/Install/Navigation.php
+++ b/Admin/Install/Navigation.php
@@ -14,7 +14,7 @@ declare(strict_types=1);
 
 namespace Modules\Media\Admin\Install;
 
-use phpOMS\DataStorage\Database\DatabasePool;
+use phpOMS\Application\ApplicationAbstract;
 
 /**
  * Navigation class.
@@ -30,14 +30,14 @@ class Navigation
      * Install navigation providing
      *
      * @param string       $path   Module path
-     * @param DatabasePool $dbPool Database pool for database interaction
+     * @param ApplicationAbstract $app Application
      *
      * @return void
      *
      * @since 1.0.0
      */
-    public static function install(string $path, DatabasePool $dbPool) : void
+    public static function install(string $path, ApplicationAbstract $app) : void
     {
-        \Modules\Navigation\Admin\Installer::installExternal($dbPool, ['path' => __DIR__ . '/Navigation.install.json']);
+        \Modules\Navigation\Admin\Installer::installExternal($app, ['path' => __DIR__ . '/Navigation.install.json']);
     }
 }
diff --git a/Admin/Installer.php b/Admin/Installer.php
index 34665ba..9fafcbc 100755
--- a/Admin/Installer.php
+++ b/Admin/Installer.php
@@ -26,6 +26,7 @@ use phpOMS\Module\InstallerAbstract;
 use phpOMS\System\File\Local\Directory;
 use phpOMS\System\File\Local\File;
 use phpOMS\System\File\PathException;
+use phpOMS\Application\ApplicationAbstract;
 
 /**
  * Installer class.
@@ -40,7 +41,7 @@ final class Installer extends InstallerAbstract
     /**
      * Install data from providing modules.
      *
-     * @param DatabasePool $dbPool Database pool
+     * @param ApplicationAbstract $app Application
      * @param array        $data   Module info
      *
      * @return array
@@ -50,10 +51,10 @@ final class Installer extends InstallerAbstract
      *
      * @since 1.0.0
      */
-    public static function installExternal(DatabasePool $dbPool, array $data) : array
+    public static function installExternal(ApplicationAbstract $app, array $data) : array
     {
         try {
-            $dbPool->get()->con->query('select 1 from `media`');
+            $app->dbPool->get()->con->query('select 1 from `media`');
         } catch (\Exception $e) {
             return []; // @codeCoverageIgnore
         }
@@ -85,10 +86,10 @@ final class Installer extends InstallerAbstract
         foreach ($mediaData as $media) {
             switch ($media['type']) {
                 case 'collection':
-                    $result['collection'][] = self::createCollection($dbPool, $media);
+                    $result['collection'][] = self::createCollection($app->dbPool, $media);
                     break;
                 case 'upload':
-                    $result['upload'][] = self::uploadMedia($dbPool, $media);
+                    $result['upload'][] = self::uploadMedia($app->dbPool, $media);
                     break;
                 default:
             }
@@ -181,7 +182,9 @@ final class Installer extends InstallerAbstract
         }
 
         $upload = new UploadFile();
-        $upload->setOutputDir(empty($data['path'] ?? '') ? ApiController::createMediaPath() : __DIR__ . '/../../..' . $data['path']);
+        $upload->outputDir = empty($data['path'] ?? '')
+            ? ApiController::createMediaPath()
+            : __DIR__ . '/../../..' . $data['path'];
 
         $status = $upload->upload($files, $data['name'], true);