From 043cde0fa566170a62d83281dc3ec3de738f5802 Mon Sep 17 00:00:00 2001 From: githubjeka Date: Wed, 7 Mar 2018 15:08:37 +0300 Subject: [PATCH] moved DatabaseInfo and enhancement for unit test --- .../{controllers/services => components}/DatabaseInfo.php | 2 +- .../modules/admin/controllers/InformationController.php | 4 ++-- .../admin/tests/codeception/unit/DatabaseInfoTest.php | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) rename protected/humhub/modules/admin/{controllers/services => components}/DatabaseInfo.php (91%) diff --git a/protected/humhub/modules/admin/controllers/services/DatabaseInfo.php b/protected/humhub/modules/admin/components/DatabaseInfo.php similarity index 91% rename from protected/humhub/modules/admin/controllers/services/DatabaseInfo.php rename to protected/humhub/modules/admin/components/DatabaseInfo.php index 904420b894..29d4efd13c 100644 --- a/protected/humhub/modules/admin/controllers/services/DatabaseInfo.php +++ b/protected/humhub/modules/admin/components/DatabaseInfo.php @@ -6,7 +6,7 @@ * @license https://www.humhub.com/licences */ -namespace humhub\modules\admin\controllers\services; +namespace humhub\modules\admin\components; /** * @since 1.3 diff --git a/protected/humhub/modules/admin/controllers/InformationController.php b/protected/humhub/modules/admin/controllers/InformationController.php index 016f7a2351..fe816f6d9a 100644 --- a/protected/humhub/modules/admin/controllers/InformationController.php +++ b/protected/humhub/modules/admin/controllers/InformationController.php @@ -9,7 +9,7 @@ namespace humhub\modules\admin\controllers; use humhub\modules\admin\components\Controller; -use humhub\modules\admin\controllers\services\DatabaseInfo; +use humhub\modules\admin\components\DatabaseInfo; use humhub\modules\admin\libs\HumHubAPI; use Yii; @@ -43,7 +43,7 @@ class InformationController extends Controller public function getAccessRules() { return [ - ['permissions' => \humhub\modules\admin\permissions\SeeAdminInformation::className()], + ['permissions' => \humhub\modules\admin\permissions\SeeAdminInformation::class], ]; } diff --git a/protected/humhub/modules/admin/tests/codeception/unit/DatabaseInfoTest.php b/protected/humhub/modules/admin/tests/codeception/unit/DatabaseInfoTest.php index 05cd490a55..7aaa824d23 100644 --- a/protected/humhub/modules/admin/tests/codeception/unit/DatabaseInfoTest.php +++ b/protected/humhub/modules/admin/tests/codeception/unit/DatabaseInfoTest.php @@ -2,10 +2,10 @@ namespace humhub\modules\admin\tests\codeception\unit; -use humhub\modules\admin\controllers\services\DatabaseInfo; -use tests\codeception\_support\HumHubDbTestCase; +use Codeception\Test\Unit; +use humhub\modules\admin\components\DatabaseInfo; -class DatabaseInfoTest extends HumHubDbTestCase +class DatabaseInfoTest extends Unit { public function testGetDatabaseNameByMysqlDsn() {