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

Removing ROOT_PATH

Browse Source
This commit is contained in:
Dennis Eichhorn 2017-03-31 15:19:22 +02:00
parent ed909b224c
commit b1a8e92de7
3 changed files with 25 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Module/InfoManager.php
View File

@ -62,7 +62,20 @@ class InfoManager
*/ */
public function __construct($path) public function __construct($path)
{ {
$this->path = $path; $this->path = realpath($path);
}
/**
* Get info path
*
* @return string
*
* @since 1.0.0
* @author Dennis Eichhorn
*/
public function getPath() : string
{
return $this->path;
} }
/** /**

2
Module/InstallerAbstract.php
View File

@ -158,7 +158,7 @@ class InstallerAbstract
private static function initRoutes(string $routePath, InfoManager $info) /* : void */ private static function initRoutes(string $routePath, InfoManager $info) /* : void */
{ {
// todo: maybe use static::__DIR__ ? // todo: maybe use static::__DIR__ ?
$directories = new Directory(ROOT_PATH . '/Modules/' . $info->getDirectory() . '/Admin/Routes'); $directories = new Directory(dirname($info->getPath()) . '/Modules/' . $info->getDirectory() . '/Admin/Routes');
foreach ($directories as $key => $subdir) { foreach ($directories as $key => $subdir) {
if ($subdir instanceof Directory) { if ($subdir instanceof Directory) {

27
Module/ModuleManager.php
View File

@ -39,14 +39,6 @@ use phpOMS\System\File\PathException;
class ModuleManager class ModuleManager
{ {
/**
* Module path.
*
* @var string
* @since 1.0.0
*/
/* public */ const MODULE_PATH = __DIR__ . '/../../Modules';
/** /**
* All modules that are running on this uri. * All modules that are running on this uri.
* *
@ -103,9 +95,10 @@ class ModuleManager
* @since 1.0.0 * @since 1.0.0
* @author Dennis Eichhorn <d.eichhorn@oms.com> * @author Dennis Eichhorn <d.eichhorn@oms.com>
*/ */
public function __construct(ApplicationAbstract $app) public function __construct(ApplicationAbstract $app, string $modulePath = '')
{ {
$this->app = $app; $this->app = $app;
$modulePath = $modulePath;
} }
/** /**
@ -242,12 +235,12 @@ class ModuleManager
public static function getAllModules() : array public static function getAllModules() : array
{ {
if (!isset(self::$all)) { if (!isset(self::$all)) {
chdir(self::MODULE_PATH); chdir($this->modulePath);
$files = glob('*', GLOB_ONLYDIR); $files = glob('*', GLOB_ONLYDIR);
$c = count($files); $c = count($files);
for ($i = 0; $i < $c; $i++) { for ($i = 0; $i < $c; $i++) {
$path = self::MODULE_PATH . '/' . $files[$i] . '/info.json'; $path = $this->modulePath . '/' . $files[$i] . '/info.json';
if (!file_exists($path)) { if (!file_exists($path)) {
continue; continue;
@ -368,7 +361,7 @@ class ModuleManager
throw new \Exception('Module installer does not exist'); throw new \Exception('Module installer does not exist');
} }
$class::reInit(ROOT_PATH, $info); $class::reInit($this->modulePath, $info);
} }
/** /**
@ -389,7 +382,7 @@ class ModuleManager
return false; return false;
} }
if (!file_exists(self::MODULE_PATH . '/' . $module . '/Admin/Installer.php')) { if (!file_exists($this->modulePath . '/' . $module . '/Admin/Installer.php')) {
// todo download; // todo download;
return false; return false;
} }
@ -463,7 +456,7 @@ class ModuleManager
throw new \Exception('Module installer does not exist'); throw new \Exception('Module installer does not exist');
} }
$class::install(ROOT_PATH, $this->app->dbPool, $info); $class::install($this->modulePath, $this->app->dbPool, $info);
} }
/** /**
@ -526,7 +519,7 @@ class ModuleManager
*/ */
private function loadInfo(string $module) : InfoManager private function loadInfo(string $module) : InfoManager
{ {
$path = realpath($oldPath = self::MODULE_PATH . '/' . $module . '/' . 'info.json'); $path = realpath($oldPath = $this->modulePath . '/' . $module . '/' . 'info.json');
if ($path === false) { if ($path === false) {
throw new PathException($oldPath); throw new PathException($oldPath);
@ -576,10 +569,10 @@ class ModuleManager
*/ */
public function installProviding(string $from, string $for) /* : void */ public function installProviding(string $from, string $for) /* : void */
{ {
if (file_exists(self::MODULE_PATH . '/' . $from . '/Admin/Install/' . $for . '.php')) { if (file_exists($this->modulePath . '/' . $from . '/Admin/Install/' . $for . '.php')) {
$class = '\\Modules\\' . $from . '\\Admin\\Install\\' . $for; $class = '\\Modules\\' . $from . '\\Admin\\Install\\' . $for;
/** @var $class InstallerAbstract */ /** @var $class InstallerAbstract */
$class::install(ROOT_PATH, $this->app->dbPool, null); $class::install($this->modulePath, $this->app->dbPool, null);
} }
} }