Add hints to Database/Driver & Dialect.

Refs #11935

src/Database/Dialect/MysqlDialectTrait.php

@@ -68,7 +68,7 @@ trait MysqlDialectTrait
     /**
      * {@inheritDoc}
      */
-    public function disableForeignKeySQL()
+    public function disableForeignKeySQL(): string
     {
         return 'SET foreign_key_checks = 0';
     }
@@ -76,7 +76,7 @@ trait MysqlDialectTrait
     /**
      * {@inheritDoc}
      */
-    public function enableForeignKeySQL()
+    public function enableForeignKeySQL(): string
     {
         return 'SET foreign_key_checks = 1';
     }

src/Database/Dialect/PostgresDialectTrait.php

@@ -176,7 +176,7 @@ trait PostgresDialectTrait
     /**
      * {@inheritDoc}
      */
-    public function disableForeignKeySQL()
+    public function disableForeignKeySQL(): string
     {
         return 'SET CONSTRAINTS ALL DEFERRED';
     }
@@ -184,7 +184,7 @@ trait PostgresDialectTrait
     /**
      * {@inheritDoc}
      */
-    public function enableForeignKeySQL()
+    public function enableForeignKeySQL(): string
     {
         return 'SET CONSTRAINTS ALL IMMEDIATE';
     }

src/Database/Dialect/SqliteDialectTrait.php

@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 /**
  * CakePHP(tm) : Rapid Development Framework (https://cakephp.org)
  * Copyright (c) Cake Software Foundation, Inc. (https://cakefoundation.org)
@@ -175,7 +176,7 @@ trait SqliteDialectTrait
     /**
      * {@inheritDoc}
      */
-    public function disableForeignKeySQL()
+    public function disableForeignKeySQL(): string
     {
         return 'PRAGMA foreign_keys = OFF';
     }
@@ -183,7 +184,7 @@ trait SqliteDialectTrait
     /**
      * {@inheritDoc}
      */
-    public function enableForeignKeySQL()
+    public function enableForeignKeySQL(): string
     {
         return 'PRAGMA foreign_keys = ON';
     }

src/Database/Dialect/SqlserverDialectTrait.php

@@ -337,7 +337,7 @@ trait SqlserverDialectTrait
      * @param string $name save point name
      * @return string
      */
-    public function savePointSQL($name)
+    public function savePointSQL(string $name): string
     {
         return 'SAVE TRANSACTION t' . $name;
     }
@@ -348,7 +348,7 @@ trait SqlserverDialectTrait
      * @param string $name save point name
      * @return string
      */
-    public function releaseSavePointSQL($name)
+    public function releaseSavePointSQL(string $name): string
     {
         return 'COMMIT TRANSACTION t' . $name;
     }
@@ -359,7 +359,7 @@ trait SqlserverDialectTrait
      * @param string $name save point name
      * @return string
      */
-    public function rollbackSavePointSQL($name)
+    public function rollbackSavePointSQL(string $name): string
     {
         return 'ROLLBACK TRANSACTION t' . $name;
     }
@@ -377,7 +377,7 @@ trait SqlserverDialectTrait
     /**
      * {@inheritDoc}
      */
-    public function disableForeignKeySQL()
+    public function disableForeignKeySQL(): string
     {
         return 'EXEC sp_msforeachtable "ALTER TABLE ? NOCHECK CONSTRAINT all"';
     }
@@ -385,7 +385,7 @@ trait SqlserverDialectTrait
     /**
      * {@inheritDoc}
      */
-    public function enableForeignKeySQL()
+    public function enableForeignKeySQL(): string
     {
         return 'EXEC sp_msforeachtable "ALTER TABLE ? WITH CHECK CHECK CONSTRAINT all"';
     }

src/Database/Driver.php

@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 /**
  * CakePHP(tm) : Rapid Development Framework (https://cakephp.org)
  * Copyright (c) Cake Software Foundation, Inc. (https://cakefoundation.org)
@@ -98,12 +99,12 @@ abstract class Driver implements DriverInterface
     /**
      * {@inheritDoc}
      */
-    abstract public function connect();
+    abstract public function connect(): bool;
 
     /**
      * {@inheritDoc}
      */
-    public function disconnect()
+    public function disconnect(): void
     {
         $this->_connection = null;
     }
@@ -134,12 +135,12 @@ abstract class Driver implements DriverInterface
     /**
      * {@inheritDoc}
      */
-    abstract public function enabled();
+    abstract public function enabled(): bool;
 
     /**
      * {@inheritDoc}
      */
-    public function prepare($query)
+    public function prepare($query): StatementInterface
     {
         $this->connect();
         $isObject = $query instanceof Query;
@@ -151,7 +152,7 @@ abstract class Driver implements DriverInterface
     /**
      * {@inheritDoc}
      */
-    public function beginTransaction()
+    public function beginTransaction(): bool
     {
         $this->connect();
         if ($this->_connection->inTransaction()) {
@@ -164,7 +165,7 @@ abstract class Driver implements DriverInterface
     /**
      * {@inheritDoc}
      */
-    public function commitTransaction()
+    public function commitTransaction(): bool
     {
         $this->connect();
         if (!$this->_connection->inTransaction()) {
@@ -177,7 +178,7 @@ abstract class Driver implements DriverInterface
     /**
      * {@inheritDoc}
      */
-    public function rollbackTransaction()
+    public function rollbackTransaction(): bool
     {
         $this->connect();
         if (!$this->_connection->inTransaction()) {
@@ -190,37 +191,37 @@ abstract class Driver implements DriverInterface
     /**
      * {@inheritDoc}
      */
-    abstract public function releaseSavePointSQL($name);
+    abstract public function releaseSavePointSQL(string $name): string;
 
     /**
      * {@inheritDoc}
      */
-    abstract public function savePointSQL($name);
+    abstract public function savePointSQL(string $name): string;
 
     /**
      * {@inheritDoc}
      */
-    abstract public function rollbackSavePointSQL($name);
+    abstract public function rollbackSavePointSQL(string $name): string;
 
     /**
      * {@inheritDoc}
      */
-    abstract public function disableForeignKeySQL();
+    abstract public function disableForeignKeySQL(): string;
 
     /**
      * {@inheritDoc}
      */
-    abstract public function enableForeignKeySQL();
+    abstract public function enableForeignKeySQL(): string;
 
     /**
      * {@inheritDoc}
      */
-    abstract public function supportsDynamicConstraints();
+    abstract public function supportsDynamicConstraints(): bool;
 
     /**
      * {@inheritDoc}
      */
-    public function supportsSavePoints()
+    public function supportsSavePoints(): bool
     {
         return true;
     }
@@ -228,7 +229,7 @@ abstract class Driver implements DriverInterface
     /**
      * {@inheritDoc}
      */
-    public function quote($value, $type)
+    public function quote($value, $type): string
     {
         $this->connect();
 
@@ -240,7 +241,7 @@ abstract class Driver implements DriverInterface
      *
      * @return bool
      */
-    public function supportsQuoting()
+    public function supportsQuoting(): bool
     {
         $this->connect();
 
@@ -260,12 +261,12 @@ abstract class Driver implements DriverInterface
     /**
      * {@inheritDoc}
      */
-    abstract public function quoteIdentifier($identifier);
+    abstract public function quoteIdentifier(string $identifier): string;
 
     /**
      * {@inheritDoc}
      */
-    public function schemaValue($value)
+    public function schemaValue($value): string
     {
         if ($value === null) {
             return 'NULL';
@@ -292,7 +293,7 @@ abstract class Driver implements DriverInterface
     /**
      * {@inheritDoc}
      */
-    public function schema()
+    public function schema(): string
     {
         return $this->_config['schema'];
     }
@@ -300,7 +301,7 @@ abstract class Driver implements DriverInterface
     /**
      * {@inheritDoc}
      */
-    public function lastInsertId($table = null, $column = null)
+    public function lastInsertId(?string $table = null, ?string $column = null)
     {
         $this->connect();
 
@@ -314,7 +315,7 @@ abstract class Driver implements DriverInterface
     /**
      * {@inheritDoc}
      */
-    public function isConnected()
+    public function isConnected(): bool
     {
         if ($this->_connection === null) {
             $connected = false;
@@ -332,7 +333,7 @@ abstract class Driver implements DriverInterface
     /**
      * {@inheritDoc}
      */
-    public function enableAutoQuoting($enable = true)
+    public function enableAutoQuoting(bool $enable = true): DriverInterface
     {
         $this->_autoQuoting = (bool)$enable;
 
@@ -342,7 +343,7 @@ abstract class Driver implements DriverInterface
     /**
      * {@inheritDoc}
      */
-    public function isAutoQuotingEnabled()
+    public function isAutoQuotingEnabled(): bool
     {
         return $this->_autoQuoting;
     }
@@ -350,7 +351,7 @@ abstract class Driver implements DriverInterface
     /**
      * {@inheritDoc}
      */
-    public function compileQuery(Query $query, ValueBinder $generator)
+    public function compileQuery(Query $query, ValueBinder $generator): array
     {
         $processor = $this->newCompiler();
         $translator = $this->queryTranslator($query->type());

src/Database/Driver/Mysql.php

@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 /**
  * CakePHP(tm) : Rapid Development Framework (https://cakephp.org)
  * Copyright (c) Cake Software Foundation, Inc. (https://cakefoundation.org)
@@ -18,6 +19,7 @@ use Cake\Database\Dialect\MysqlDialectTrait;
 use Cake\Database\Driver;
 use Cake\Database\Query;
 use Cake\Database\Statement\MysqlStatement;
+use Cake\Database\StatementInterface;
 use PDO;
 
 /**
@@ -64,7 +66,7 @@ class Mysql extends Driver
      *
      * @return bool true on success
      */
-    public function connect()
+    public function connect(): bool
     {
         if ($this->_connection) {
             return true;
@@ -119,7 +121,7 @@ class Mysql extends Driver
      *
      * @return bool true if it is valid to use this driver
      */
-    public function enabled()
+    public function enabled(): bool
     {
         return in_array('mysql', PDO::getAvailableDrivers());
     }
@@ -130,7 +132,7 @@ class Mysql extends Driver
      * @param string|\Cake\Database\Query $query The query to prepare.
      * @return \Cake\Database\StatementInterface
      */
-    public function prepare($query)
+    public function prepare($query): StatementInterface
     {
         $this->connect();
         $isObject = $query instanceof Query;
@@ -146,7 +148,7 @@ class Mysql extends Driver
     /**
      * {@inheritDoc}
      */
-    public function schema()
+    public function schema(): string
     {
         return $this->_config['database'];
     }
@@ -154,7 +156,7 @@ class Mysql extends Driver
     /**
      * {@inheritDoc}
      */
-    public function supportsDynamicConstraints()
+    public function supportsDynamicConstraints(): bool
     {
         return true;
     }
@@ -164,14 +166,14 @@ class Mysql extends Driver
      *
      * @return bool
      */
-    public function supportsNativeJson()
+    public function supportsNativeJson(): bool
     {
         if ($this->_supportsNativeJson !== null) {
             return $this->_supportsNativeJson;
         }
 
         if ($this->_version === null) {
-            $this->_version = $this->_connection->getAttribute(PDO::ATTR_SERVER_VERSION);
+            $this->_version = (string)$this->_connection->getAttribute(PDO::ATTR_SERVER_VERSION);
         }
 
         return $this->_supportsNativeJson = version_compare($this->_version, '5.7.0', '>=');

src/Database/Driver/Postgres.php

@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 /**
  * CakePHP(tm) : Rapid Development Framework (https://cakephp.org)
  * Copyright (c) Cake Software Foundation, Inc. (https://cakefoundation.org)
@@ -49,7 +50,7 @@ class Postgres extends Driver
      *
      * @return bool true on success
      */
-    public function connect()
+    public function connect(): bool
     {
         if ($this->_connection) {
             return true;
@@ -92,7 +93,7 @@ class Postgres extends Driver
      *
      * @return bool true if it is valid to use this driver
      */
-    public function enabled()
+    public function enabled(): bool
     {
         return in_array('pgsql', PDO::getAvailableDrivers());
     }
@@ -103,7 +104,7 @@ class Postgres extends Driver
      * @param string $encoding The encoding to use.
      * @return void
      */
-    public function setEncoding($encoding)
+    public function setEncoding(string $encoding): void
     {
         $this->connect();
         $this->_connection->exec('SET NAMES ' . $this->_connection->quote($encoding));
@@ -116,7 +117,7 @@ class Postgres extends Driver
      * @param string $schema The schema names to set `search_path` to.
      * @return void
      */
-    public function setSchema($schema)
+    public function setSchema(string $schema): void
     {
         $this->connect();
         $this->_connection->exec('SET search_path TO ' . $this->_connection->quote($schema));
@@ -125,7 +126,7 @@ class Postgres extends Driver
     /**
      * {@inheritDoc}
      */
-    public function supportsDynamicConstraints()
+    public function supportsDynamicConstraints(): bool
     {
         return true;
     }

src/Database/Driver/Sqlite.php

@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 /**
  * CakePHP(tm) : Rapid Development Framework (https://cakephp.org)
  * Copyright (c) Cake Software Foundation, Inc. (https://cakefoundation.org)
@@ -17,6 +18,7 @@ namespace Cake\Database\Driver;
 use Cake\Database\Dialect\SqliteDialectTrait;
 use Cake\Database\Driver;
 use Cake\Database\Query;
+use Cake\Database\StatementInterface;
 use Cake\Database\Statement\PDOStatement;
 use Cake\Database\Statement\SqliteStatement;
 use PDO;
@@ -51,7 +53,7 @@ class Sqlite extends Driver
      *
      * @return bool true on success
      */
-    public function connect()
+    public function connect(): bool
     {
         if ($this->_connection) {
             return true;
@@ -88,7 +90,7 @@ class Sqlite extends Driver
      *
      * @return bool true if it is valid to use this driver
      */
-    public function enabled()
+    public function enabled(): bool
     {
         return in_array('sqlite', PDO::getAvailableDrivers());
     }
@@ -99,7 +101,7 @@ class Sqlite extends Driver
      * @param string|\Cake\Database\Query $query The query to prepare.
      * @return \Cake\Database\StatementInterface
      */
-    public function prepare($query)
+    public function prepare($query): StatementInterface
     {
         $this->connect();
         $isObject = $query instanceof Query;
@@ -115,7 +117,7 @@ class Sqlite extends Driver
     /**
      * {@inheritDoc}
      */
-    public function supportsDynamicConstraints()
+    public function supportsDynamicConstraints(): bool
     {
         return false;
     }

src/Database/Driver/Sqlserver.php

@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 /**
  * CakePHP(tm) : Rapid Development Framework (https://cakephp.org)
  * Copyright (c) Cake Software Foundation, Inc. (https://cakefoundation.org)
@@ -17,6 +18,7 @@ namespace Cake\Database\Driver;
 use Cake\Database\Dialect\SqlserverDialectTrait;
 use Cake\Database\Driver;
 use Cake\Database\Query;
+use Cake\Database\StatementInterface;
 use Cake\Database\Statement\SqlserverStatement;
 use PDO;
 
@@ -62,7 +64,7 @@ class Sqlserver extends Driver
      * @throws \InvalidArgumentException if an unsupported setting is in the driver config
      * @return bool true on success
      */
-    public function connect()
+    public function connect(): bool
     {
         if ($this->_connection) {
             return true;
@@ -82,7 +84,7 @@ class Sqlserver extends Driver
             $config['flags'][PDO::SQLSRV_ATTR_ENCODING] = $config['encoding'];
         }
         $port = '';
-        if (strlen($config['port'])) {
+        if ($config['port']) {
             $port = ',' . $config['port'];
         }
 
@@ -129,7 +131,7 @@ class Sqlserver extends Driver
      *
      * @return bool true if it is valid to use this driver
      */
-    public function enabled()
+    public function enabled(): bool
     {
         return in_array('sqlsrv', PDO::getAvailableDrivers());
     }
@@ -140,7 +142,7 @@ class Sqlserver extends Driver
      * @param string|\Cake\Database\Query $query The query to prepare.
      * @return \Cake\Database\StatementInterface
      */
-    public function prepare($query)
+    public function prepare($query): StatementInterface
     {
         $this->connect();
         $options = [PDO::ATTR_CURSOR => PDO::CURSOR_SCROLL];
@@ -156,7 +158,7 @@ class Sqlserver extends Driver
     /**
      * {@inheritDoc}
      */
-    public function supportsDynamicConstraints()
+    public function supportsDynamicConstraints(): bool
     {
         return true;
     }

src/Database/DriverInterface.php

@@ -24,14 +24,14 @@ interface DriverInterface
      *
      * @return bool True on success, false on failure.
      */
-    public function connect();
+    public function connect(): bool;
 
     /**
      * Disconnects from database server.
      *
      * @return void
      */
-    public function disconnect();
+    public function disconnect(): void;
 
     /**
      * Returns correct connection resource or object that is internally used.
@@ -53,7 +53,7 @@ interface DriverInterface
      *
      * @return bool True if it is valid to use this driver.
      */
-    public function enabled();
+    public function enabled(): bool;
 
     /**
      * Prepares a sql statement to be executed.
@@ -61,28 +61,28 @@ interface DriverInterface
      * @param string|\Cake\Database\Query $query The query to turn into a prepared statement.
      * @return \Cake\Database\StatementInterface
      */
-    public function prepare($query);
+    public function prepare($query): StatementInterface;
 
     /**
      * Starts a transaction.
      *
      * @return bool True on success, false otherwise.
      */
-    public function beginTransaction();
+    public function beginTransaction(): bool;
 
     /**
      * Commits a transaction.
      *
      * @return bool True on success, false otherwise.
      */
-    public function commitTransaction();
+    public function commitTransaction(): bool;
 
     /**
      * Rollbacks a transaction.
      *
      * @return bool True on success, false otherwise.
      */
-    public function rollbackTransaction();
+    public function rollbackTransaction(): bool;
 
     /**
      * Get the SQL for releasing a save point.
@@ -90,7 +90,7 @@ interface DriverInterface
      * @param string $name The table name.
      * @return string
      */
-    public function releaseSavePointSQL($name);
+    public function releaseSavePointSQL(string $name): string;
 
     /**
      * Get the SQL for creating a save point.
@@ -98,7 +98,7 @@ interface DriverInterface
      * @param string $name The table name.
      * @return string
      */
-    public function savePointSQL($name);
+    public function savePointSQL(string $name): string;
 
     /**
      * Get the SQL for rollingback a save point.
@@ -106,21 +106,21 @@ interface DriverInterface
      * @param string $name The table name.
      * @return string
      */
-    public function rollbackSavePointSQL($name);
+    public function rollbackSavePointSQL(string $name): string;
 
     /**
      * Get the SQL for disabling foreign keys.
      *
      * @return string
      */
-    public function disableForeignKeySQL();
+    public function disableForeignKeySQL(): string;
 
     /**
      * Get the SQL for enabling foreign keys.
      *
      * @return string
      */
-    public function enableForeignKeySQL();
+    public function enableForeignKeySQL(): string;
 
     /**
      * Returns whether the driver supports adding or dropping constraints
@@ -128,30 +128,30 @@ interface DriverInterface
      *
      * @return bool true if driver supports dynamic constraints.
      */
-    public function supportsDynamicConstraints();
+    public function supportsDynamicConstraints(): bool;
 
     /**
      * Returns whether this driver supports save points for nested transactions.
      *
      * @return bool True if save points are supported, false otherwise.
      */
-    public function supportsSavePoints();
+    public function supportsSavePoints(): bool;
 
     /**
      * Returns a value in a safe representation to be used in a query string
      *
      * @param mixed $value The value to quote.
-     * @param string $type Type to be used for determining kind of quoting to perform.
+     * @param string|int $type Type to be used for determining kind of quoting to perform.
      * @return string
      */
-    public function quote($value, $type);
+    public function quote($value, $type): string;
 
     /**
      * Checks if the driver supports quoting.
      *
      * @return bool
      */
-    public function supportsQuoting();
+    public function supportsQuoting(): bool;
 
     /**
      * Returns a callable function that will be used to transform a passed Query object.
@@ -162,7 +162,7 @@ interface DriverInterface
      * (select, insert, update, delete).
      * @return callable
      */
-    public function queryTranslator($type);
+    public function queryTranslator(string $type);
 
     /**
      * Get the schema dialect.
@@ -184,7 +184,7 @@ interface DriverInterface
      * @param string $identifier The identifier expression to quote.
      * @return string
      */
-    public function quoteIdentifier($identifier);
+    public function quoteIdentifier(string $identifier): string;
 
     /**
      * Escapes values for use in schema definitions.
@@ -192,14 +192,14 @@ interface DriverInterface
      * @param mixed $value The value to escape.
      * @return string String for use in schema definitions.
      */
-    public function schemaValue($value);
+    public function schemaValue($value): string;
 
     /**
      * Returns the schema name that's being used.
      *
      * @return string
      */
-    public function schema();
+    public function schema(): string;
 
     /**
      * Returns last id generated for a table or sequence in database.
@@ -208,14 +208,14 @@ interface DriverInterface
      * @param string|null $column the name of the column representing the primary key.
      * @return string|int
      */
-    public function lastInsertId($table = null, $column = null);
+    public function lastInsertId(?string $table = null, ?string $column = null);
 
     /**
      * Checks whether or not the driver is connected.
      *
      * @return bool
      */
-    public function isConnected();
+    public function isConnected(): bool;
 
     /**
      * Sets whether or not this driver should automatically quote identifiers
@@ -224,7 +224,7 @@ interface DriverInterface
      * @param bool $enable Whether to enable auto quoting
      * @return $this
      */
-    public function enableAutoQuoting($enable = true);
+    public function enableAutoQuoting(bool $enable = true): self;
 
     /**
      * Returns whether or not this driver should automatically quote identifiers
@@ -232,7 +232,7 @@ interface DriverInterface
      *
      * @return bool
      */
-    public function isAutoQuotingEnabled();
+    public function isAutoQuotingEnabled(): bool;
 
     /**
      * Transforms the passed query to this Driver's dialect and returns an instance
@@ -243,7 +243,7 @@ interface DriverInterface
      * @return array containing 2 entries. The first entity is the transformed query
      * and the second one the compiled SQL.
      */
-    public function compileQuery(Query $query, ValueBinder $generator);
+    public function compileQuery(Query $query, ValueBinder $generator): array;
 
     /**
      * Returns an instance of a QueryCompiler.

src/Database/SqlDialectTrait.php

@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 /**
  * CakePHP(tm) : Rapid Development Framework (https://cakephp.org)
  * Copyright (c) Cake Software Foundation, Inc. (https://cakefoundation.org)
@@ -28,7 +29,7 @@ trait SqlDialectTrait
      * @param string $identifier The identifier to quote.
      * @return string
      */
-    public function quoteIdentifier($identifier)
+    public function quoteIdentifier(string $identifier): string
     {
         $identifier = trim($identifier);
 
@@ -258,7 +259,7 @@ trait SqlDialectTrait
      * @param string $name save point name
      * @return string
      */
-    public function savePointSQL($name)
+    public function savePointSQL(string $name): string
     {
         return 'SAVEPOINT LEVEL' . $name;
     }
@@ -269,7 +270,7 @@ trait SqlDialectTrait
      * @param string $name save point name
      * @return string
      */
-    public function releaseSavePointSQL($name)
+    public function releaseSavePointSQL(string $name): string
     {
         return 'RELEASE SAVEPOINT LEVEL' . $name;
     }
@@ -280,7 +281,7 @@ trait SqlDialectTrait
      * @param string $name save point name
      * @return string
      */
-    public function rollbackSavePointSQL($name)
+    public function rollbackSavePointSQL(string $name): string
     {
         return 'ROLLBACK TO SAVEPOINT LEVEL' . $name;
     }

tests/TestCase/Database/Driver/MysqlTest.php

@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 /**
  * CakePHP(tm) : Rapid Development Framework (https://cakephp.org)
  * Copyright (c) Cake Software Foundation, Inc. (https://cakefoundation.org)

tests/TestCase/Database/Driver/PostgresTest.php

@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 /**
  * CakePHP(tm) : Rapid Development Framework (https://cakephp.org)
  * Copyright (c) Cake Software Foundation, Inc. (https://cakefoundation.org)

tests/TestCase/Database/Driver/SqliteTest.php

@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 /**
  * CakePHP(tm) : Rapid Development Framework (https://cakephp.org)
  * Copyright (c) Cake Software Foundation, Inc. (https://cakefoundation.org)

tests/TestCase/Database/Driver/SqlserverTest.php

@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 /**
  * CakePHP(tm) : Rapid Development Framework (https://cakephp.org)
  * Copyright (c) Cake Software Foundation, Inc. (https://cakefoundation.org)

tests/TestCase/Database/DriverTest.php

@@ -135,10 +135,10 @@ class DriverTest extends TestCase
         $connection
             ->expects($this->once())
             ->method('quote')
-            ->with($value, PDO::PARAM_STR);
+            ->with($value, PDO::PARAM_STR)
+            ->will($this->returnValue('string'));
 
         $this->driver->setConnection($connection);
-
         $this->driver->schemaValue($value);
     }
 

tests/test_app/Plugin/TestPlugin/src/Database/Driver/TestDriver.php

@@ -17,7 +17,7 @@ use Cake\Database\Driver\Sqlite;
 
 class TestDriver extends Sqlite
 {
-    public function enabled()
+    public function enabled(): bool
     {
         return true;
     }

tests/test_app/TestApp/Database/Driver/TestDriver.php

@@ -17,7 +17,7 @@ use Cake\Database\Driver\Sqlite;
 
 class TestDriver extends Sqlite
 {
-    public function enabled()
+    public function enabled(): bool
     {
         return true;
     }