Jingga/phpOMS
1
0
Fork 0
mirror of https://github.com/Karaka-Management/phpOMS.git synced 2026-02-03 11:18:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix installer

Browse Source
This commit is contained in:
Dennis Eichhorn 2017-04-01 22:41:34 +02:00
parent b3542b286b
commit 4ea2ce9886
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Module/InstallerAbstract.php
View File

@ -92,7 +92,7 @@ class InstallerAbstract
/** /**
* Install module. * Install module.
* *
* @param string $routePath Route Path * @param string $modulePath Route Path
* @param DatabasePool $dbPool Database instance * @param DatabasePool $dbPool Database instance
* @param InfoManager $info Module info * @param InfoManager $info Module info
* *
@ -101,10 +101,10 @@ class InstallerAbstract
* @since 1.0.0 * @since 1.0.0
* @author Dennis Eichhorn <d.eichhorn@oms.com> * @author Dennis Eichhorn <d.eichhorn@oms.com>
*/ */
public static function install(string $routePath, DatabasePool $dbPool, InfoManager $info) /* : void */ public static function install(string $modulePath, DatabasePool $dbPool, InfoManager $info) /* : void */
{ {
self::registerInDatabase($dbPool, $info); self::registerInDatabase($dbPool, $info);
self::initRoutes($routePath, $info); self::initRoutes($modulePath, $info);
self::activate($dbPool, $info); self::activate($dbPool, $info);
} }
@ -129,7 +129,7 @@ class InstallerAbstract
/** /**
* Re-init module. * Re-init module.
* *
* @param string $routePath Route Path * @param string $modulePath Route Path
* @param InfoManager $info Module info * @param InfoManager $info Module info
* *
* @return void * @return void
@ -137,9 +137,9 @@ class InstallerAbstract
* @since 1.0.0 * @since 1.0.0
* @author Dennis Eichhorn <d.eichhorn@oms.com> * @author Dennis Eichhorn <d.eichhorn@oms.com>
*/ */
public static function reInit(string $routePath, InfoManager $info) /* : void */ public static function reInit(string $modulePath, InfoManager $info) /* : void */
{ {
self::initRoutes($routePath, $info); self::initRoutes($modulePath, $info);
} }
/** /**
@ -155,15 +155,15 @@ class InstallerAbstract
* @since 1.0.0 * @since 1.0.0
* @author Dennis Eichhorn <d.eichhorn@oms.com> * @author Dennis Eichhorn <d.eichhorn@oms.com>
*/ */
private static function initRoutes(string $routePath, InfoManager $info) /* : void */ private static function initRoutes(string $modulePath, InfoManager $info) /* : void */
{ {
// todo: maybe use static::__DIR__ ? // todo: maybe use static::__DIR__ ?
$directories = new Directory(dirname($info->getPath()) . '/Modules/' . $info->getDirectory() . '/Admin/Routes'); $directories = new Directory($modulePath . '/Admin/Routes');
foreach ($directories as $key => $subdir) { foreach ($directories as $key => $subdir) {
if ($subdir instanceof Directory) { if ($subdir instanceof Directory) {
foreach ($subdir as $key2 => $file) { foreach ($subdir as $key2 => $file) {
self::installRoutes($routePath . '/' . $subdir->getName() . '/' . basename($file->getName(), '.php') . '/Routes.php', $file->getPath()); self::installRoutes(__DIR__ . '/../../' . $subdir->getName() . '/' . basename($file->getName(), '.php') . '/Routes.php', $file->getPath());
} }
} }
} }