From 89d76683fbd92b0f93b69ef7eb66081d7794918f Mon Sep 17 00:00:00 2001
From: SerafimArts <nesk@xakep.ru>
Date: Tue, 12 Oct 2021 15:40:37 +0300
Subject: [PATCH 1/3] Change constructors signature from Cycle to Spiral

---
 resources/.phpstorm.meta.php       | 201 +++++++++++++++--------------
 src/Database.php                   |  13 +-
 src/DatabaseManager.php            |   8 +-
 src/Driver/CompilerCache.php       |   6 +-
 src/Driver/Driver.php              |  18 ++-
 src/Driver/ReadonlyHandler.php     |   6 +-
 src/Exception/HandlerException.php |   7 +-
 src/Query/QueryBuilder.php         |  24 ++--
 src/Schema/AbstractTable.php       |  10 +-
 src/Schema/Comparator.php          |  10 +-
 src/Table.php                      |   6 +-
 11 files changed, 175 insertions(+), 134 deletions(-)

diff --git a/resources/.phpstorm.meta.php b/resources/.phpstorm.meta.php
index 55f0c22e..f14404e8 100644
--- a/resources/.phpstorm.meta.php
+++ b/resources/.phpstorm.meta.php
@@ -12,70 +12,70 @@
 namespace Spiral\Database {
 
     /**
-     * @deprecated Since Cycle ORM 1.0, use Cycle\Database\ColumnInterface instead.
+     * @deprecated since cycle/database 1.0, use Cycle\Database\ColumnInterface instead.
      */
     interface ColumnInterface extends \Cycle\Database\ColumnInterface
     {
     }
 
     /**
-     * @deprecated Since Cycle ORM 1.0, use Cycle\Database\DatabaseInterface instead.
+     * @deprecated since cycle/database 1.0, use Cycle\Database\DatabaseInterface instead.
      */
     interface DatabaseInterface extends \Cycle\Database\DatabaseInterface
     {
     }
 
     /**
-     * @deprecated Since Cycle ORM 1.0, use Cycle\Database\DatabaseProviderInterface instead.
+     * @deprecated since cycle/database 1.0, use Cycle\Database\DatabaseProviderInterface instead.
      */
     interface DatabaseProviderInterface extends \Cycle\Database\DatabaseProviderInterface
     {
     }
 
     /**
-     * @deprecated Since Cycle ORM 1.0, use Cycle\Database\ForeignKeyInterface instead.
+     * @deprecated since cycle/database 1.0, use Cycle\Database\ForeignKeyInterface instead.
      */
     interface ForeignKeyInterface extends \Cycle\Database\ForeignKeyInterface
     {
     }
 
     /**
-     * @deprecated Since Cycle ORM 1.0, use Cycle\Database\IndexInterface instead.
+     * @deprecated since cycle/database 1.0, use Cycle\Database\IndexInterface instead.
      */
     interface IndexInterface extends \Cycle\Database\IndexInterface
     {
     }
 
     /**
-     * @deprecated Since Cycle ORM 1.0, use Cycle\Database\StatementInterface instead.
+     * @deprecated since cycle/database 1.0, use Cycle\Database\StatementInterface instead.
      */
     interface StatementInterface extends \Cycle\Database\StatementInterface
     {
     }
 
     /**
-     * @deprecated Since Cycle ORM 1.0, use Cycle\Database\TableInterface instead.
+     * @deprecated since cycle/database 1.0, use Cycle\Database\TableInterface instead.
      */
     interface TableInterface extends \Cycle\Database\TableInterface
     {
     }
 
     /**
-     * @deprecated Since Cycle ORM 1.0, use Cycle\Database\Database instead.
+     * @deprecated since cycle/database 1.0, use Cycle\Database\Database instead.
      */
     final class Database extends \Cycle\Database\Database
     {
     }
 
     /**
-     * @deprecated Since Cycle ORM 1.0, use Cycle\Database\DatabaseManager instead.
+     * @deprecated since cycle/database 1.0, use Cycle\Database\DatabaseManager instead.
      */
     final class DatabaseManager extends \Cycle\Database\DatabaseManager
     {
     }
 
     /**
-     * @deprecated Since Cycle ORM 1.0, use Cycle\Database\Table instead.
+     * @deprecated since cycle/database 1.0, use Cycle\Database\Table instead.
      */
     final class Table extends \Cycle\Database\Table
     {
@@ -85,66 +85,73 @@ final class Table extends \Cycle\Database\Table
 namespace Spiral\Database\Schema {
 
     /**
-     * @deprecated Since Cycle ORM 1.0, use Cycle\Database\Schema\ComparatorInterface instead.
+     * @deprecated since cycle/database 1.0, use Cycle\Database\Schema\ComparatorInterface instead.
      */
     interface ComparatorInterface extends \Cycle\Database\Schema\ComparatorInterface
     {
     }
 
     /**
-     * @deprecated Since Cycle ORM 1.0, use Cycle\Database\Schema\ElementInterface instead.
+     * @deprecated since cycle/database 1.0, use Cycle\Database\Schema\ElementInterface instead.
      */
     interface ElementInterface extends \Cycle\Database\Schema\ElementInterface
     {
     }
 
     /**
-     * @deprecated Since Cycle ORM 1.0, use Cycle\Database\Schema\AbstractColumn instead.
+     * @deprecated since cycle/database 1.0, use Cycle\Database\Schema\AbstractColumn instead.
      */
     abstract class AbstractColumn extends \Cycle\Database\Schema\AbstractColumn
     {
     }
 
     /**
-     * @deprecated Since Cycle ORM 1.0, use Cycle\Database\Schema\AbstractForeignKey instead.
+     * @deprecated since cycle/database 1.0, use Cycle\Database\Schema\AbstractForeignKey instead.
      */
     abstract class AbstractForeignKey extends \Cycle\Database\Schema\AbstractForeignKey
     {
     }
 
     /**
-     * @deprecated Since Cycle ORM 1.0, use Cycle\Database\Schema\AbstractIndex instead.
+     * @deprecated since cycle/database 1.0, use Cycle\Database\Schema\AbstractIndex instead.
      */
     abstract class AbstractIndex extends \Cycle\Database\Schema\AbstractIndex
     {
     }
 
     /**
-     * @deprecated Since Cycle ORM 1.0, use Cycle\Database\Schema\AbstractTable instead.
+     * @deprecated since cycle/database 1.0, use Cycle\Database\Schema\AbstractTable instead.
      */
     abstract class AbstractTable extends \Cycle\Database\Schema\AbstractTable
     {
     }
 
     /**
-     * @deprecated Since Cycle ORM 1.0, use Cycle\Database\Schema\Comparator instead.
+     * @deprecated since cycle/database 1.0, use Cycle\Database\Schema\Comparator instead.
      */
     final class Comparator extends \Cycle\Database\Schema\Comparator
     {
     }
 
     /**
-     * @deprecated Since Cycle ORM 1.0, use Cycle\Database\Schema\Reflector instead.
+     * @deprecated since cycle/database 1.0, use Cycle\Database\Schema\Reflector instead.
      */
     final class Reflector extends \Cycle\Database\Schema\Reflector
     {
     }
+
+    /**
+     * @deprecated since cycle/database 1.0, use Cycle\Database\Schema\State instead.
+     */
+    final class State extends \Cycle\Database\Schema\State
+    {
+    }
 }
 
 namespace Spiral\Database\Schema\Traits {
 
     /**
-     * @deprecated Since Cycle ORM 1.0, use Cycle\Database\Schema\Traits\ElementTrait instead.
+     * @deprecated since cycle/database 1.0, use Cycle\Database\Schema\Traits\ElementTrait instead.
      */
     trait ElementTrait
     {
@@ -155,70 +162,70 @@ trait ElementTrait
 namespace Spiral\Database\Query {
 
     /**
-     * @deprecated Since Cycle ORM 1.0, use Cycle\Database\Query\BuilderInterface instead.
+     * @deprecated since cycle/database 1.0, use Cycle\Database\Query\BuilderInterface instead.
      */
     interface BuilderInterface extends \Cycle\Database\Query\BuilderInterface
     {
     }
 
     /**
-     * @deprecated Since Cycle ORM 1.0, use Cycle\Database\Query\QueryInterface instead.
+     * @deprecated since cycle/database 1.0, use Cycle\Database\Query\QueryInterface instead.
      */
     interface QueryInterface extends \Cycle\Database\Query\QueryInterface
     {
     }
 
     /**
-     * @deprecated Since Cycle ORM 1.0, use Cycle\Database\Query\ActiveQuery instead.
+     * @deprecated since cycle/database 1.0, use Cycle\Database\Query\ActiveQuery instead.
      */
     abstract class ActiveQuery extends \Cycle\Database\Query\ActiveQuery
     {
     }
 
     /**
-     * @deprecated Since Cycle ORM 1.0, use Cycle\Database\Query\DeleteQuery instead.
+     * @deprecated since cycle/database 1.0, use Cycle\Database\Query\DeleteQuery instead.
      */
     class DeleteQuery extends \Cycle\Database\Query\DeleteQuery
     {
     }
 
     /**
-     * @deprecated Since Cycle ORM 1.0, use Cycle\Database\Query\InsertQuery instead.
+     * @deprecated since cycle/database 1.0, use Cycle\Database\Query\InsertQuery instead.
      */
     class InsertQuery extends \Cycle\Database\Query\InsertQuery
     {
     }
 
     /**
-     * @deprecated Since Cycle ORM 1.0, use Cycle\Database\Query\Interpolator instead.
+     * @deprecated since cycle/database 1.0, use Cycle\Database\Query\Interpolator instead.
      */
     final class Interpolator extends \Cycle\Database\Query\Interpolator
     {
     }
 
     /**
-     * @deprecated Since Cycle ORM 1.0, use Cycle\Database\Query\QueryBuilder instead.
+     * @deprecated since cycle/database 1.0, use Cycle\Database\Query\QueryBuilder instead.
      */
     final class QueryBuilder extends \Cycle\Database\Query\QueryBuilder
     {
     }
 
     /**
-     * @deprecated Since Cycle ORM 1.0, use Cycle\Database\Query\QueryParameters instead.
+     * @deprecated since cycle/database 1.0, use Cycle\Database\Query\QueryParameters instead.
      */
     final class QueryParameters extends \Cycle\Database\Query\QueryParameters
     {
     }
 
     /**
-     * @deprecated Since Cycle ORM 1.0, use Cycle\Database\Query\SelectQuery instead.
+     * @deprecated since cycle/database 1.0, use Cycle\Database\Query\SelectQuery instead.
      */
     class SelectQuery extends \Cycle\Database\Query\SelectQuery
     {
     }
 
     /**
-     * @deprecated Since Cycle ORM 1.0, use Cycle\Database\Query\UpdateQuery instead.
+     * @deprecated since cycle/database 1.0, use Cycle\Database\Query\UpdateQuery instead.
      */
     class UpdateQuery extends \Cycle\Database\Query\UpdateQuery
     {
@@ -228,7 +235,7 @@ class UpdateQuery extends \Cycle\Database\Query\UpdateQuery
 namespace Spiral\Database\Query\Traits {
 
     /**
-     * @deprecated Since Cycle ORM 1.0, use Cycle\Database\Query\Traits\HavingTrait instead.
+     * @deprecated since cycle/database 1.0, use Cycle\Database\Query\Traits\HavingTrait instead.
      */
     trait HavingTrait
     {
@@ -236,7 +243,7 @@ trait HavingTrait
     }
 
     /**
-     * @deprecated Since Cycle ORM 1.0, use Cycle\Database\Query\Traits\JoinTrait instead.
+     * @deprecated since cycle/database 1.0, use Cycle\Database\Query\Traits\JoinTrait instead.
      */
     trait JoinTrait
     {
@@ -244,7 +251,7 @@ trait JoinTrait
     }
 
     /**
-     * @deprecated Since Cycle ORM 1.0, use Cycle\Database\Query\Traits\TokenTrait instead.
+     * @deprecated since cycle/database 1.0, use Cycle\Database\Query\Traits\TokenTrait instead.
      */
     trait TokenTrait
     {
@@ -252,7 +259,7 @@ trait TokenTrait
     }
 
     /**
-     * @deprecated Since Cycle ORM 1.0, use Cycle\Database\Query\Traits\WhereTrait instead.
+     * @deprecated since cycle/database 1.0, use Cycle\Database\Query\Traits\WhereTrait instead.
      */
     trait WhereTrait
     {
@@ -263,42 +270,42 @@ trait WhereTrait
 namespace Spiral\Database\Injection {
 
     /**
-     * @deprecated Since Cycle ORM 1.0, use Cycle\Database\Injection\FragmentInterface instead.
+     * @deprecated since cycle/database 1.0, use Cycle\Database\Injection\FragmentInterface instead.
      */
     interface FragmentInterface extends \Cycle\Database\Injection\FragmentInterface
     {
     }
 
     /**
-     * @deprecated Since Cycle ORM 1.0, use Cycle\Database\Injection\ParameterInterface instead.
+     * @deprecated since cycle/database 1.0, use Cycle\Database\Injection\ParameterInterface instead.
      */
     interface ParameterInterface extends \Cycle\Database\Injection\ParameterInterface
     {
     }
 
     /**
-     * @deprecated Since Cycle ORM 1.0, use Cycle\Database\Injection\ValueInterface instead.
+     * @deprecated since cycle/database 1.0, use Cycle\Database\Injection\ValueInterface instead.
      */
     interface ValueInterface extends \Cycle\Database\Injection\ValueInterface
     {
     }
 
     /**
-     * @deprecated Since Cycle ORM 1.0, use Cycle\Database\Injection\Expression instead.
+     * @deprecated since cycle/database 1.0, use Cycle\Database\Injection\Expression instead.
      */
     class Expression extends \Cycle\Database\Injection\Expression
     {
     }
 
     /**
-     * @deprecated Since Cycle ORM 1.0, use Cycle\Database\Injection\Fragment instead.
+     * @deprecated since cycle/database 1.0, use Cycle\Database\Injection\Fragment instead.
      */
     class Fragment extends \Cycle\Database\Injection\Fragment
     {
     }
 
     /**
-     * @deprecated Since Cycle ORM 1.0, use Cycle\Database\Injection\Parameter instead.
+     * @deprecated since cycle/database 1.0, use Cycle\Database\Injection\Parameter instead.
      */
     class Parameter extends \Cycle\Database\Injection\Parameter
     {
@@ -308,84 +315,84 @@ class Parameter extends \Cycle\Database\Injection\Parameter
 namespace Spiral\Database\Exception {
 
     /**
-     * @deprecated Since Cycle ORM 1.0, use Cycle\Database\Exception\StatementExceptionInterface instead.
+     * @deprecated since cycle/database 1.0, use Cycle\Database\Exception\StatementExceptionInterface instead.
      */
     interface StatementExceptionInterface extends \Cycle\Database\Exception\StatementExceptionInterface
     {
     }
 
     /**
-     * @deprecated Since Cycle ORM 1.0, use Cycle\Database\Exception\BuilderException instead.
+     * @deprecated since cycle/database 1.0, use Cycle\Database\Exception\BuilderException instead.
      */
     class BuilderException extends \Cycle\Database\Exception\BuilderException
     {
     }
 
     /**
-     * @deprecated Since Cycle ORM 1.0, use Cycle\Database\Exception\CompilerException instead.
+     * @deprecated since cycle/database 1.0, use Cycle\Database\Exception\CompilerException instead.
      */
     class CompilerException extends \Cycle\Database\Exception\CompilerException
     {
     }
 
     /**
-     * @deprecated Since Cycle ORM 1.0, use Cycle\Database\Exception\ConfigException instead.
+     * @deprecated since cycle/database 1.0, use Cycle\Database\Exception\ConfigException instead.
      */
     class ConfigException extends \Cycle\Database\Exception\ConfigException
     {
     }
 
     /**
-     * @deprecated Since Cycle ORM 1.0, use Cycle\Database\Exception\DatabaseException instead.
+     * @deprecated since cycle/database 1.0, use Cycle\Database\Exception\DatabaseException instead.
      */
     class DatabaseException extends \Cycle\Database\Exception\DatabaseException
     {
     }
 
     /**
-     * @deprecated Since Cycle ORM 1.0, use Cycle\Database\Exception\DBALException instead.
+     * @deprecated since cycle/database 1.0, use Cycle\Database\Exception\DBALException instead.
      */
     class DBALException extends \Cycle\Database\Exception\DBALException
     {
     }
 
     /**
-     * @deprecated Since Cycle ORM 1.0, use Cycle\Database\Exception\DefaultValueException instead.
+     * @deprecated since cycle/database 1.0, use Cycle\Database\Exception\DefaultValueException instead.
      */
     class DefaultValueException extends \Cycle\Database\Exception\DefaultValueException
     {
     }
 
     /**
-     * @deprecated Since Cycle ORM 1.0, use Cycle\Database\Exception\DriverException instead.
+     * @deprecated since cycle/database 1.0, use Cycle\Database\Exception\DriverException instead.
      */
     class DriverException extends \Cycle\Database\Exception\DriverException
     {
     }
 
     /**
-     * @deprecated Since Cycle ORM 1.0, use Cycle\Database\Exception\HandlerException instead.
+     * @deprecated since cycle/database 1.0, use Cycle\Database\Exception\HandlerException instead.
      */
     class HandlerException extends \Cycle\Database\Exception\HandlerException
     {
     }
 
     /**
-     * @deprecated Since Cycle ORM 1.0, use Cycle\Database\Exception\InterpolatorException instead.
+     * @deprecated since cycle/database 1.0, use Cycle\Database\Exception\InterpolatorException instead.
      */
     class InterpolatorException extends \Cycle\Database\Exception\InterpolatorException
     {
     }
 
     /**
-     * @deprecated Since Cycle ORM 1.0, use Cycle\Database\Exception\SchemaException instead.
+     * @deprecated since cycle/database 1.0, use Cycle\Database\Exception\SchemaException instead.
      */
     class SchemaException extends \Cycle\Database\Exception\SchemaException
     {
     }
 
     /**
-     * @deprecated Since Cycle ORM 1.0, use Cycle\Database\Exception\StatementExceptionInterface instead.
+     * @deprecated since cycle/database 1.0, use Cycle\Database\Exception\StatementExceptionInterface instead.
      */
     class StatementException extends \Cycle\Database\Exception\StatementException
     {
@@ -395,14 +402,14 @@ class StatementException extends \Cycle\Database\Exception\StatementException
 namespace Spiral\Database\Exception\StatementException {
 
     /**
-     * @deprecated Since Cycle ORM 1.0, use Cycle\Database\Exception\StatementException\ConnectionException instead.
+     * @deprecated since cycle/database 1.0, use Cycle\Database\Exception\StatementException\ConnectionException instead.
      */
     class ConnectionException extends ConnectionException
     {
     }
 
     /**
-     * @deprecated Since Cycle ORM 1.0, use Cycle\Database\Exception\StatementException\ConnectionException instead.
+     * @deprecated since cycle/database 1.0, use Cycle\Database\Exception\StatementException\ConnectionException instead.
      */
     class ConstrainException extends ConstrainException
     {
@@ -412,77 +419,77 @@ class ConstrainException extends ConstrainException
 namespace Spiral\Database\Driver {
 
     /**
-     * @deprecated Since Cycle ORM 1.0, use Cycle\Database\Driver\CachingCompilerInterface instead.
+     * @deprecated since cycle/database 1.0, use Cycle\Database\Driver\CachingCompilerInterface instead.
      */
     interface CachingCompilerInterface extends \Cycle\Database\Driver\CachingCompilerInterface
     {
     }
 
     /**
-     * @deprecated Since Cycle ORM 1.0, use Cycle\Database\Driver\CompilerInterface instead.
+     * @deprecated since cycle/database 1.0, use Cycle\Database\Driver\CompilerInterface instead.
      */
     interface CompilerInterface extends \Cycle\Database\Driver\CompilerInterface
     {
     }
 
     /**
-     * @deprecated Since Cycle ORM 1.0, use Cycle\Database\Driver\DriverInterface instead.
+     * @deprecated since cycle/database 1.0, use Cycle\Database\Driver\DriverInterface instead.
      */
     interface DriverInterface extends \Cycle\Database\Driver\DriverInterface
     {
     }
 
     /**
-     * @deprecated Since Cycle ORM 1.0, use Cycle\Database\Driver\HandlerInterface instead.
+     * @deprecated since cycle/database 1.0, use Cycle\Database\Driver\HandlerInterface instead.
      */
     interface HandlerInterface extends \Cycle\Database\Driver\HandlerInterface
     {
     }
 
     /**
-     * @deprecated Since Cycle ORM 1.0, use Cycle\Database\Driver\Compiler instead.
+     * @deprecated since cycle/database 1.0, use Cycle\Database\Driver\Compiler instead.
      */
     abstract class Compiler extends \Cycle\Database\Driver\Compiler
     {
     }
 
     /**
-     * @deprecated Since Cycle ORM 1.0, use Cycle\Database\Driver\Driver instead.
+     * @deprecated since cycle/database 1.0, use Cycle\Database\Driver\Driver instead.
      */
     abstract class Driver extends \Cycle\Database\Driver\Driver
     {
     }
 
     /**
-     * @deprecated Since Cycle ORM 1.0, use Cycle\Database\Driver\Handler instead.
+     * @deprecated since cycle/database 1.0, use Cycle\Database\Driver\Handler instead.
      */
     abstract class Handler extends \Cycle\Database\Driver\Handler
     {
     }
 
     /**
-     * @deprecated Since Cycle ORM 1.0, use Cycle\Database\Driver\CompilerCache instead.
+     * @deprecated since cycle/database 1.0, use Cycle\Database\Driver\CompilerCache instead.
      */
     final class CompilerCache extends \Cycle\Database\Driver\CompilerCache
     {
     }
 
     /**
-     * @deprecated Since Cycle ORM 1.0, use Cycle\Database\Driver\Quoter instead.
+     * @deprecated since cycle/database 1.0, use Cycle\Database\Driver\Quoter instead.
      */
     final class Quoter extends \Cycle\Database\Driver\Quoter
     {
     }
 
     /**
-     * @deprecated Since Cycle ORM 1.0, use Cycle\Database\Driver\ReadonlyHandler instead.
+     * @deprecated since cycle/database 1.0, use Cycle\Database\Driver\ReadonlyHandler instead.
      */
     final class ReadonlyHandler extends \Cycle\Database\Driver\ReadonlyHandler
     {
     }
 
     /**
-     * @deprecated Since Cycle ORM 1.0, use Cycle\Database\Driver\Statement instead.
+     * @deprecated since cycle/database 1.0, use Cycle\Database\Driver\Statement instead.
      */
     final class Statement extends \Cycle\Database\Driver\Statement
     {
@@ -492,21 +499,21 @@ final class Statement extends \Cycle\Database\Driver\Statement
 namespace Spiral\Database\Driver\MySQL {
 
     /**
-     * @deprecated Since Cycle ORM 1.0, use Cycle\Database\Driver\MySQL\MySQLCompiler instead.
+     * @deprecated since cycle/database 1.0, use Cycle\Database\Driver\MySQL\MySQLCompiler instead.
      */
     class MySQLCompiler extends \Cycle\Database\Driver\MySQL\MySQLCompiler
     {
     }
 
     /**
-     * @deprecated Since Cycle ORM 1.0, use Cycle\Database\Driver\MySQL\MySQLDriver instead.
+     * @deprecated since cycle/database 1.0, use Cycle\Database\Driver\MySQL\MySQLDriver instead.
      */
     class MySQLDriver extends \Cycle\Database\Driver\MySQL\MySQLDriver
     {
     }
 
     /**
-     * @deprecated Since Cycle ORM 1.0, use Cycle\Database\Driver\MySQL\MySQLHandler instead.
+     * @deprecated since cycle/database 1.0, use Cycle\Database\Driver\MySQL\MySQLHandler instead.
      */
     class MySQLHandler extends \Cycle\Database\Driver\MySQL\MySQLHandler
     {
@@ -516,7 +523,7 @@ class MySQLHandler extends \Cycle\Database\Driver\MySQL\MySQLHandler
 namespace Spiral\Database\Driver\MySQL\Exception {
 
     /**
-     * @deprecated Since Cycle ORM 1.0, use Cycle\Database\Driver\MySQL\Exception\MySQLException instead.
+     * @deprecated since cycle/database 1.0, use Cycle\Database\Driver\MySQL\Exception\MySQLException instead.
      */
     class MySQLException extends \Cycle\Database\Driver\MySQL\Exception\MySQLException
     {
@@ -526,28 +533,28 @@ class MySQLException extends \Cycle\Database\Driver\MySQL\Exception\MySQLExcepti
 namespace Spiral\Database\Driver\MySQL\Schema {
 
     /**
-     * @deprecated Since Cycle ORM 1.0, use Cycle\Database\Driver\MySQL\Schema\MySQLColumn instead.
+     * @deprecated since cycle/database 1.0, use Cycle\Database\Driver\MySQL\Schema\MySQLColumn instead.
      */
     class MySQLColumn extends \Cycle\Database\Driver\MySQL\Schema\MySQLColumn
     {
     }
 
     /**
-     * @deprecated Since Cycle ORM 1.0, use Cycle\Database\Driver\MySQL\Schema\MySQLForeignKey instead.
+     * @deprecated since cycle/database 1.0, use Cycle\Database\Driver\MySQL\Schema\MySQLForeignKey instead.
      */
     class MySQLForeignKey extends \Cycle\Database\Driver\MySQL\Schema\MySQLForeignKey
     {
     }
 
     /**
-     * @deprecated Since Cycle ORM 1.0, use Cycle\Database\Driver\MySQL\Schema\MySQLIndex instead.
+     * @deprecated since cycle/database 1.0, use Cycle\Database\Driver\MySQL\Schema\MySQLIndex instead.
      */
     class MySQLIndex extends \Cycle\Database\Driver\MySQL\Schema\MySQLIndex
     {
     }
 
     /**
-     * @deprecated Since Cycle ORM 1.0, use Cycle\Database\Driver\MySQL\Schema\MySQLTable instead.
+     * @deprecated since cycle/database 1.0, use Cycle\Database\Driver\MySQL\Schema\MySQLTable instead.
      */
     class MySQLTable extends \Cycle\Database\Driver\MySQL\Schema\MySQLTable
     {
@@ -557,21 +564,21 @@ class MySQLTable extends \Cycle\Database\Driver\MySQL\Schema\MySQLTable
 namespace Spiral\Database\Driver\Postgres {
 
     /**
-     * @deprecated Since Cycle ORM 1.0, use Cycle\Database\Driver\Postgres\PostgresCompiler instead.
+     * @deprecated since cycle/database 1.0, use Cycle\Database\Driver\Postgres\PostgresCompiler instead.
      */
     class PostgresCompiler extends \Cycle\Database\Driver\Postgres\PostgresCompiler
     {
     }
 
     /**
-     * @deprecated Since Cycle ORM 1.0, use Cycle\Database\Driver\Postgres\PostgresDriver instead.
+     * @deprecated since cycle/database 1.0, use Cycle\Database\Driver\Postgres\PostgresDriver instead.
      */
     class PostgresDriver extends \Cycle\Database\Driver\Postgres\PostgresDriver
     {
     }
 
     /**
-     * @deprecated Since Cycle ORM 1.0, use Cycle\Database\Driver\Postgres\PostgresHandler instead.
+     * @deprecated since cycle/database 1.0, use Cycle\Database\Driver\Postgres\PostgresHandler instead.
      */
     class PostgresHandler extends \Cycle\Database\Driver\Postgres\PostgresHandler
     {
@@ -581,14 +588,14 @@ class PostgresHandler extends \Cycle\Database\Driver\Postgres\PostgresHandler
 namespace Spiral\Database\Driver\Postgres\Query {
 
     /**
-     * @deprecated Since Cycle ORM 1.0, use Cycle\Database\Driver\Postgres\Query\PostgresInsertQuery instead.
+     * @deprecated since cycle/database 1.0, use Cycle\Database\Driver\Postgres\Query\PostgresInsertQuery instead.
      */
     class PostgresInsertQuery extends \Cycle\Database\Driver\Postgres\Query\PostgresInsertQuery
     {
     }
 
     /**
-     * @deprecated Since Cycle ORM 1.0, use Cycle\Database\Driver\Postgres\Query\PostgresSelectQuery instead.
+     * @deprecated since cycle/database 1.0, use Cycle\Database\Driver\Postgres\Query\PostgresSelectQuery instead.
      */
     class PostgresSelectQuery extends \Cycle\Database\Driver\Postgres\Query\PostgresSelectQuery
     {
@@ -598,28 +605,28 @@ class PostgresSelectQuery extends \Cycle\Database\Driver\Postgres\Query\Postgres
 namespace Spiral\Database\Driver\Postgres\Schema {
 
     /**
-     * @deprecated Since Cycle ORM 1.0, use Cycle\Database\Driver\Postgres\Schema\PostgresColumn instead.
+     * @deprecated since cycle/database 1.0, use Cycle\Database\Driver\Postgres\Schema\PostgresColumn instead.
      */
     class PostgresColumn extends \Cycle\Database\Driver\Postgres\Schema\PostgresColumn
     {
     }
 
     /**
-     * @deprecated Since Cycle ORM 1.0, use Cycle\Database\Driver\Postgres\Schema\PostgresForeignKey instead.
+     * @deprecated since cycle/database 1.0, use Cycle\Database\Driver\Postgres\Schema\PostgresForeignKey instead.
      */
     class PostgresForeignKey extends \Cycle\Database\Driver\Postgres\Schema\PostgresForeignKey
     {
     }
 
     /**
-     * @deprecated Since Cycle ORM 1.0, use Cycle\Database\Driver\Postgres\Schema\PostgresIndex instead.
+     * @deprecated since cycle/database 1.0, use Cycle\Database\Driver\Postgres\Schema\PostgresIndex instead.
      */
     class PostgresIndex extends \Cycle\Database\Driver\Postgres\Schema\PostgresIndex
     {
     }
 
     /**
-     * @deprecated Since Cycle ORM 1.0, use Cycle\Database\Driver\Postgres\Schema\PostgresTable instead.
+     * @deprecated since cycle/database 1.0, use Cycle\Database\Driver\Postgres\Schema\PostgresTable instead.
      */
     class PostgresTable extends \Cycle\Database\Driver\Postgres\Schema\PostgresTable
     {
@@ -629,21 +636,21 @@ class PostgresTable extends \Cycle\Database\Driver\Postgres\Schema\PostgresTable
 namespace Spiral\Database\Driver\SQLite {
 
     /**
-     * @deprecated Since Cycle ORM 1.0, use Cycle\Database\Driver\SQLite\SQLiteCompiler instead.
+     * @deprecated since cycle/database 1.0, use Cycle\Database\Driver\SQLite\SQLiteCompiler instead.
      */
     class SQLiteCompiler extends \Cycle\Database\Driver\SQLite\SQLiteCompiler
     {
     }
 
     /**
-     * @deprecated Since Cycle ORM 1.0, use Cycle\Database\Driver\SQLite\SQLiteDriver instead.
+     * @deprecated since cycle/database 1.0, use Cycle\Database\Driver\SQLite\SQLiteDriver instead.
      */
     class SQLiteDriver extends \Cycle\Database\Driver\SQLite\SQLiteDriver
     {
     }
 
     /**
-     * @deprecated Since Cycle ORM 1.0, use Cycle\Database\Driver\SQLite\SQLiteHandler instead.
+     * @deprecated since cycle/database 1.0, use Cycle\Database\Driver\SQLite\SQLiteHandler instead.
      */
     class SQLiteHandler extends \Cycle\Database\Driver\SQLite\SQLiteHandler
     {
@@ -653,28 +660,28 @@ class SQLiteHandler extends \Cycle\Database\Driver\SQLite\SQLiteHandler
 namespace Spiral\Database\Driver\SQLite\Schema {
 
     /**
-     * @deprecated Since Cycle ORM 1.0, use Cycle\Database\Driver\SQLite\Schema\SQLiteColumn instead.
+     * @deprecated since cycle/database 1.0, use Cycle\Database\Driver\SQLite\Schema\SQLiteColumn instead.
      */
     class SQLiteColumn extends \Cycle\Database\Driver\SQLite\Schema\SQLiteColumn
     {
     }
 
     /**
-     * @deprecated Since Cycle ORM 1.0, use Cycle\Database\Driver\SQLite\Schema\SQLiteForeignKey instead.
+     * @deprecated since cycle/database 1.0, use Cycle\Database\Driver\SQLite\Schema\SQLiteForeignKey instead.
      */
     class SQLiteForeignKey extends \Cycle\Database\Driver\SQLite\Schema\SQLiteForeignKey
     {
     }
 
     /**
-     * @deprecated Since Cycle ORM 1.0, use Cycle\Database\Driver\SQLite\Schema\SQLiteIndex instead.
+     * @deprecated since cycle/database 1.0, use Cycle\Database\Driver\SQLite\Schema\SQLiteIndex instead.
      */
     class SQLiteIndex extends \Cycle\Database\Driver\SQLite\Schema\SQLiteIndex
     {
     }
 
     /**
-     * @deprecated Since Cycle ORM 1.0, use Cycle\Database\Driver\SQLite\Schema\SQLiteTable instead.
+     * @deprecated since cycle/database 1.0, use Cycle\Database\Driver\SQLite\Schema\SQLiteTable instead.
      */
     class SQLiteTable extends \Cycle\Database\Driver\SQLite\Schema\SQLiteTable
     {
@@ -684,21 +691,21 @@ class SQLiteTable extends \Cycle\Database\Driver\SQLite\Schema\SQLiteTable
 namespace Spiral\Database\Driver\SQLServer {
 
     /**
-     * @deprecated Since Cycle ORM 1.0, use Cycle\Database\Driver\SQLServer\SQLServerCompiler instead.
+     * @deprecated since cycle/database 1.0, use Cycle\Database\Driver\SQLServer\SQLServerCompiler instead.
      */
     class SQLServerCompiler extends \Cycle\Database\Driver\SQLServer\SQLServerCompiler
     {
     }
 
     /**
-     * @deprecated Since Cycle ORM 1.0, use Cycle\Database\Driver\SQLServer\SQLServerDriver instead.
+     * @deprecated since cycle/database 1.0, use Cycle\Database\Driver\SQLServer\SQLServerDriver instead.
      */
     class SQLServerDriver extends \Cycle\Database\Driver\SQLServer\SQLServerDriver
     {
     }
 
     /**
-     * @deprecated Since Cycle ORM 1.0, use Cycle\Database\Driver\SQLServer\SQLServerHandler instead.
+     * @deprecated since cycle/database 1.0, use Cycle\Database\Driver\SQLServer\SQLServerHandler instead.
      */
     class SQLServerHandler extends \Cycle\Database\Driver\SQLServer\SQLServerHandler
     {
@@ -708,28 +715,28 @@ class SQLServerHandler extends \Cycle\Database\Driver\SQLServer\SQLServerHandler
 namespace Spiral\Database\Driver\SQLServer\Schema {
 
     /**
-     * @deprecated Since Cycle ORM 1.0, use Cycle\Database\Driver\SQLServer\Schema\SQLServerColumn instead.
+     * @deprecated since cycle/database 1.0, use Cycle\Database\Driver\SQLServer\Schema\SQLServerColumn instead.
      */
     class SQLServerColumn extends \Cycle\Database\Driver\SQLServer\Schema\SQLServerColumn
     {
     }
 
     /**
-     * @deprecated Since Cycle ORM 1.0, use Cycle\Database\Driver\SQLServer\Schema\SQLServerForeignKey instead.
+     * @deprecated since cycle/database 1.0, use Cycle\Database\Driver\SQLServer\Schema\SQLServerForeignKey instead.
      */
     class SQlServerForeignKey extends \Cycle\Database\Driver\SQLServer\Schema\SQLServerForeignKey
     {
     }
 
     /**
-     * @deprecated Since Cycle ORM 1.0, use Cycle\Database\Driver\SQLServer\Schema\SQLServerIndex instead.
+     * @deprecated since cycle/database 1.0, use Cycle\Database\Driver\SQLServer\Schema\SQLServerIndex instead.
      */
     class SQLServerIndex extends \Cycle\Database\Driver\SQLServer\Schema\SQLServerIndex
     {
     }
 
     /**
-     * @deprecated Since Cycle ORM 1.0, use Cycle\Database\Driver\SQLServer\Schema\SQLServerTable instead.
+     * @deprecated since cycle/database 1.0, use Cycle\Database\Driver\SQLServer\Schema\SQLServerTable instead.
      */
     class SQLServerTable extends \Cycle\Database\Driver\SQLServer\Schema\SQLServerTable
     {
@@ -739,14 +746,14 @@ class SQLServerTable extends \Cycle\Database\Driver\SQLServer\Schema\SQLServerTa
 namespace Spiral\Database\Config {
 
     /**
-     * @deprecated Since Cycle ORM 1.0, use Cycle\Database\Config\DatabaseConfig instead.
+     * @deprecated since cycle/database 1.0, use Cycle\Database\Config\DatabaseConfig instead.
      */
     final class DatabaseConfig extends \Cycle\Database\Config\DatabaseConfig
     {
     }
 
     /**
-     * @deprecated Since Cycle ORM 1.0, use Cycle\Database\Config\DatabasePartial instead.
+     * @deprecated since cycle/database 1.0, use Cycle\Database\Config\DatabasePartial instead.
      */
     final class DatabasePartial extends \Cycle\Database\Config\DatabasePartial
     {
diff --git a/src/Database.php b/src/Database.php
index de6534f6..372f70de 100644
--- a/src/Database.php
+++ b/src/Database.php
@@ -13,6 +13,7 @@
 
 use Spiral\Core\Container\InjectableInterface;
 use Cycle\Database\Driver\DriverInterface;
+use Spiral\Database\Driver\DriverInterface as SpiralDriverInterface;
 use Cycle\Database\Query\DeleteQuery;
 use Cycle\Database\Query\InsertQuery;
 use Cycle\Database\Query\SelectQuery;
@@ -46,11 +47,13 @@ final class Database implements DatabaseInterface, InjectableInterface
     private $readDriver;
 
     /**
-     * @param string               $name       Internal database name/id.
-     * @param string               $prefix     Default database table prefix, will be used for all
-     *                                         table identifiers.
-     * @param DriverInterface      $driver     Driver instance responsible for database connection.
-     * @param DriverInterface|null $readDriver Read-only driver connection.
+     * @param string $name Internal database name/id.
+     * @param string $prefix Default database table prefix, will be used for all
+     *        table identifiers.
+     * @param SpiralDriverInterface|DriverInterface $driver Driver instance responsible for database connection.
+     *        The signature of this argument will be changed to {@see DriverInterface} in future release.
+     * @param SpiralDriverInterface|DriverInterface|null $readDriver Read-only driver connection.
+     *        The signature of this argument will be changed to {@see DriverInterface} in future release.
      */
     public function __construct(
         string $name,
diff --git a/src/DatabaseManager.php b/src/DatabaseManager.php
index 20731b5c..4321c13d 100644
--- a/src/DatabaseManager.php
+++ b/src/DatabaseManager.php
@@ -18,6 +18,7 @@
 use Spiral\Core\Container;
 use Spiral\Core\FactoryInterface;
 use Cycle\Database\Config\DatabaseConfig;
+use Spiral\Database\Config\DatabaseConfig as SpiralDatabaseConfig;
 use Cycle\Database\Config\DatabasePartial;
 use Cycle\Database\Driver\Driver;
 use Cycle\Database\Driver\DriverInterface;
@@ -121,10 +122,11 @@ public function setLogger(LoggerInterface $logger): void
     }
 
     /**
-     * @param DatabaseConfig   $config
-     * @param FactoryInterface $factory
+     * @param SpiralDatabaseConfig|DatabaseConfig $config The signature of this
+     *        argument will be changed to {@see DatabaseConfig} in future release.
+     * @param FactoryInterface|null $factory
      */
-    public function __construct(DatabaseConfig $config, FactoryInterface $factory = null)
+    public function __construct(SpiralDatabaseConfig $config, FactoryInterface $factory = null)
     {
         $this->config = $config;
         $this->factory = $factory ?? new Container();
diff --git a/src/Driver/CompilerCache.php b/src/Driver/CompilerCache.php
index b259c64e..59621334 100644
--- a/src/Driver/CompilerCache.php
+++ b/src/Driver/CompilerCache.php
@@ -19,6 +19,7 @@
 use Cycle\Database\Query\QueryInterface;
 use Cycle\Database\Query\QueryParameters;
 use Cycle\Database\Query\SelectQuery;
+use Spiral\Database\Driver\CachingCompilerInterface as SpiralCachingCompilerInterface;
 
 /**
  * Caches calculated queries. Code in this class is performance optimized.
@@ -32,9 +33,10 @@ final class CompilerCache implements CompilerInterface
     private $compiler;
 
     /**
-     * @param CachingCompilerInterface $compiler
+     * @param SpiralCachingCompilerInterface|CachingCompilerInterface $compiler The signature
+     *        of this argument will be changed to {@see DriverInterface} in future release.
      */
-    public function __construct(CachingCompilerInterface $compiler)
+    public function __construct(SpiralCachingCompilerInterface $compiler)
     {
         $this->compiler = $compiler;
     }
diff --git a/src/Driver/Driver.php b/src/Driver/Driver.php
index caf807a4..a3706431 100644
--- a/src/Driver/Driver.php
+++ b/src/Driver/Driver.php
@@ -27,6 +27,9 @@
 use Cycle\Database\Query\Interpolator;
 use Cycle\Database\StatementInterface;
 use Throwable;
+use Spiral\Database\Query\BuilderInterface as SpiralBuilderInterface;
+use Spiral\Database\Driver\HandlerInterface as SpiralHandlerInterface;
+use Spiral\Database\Driver\CompilerInterface as SpiralCompilerInterface;
 
 /**
  * Provides low level abstraction at top of
@@ -97,15 +100,18 @@ abstract class Driver implements DriverInterface, LoggerAwareInterface
 
     /**
      * @param array             $options
-     * @param HandlerInterface  $schemaHandler
-     * @param CompilerInterface $queryCompiler
-     * @param BuilderInterface  $queryBuilder
+     * @param SpiralHandlerInterface|HandlerInterface $schemaHandler The signature of
+     *        this argument will be changed to {@see HandlerInterface} in future release.
+     * @param SpiralCompilerInterface|CompilerInterface $queryCompiler The signature of
+     *        this argument will be changed to {@see CompilerInterface} in future release.
+     * @param SpiralBuilderInterface|BuilderInterface $queryBuilder The signature of
+     *        this argument will be changed to {@see BuilderInterface} in future release.
      */
     public function __construct(
         array $options,
-        HandlerInterface $schemaHandler,
-        CompilerInterface $queryCompiler,
-        BuilderInterface $queryBuilder
+        SpiralHandlerInterface $schemaHandler,
+        SpiralCompilerInterface $queryCompiler,
+        SpiralBuilderInterface $queryBuilder
     ) {
         $this->schemaHandler = $schemaHandler->withDriver($this);
         $this->queryBuilder = $queryBuilder->withDriver($this);
diff --git a/src/Driver/ReadonlyHandler.php b/src/Driver/ReadonlyHandler.php
index f5e8e1dc..b19159d7 100644
--- a/src/Driver/ReadonlyHandler.php
+++ b/src/Driver/ReadonlyHandler.php
@@ -15,6 +15,7 @@
 use Cycle\Database\Schema\AbstractForeignKey;
 use Cycle\Database\Schema\AbstractIndex;
 use Cycle\Database\Schema\AbstractTable;
+use Spiral\Database\Driver\HandlerInterface as SpiralHandlerInterface;
 
 final class ReadonlyHandler implements HandlerInterface
 {
@@ -22,9 +23,10 @@ final class ReadonlyHandler implements HandlerInterface
     private $parent;
 
     /**
-     * @param HandlerInterface $parent
+     * @param SpiralHandlerInterface|HandlerInterface $parent The signature of this
+     *        argument will be changed to {@see HandlerInterface} in future release.
      */
-    public function __construct(HandlerInterface $parent)
+    public function __construct(SpiralHandlerInterface $parent)
     {
         $this->parent = $parent;
     }
diff --git a/src/Exception/HandlerException.php b/src/Exception/HandlerException.php
index 37a35d6f..c9c8fa4f 100644
--- a/src/Exception/HandlerException.php
+++ b/src/Exception/HandlerException.php
@@ -11,15 +11,18 @@
 
 namespace Cycle\Database\Exception;
 
+use Spiral\Database\Exception\StatementException as SpiralStatementException;
+
 /**
  * Schema sync related exception.
  */
 class HandlerException extends DriverException implements StatementExceptionInterface
 {
     /**
-     * @param StatementException $e
+     * @param SpiralStatementException|StatementException $e The signature of this
+     *        argument will be changed to {@see StatementException} in future release.
      */
-    public function __construct(StatementException $e)
+    public function __construct(SpiralStatementException $e)
     {
         parent::__construct($e->getMessage(), $e->getCode(), $e);
     }
diff --git a/src/Query/QueryBuilder.php b/src/Query/QueryBuilder.php
index 7c8d3a02..859108fa 100644
--- a/src/Query/QueryBuilder.php
+++ b/src/Query/QueryBuilder.php
@@ -12,6 +12,10 @@
 namespace Cycle\Database\Query;
 
 use Cycle\Database\Driver\DriverInterface;
+use Spiral\Database\Query\SelectQuery as SpiralSelectQuery;
+use Spiral\Database\Query\InsertQuery as SpiralInsertQuery;
+use Spiral\Database\Query\UpdateQuery as SpiralUpdateQuery;
+use Spiral\Database\Query\DeleteQuery as SpiralDeleteQuery;
 
 /**
  * Initiates active queries.
@@ -36,16 +40,20 @@ final class QueryBuilder implements BuilderInterface
     /**
      * QueryBuilder constructor.
      *
-     * @param SelectQuery $selectQuery
-     * @param InsertQuery $insertQuery
-     * @param UpdateQuery $updateQuery
-     * @param DeleteQuery $deleteQuery
+     * @param SpiralSelectQuery|SelectQuery $selectQuery The signature of this
+     *        argument will be changed to {@see SelectQuery} in future release.
+     * @param SpiralInsertQuery|InsertQuery $insertQuery The signature of this
+     *        argument will be changed to {@see InsertQuery} in future release.
+     * @param SpiralUpdateQuery|UpdateQuery $updateQuery The signature of this
+     *        argument will be changed to {@see UpdateQuery} in future release.
+     * @param SpiralDeleteQuery|DeleteQuery $deleteQuery The signature of this
+     *        argument will be changed to {@see DeleteQuery} in future release.
      */
     public function __construct(
-        SelectQuery $selectQuery,
-        InsertQuery $insertQuery,
-        UpdateQuery $updateQuery,
-        DeleteQuery $deleteQuery
+        SpiralSelectQuery $selectQuery,
+        SpiralInsertQuery $insertQuery,
+        SpiralUpdateQuery $updateQuery,
+        SpiralDeleteQuery $deleteQuery
     ) {
         $this->selectQuery = $selectQuery;
         $this->insertQuery = $insertQuery;
diff --git a/src/Schema/AbstractTable.php b/src/Schema/AbstractTable.php
index 2a89a4c7..c77e95db 100644
--- a/src/Schema/AbstractTable.php
+++ b/src/Schema/AbstractTable.php
@@ -17,6 +17,7 @@
 use Cycle\Database\Exception\HandlerException;
 use Cycle\Database\Exception\SchemaException;
 use Cycle\Database\TableInterface;
+use Spiral\Database\Driver\DriverInterface as SpiralDriverInterface;
 
 /**
  * AbstractTable class used to describe and manage state of specified table. It provides ability to
@@ -98,11 +99,12 @@ abstract class AbstractTable implements TableInterface, ElementInterface
     private $prefix;
 
     /**
-     * @param DriverInterface $driver Parent driver.
-     * @param string          $name   Table name, must include table prefix.
-     * @param string          $prefix Database specific table prefix.
+     * @param SpiralDriverInterface|DriverInterface $driver Parent driver. The signature
+     *        of this argument will be changed to {@see DriverInterface} in future release.
+     * @param string $name Table name, must include table prefix.
+     * @param string $prefix Database specific table prefix.
      */
-    public function __construct(DriverInterface $driver, string $name, string $prefix)
+    public function __construct(SpiralDriverInterface $driver, string $name, string $prefix)
     {
         $this->driver = $driver;
         $this->prefix = $prefix;
diff --git a/src/Schema/Comparator.php b/src/Schema/Comparator.php
index a320165d..9d1c8ae0 100644
--- a/src/Schema/Comparator.php
+++ b/src/Schema/Comparator.php
@@ -11,6 +11,8 @@
 
 namespace Cycle\Database\Schema;
 
+use Spiral\Database\Schema\State as SpiralState;
+
 /**
  * Compares two table states.
  */
@@ -23,10 +25,12 @@ final class Comparator implements ComparatorInterface
     private $current;
 
     /**
-     * @param State $initial
-     * @param State $current
+     * @param SpiralState|State $initial The signature of this argument
+     *        will be changed to {@see State} in future release.
+     * @param SpiralState|State $current The signature of this argument
+     *        will be changed to {@see State} in future release.
      */
-    public function __construct(State $initial, State $current)
+    public function __construct(SpiralState $initial, SpiralState $current)
     {
         $this->initial = $initial;
         $this->current = $current;
diff --git a/src/Table.php b/src/Table.php
index 901569e6..8dbe4754 100644
--- a/src/Table.php
+++ b/src/Table.php
@@ -17,6 +17,7 @@
 use Cycle\Database\Query\SelectQuery;
 use Cycle\Database\Query\UpdateQuery;
 use Cycle\Database\Schema\AbstractTable;
+use Spiral\Database\DatabaseInterface as SpiralDatabaseInterface;
 
 /**
  * Represent table level abstraction with simplified access to SelectQuery associated with such
@@ -36,8 +37,9 @@ final class Table implements TableInterface, \IteratorAggregate, \Countable
     private $name;
 
     /**
-     * @param DatabaseInterface $database Parent DBAL database.
-     * @param string            $name     Table name without prefix.
+     * @param SpiralDatabaseInterface|DatabaseInterface $database Parent DBAL database. The signature
+     *        of this argument will be changed to {@see DatabaseInterface} in future release.
+     * @param string $name Table name without prefix.
      */
     public function __construct(DatabaseInterface $database, string $name)
     {

From c1e533439904e40d81971ac9e46c4563d2ccd079 Mon Sep 17 00:00:00 2001
From: SerafimArts <nesk@xakep.ru>
Date: Tue, 12 Oct 2021 15:44:56 +0300
Subject: [PATCH 2/3] Fix polyfill

---
 src/polyfill.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/polyfill.php b/src/polyfill.php
index 97375119..4203d804 100644
--- a/src/polyfill.php
+++ b/src/polyfill.php
@@ -13,7 +13,7 @@
 // Replaces: SQlServerForeignKey to SQLServerForeignKey
 class_alias(
     \Cycle\Database\Driver\SQLServer\Schema\SQLServerForeignKey::class,
-    \Spiral\Database\Driver\SQLServer\Schema\SQlServerForeignKey::class,
+    \Spiral\Database\Driver\SQLServer\Schema\SQlServerForeignKey::class
 );
 
 spl_autoload_register(static function (string $class) {

From 38bc667a86d56cdc312b338d021799f844f782c7 Mon Sep 17 00:00:00 2001
From: SerafimArts <nesk@xakep.ru>
Date: Tue, 12 Oct 2021 20:36:11 +0300
Subject: [PATCH 3/3] Add aliases preloading

---
 src/polyfill.php | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/src/polyfill.php b/src/polyfill.php
index 4203d804..c4fee5cd 100644
--- a/src/polyfill.php
+++ b/src/polyfill.php
@@ -16,6 +16,7 @@ class_alias(
     \Spiral\Database\Driver\SQLServer\Schema\SQlServerForeignKey::class
 );
 
+
 spl_autoload_register(static function (string $class) {
     if (strpos($class, 'Spiral\\Database\\') === 0) {
         $original = 'Cycle\\Database\\' . substr($class, 16);
@@ -29,3 +30,19 @@ class_alias(
         class_alias($original, $class);
     }
 });
+
+// Preload some aliases
+interface_exists(\Spiral\Database\Driver\CachingCompilerInterface::class);
+interface_exists(\Spiral\Database\Driver\CompilerInterface::class);
+interface_exists(\Spiral\Database\Driver\HandlerInterface::class);
+interface_exists(\Spiral\Database\Driver\DriverInterface::class);
+interface_exists(\Spiral\Database\Query\BuilderInterface::class);
+interface_exists(\Spiral\Database\DatabaseInterface::class);
+
+class_exists(\Spiral\Database\Exception\StatementException::class);
+class_exists(\Spiral\Database\Config\DatabaseConfig::class);
+class_exists(\Spiral\Database\Query\SelectQuery::class);
+class_exists(\Spiral\Database\Query\InsertQuery::class);
+class_exists(\Spiral\Database\Query\UpdateQuery::class);
+class_exists(\Spiral\Database\Query\DeleteQuery::class);
+class_exists(\Spiral\Database\Schema\State::class);