Apply fixes from StyleCI

src/ColumnInterface.php

@@ -21,10 +21,10 @@ interface ColumnInterface
     /**
      * PHP types for phpType() method.
      */
-    public const INT    = 'int';
-    public const BOOL   = 'bool';
+    public const INT = 'int';
+    public const BOOL = 'bool';
     public const STRING = 'string';
-    public const FLOAT  = 'float';
+    public const FLOAT = 'float';
 
     /**
      * Get element name (unquoted).

src/Config/DatabaseConfig.php

@@ -21,17 +21,18 @@ final class DatabaseConfig extends InjectableConfig
 {
     use AliasTrait;
 
-    public const CONFIG           = 'database';
+    public const CONFIG = 'database';
     public const DEFAULT_DATABASE = 'default';
 
     /**
      * @internal
+     *
      * @var array
      */
     protected $config = [
-        'default'     => self::DEFAULT_DATABASE,
-        'aliases'     => [],
-        'databases'   => [],
+        'default' => self::DEFAULT_DATABASE,
+        'aliases' => [],
+        'databases' => [],
         'connections' => [],
     ];
 
@@ -75,6 +76,7 @@ public function getDrivers(): array
 
     /**
      * @param string $database
+     *
      * @return bool
      */
     public function hasDatabase(string $database): bool
@@ -84,9 +86,10 @@ public function hasDatabase(string $database): bool
 
     /**
      * @param string $database
-     * @return DatabasePartial
      *
      * @throws ConfigException
+     *
+     * @return DatabasePartial
      */
     public function getDatabase(string $database): DatabasePartial
     {
@@ -106,6 +109,7 @@ public function getDatabase(string $database): DatabasePartial
 
     /**
      * @param string $driver
+     *
      * @return bool
      */
     public function hasDriver(string $driver): bool
@@ -115,9 +119,10 @@ public function hasDriver(string $driver): bool
 
     /**
      * @param string $driver
-     * @return Autowire
      *
      * @throws ConfigException
+     *
+     * @return Autowire
      */
     public function getDriver(string $driver): Autowire
     {

src/Config/DatabasePartial.php

@@ -24,7 +24,7 @@ final class DatabasePartial
     /** @var string */
     private $driver;
 
-    /** @var null|string */
+    /** @var string|null */
     private $readDriver;
 
     /**
@@ -70,7 +70,7 @@ public function getDriver(): string
     }
 
     /**
-     * @return null|string
+     * @return string|null
      */
     public function getReadDriver(): ?string
     {

src/Database.php

@@ -32,9 +32,9 @@ final class Database implements DatabaseInterface, InjectableInterface
     public const INJECTOR = DatabaseManager::class;
 
     // Isolation levels for transactions
-    public const ISOLATION_SERIALIZABLE     = DriverInterface::ISOLATION_SERIALIZABLE;
-    public const ISOLATION_REPEATABLE_READ  = DriverInterface::ISOLATION_REPEATABLE_READ;
-    public const ISOLATION_READ_COMMITTED   = DriverInterface::ISOLATION_READ_COMMITTED;
+    public const ISOLATION_SERIALIZABLE = DriverInterface::ISOLATION_SERIALIZABLE;
+    public const ISOLATION_REPEATABLE_READ = DriverInterface::ISOLATION_REPEATABLE_READ;
+    public const ISOLATION_READ_COMMITTED = DriverInterface::ISOLATION_READ_COMMITTED;
     public const ISOLATION_READ_UNCOMMITTED = DriverInterface::ISOLATION_READ_UNCOMMITTED;
 
     /** @var string */
@@ -72,6 +72,7 @@ public function __construct(
      * Shortcut to get table abstraction.
      *
      * @param string $name Table name without prefix.
+     *
      * @return Table
      */
     public function __get(string $name): Table

src/DatabaseInterface.php

@@ -28,7 +28,7 @@ interface DatabaseInterface
 {
     // Driver types
     public const WRITE = 0;
-    public const READ  = 1;
+    public const READ = 1;
 
     /**
      * @return string
@@ -45,6 +45,7 @@ public function getType(): string;
 
     /**
      * @param int $type
+     *
      * @return DriverInterface
      */
     public function getDriver(int $type = self::WRITE): DriverInterface;
@@ -54,7 +55,8 @@ public function getDriver(int $type = self::WRITE): DriverInterface;
      *
      * @param string $prefix
      * @param bool   $add
-     * @return self|$this
+     *
+     * @return $this|self
      */
     public function withPrefix(string $prefix, bool $add = true): self;
 
@@ -67,6 +69,7 @@ public function getPrefix(): string;
      * Check if table exists.
      *
      * @param string $name
+     *
      * @return bool
      */
     public function hasTable(string $name): bool;
@@ -80,6 +83,7 @@ public function getTables(): array;
 
     /**
      * @param string $name
+     *
      * @return TableInterface
      */
     public function table(string $name): TableInterface;
@@ -89,9 +93,10 @@ public function table(string $name): TableInterface;
      *
      * @param string $query
      * @param array  $parameters Parameters to be binded into query.
-     * @return int
      *
      * @throws StatementException
+     *
+     * @return int
      */
     public function execute(string $query, array $parameters = []): int;
 
@@ -100,16 +105,18 @@ public function execute(string $query, array $parameters = []): int;
      *
      * @param string $query
      * @param array  $parameters Parameters to be binded into query.
-     * @return StatementInterface
      *
      * @throws StatementException
+     *
+     * @return StatementInterface
      */
     public function query(string $query, array $parameters = []): StatementInterface;
 
     /**
      * Get instance of InsertBuilder associated with current Database.
      *
      * @param string $table Table where values should be inserted to.
+     *
      * @return InsertQuery
      */
     public function insert(string $table = ''): InsertQuery;
@@ -120,6 +127,7 @@ public function insert(string $table = ''): InsertQuery;
      * @param string $table  Table where rows should be updated in.
      * @param array  $values Initial set of columns to update associated with their values.
      * @param array  $where  Initial set of where rules specified as array.
+     *
      * @return UpdateQuery
      */
     public function update(string $table = '', array $values = [], array $where = []): UpdateQuery;
@@ -129,6 +137,7 @@ public function update(string $table = '', array $values = [], array $where = []
      *
      * @param string $table Table where rows should be deleted from.
      * @param array  $where Initial set of where rules specified as array.
+     *
      * @return DeleteQuery
      */
     public function delete(string $table = '', array $where = []): DeleteQuery;
@@ -137,6 +146,7 @@ public function delete(string $table = '', array $where = []): DeleteQuery;
      * Get instance of SelectBuilder associated with current Database.
      *
      * @param array|string $columns Columns to select.
+     *
      * @return SelectQuery
      */
     public function select($columns = '*'): SelectQuery;
@@ -146,19 +156,23 @@ public function select($columns = '*'): SelectQuery;
      * function must receive only one argument - DatabaseInterface instance.
      *
      * @link http://en.wikipedia.org/wiki/Database_transaction
+     *
      * @param callable $callback
      * @param string   $isolationLevel
-     * @return mixed
      *
      * @throws \Throwable
+     *
+     * @return mixed
      */
     public function transaction(callable $callback, string $isolationLevel = null);
 
     /**
      * Start database transaction.
      *
      * @link http://en.wikipedia.org/wiki/Database_transaction
+     *
      * @param string $isolationLevel
+     *
      * @return bool
      */
     public function begin(string $isolationLevel = null): bool;

src/DatabaseManager.php

@@ -154,9 +154,9 @@ public function createInjection(\ReflectionClass $class, string $context = null)
     /**
      * Get all databases.
      *
-     * @return Database[]
-     *
      * @throws DatabaseException
+     *
+     * @return Database[]
      */
     public function getDatabases(): array
     {
@@ -179,9 +179,10 @@ public function getDatabases(): array
      * Get Database associated with a given database alias or automatically created one.
      *
      * @param string|null $database
-     * @return Database|DatabaseInterface
      *
      * @throws DBALException
+     *
+     * @return Database|DatabaseInterface
      */
     public function database(string $database = null): DatabaseInterface
     {
@@ -227,9 +228,9 @@ public function addDatabase(SpiralDatabase $database): void
     /**
      * Get instance of every available driver/connection.
      *
-     * @return Driver[]
-     *
      * @throws DBALException
+     *
+     * @return Driver[]
      */
     public function getDrivers(): array
     {
@@ -252,9 +253,10 @@ public function getDrivers(): array
      * Get driver instance by it's name or automatically create one.
      *
      * @param string $driver
-     * @return DriverInterface
      *
      * @throws DBALException
+     *
+     * @return DriverInterface
      */
     public function driver(string $driver): DriverInterface
     {
@@ -284,11 +286,12 @@ public function driver(string $driver): DriverInterface
      *
      * @param string          $name
      * @param DriverInterface $driver
-     * @return self
      *
      * @throws DBALException
+     *
+     * @return self
      */
-    public function addDriver(string $name, SpiralDriverInterface $driver): DatabaseManager
+    public function addDriver(string $name, SpiralDriverInterface $driver): self
     {
         if (isset($this->drivers[$name])) {
             throw new DBALException("Connection '{$name}' already exists");
@@ -301,9 +304,10 @@ public function addDriver(string $name, SpiralDriverInterface $driver): Database
 
     /**
      * @param DatabasePartial $database
-     * @return Database
      *
      * @throws DBALException
+     *
+     * @return Database
      */
     protected function makeDatabase(SpiralDatabasePartial $database): Database
     {

src/DatabaseProviderInterface.php

@@ -20,9 +20,10 @@ interface DatabaseProviderInterface
      * Get Database associated with a given database alias or automatically created one.
      *
      * @param string|null $database
-     * @return DatabaseInterface
      *
      * @throws DBALException
+     *
+     * @return DatabaseInterface
      */
     public function database(string $database = null): DatabaseInterface;
 }

src/Driver/CachingCompilerInterface.php

@@ -27,6 +27,7 @@ interface CachingCompilerInterface extends CompilerInterface
      *
      * @param QueryParameters $params
      * @param array           $tokens
+     *
      * @return string
      */
     public function hashLimit(SpiralQueryParameters $params, array $tokens): string;