Merge remote-tracking branch 'upstream/develop' into develop

4 files changed, 14 insertions, 7 deletions

diff --git a/tests/mocks/core/security.php b/tests/mocks/core/security.php
index e19a8b20b..a21fc5cb3 100644
--- a/tests/mocks/core/security.php
+++ b/tests/mocks/core/security.php
@@ -10,13 +10,13 @@ class Mock_Core_Security extends CI_Security {
 		return $this;
 	}
 
-	// Overide inaccesible protected properties
+	// Override inaccessible protected properties
 	public function __get($property)
 	{
 		return isset($this->{'_'.$property}) ? $this->{'_'.$property} : NULL;
 	}
 
-	// Overide inaccesible protected method
+	// Override inaccessible protected method
 	public function __call($method, $params)
 	{
 		if (is_callable(array($this, '_'.$method)))
@@ -27,4 +27,4 @@ class Mock_Core_Security extends CI_Security {
 		throw new BadMethodCallException('Method '.$method.' was not found');
 	}
 
-}
\ No newline at end of file
+}
diff --git a/tests/mocks/database/schema/skeleton.php b/tests/mocks/database/schema/skeleton.php
index b6d4b7893..5fe5b0f30 100644
--- a/tests/mocks/database/schema/skeleton.php
+++ b/tests/mocks/database/schema/skeleton.php
@@ -24,6 +24,13 @@ class Mock_Database_Schema_Skeleton {
 	{
 		if (empty(self::$db) && empty(self::$forge))
 		{
+			// E_DEPRECATED notices thrown by mysql_connect(), mysql_pconnect()
+			// on PHP 5.5+ cause the tests to fail
+			if ($driver === 'mysql' && version_compare(PHP_VERSION, '5.5', '>='))
+			{
+				error_reporting(E_ALL & ~E_DEPRECATED);
+			}
+
 			$config = Mock_Database_DB::config($driver);
 			$connection = new Mock_Database_DB($config);
 			$db = Mock_Database_DB::DB($connection->set_dsn($driver), TRUE);
diff --git a/tests/mocks/libraries/encrypt.php b/tests/mocks/libraries/encrypt.php
index f1859398f..c14d1e02f 100644
--- a/tests/mocks/libraries/encrypt.php
+++ b/tests/mocks/libraries/encrypt.php
@@ -2,7 +2,7 @@
 
 class Mock_Libraries_Encrypt extends CI_Encrypt {
 
-	// Overide inaccesible protected method
+	// Override inaccessible protected method
 	public function __call($method, $params)
 	{
 		if (is_callable(array($this, '_'.$method)))
@@ -13,4 +13,4 @@ class Mock_Libraries_Encrypt extends CI_Encrypt {
 		throw new BadMethodCallException('Method '.$method.' was not found');
 	}
 
-}
\ No newline at end of file
+}
diff --git a/tests/mocks/libraries/table.php b/tests/mocks/libraries/table.php
index 87c278bce..08f80072a 100644
--- a/tests/mocks/libraries/table.php
+++ b/tests/mocks/libraries/table.php
@@ -2,7 +2,7 @@
 
 class Mock_Libraries_Table extends CI_Table {
 
-	// Overide inaccesible protected method
+	// Override inaccessible protected method
 	public function __call($method, $params)
 	{
 		if (is_callable(array($this, '_'.$method)))
@@ -13,4 +13,4 @@ class Mock_Libraries_Table extends CI_Table {
 		throw new BadMethodCallException('Method '.$method.' was not found');
 	}
 
-}
\ No newline at end of file
+}