diff --git a/framework/rbac/DbManager.php b/framework/rbac/DbManager.php index 5919c797c4..a0e1c6adf8 100644 --- a/framework/rbac/DbManager.php +++ b/framework/rbac/DbManager.php @@ -41,22 +41,18 @@ class DbManager extends BaseManager * with a DB connection object. */ public $db = 'db'; - /** * @var string the name of the table storing authorization items. Defaults to "auth_item". */ public $itemTable = '{{%auth_item}}'; - /** * @var string the name of the table storing authorization item hierarchy. Defaults to "auth_item_child". */ public $itemChildTable = '{{%auth_item_child}}'; - /** * @var string the name of the table storing authorization item assignments. Defaults to "auth_assignment". */ public $assignmentTable = '{{%auth_assignment}}'; - /** * @var string the name of the table storing rules. Defaults to "auth_rule". */ @@ -70,7 +66,6 @@ class DbManager extends BaseManager public function init() { parent::init(); - $this->db = Instance::ensure($this->db, Connection::className()); } diff --git a/framework/rbac/PhpManager.php b/framework/rbac/PhpManager.php index 3dd1a77bba..64698048cb 100644 --- a/framework/rbac/PhpManager.php +++ b/framework/rbac/PhpManager.php @@ -47,7 +47,6 @@ class PhpManager extends BaseManager * @see saveToFile() */ public $assignmentFile = '@app/rbac/assignments.php'; - /** * @var string the path of the PHP script that contains the authorization rules. * This can be either a file path or a path alias to the file. @@ -56,6 +55,7 @@ class PhpManager extends BaseManager * @see saveToFile() */ public $ruleFile = '@app/rbac/rules.php'; + /** * @var Item[] */ diff --git a/tests/unit/framework/rbac/MySQLManagerTest.php b/tests/unit/framework/rbac/MySQLManagerTest.php index 853faa5254..d64c0cd6ec 100644 --- a/tests/unit/framework/rbac/MySQLManagerTest.php +++ b/tests/unit/framework/rbac/MySQLManagerTest.php @@ -3,6 +3,8 @@ namespace yiiunit\framework\rbac; /** * MySQLManagerTest + * @group db + * @group rbac */ class MySQLManagerTest extends DbManagerTestCase { diff --git a/tests/unit/framework/rbac/PgSQLManagerTest.php b/tests/unit/framework/rbac/PgSQLManagerTest.php index 4186fe23eb..fb15aad163 100644 --- a/tests/unit/framework/rbac/PgSQLManagerTest.php +++ b/tests/unit/framework/rbac/PgSQLManagerTest.php @@ -3,6 +3,8 @@ namespace yiiunit\framework\rbac; /** * PgSQLManagerTest + * @group db + * @group rbac */ class PgSQLManagerTest extends DbManagerTestCase { diff --git a/tests/unit/framework/rbac/SqliteManagerTest.php b/tests/unit/framework/rbac/SqliteManagerTest.php index 316c46a19a..2b77fd0f22 100644 --- a/tests/unit/framework/rbac/SqliteManagerTest.php +++ b/tests/unit/framework/rbac/SqliteManagerTest.php @@ -3,6 +3,8 @@ namespace yiiunit\framework\rbac; /** * SqliteManagerTest + * @group db + * @group rbac */ class SqliteManagerTest extends DbManagerTestCase {