From 356d438137079b80958836b1e5398435420a3090 Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Sun, 9 Oct 2016 20:07:30 +0200 Subject: [PATCH 1/4] Fix install --- Admin/Installer.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Admin/Installer.php b/Admin/Installer.php index ea12c93..e841b31 100644 --- a/Admin/Installer.php +++ b/Admin/Installer.php @@ -37,9 +37,9 @@ class Installer extends InstallerAbstract /** * {@inheritdoc} */ - public static function install(Pool $dbPool, InfoManager $info) + public static function install(string $path, Pool $dbPool, InfoManager $info) { - parent::install($dbPool, $info); + parent::install($path, $dbPool, $info); switch ($dbPool->get('core')->getType()) { case DatabaseType::MYSQL: From 7beb497b58cd5dcff18383ada5841c38bada2db5 Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Sat, 29 Oct 2016 20:44:52 +0200 Subject: [PATCH 2/4] Adjust database pool name --- Admin/Activate.php | 4 ++-- Admin/Deactivate.php | 4 ++-- Admin/Installer.php | 6 +++--- Admin/Uninstall.php | 4 ++-- Admin/Update.php | 4 ++-- Models/Navigation.php | 6 +++--- 6 files changed, 14 insertions(+), 14 deletions(-) diff --git a/Admin/Activate.php b/Admin/Activate.php index 7886929..80d7c8b 100644 --- a/Admin/Activate.php +++ b/Admin/Activate.php @@ -16,7 +16,7 @@ namespace Modules\Navigation\Admin; -use phpOMS\DataStorage\Database\Pool; +use phpOMS\DataStorage\Database\DatabasePool; use phpOMS\Module\ActivateAbstract; use phpOMS\Module\InfoManager; @@ -37,7 +37,7 @@ class Activate extends ActivateAbstract /** * {@inheritdoc} */ - public static function activate(Pool $dbPool, InfoManager $info) + public static function activate(DatabasePool $dbPool, InfoManager $info) { parent::activate($dbPool, $info); } diff --git a/Admin/Deactivate.php b/Admin/Deactivate.php index b0a249b..0ff69e9 100644 --- a/Admin/Deactivate.php +++ b/Admin/Deactivate.php @@ -16,7 +16,7 @@ namespace Modules\Navigation\Admin; -use phpOMS\DataStorage\Database\Pool; +use phpOMS\DataStorage\Database\DatabasePool; use phpOMS\Module\DeactivateAbstract; use phpOMS\Module\InfoManager; @@ -37,7 +37,7 @@ class Deactivate extends DeactivateAbstract /** * {@inheritdoc} */ - public static function deactivate(Pool $dbPool, InfoManager $info) + public static function deactivate(DatabasePool $dbPool, InfoManager $info) { parent::deactivate($dbPool, $info); } diff --git a/Admin/Installer.php b/Admin/Installer.php index e841b31..3235d0d 100644 --- a/Admin/Installer.php +++ b/Admin/Installer.php @@ -16,7 +16,7 @@ namespace Modules\Navigation\Admin; use phpOMS\DataStorage\Database\DatabaseType; -use phpOMS\DataStorage\Database\Pool; +use phpOMS\DataStorage\Database\DatabasePool; use phpOMS\Module\InfoManager; use phpOMS\Module\InstallerAbstract; @@ -37,7 +37,7 @@ class Installer extends InstallerAbstract /** * {@inheritdoc} */ - public static function install(string $path, Pool $dbPool, InfoManager $info) + public static function install(string $path, DatabasePool $dbPool, InfoManager $info) { parent::install($path, $dbPool, $info); @@ -75,7 +75,7 @@ class Installer extends InstallerAbstract * @since 1.0.0 * @author Dennis Eichhorn */ - public static function installExternal(Pool $dbPool, array $data) + public static function installExternal(DatabasePool $dbPool, array $data) { try { $dbPool->get('core')->con->query('select 1 from `' . $dbPool->get('core')->prefix . 'nav`'); diff --git a/Admin/Uninstall.php b/Admin/Uninstall.php index 40c5fcb..243bfb7 100644 --- a/Admin/Uninstall.php +++ b/Admin/Uninstall.php @@ -16,7 +16,7 @@ namespace Modules\Navigation\Admin; -use phpOMS\DataStorage\Database\Pool; +use phpOMS\DataStorage\Database\DatabasePool; use phpOMS\DataStorage\Database\Schema\Builder; use phpOMS\Module\UninstallAbstract; @@ -37,7 +37,7 @@ class Uninstall extends UninstallAbstract /** * {@inheritdoc} */ - public static function uninstall(Pool $dbPool, InfoManager $info) + public static function uninstall(DatabasePool $dbPool, InfoManager $info) { parent::uninstall($dbPool, $info); diff --git a/Admin/Update.php b/Admin/Update.php index dce4d97..78dd8db 100644 --- a/Admin/Update.php +++ b/Admin/Update.php @@ -16,7 +16,7 @@ namespace Modules\Navigation\Admin; -use phpOMS\DataStorage\Database\Pool; +use phpOMS\DataStorage\Database\DatabasePool; use phpOMS\Module\UpdateAbstract; use phpOMS\System\File\Directory; @@ -37,7 +37,7 @@ class Update extends UpdateAbstract /** * {@inheritdoc} */ - public static function update(Pool $dbPool, array $info) + public static function update(DatabasePool $dbPool, array $info) { Directory::deletePath(__DIR__ . '/Update'); mkdir('Update'); diff --git a/Models/Navigation.php b/Models/Navigation.php index 9f10c4c..3fd0081 100644 --- a/Models/Navigation.php +++ b/Models/Navigation.php @@ -15,7 +15,7 @@ */ namespace Modules\Navigation\Models; -use phpOMS\DataStorage\Database\Pool; +use phpOMS\DataStorage\Database\DatabasePool; use phpOMS\Message\RequestAbstract; /** @@ -67,7 +67,7 @@ class Navigation * @since 1.0.0 * @author Dennis Eichhorn */ - private function __construct(RequestAbstract $request, Pool $dbPool = null) + private function __construct(RequestAbstract $request, DatabasePool $dbPool = null) { $this->dbPool = $dbPool; $this->load($request->getHash()); @@ -126,7 +126,7 @@ class Navigation * @since 1.0.0 * @author Dennis Eichhorn */ - public static function getInstance(RequestAbstract $request = null, Pool $dbPool = null) + public static function getInstance(RequestAbstract $request = null, DatabasePool $dbPool = null) { if (!isset(self::$instance)) { if(!isset($request) || !isset($dbPool)) { From 417166fa45d8da7f8cf86cf68ea9cb767c5f8e07 Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Wed, 7 Dec 2016 20:23:04 +0100 Subject: [PATCH 3/4] Prepare const visibility --- Controller.php | 6 +++--- Models/LinkType.php | 4 ++-- Models/NavigationType.php | 12 ++++++------ 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Controller.php b/Controller.php index 25918df..266e7cc 100644 --- a/Controller.php +++ b/Controller.php @@ -44,7 +44,7 @@ class Controller extends ModuleAbstract implements WebInterface * @var string * @since 1.0.0 */ - const MODULE_PATH = __DIR__; + /* public */ const MODULE_PATH = __DIR__; /** * Module version. @@ -52,7 +52,7 @@ class Controller extends ModuleAbstract implements WebInterface * @var string * @since 1.0.0 */ - const MODULE_VERSION = '1.0.0'; + /* public */ const MODULE_VERSION = '1.0.0'; /** * Module name. @@ -60,7 +60,7 @@ class Controller extends ModuleAbstract implements WebInterface * @var string * @since 1.0.0 */ - const MODULE_NAME = 'Navigation'; + /* public */ const MODULE_NAME = 'Navigation'; /** * Providing. diff --git a/Models/LinkType.php b/Models/LinkType.php index 510f145..b6c084b 100644 --- a/Models/LinkType.php +++ b/Models/LinkType.php @@ -30,7 +30,7 @@ use phpOMS\Datatypes\Enum; */ abstract class LinkType extends Enum { - const CATEGORY = 0; + /* public */ const CATEGORY = 0; - const LINK = 1; + /* public */ const LINK = 1; } diff --git a/Models/NavigationType.php b/Models/NavigationType.php index b55bed5..adc337f 100644 --- a/Models/NavigationType.php +++ b/Models/NavigationType.php @@ -30,15 +30,15 @@ use phpOMS\Datatypes\Enum; */ abstract class NavigationType extends Enum { - const TOP = 1; + /* public */ const TOP = 1; - const SIDE = 2; + /* public */ const SIDE = 2; - const CONTENT = 3; + /* public */ const CONTENT = 3; - const TAB = 4; + /* public */ const TAB = 4; - const CONTENT_SIDE = 5; + /* public */ const CONTENT_SIDE = 5; - const BOTTOM = 6; + /* public */ const BOTTOM = 6; } From 7c37cbef22d3ef619455dd036e443e1298c5b25f Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Wed, 7 Dec 2016 20:56:15 +0100 Subject: [PATCH 4/4] Increase php version requirement --- Admin/Activate.php | 2 +- Admin/Deactivate.php | 2 +- Admin/Installer.php | 2 +- Admin/Uninstall.php | 2 +- Admin/Update.php | 2 +- Controller.php | 2 +- Models/LinkType.php | 2 +- Models/Navigation.php | 2 +- Models/NavigationType.php | 2 +- Theme/Backend/Lang/en.lang.php | 2 +- Theme/Backend/mid-side.tpl.php | 2 +- Theme/Backend/mid.tpl.php | 2 +- Theme/Backend/side.tpl.php | 4 ++-- Theme/Backend/splash.tpl.php | 2 +- Theme/Backend/top.tpl.php | 2 +- Theme/backend/Lang/en.lang.php | 2 +- Theme/backend/mid-side.tpl.php | 2 +- Theme/backend/mid.tpl.php | 2 +- Theme/backend/side.tpl.php | 4 ++-- Theme/backend/top.tpl.php | 2 +- Views/NavigationView.php | 2 +- 21 files changed, 23 insertions(+), 23 deletions(-) diff --git a/Admin/Activate.php b/Admin/Activate.php index 80d7c8b..f9802cb 100644 --- a/Admin/Activate.php +++ b/Admin/Activate.php @@ -2,7 +2,7 @@ /** * Orange Management * - * PHP Version 7.0 + * PHP Version 7.1 * * @category TBD * @package TBD diff --git a/Admin/Deactivate.php b/Admin/Deactivate.php index 0ff69e9..6b7ef8a 100644 --- a/Admin/Deactivate.php +++ b/Admin/Deactivate.php @@ -2,7 +2,7 @@ /** * Orange Management * - * PHP Version 7.0 + * PHP Version 7.1 * * @category TBD * @package TBD diff --git a/Admin/Installer.php b/Admin/Installer.php index 3235d0d..bc69094 100644 --- a/Admin/Installer.php +++ b/Admin/Installer.php @@ -2,7 +2,7 @@ /** * Orange Management * - * PHP Version 7.0 + * PHP Version 7.1 * * @category TBD * @package TBD diff --git a/Admin/Uninstall.php b/Admin/Uninstall.php index 243bfb7..2e3f8a5 100644 --- a/Admin/Uninstall.php +++ b/Admin/Uninstall.php @@ -2,7 +2,7 @@ /** * Orange Management * - * PHP Version 7.0 + * PHP Version 7.1 * * @category TBD * @package TBD diff --git a/Admin/Update.php b/Admin/Update.php index 78dd8db..ec59bf2 100644 --- a/Admin/Update.php +++ b/Admin/Update.php @@ -2,7 +2,7 @@ /** * Orange Management * - * PHP Version 7.0 + * PHP Version 7.1 * * @category TBD * @package TBD diff --git a/Controller.php b/Controller.php index 266e7cc..b575f74 100644 --- a/Controller.php +++ b/Controller.php @@ -2,7 +2,7 @@ /** * Orange Management * - * PHP Version 7.0 + * PHP Version 7.1 * * @category TBD * @package TBD diff --git a/Models/LinkType.php b/Models/LinkType.php index b6c084b..f8daed9 100644 --- a/Models/LinkType.php +++ b/Models/LinkType.php @@ -2,7 +2,7 @@ /** * Orange Management * - * PHP Version 7.0 + * PHP Version 7.1 * * @category TBD * @package TBD diff --git a/Models/Navigation.php b/Models/Navigation.php index 3fd0081..3ba18fb 100644 --- a/Models/Navigation.php +++ b/Models/Navigation.php @@ -2,7 +2,7 @@ /** * Orange Management * - * PHP Version 7.0 + * PHP Version 7.1 * * @category TBD * @package TBD diff --git a/Models/NavigationType.php b/Models/NavigationType.php index adc337f..7e1532c 100644 --- a/Models/NavigationType.php +++ b/Models/NavigationType.php @@ -2,7 +2,7 @@ /** * Orange Management * - * PHP Version 7.0 + * PHP Version 7.1 * * @category TBD * @package TBD diff --git a/Theme/Backend/Lang/en.lang.php b/Theme/Backend/Lang/en.lang.php index 2ad01a3..d674d1a 100644 --- a/Theme/Backend/Lang/en.lang.php +++ b/Theme/Backend/Lang/en.lang.php @@ -2,7 +2,7 @@ /** * Orange Management * - * PHP Version 7.0 + * PHP Version 7.1 * * @category TBD * @package TBD diff --git a/Theme/Backend/mid-side.tpl.php b/Theme/Backend/mid-side.tpl.php index ae38715..1696355 100644 --- a/Theme/Backend/mid-side.tpl.php +++ b/Theme/Backend/mid-side.tpl.php @@ -2,7 +2,7 @@ /** * Orange Management * - * PHP Version 7.0 + * PHP Version 7.1 * * @category TBD * @package TBD diff --git a/Theme/Backend/mid.tpl.php b/Theme/Backend/mid.tpl.php index 1efeb46..f4bbf07 100644 --- a/Theme/Backend/mid.tpl.php +++ b/Theme/Backend/mid.tpl.php @@ -2,7 +2,7 @@ /** * Orange Management * - * PHP Version 7.0 + * PHP Version 7.1 * * @category TBD * @package TBD diff --git a/Theme/Backend/side.tpl.php b/Theme/Backend/side.tpl.php index 9dc5652..590f381 100644 --- a/Theme/Backend/side.tpl.php +++ b/Theme/Backend/side.tpl.php @@ -2,7 +2,7 @@ /** * Orange Management * - * PHP Version 7.0 + * PHP Version 7.1 * * @category TBD * @package TBD @@ -40,7 +40,7 @@ if (isset($this->nav[\Modules\Navigation\Models\NavigationType::SIDE])) : ?> /** * Orange Management * - * PHP Version 7.0 + * PHP Version 7.1 * * @category TBD * @package TBD diff --git a/Theme/Backend/splash.tpl.php b/Theme/Backend/splash.tpl.php index f85db1c..fbd6703 100644 --- a/Theme/Backend/splash.tpl.php +++ b/Theme/Backend/splash.tpl.php @@ -2,7 +2,7 @@ /** * Orange Management * - * PHP Version 7.0 + * PHP Version 7.1 * * @category TBD * @package TBD diff --git a/Theme/Backend/top.tpl.php b/Theme/Backend/top.tpl.php index 4eede56..422cfc2 100644 --- a/Theme/Backend/top.tpl.php +++ b/Theme/Backend/top.tpl.php @@ -2,7 +2,7 @@ /** * Orange Management * - * PHP Version 7.0 + * PHP Version 7.1 * * @category TBD * @package TBD diff --git a/Theme/backend/Lang/en.lang.php b/Theme/backend/Lang/en.lang.php index 2ad01a3..d674d1a 100644 --- a/Theme/backend/Lang/en.lang.php +++ b/Theme/backend/Lang/en.lang.php @@ -2,7 +2,7 @@ /** * Orange Management * - * PHP Version 7.0 + * PHP Version 7.1 * * @category TBD * @package TBD diff --git a/Theme/backend/mid-side.tpl.php b/Theme/backend/mid-side.tpl.php index ae38715..1696355 100644 --- a/Theme/backend/mid-side.tpl.php +++ b/Theme/backend/mid-side.tpl.php @@ -2,7 +2,7 @@ /** * Orange Management * - * PHP Version 7.0 + * PHP Version 7.1 * * @category TBD * @package TBD diff --git a/Theme/backend/mid.tpl.php b/Theme/backend/mid.tpl.php index 1efeb46..f4bbf07 100644 --- a/Theme/backend/mid.tpl.php +++ b/Theme/backend/mid.tpl.php @@ -2,7 +2,7 @@ /** * Orange Management * - * PHP Version 7.0 + * PHP Version 7.1 * * @category TBD * @package TBD diff --git a/Theme/backend/side.tpl.php b/Theme/backend/side.tpl.php index 9dc5652..590f381 100644 --- a/Theme/backend/side.tpl.php +++ b/Theme/backend/side.tpl.php @@ -2,7 +2,7 @@ /** * Orange Management * - * PHP Version 7.0 + * PHP Version 7.1 * * @category TBD * @package TBD @@ -40,7 +40,7 @@ if (isset($this->nav[\Modules\Navigation\Models\NavigationType::SIDE])) : ?> /** * Orange Management * - * PHP Version 7.0 + * PHP Version 7.1 * * @category TBD * @package TBD diff --git a/Theme/backend/top.tpl.php b/Theme/backend/top.tpl.php index 4eede56..422cfc2 100644 --- a/Theme/backend/top.tpl.php +++ b/Theme/backend/top.tpl.php @@ -2,7 +2,7 @@ /** * Orange Management * - * PHP Version 7.0 + * PHP Version 7.1 * * @category TBD * @package TBD diff --git a/Views/NavigationView.php b/Views/NavigationView.php index 1d11dd8..e4f0a54 100644 --- a/Views/NavigationView.php +++ b/Views/NavigationView.php @@ -2,7 +2,7 @@ /** * Orange Management * - * PHP Version 7.0 + * PHP Version 7.1 * * @category TBD * @package TBD