[Pkg-owncloud-commits] [owncloud] 28/61: function declaration did not match

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository owncloud.

commit bfb6b7ba9083c40efdcf0bb2a659d4b2467adaa3
Author: Thomas Müller <thomas.mueller at tmit.eu>
Date:   Mon Jul 28 22:38:56 2014 +0200

    function declaration did not match
---
 tests/lib/contacts/localadressbook.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/tests/lib/contacts/localadressbook.php b/tests/lib/contacts/localadressbook.php
index 3d08fc9..bb69910 100644
--- a/tests/lib/contacts/localadressbook.php
+++ b/tests/lib/contacts/localadressbook.php
@@ -17,7 +17,7 @@ class Test_LocalAddressBook extends PHPUnit_Framework_TestCase
 	public function testSearchFN() {
 		$stub = $this->getMockForAbstractClass('\OCP\IUserManager', array('searchDisplayName'));
 
-		$stub->expects($this->any())->method('searchDisplayName')->will($this->return(array(
+		$stub->expects($this->any())->method('searchDisplayName')->will($this->returnValue(array(
 			new SimpleUserForTesting('tom', 'Thomas'),
 			new SimpleUserForTesting('tomtom', 'Thomas T.'),
 		)));
@@ -25,13 +25,13 @@ class Test_LocalAddressBook extends PHPUnit_Framework_TestCase
 		$localAddressBook = new LocalAddressBook($stub);
 
 		$result = $localAddressBook->search('tom', array('FN'), array());
-		$this->assertEqual(2, count($result));
+		$this->assertEquals(2, count($result));
 	}
 
 	public function testSearchId() {
 		$stub = $this->getMockForAbstractClass('\OCP\IUserManager', array('searchDisplayName'));
 
-		$stub->expects($this->any())->method('search')->will($this->return(array(
+		$stub->expects($this->any())->method('search')->will($this->returnValue(array(
 			new SimpleUserForTesting('tom', 'Thomas'),
 			new SimpleUserForTesting('tomtom', 'Thomas T.'),
 		)));
@@ -39,7 +39,7 @@ class Test_LocalAddressBook extends PHPUnit_Framework_TestCase
 		$localAddressBook = new LocalAddressBook($stub);
 
 		$result = $localAddressBook->search('tom', array('id'), array());
-		$this->assertEqual(2, count($result));
+		$this->assertEquals(2, count($result));
 	}
 }
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git