Sync DbSchemaManager and README with rbac-db (#74)

yiisoft · Sep 15, 2023 · 791e27f · 791e27f
1 parent 9c7eef5
commit 791e27f
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 12 deletions.
diff --git a/README.md b/README.md
@@ -116,8 +116,8 @@ use Yiisoft\Rbac\Permission;
 use Yiisoft\Rbac\RuleFactoryInterface;
 
 /** @var DatabaseInterface $database */
-$itemsStorage = new ItemsStorage(database: $database);
-$assignmentsStorage = new AssignmentsStorage(database: $database);
+$itemsStorage = new ItemsStorage($database);
+$assignmentsStorage = new AssignmentsStorage($database);
 /** @var RuleFactoryInterface $rulesContainer */
 $manager = new TransactionalManagerDecorator(
     new Manager(

diff --git a/src/DbSchemaManager.php b/src/DbSchemaManager.php
@@ -255,8 +255,17 @@ public function getItemsChildrenTable(): ?string
      */
     private function initTables(?string $itemsTable, ?string $itemsChildrenTable, ?string $assignmentsTable): void
     {
-        if ($itemsTable === null && $assignmentsTable === null) {
-            throw new InvalidArgumentException('At least items table or assignments table name must be set.');
+        if ($itemsTable === null && $itemsChildrenTable === null && $assignmentsTable === null) {
+            $message = 'At least items and items children table names or assignments table name must be set.';
+
+            throw new InvalidArgumentException($message);
+        }
+
+        if (
+            ($itemsTable !== null && $itemsChildrenTable === null) ||
+            ($itemsTable === null && $itemsChildrenTable !== null)
+        ) {
+            throw new InvalidArgumentException('Items and items children table names must be set together.');
         }
 
         if ($itemsTable === '') {

diff --git a/tests/Base/DbSchemaManagerTest.php b/tests/Base/DbSchemaManagerTest.php
@@ -43,19 +43,19 @@ public function dataInitWithEmptyTableNames(): array
         return [
             [
                 ['itemsTable' => null, 'itemsChildrenTable' => null, 'assignmentsTable' => null],
-                'At least items table or assignments table name must be set.',
+                'At least items and items children table names or assignments table name must be set.',
             ],
-            [['itemsTable' => '', 'assignmentsTable' => 'assignments'], 'Items table name can\'t be empty.'],
-            [['itemsTable' => 'items', 'assignmentsTable' => ''], 'Assignments table name can\'t be empty.'],
-            [['itemsTable' => '', 'assignmentsTable' => ''], 'Items table name can\'t be empty.'],
             [
-                ['itemsTable' => 'items', 'itemsChildrenTable' => '', 'assignmentsTable' => 'assignments'],
-                'Items children table name can\'t be empty.',
+                ['itemsTable' => 'items', 'itemsChildrenTable' => null, 'assignmentsTable' => null],
+                'Items and items children table names must be set together.',
             ],
             [
-                ['itemsTable' => '', 'itemsChildrenTable' => '', 'assignmentsTable' => ''],
-                'Items table name can\'t be empty.',
+                ['itemsTable' => null, 'itemsChildrenTable' => 'items_children', 'assignmentsTable' => null],
+                'Items and items children table names must be set together.',
             ],
+            [['itemsTable' => ''], 'Items table name can\'t be empty.'],
+            [['itemsChildrenTable' => ''], 'Items children table name can\'t be empty.'],
+            [['assignmentsTable' => ''], 'Assignments table name can\'t be empty.'],
         ];
     }