From b1b51b0281a901eed12e7623fdb3a842d2bbc2cd Mon Sep 17 00:00:00 2001
From: Dennis Eichhorn <spl1nes.com@googlemail.com>
Date: Sun, 20 May 2018 11:54:02 +0200
Subject: [PATCH] Bug fixes with install scripts

---
 Math/Statistic/Forecast/Forecasts.php |  4 ++--
 Module/InstallerAbstract.php          | 34 ++++++++++++---------------
 Module/ModuleManager.php              |  2 +-
 tests/Message/Http/RequestTest.php    |  1 -
 4 files changed, 18 insertions(+), 23 deletions(-)

diff --git a/Math/Statistic/Forecast/Forecasts.php b/Math/Statistic/Forecast/Forecasts.php
index 14f0f686e..834935ad0 100644
--- a/Math/Statistic/Forecast/Forecasts.php
+++ b/Math/Statistic/Forecast/Forecasts.php
@@ -4,7 +4,7 @@
  *
  * PHP Version 7.2
  *
- * @package    TBD
+ * @package    phpOMS\Math\Statistic\Forecast
  * @copyright  Dennis Eichhorn
  * @license    OMS License 1.0
  * @version    1.0.0
@@ -17,7 +17,7 @@ namespace phpOMS\Math\Statistic\Forecast;
 /**
  * Address type enum.
  *
- * @package    Framework
+ * @package    phpOMS\Math\Statistic\Forecast
  * @license    OMS License 1.0
  * @link       http://website.orange-management.de
  * @since      1.0.0
diff --git a/Module/InstallerAbstract.php b/Module/InstallerAbstract.php
index 927651664..3849d3849 100644
--- a/Module/InstallerAbstract.php
+++ b/Module/InstallerAbstract.php
@@ -88,19 +88,18 @@ class InstallerAbstract
     /**
      * Install module.
      *
-     * @param string       $modulePath Route Path
-     * @param DatabasePool $dbPool     Database instance
-     * @param InfoManager  $info       Module info
+     * @param DatabasePool $dbPool Database instance
+     * @param InfoManager  $info   Module info
      *
      * @return void
      *
      * @since  1.0.0
      */
-    public static function install(string $modulePath, DatabasePool $dbPool, InfoManager $info) : void
+    public static function install(DatabasePool $dbPool, InfoManager $info) : void
     {
         self::registerInDatabase($dbPool, $info);
-        self::initRoutes($modulePath, $info);
-        self::initHooks($modulePath, $info);
+        self::initRoutes($info);
+        self::initHooks($info);
         self::activate($dbPool, $info);
     }
 
@@ -124,24 +123,22 @@ class InstallerAbstract
     /**
      * Re-init module.
      *
-     * @param string      $modulePath Route Path
-     * @param InfoManager $info       Module info
+     * @param InfoManager $info Module info
      *
      * @return void
      *
      * @since  1.0.0
      */
-    public static function reInit(string $modulePath, InfoManager $info) : void
+    public static function reInit(InfoManager $info) : void
     {
-        self::initRoutes($modulePath, $info);
-        self::initHooks($modulePath, $info);
+        self::initRoutes($info);
+        self::initHooks($info);
     }
 
     /**
      * Init routes.
      *
-     * @param string      $modulePath Path to the module
-     * @param InfoManager $info       Module info
+     * @param InfoManager $info Module info
      *
      * @return void
      *
@@ -149,9 +146,9 @@ class InstallerAbstract
      *
      * @since  1.0.0
      */
-    private static function initRoutes(string $modulePath, InfoManager $info) : void
+    private static function initRoutes(InfoManager $info) : void
     {
-        $directories = new Directory($modulePath . '/Admin/Routes');
+        $directories = new Directory(dirname($info->getPath()) . '/Admin/Routes');
 
         foreach ($directories as $key => $subdir) {
             if ($subdir instanceof Directory) {
@@ -205,8 +202,7 @@ class InstallerAbstract
     /**
      * Init hooks.
      *
-     * @param string      $modulePath Path to the module
-     * @param InfoManager $info       Module info
+     * @param InfoManager $info Module info
      *
      * @return void
      *
@@ -214,9 +210,9 @@ class InstallerAbstract
      *
      * @since  1.0.0
      */
-    private static function initHooks(string $modulePath, InfoManager $info) : void
+    private static function initHooks(InfoManager $info) : void
     {
-        $directories = new Directory($modulePath . '/Admin/Hooks');
+        $directories = new Directory(dirname($info->getPath()) . '/Admin/Hooks');
 
         foreach ($directories as $key => $subdir) {
             if ($subdir instanceof Directory) {
diff --git a/Module/ModuleManager.php b/Module/ModuleManager.php
index c77d9d235..c805aace4 100644
--- a/Module/ModuleManager.php
+++ b/Module/ModuleManager.php
@@ -539,7 +539,7 @@ final class ModuleManager
         }
 
         /** @var $class InstallerAbstract */
-        $class::install($this->modulePath, $this->app->dbPool, $info);
+        $class::install($this->app->dbPool, $info);
     }
 
     /**
diff --git a/tests/Message/Http/RequestTest.php b/tests/Message/Http/RequestTest.php
index 2cfa35671..786ba7aa9 100644
--- a/tests/Message/Http/RequestTest.php
+++ b/tests/Message/Http/RequestTest.php
@@ -39,7 +39,6 @@ class RequestTest extends \PHPUnit\Framework\TestCase
         self::assertFalse($request->isHttps());
         self::assertEquals([], $request->getHash());
         self::assertEmpty($request->getBody());
-        self::assertEquals('/', $request->getRequestTarget());
         self::assertEmpty($request->getFiles());
         self::assertEquals(RouteVerb::GET, $request->getRouteVerb());
         self::assertEquals(RequestMethod::GET, $request->getMethod());