From 9f872bfc143dd137b65e0a117cd894a6e3bec321 Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Sat, 29 Oct 2016 20:48:03 +0200 Subject: [PATCH] Renaming database pool --- ApplicationAbstract.php | 4 ++-- DataStorage/Database/{Pool.php => DatabasePool.php} | 2 +- Module/ActivateAbstract.php | 6 +++--- Module/DeactivateAbstract.php | 6 +++--- Module/InstallerAbstract.php | 8 ++++---- Module/UninstallAbstract.php | 4 ++-- Module/UpdateAbstract.php | 4 ++-- 7 files changed, 17 insertions(+), 17 deletions(-) rename DataStorage/Database/{Pool.php => DatabasePool.php} (99%) diff --git a/ApplicationAbstract.php b/ApplicationAbstract.php index 10120960d..a827cf25d 100644 --- a/ApplicationAbstract.php +++ b/ApplicationAbstract.php @@ -40,7 +40,7 @@ class ApplicationAbstract /** * Database object. * - * @var \phpOMS\DataStorage\Database\Pool + * @var \phpOMS\DataStorage\Database\DatabasePool * @since 1.0.0 */ public $dbPool = null; @@ -64,7 +64,7 @@ class ApplicationAbstract /** * Cache instance. * - * @var \phpOMS\DataStorage\Cache\Pool + * @var \phpOMS\DataStorage\Cache\CachePool * @since 1.0.0 */ public $cachePool = null; diff --git a/DataStorage/Database/Pool.php b/DataStorage/Database/DatabasePool.php similarity index 99% rename from DataStorage/Database/Pool.php rename to DataStorage/Database/DatabasePool.php index f4f16400b..ca9a19b7b 100644 --- a/DataStorage/Database/Pool.php +++ b/DataStorage/Database/DatabasePool.php @@ -30,7 +30,7 @@ use phpOMS\DataStorage\Database\Connection\ConnectionFactory; * @link http://orange-management.com * @since 1.0.0 */ -class Pool +class DatabasePool { /** diff --git a/Module/ActivateAbstract.php b/Module/ActivateAbstract.php index 88b72dc08..aa9675124 100644 --- a/Module/ActivateAbstract.php +++ b/Module/ActivateAbstract.php @@ -16,7 +16,7 @@ namespace phpOMS\Module; use phpOMS\DataStorage\Database\DatabaseType; -use phpOMS\DataStorage\Database\Pool; +use phpOMS\DataStorage\Database\DatabasePool; /** * Installer Abstract class. @@ -43,7 +43,7 @@ class ActivateAbstract * @since 1.0.0 * @author Dennis Eichhorn */ - public static function activate(Pool $dbPool, InfoManager $info) + public static function activate(DatabasePool $dbPool, InfoManager $info) { self::activateRoutes(ROOT_PATH . '/Web/Routes.php', ROOT_PATH . '/Modules/' . $info->getDirectory() . '/Admin/Routes/http.php'); self::activateInDatabase($dbPool, $info); @@ -76,7 +76,7 @@ class ActivateAbstract * @since 1.0.0 * @author Dennis Eichhorn */ - public static function activateInDatabase(Pool $dbPool, InfoManager $info) + public static function activateInDatabase(DatabasePool $dbPool, InfoManager $info) { switch ($dbPool->get()->getType()) { case DatabaseType::MYSQL: diff --git a/Module/DeactivateAbstract.php b/Module/DeactivateAbstract.php index 347e9b60b..9fa0c0c71 100644 --- a/Module/DeactivateAbstract.php +++ b/Module/DeactivateAbstract.php @@ -16,7 +16,7 @@ namespace phpOMS\Module; use phpOMS\DataStorage\Database\DatabaseType; -use phpOMS\DataStorage\Database\Pool; +use phpOMS\DataStorage\Database\DatabasePool; /** * Installer Abstract class. @@ -43,7 +43,7 @@ class DeactivateAbstract * @since 1.0.0 * @author Dennis Eichhorn */ - public static function deactivate(Pool $dbPool, InfoManager $info) + public static function deactivate(DatabasePool $dbPool, InfoManager $info) { self::deactivateRoutes(ROOT_PATH . '/Web/Routes.php', ROOT_PATH . '/Modules/' . $info->getDirectory() . '/Admin/Routes/http.php'); self::deactivateInDatabase($dbPool, $info); @@ -76,7 +76,7 @@ class DeactivateAbstract * @since 1.0.0 * @author Dennis Eichhorn */ - public static function deactivateInDatabase(Pool $dbPool, InfoManager $info) + public static function deactivateInDatabase(DatabasePool $dbPool, InfoManager $info) { switch ($dbPool->get()->getType()) { case DatabaseType::MYSQL: diff --git a/Module/InstallerAbstract.php b/Module/InstallerAbstract.php index 4988c581b..922349482 100644 --- a/Module/InstallerAbstract.php +++ b/Module/InstallerAbstract.php @@ -16,7 +16,7 @@ namespace phpOMS\Module; use phpOMS\DataStorage\Database\DatabaseType; -use phpOMS\DataStorage\Database\Pool; +use phpOMS\DataStorage\Database\DatabasePool; use phpOMS\System\File\Local\Directory; use phpOMS\System\File\PathException; use phpOMS\System\File\PermissionException; @@ -46,7 +46,7 @@ class InstallerAbstract * @since 1.0.0 * @author Dennis Eichhorn */ - public static function registerInDatabase(Pool $dbPool, InfoManager $info) + public static function registerInDatabase(DatabasePool $dbPool, InfoManager $info) { switch ($dbPool->get()->getType()) { case DatabaseType::MYSQL: @@ -99,7 +99,7 @@ class InstallerAbstract * @since 1.0.0 * @author Dennis Eichhorn */ - public static function install(string $routePath, Pool $dbPool, InfoManager $info) + public static function install(string $routePath, DatabasePool $dbPool, InfoManager $info) { self::registerInDatabase($dbPool, $info); self::initRoutes($routePath, $info); @@ -117,7 +117,7 @@ class InstallerAbstract * @since 1.0.0 * @author Dennis Eichhorn */ - private static function activate(Pool $dbPool, InfoManager $info) + private static function activate(DatabasePool $dbPool, InfoManager $info) { /** @var ActivateAbstract $class */ $class = '\Modules\\' . $info->getDirectory() . '\Admin\Activate'; diff --git a/Module/UninstallAbstract.php b/Module/UninstallAbstract.php index 4cf227ece..b80667e3d 100644 --- a/Module/UninstallAbstract.php +++ b/Module/UninstallAbstract.php @@ -15,7 +15,7 @@ */ namespace phpOMS\Module; -use phpOMS\DataStorage\Database\Pool; +use phpOMS\DataStorage\Database\DatabasePool; /** * Installer Abstract class. @@ -42,7 +42,7 @@ class UninstallAbstract * @since 1.0.0 * @author Dennis Eichhorn */ - public static function uninstall(Pool $dbPool, InfoManager $info) + public static function uninstall(DatabasePool $dbPool, InfoManager $info) { } diff --git a/Module/UpdateAbstract.php b/Module/UpdateAbstract.php index d42526a8f..6c43b7b83 100644 --- a/Module/UpdateAbstract.php +++ b/Module/UpdateAbstract.php @@ -15,7 +15,7 @@ */ namespace phpOMS\Module; -use phpOMS\DataStorage\Database\Pool; +use phpOMS\DataStorage\Database\DatabasePool; /** * Installer Abstract class. @@ -42,7 +42,7 @@ class UpdateAbstract * @since 1.0.0 * @author Dennis Eichhorn */ - public static function update(Pool $dbPool, InfoManager $info) + public static function update(DatabasePool $dbPool, InfoManager $info) { } }