diff --git a/Admin/Activate.php b/Admin/Activate.php index e07e90f..7204b09 100644 --- a/Admin/Activate.php +++ b/Admin/Activate.php @@ -15,7 +15,7 @@ */ namespace Modules\Tools\Admin; -use phpOMS\DataStorage\Database\DatabaseType; + use phpOMS\DataStorage\Database\Pool; use phpOMS\Module\ActivateAbstract; diff --git a/Admin/Deactivate.php b/Admin/Deactivate.php index e45ce30..5ddf982 100644 --- a/Admin/Deactivate.php +++ b/Admin/Deactivate.php @@ -15,7 +15,7 @@ */ namespace Modules\Tools\Admin; -use phpOMS\DataStorage\Database\DatabaseType; + use phpOMS\DataStorage\Database\Pool; use phpOMS\Module\DeactivateAbstract; diff --git a/Admin/Install/Navigation.php b/Admin/Install/Navigation.php index a4717c4..c3cc8be 100644 --- a/Admin/Install/Navigation.php +++ b/Admin/Install/Navigation.php @@ -14,6 +14,7 @@ * @link http://orange-management.com */ namespace Modules\Tools\Admin\Install; +use phpOMS\DataStorage\Database\Pool; /** * Navigation class. @@ -33,6 +34,7 @@ class Navigation $navData = json_decode(file_get_contents(__DIR__ . '/Navigation.install.json'), true); $class = '\\Modules\\Navigation\\Admin\\Installer'; + /** @var $class \Modules\Navigation\Admin\Installer */ $class::installExternal($dbPool, $navData); } } diff --git a/Admin/Uninstall.php b/Admin/Uninstall.php index 3742209..840b7f2 100644 --- a/Admin/Uninstall.php +++ b/Admin/Uninstall.php @@ -15,7 +15,7 @@ */ namespace Modules\Tools\Admin; -use phpOMS\DataStorage\Database\DatabaseType; + use phpOMS\DataStorage\Database\Pool; use phpOMS\Module\UninstallAbstract; diff --git a/Admin/Update.php b/Admin/Update.php index 040d2de..356703e 100644 --- a/Admin/Update.php +++ b/Admin/Update.php @@ -15,9 +15,10 @@ */ namespace Modules\Tools\Admin; -use phpOMS\DataStorage\Database\DatabaseType; + use phpOMS\DataStorage\Database\Pool; use phpOMS\Module\UpdateAbstract; +use phpOMS\System\FileSystem; /** * Navigation class. @@ -38,6 +39,8 @@ class Update extends UpdateAbstract */ public static function update(Pool $dbPool, array $info) { + FileSystem::deletePath(__DIR__ . '/Update'); + mkdir('Update'); parent::update($dbPool, $info); } } diff --git a/Controller.php b/Controller.php index fd457b1..67a92f6 100644 --- a/Controller.php +++ b/Controller.php @@ -15,8 +15,6 @@ */ namespace Modules\Tools; -use phpOMS\Message\RequestAbstract; -use phpOMS\Message\ResponseAbstract; use phpOMS\Module\ModuleAbstract; use phpOMS\Module\WebInterface; @@ -56,7 +54,7 @@ class Controller extends ModuleAbstract implements WebInterface * @var \string * @since 1.0.0 */ - protected static $module = 'MyTools'; + const MODULE_NAME = 'MyTools'; /** * Localization files. diff --git a/Theme/lang/nav.backend.en.lang.php b/Theme/Backend/Lang/Navigation.en.lang.php similarity index 100% rename from Theme/lang/nav.backend.en.lang.php rename to Theme/Backend/Lang/Navigation.en.lang.php diff --git a/info.json b/info.json index b5425d3..b60a6d9 100644 --- a/info.json +++ b/info.json @@ -27,7 +27,7 @@ "type": 5, "from": "Tools", "for": "Navigation", - "file": "nav.backend" + "file": "Navigation" } ] }