Jingga/phpOMS
1
0
Fork 0
mirror of https://github.com/Karaka-Management/phpOMS.git synced 2026-02-06 04:28:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug fixes with install scripts

Browse Source
This commit is contained in:
Dennis Eichhorn 2018-05-20 11:54:02 +02:00
parent f2591bff06
commit b1b51b0281
4 changed files with 18 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Math/Statistic/Forecast/Forecasts.php
View File

@ -4,7 +4,7 @@
* *
* PHP Version 7.2 * PHP Version 7.2
* *
* @package TBD * @package phpOMS\Math\Statistic\Forecast
* @copyright Dennis Eichhorn * @copyright Dennis Eichhorn
* @license OMS License 1.0 * @license OMS License 1.0
* @version 1.0.0 * @version 1.0.0
@ -17,7 +17,7 @@ namespace phpOMS\Math\Statistic\Forecast;
/** /**
* Address type enum. * Address type enum.
* *
* @package Framework * @package phpOMS\Math\Statistic\Forecast
* @license OMS License 1.0 * @license OMS License 1.0
* @link http://website.orange-management.de * @link http://website.orange-management.de
* @since 1.0.0 * @since 1.0.0

34
Module/InstallerAbstract.php
View File

@ -88,19 +88,18 @@ class InstallerAbstract
/** /**
* Install module. * Install module.
* *
* @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
* *
* @return void * @return void
* *
* @since 1.0.0 * @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::registerInDatabase($dbPool, $info);
self::initRoutes($modulePath, $info); self::initRoutes($info);
self::initHooks($modulePath, $info); self::initHooks($info);
self::activate($dbPool, $info); self::activate($dbPool, $info);
} }
@ -124,24 +123,22 @@ class InstallerAbstract
/** /**
* Re-init module. * Re-init module.
* *
* @param string $modulePath Route Path * @param InfoManager $info Module info
* @param InfoManager $info Module info
* *
* @return void * @return void
* *
* @since 1.0.0 * @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::initRoutes($info);
self::initHooks($modulePath, $info); self::initHooks($info);
} }
/** /**
* Init routes. * Init routes.
* *
* @param string $modulePath Path to the module * @param InfoManager $info Module info
* @param InfoManager $info Module info
* *
* @return void * @return void
* *
@ -149,9 +146,9 @@ class InstallerAbstract
* *
* @since 1.0.0 * @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) { foreach ($directories as $key => $subdir) {
if ($subdir instanceof Directory) { if ($subdir instanceof Directory) {
@ -205,8 +202,7 @@ class InstallerAbstract
/** /**
* Init hooks. * Init hooks.
* *
* @param string $modulePath Path to the module * @param InfoManager $info Module info
* @param InfoManager $info Module info
* *
* @return void * @return void
* *
@ -214,9 +210,9 @@ class InstallerAbstract
* *
* @since 1.0.0 * @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) { foreach ($directories as $key => $subdir) {
if ($subdir instanceof Directory) { if ($subdir instanceof Directory) {

2
Module/ModuleManager.php
View File

@ -539,7 +539,7 @@ final class ModuleManager
} }
/** @var $class InstallerAbstract */ /** @var $class InstallerAbstract */
$class::install($this->modulePath, $this->app->dbPool, $info); $class::install($this->app->dbPool, $info);
} }
/** /**

1
tests/Message/Http/RequestTest.php
View File

@ -39,7 +39,6 @@ class RequestTest extends \PHPUnit\Framework\TestCase
self::assertFalse($request->isHttps()); self::assertFalse($request->isHttps());
self::assertEquals([], $request->getHash()); self::assertEquals([], $request->getHash());
self::assertEmpty($request->getBody()); self::assertEmpty($request->getBody());
self::assertEquals('/', $request->getRequestTarget());
self::assertEmpty($request->getFiles()); self::assertEmpty($request->getFiles());
self::assertEquals(RouteVerb::GET, $request->getRouteVerb()); self::assertEquals(RouteVerb::GET, $request->getRouteVerb());
self::assertEquals(RequestMethod::GET, $request->getMethod()); self::assertEquals(RequestMethod::GET, $request->getMethod());