Make protected method protected.

PHPUnit loses its lunch when trait methods are renamed. This change also simplifies the classes using PDODriverTrait.
cakephp · Mar 24, 2013 · 4263940 · 4263940
1 parent 40389af
commit 4263940
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 11 deletions.
diff --git a/lib/Cake/Model/Datasource/Database/Driver/Mysql.php b/lib/Cake/Model/Datasource/Database/Driver/Mysql.php
@@ -17,13 +17,13 @@
  */
 namespace Cake\Model\Datasource\Database\Driver;
 
+use Cake\Model\Datasource\Database\Dialect\MysqlDialectTrait;
 use PDO;
 
 class Mysql extends \Cake\Model\Datasource\Database\Driver {
 
-	use PDODriverTrait {
+	use PDODriverTrait;
-		connect as protected _connect;
+	use MysqlDialectTrait;
-	}
 
 /**
  * Base configuration settings for MySQL driver

diff --git a/lib/Cake/Model/Datasource/Database/Driver/PDODriverTrait.php b/lib/Cake/Model/Datasource/Database/Driver/PDODriverTrait.php
@@ -28,7 +28,7 @@ trait PDODriverTrait {
  * @param array $config configuration to be used for creating connection
  * @return boolean true on success
  */
-	public function connect(array $config) {
+	protected function _connect(array $config) {
 		$connection = new PDO(
 			$config['dsn'],
 			$config['login'],
@@ -46,7 +46,7 @@ public function connect(array $config) {
  *
  * @return mixed connection object used internally
  */
-	public  function connection($connection = null) {
+	public function connection($connection = null) {
 		if ($connection !== null) {
 			$this->_connection = $connection;
 		}

diff --git a/lib/Cake/Model/Datasource/Database/Driver/Postgres.php b/lib/Cake/Model/Datasource/Database/Driver/Postgres.php
@@ -23,9 +23,7 @@
 
 class Postgres extends \Cake\Model\Datasource\Database\Driver {
 
-	use PDODriverTrait {
+	use PDODriverTrait;
-		connect as protected _connect;
-	}
 	use PostgresDialectTrait;
 
 /**

diff --git a/lib/Cake/Model/Datasource/Database/Driver/Sqlite.php b/lib/Cake/Model/Datasource/Database/Driver/Sqlite.php
@@ -23,9 +23,7 @@
 
 class Sqlite extends \Cake\Model\Datasource\Database\Driver {
 
-	use PDODriverTrait {
+	use PDODriverTrait;
-		connect as protected _connect;
-	}
 	use SqliteDialectTrait;
 
 /**