summaryrefslogtreecommitdiffstats
path: root/tests/mocks/libraries
diff options
context:
space:
mode:
authorAhmad Anbar <aanbar@gmail.com>2015-02-04 18:20:01 +0100
committerAhmad Anbar <aanbar@gmail.com>2015-02-04 18:20:01 +0100
commite5454f9b28f123a5549971f580255a065b2f8cc2 (patch)
treec4927e7b7afb0bf242976034630cc60f2f1db00f /tests/mocks/libraries
parent6db62ab0ad0e223806a1367e12b1884b48dc65d7 (diff)
parenteccac6e6a73a4d1a5b40f383ce64359c2c94ae12 (diff)
Merge remote-tracking branch 'upstream/develop' into develop
Diffstat (limited to 'tests/mocks/libraries')
-rw-r--r--tests/mocks/libraries/encrypt.php4
-rw-r--r--tests/mocks/libraries/table.php4
2 files changed, 4 insertions, 4 deletions
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
+}