From 15e0ed017fd474eedb305c334d8e4396709da5e0 Mon Sep 17 00:00:00 2001 From: Yves P Date: Fri, 25 Sep 2015 23:16:44 +0200 Subject: [PATCH] Typehint should be against the ConnectionInterface and not a Connection object --- src/Database/Schema/CachedCollection.php | 6 +++--- src/Database/Schema/Collection.php | 6 +++--- src/Database/Schema/Table.php | 14 +++++++------- src/ORM/Table.php | 8 ++++---- 4 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/Database/Schema/CachedCollection.php b/src/Database/Schema/CachedCollection.php index 70961f0ef2b..4bc25eae593 100644 --- a/src/Database/Schema/CachedCollection.php +++ b/src/Database/Schema/CachedCollection.php @@ -15,7 +15,7 @@ namespace Cake\Database\Schema; use Cake\Cache\Cache; -use Cake\Database\Connection; +use Cake\Datasource\ConnectionInterface; /** * Extends the schema collection class to provide caching @@ -35,10 +35,10 @@ class CachedCollection extends Collection /** * Constructor. * - * @param \Cake\Database\Connection $connection The connection instance. + * @param \Cake\Datasource\ConnectionInterface $connection The connection instance. * @param string|bool $cacheKey The cache key or boolean false to disable caching. */ - public function __construct(Connection $connection, $cacheKey = true) + public function __construct(ConnectionInterface $connection, $cacheKey = true) { parent::__construct($connection); $this->cacheMetadata($cacheKey); diff --git a/src/Database/Schema/Collection.php b/src/Database/Schema/Collection.php index 02f21ddfd28..1fd20019dba 100644 --- a/src/Database/Schema/Collection.php +++ b/src/Database/Schema/Collection.php @@ -14,8 +14,8 @@ */ namespace Cake\Database\Schema; -use Cake\Database\Connection; use Cake\Database\Exception; +use Cake\Datasource\ConnectionInterface; use PDOException; /** @@ -44,9 +44,9 @@ class Collection /** * Constructor. * - * @param \Cake\Database\Connection $connection The connection instance. + * @param \Cake\Datasource\ConnectionInterface $connection The connection instance. */ - public function __construct(Connection $connection) + public function __construct(ConnectionInterface $connection) { $this->_connection = $connection; $this->_dialect = $connection->driver()->schemaDialect(); diff --git a/src/Database/Schema/Table.php b/src/Database/Schema/Table.php index a93c8beabb2..ec082f70706 100644 --- a/src/Database/Schema/Table.php +++ b/src/Database/Schema/Table.php @@ -14,9 +14,9 @@ */ namespace Cake\Database\Schema; -use Cake\Database\Connection; use Cake\Database\Exception; use Cake\Database\Type; +use Cake\Datasource\ConnectionInterface; /** * Represents a single table in a database schema. @@ -664,11 +664,11 @@ public function temporary($set = null) * Uses the connection to access the schema dialect * to generate platform specific SQL. * - * @param Connection $connection The connection to generate SQL for + * @param \Cake\Datasource\ConnectionInterface $connection The connection to generate SQL for * @return array List of SQL statements to create the table and the * required indexes. */ - public function createSql(Connection $connection) + public function createSql(ConnectionInterface $connection) { $dialect = $connection->driver()->schemaDialect(); $columns = $constraints = $indexes = []; @@ -690,10 +690,10 @@ public function createSql(Connection $connection) * Uses the connection to access the schema dialect to generate platform * specific SQL. * - * @param Connection $connection The connection to generate SQL for. + * @param \Cake\Datasource\ConnectionInterface $connection The connection to generate SQL for. * @return array SQL to drop a table. */ - public function dropSql(Connection $connection) + public function dropSql(ConnectionInterface $connection) { $dialect = $connection->driver()->schemaDialect(); return $dialect->dropTableSql($this); @@ -702,10 +702,10 @@ public function dropSql(Connection $connection) /** * Generate the SQL statements to truncate a table * - * @param Connection $connection The connection to generate SQL for. + * @param \Cake\Datasource\ConnectionInterface $connection The connection to generate SQL for. * @return array SQL to drop a table. */ - public function truncateSql(Connection $connection) + public function truncateSql(ConnectionInterface $connection) { $dialect = $connection->driver()->schemaDialect(); return $dialect->truncateTableSql($this); diff --git a/src/ORM/Table.php b/src/ORM/Table.php index 31f0f0c198e..584f71012be 100644 --- a/src/ORM/Table.php +++ b/src/ORM/Table.php @@ -17,9 +17,9 @@ use ArrayObject; use BadMethodCallException; use Cake\Core\App; -use Cake\Database\Connection; use Cake\Database\Schema\Table as Schema; use Cake\Database\Type; +use Cake\Datasource\ConnectionInterface; use Cake\Datasource\EntityInterface; use Cake\Datasource\Exception\InvalidPrimaryKeyException; use Cake\Datasource\RepositoryInterface; @@ -389,10 +389,10 @@ public function registryAlias($registryAlias = null) /** * Returns the connection instance or sets a new one * - * @param \Cake\Database\Connection|null $conn The new connection instance - * @return \Cake\Database\Connection + * @param \Cake\Datasource\ConnectionInterface|null $conn The new connection instance + * @return \Cake\Datasource\ConnectionInterface */ - public function connection(Connection $conn = null) + public function connection(ConnectionInterface $conn = null) { if ($conn === null) { return $this->_connection;