Commit 74c99dc9 by Carsten Brandt

code style + test groups

parent 9e62d558
...@@ -41,22 +41,18 @@ class DbManager extends BaseManager ...@@ -41,22 +41,18 @@ class DbManager extends BaseManager
* with a DB connection object. * with a DB connection object.
*/ */
public $db = 'db'; public $db = 'db';
/** /**
* @var string the name of the table storing authorization items. Defaults to "auth_item". * @var string the name of the table storing authorization items. Defaults to "auth_item".
*/ */
public $itemTable = '{{%auth_item}}'; public $itemTable = '{{%auth_item}}';
/** /**
* @var string the name of the table storing authorization item hierarchy. Defaults to "auth_item_child". * @var string the name of the table storing authorization item hierarchy. Defaults to "auth_item_child".
*/ */
public $itemChildTable = '{{%auth_item_child}}'; public $itemChildTable = '{{%auth_item_child}}';
/** /**
* @var string the name of the table storing authorization item assignments. Defaults to "auth_assignment". * @var string the name of the table storing authorization item assignments. Defaults to "auth_assignment".
*/ */
public $assignmentTable = '{{%auth_assignment}}'; public $assignmentTable = '{{%auth_assignment}}';
/** /**
* @var string the name of the table storing rules. Defaults to "auth_rule". * @var string the name of the table storing rules. Defaults to "auth_rule".
*/ */
...@@ -70,7 +66,6 @@ class DbManager extends BaseManager ...@@ -70,7 +66,6 @@ class DbManager extends BaseManager
public function init() public function init()
{ {
parent::init(); parent::init();
$this->db = Instance::ensure($this->db, Connection::className()); $this->db = Instance::ensure($this->db, Connection::className());
} }
......
...@@ -47,7 +47,6 @@ class PhpManager extends BaseManager ...@@ -47,7 +47,6 @@ class PhpManager extends BaseManager
* @see saveToFile() * @see saveToFile()
*/ */
public $assignmentFile = '@app/rbac/assignments.php'; public $assignmentFile = '@app/rbac/assignments.php';
/** /**
* @var string the path of the PHP script that contains the authorization rules. * @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. * This can be either a file path or a path alias to the file.
...@@ -56,6 +55,7 @@ class PhpManager extends BaseManager ...@@ -56,6 +55,7 @@ class PhpManager extends BaseManager
* @see saveToFile() * @see saveToFile()
*/ */
public $ruleFile = '@app/rbac/rules.php'; public $ruleFile = '@app/rbac/rules.php';
/** /**
* @var Item[] * @var Item[]
*/ */
......
...@@ -3,6 +3,8 @@ namespace yiiunit\framework\rbac; ...@@ -3,6 +3,8 @@ namespace yiiunit\framework\rbac;
/** /**
* MySQLManagerTest * MySQLManagerTest
* @group db
* @group rbac
*/ */
class MySQLManagerTest extends DbManagerTestCase class MySQLManagerTest extends DbManagerTestCase
{ {
......
...@@ -3,6 +3,8 @@ namespace yiiunit\framework\rbac; ...@@ -3,6 +3,8 @@ namespace yiiunit\framework\rbac;
/** /**
* PgSQLManagerTest * PgSQLManagerTest
* @group db
* @group rbac
*/ */
class PgSQLManagerTest extends DbManagerTestCase class PgSQLManagerTest extends DbManagerTestCase
{ {
......
...@@ -3,6 +3,8 @@ namespace yiiunit\framework\rbac; ...@@ -3,6 +3,8 @@ namespace yiiunit\framework\rbac;
/** /**
* SqliteManagerTest * SqliteManagerTest
* @group db
* @group rbac
*/ */
class SqliteManagerTest extends DbManagerTestCase class SqliteManagerTest extends DbManagerTestCase
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment