Merge branch '3.1-stable' into develop

1 files changed, 2 insertions, 2 deletions

diff --git a/tests/codeigniter/helpers/language_helper_test.php b/tests/codeigniter/helpers/language_helper_test.php
index 176da689a..1ddabea3d 100644
--- a/tests/codeigniter/helpers/language_helper_test.php
+++ b/tests/codeigniter/helpers/language_helper_test.php
@@ -5,7 +5,7 @@ class Language_helper_test extends CI_TestCase {
 	public function test_lang()
 	{
 		$this->helper('language');
-		$lang = $this->getMock('CI_Lang', array('line'));
+		$lang = $this->getMockBuilder('CI_Lang')->setMethods(array('line'))->getMock();
 		$lang->expects($this->any())->method('line')->will($this->returnValue(FALSE));
 		$this->ci_instance_var('lang', $lang);
 
@@ -13,4 +13,4 @@ class Language_helper_test extends CI_TestCase {
 		$this->assertEquals('<label for="foo" class="bar"></label>', lang(1, 'foo', array('class' => 'bar')));
 	}
 
-}
\ No newline at end of file
+}