diff --git a/Admin/Activate.php b/Admin/Activate.php index f6f22a1..6eede60 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 @@ -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 17a9bc6..1133c7c 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 @@ -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 e4af9cc..57e54dc 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 @@ -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,9 +37,9 @@ class Installer extends InstallerAbstract /** * {@inheritdoc} */ - public static function install(Pool $dbPool, InfoManager $info) + public static function install(string $path, DatabasePool $dbPool, InfoManager $info) { - parent::install($dbPool, $info); + parent::install($path, $dbPool, $info); switch ($dbPool->get('core')->getType()) { case DatabaseType::MYSQL: @@ -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 578a645..8869603 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 @@ -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 c9a144c..5676489 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 @@ -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/Controller.php b/Controller.php index 2545a1a..d09a1b2 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 @@ -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 9bfb22f..8fb8001 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 @@ -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/Navigation.php b/Models/Navigation.php index b0779e9..0050ef7 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 @@ -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)) { diff --git a/Models/NavigationType.php b/Models/NavigationType.php index b346947..155b421 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 @@ -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; } diff --git a/Theme/Backend/Lang/en.lang.php b/Theme/Backend/Lang/en.lang.php index 12b07ca..e49c24a 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 e1292f4..cef6a2f 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 f4f18ac..4a57d56 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 dd41f42..b0d7044 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 4eb8a10..28a38d5 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 2dba491..42bc1ff 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 12b07ca..e49c24a 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 e1292f4..cef6a2f 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/top.tpl.php b/Theme/backend/top.tpl.php index 2dba491..42bc1ff 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 facc861..d74fce9 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