Actualize

src/Command/RbacDbInit.php

@@ -0,0 +1,20 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Yiisoft\Rbac\Db\Command;
+
+/**
+ * Command for creating RBAC related database tables using Yii Database.
+ */
+final class RbacDbInit extends \Yiisoft\Rbac\Command\RbacDbInit
+{
+    protected static $defaultName = 'rbac/db/init';
+
+    protected function configure(): void
+    {
+        parent::configure();
+
+        $this->setHelp('This command creates schemas for RBAC using Yii Database');
+    }
+}

src/SchemaManager.php

@@ -9,24 +9,11 @@
 use Yiisoft\Db\Schema\SchemaInterface;
 use Yiisoft\Db\Sqlite\Column;
 use Yiisoft\Rbac\SchemaManagerInterface;
+use Yiisoft\Rbac\SchemaManagerTrait;
 
 final class SchemaManager implements SchemaManagerInterface
 {
-    /**
-     * @var string A name of the table for storing RBAC items (roles and permissions).
-     * @psalm-var non-empty-string
-     */
-    private string $itemsTable;
-    /**
-     * @var string A name of the table for storing RBAC assignments.
-     * @psalm-var non-empty-string
-     */
-    private string $assignmentsTable;
-    /**
-     * @var string A name of the table for storing relations between RBAC items.
-     * @psalm-var non-empty-string
-     */
-    private string $itemsChildrenTable;
+    use SchemaManagerTrait;
 
     /**
      * @param string $itemsTable A name of the table for storing RBAC items (roles and permissions).
@@ -43,23 +30,7 @@ public function __construct(
         private ConnectionInterface $database,
         string|null $itemsChildrenTable = null,
     ) {
-        if ($itemsTable === '') {
-            throw new InvalidArgumentException('Items table name can\'t be empty.');
-        }
-
-        $this->itemsTable = $itemsTable;
-
-        if ($assignmentsTable === '') {
-            throw new InvalidArgumentException('Assignments table name can\'t be empty.');
-        }
-
-        $this->assignmentsTable = $assignmentsTable;
-
-        if ($itemsChildrenTable === '') {
-            throw new InvalidArgumentException('Items children table name can\'t be empty.');
-        }
-
-        $this->itemsChildrenTable = $itemsChildrenTable ?? $this->itemsTable . '_child';
+        $this->initTables($itemsTable, $assignmentsTable, $itemsChildrenTable);
     }
 
     /**
@@ -137,7 +108,7 @@ public function createAssignmentsTable(): void
             ->execute();
     }
 
-    public function tableExists(string $tableName): bool
+    public function hasTable(string $tableName): bool
     {
         return $this->database->getSchema()->getTableSchema($tableName) !== null;
     }
@@ -146,37 +117,4 @@ public function dropTable(string $tableName): void
     {
         $this->database->createCommand()->dropTable($tableName)->execute();
     }
-
-    public function createAll(bool $force = true): void
-    {
-        if ($force === true) {
-            $this->dropAll();
-        }
-
-        $this->createItemsTable();
-        $this->createItemsChildrenTable();
-        $this->createAssignmentsTable();
-    }
-
-    public function dropAll(): void
-    {
-        $this->dropTable($this->itemsChildrenTable);
-        $this->dropTable($this->assignmentsTable);
-        $this->dropTable($this->itemsTable);
-    }
-
-    public function getItemsTable(): string
-    {
-        return $this->itemsTable;
-    }
-
-    public function getAssignmentsTable(): string
-    {
-        return $this->assignmentsTable;
-    }
-
-    public function getItemsChildrenTable(): string
-    {
-        return $this->itemsChildrenTable;
-    }
 }

tests/Base/TestCase.php

@@ -8,7 +8,7 @@
 use Symfony\Component\Console\Input\ArrayInput;
 use Symfony\Component\Console\Output\NullOutput;
 use Yiisoft\Db\Connection\ConnectionInterface;
-use Yiisoft\Rbac\Command\RbacDbInit;
+use Yiisoft\Rbac\Db\Command\RbacDbInit;
 use Yiisoft\Rbac\Db\SchemaManager;
 
 abstract class TestCase extends \PHPUnit\Framework\TestCase