Merge branch 'develop' of github.com:EllisLab/CodeIgniter into develop

2 files changed, 18 insertions, 1 deletions

diff --git a/tests/mocks/libraries/encrypt.php b/tests/mocks/libraries/encrypt.php
new file mode 100644
index 000000000..f1859398f
--- /dev/null
+++ b/tests/mocks/libraries/encrypt.php
@@ -0,0 +1,16 @@
+<?php
+
+class Mock_Libraries_Encrypt extends CI_Encrypt {
+
+	// Overide inaccesible protected method
+	public function __call($method, $params)
+	{
+		if (is_callable(array($this, '_'.$method)))
+		{
+			return call_user_func_array(array($this, '_'.$method), $params);
+		}
+
+		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 97fbb30bd..87c278bce 100644
--- a/tests/mocks/libraries/table.php
+++ b/tests/mocks/libraries/table.php
@@ -1,7 +1,7 @@
 <?php
 
 class Mock_Libraries_Table extends CI_Table {
-	
+
 	// Overide inaccesible protected method
 	public function __call($method, $params)
 	{
@@ -12,4 +12,5 @@ class Mock_Libraries_Table extends CI_Table {
 
 		throw new BadMethodCallException('Method '.$method.' was not found');
 	}
+
 }
\ No newline at end of file