Change constructors signature from Cycle to Spiral

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,

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();

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;
     }

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);

src/Driver/ReadonlyHandler.php

@@ -15,16 +15,18 @@
 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
 {
     /** @var 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;
     }

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);
     }

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;

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;

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;

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)
     {

src/polyfill.php

@@ -13,9 +13,10 @@
 // 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) {
     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);