From d0ed9adec8084b193c3429b664a408b2a3f6b71c Mon Sep 17 00:00:00 2001 From: Christian Weiske Date: Sun, 17 Mar 2013 22:22:16 +0100 Subject: remove php4-style object reference passing --- tests/Api/ExportCsvTest.php | 4 ++-- tests/Api/OpenSearchTest.php | 4 ++-- tests/TestBase.php | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) (limited to 'tests') diff --git a/tests/Api/ExportCsvTest.php b/tests/Api/ExportCsvTest.php index 681f0de..a0a9eae 100644 --- a/tests/Api/ExportCsvTest.php +++ b/tests/Api/ExportCsvTest.php @@ -64,7 +64,7 @@ class Api_ExportCsvTest extends TestBaseApi */ public function testMimeTypeFilename() { - $res = reset($this->getAuthRequest())->send(); + $res = rreset($this->getAuthRequest())->send(); $this->assertEquals(200, $res->getStatus()); //verify MIME content type @@ -253,7 +253,7 @@ class Api_ExportCsvTest extends TestBaseApi $ar[] = $arl; } } - if (count(end($ar)) == 1 && reset(end($ar)) == '') { + if (count(end($ar)) == 1 && rreset(end($ar)) == '') { unset($ar[key($ar)]); } return $ar; diff --git a/tests/Api/OpenSearchTest.php b/tests/Api/OpenSearchTest.php index f438b46..09166da 100644 --- a/tests/Api/OpenSearchTest.php +++ b/tests/Api/OpenSearchTest.php @@ -12,7 +12,7 @@ class Api_OpenSearchTest extends TestBaseApi $xhtml = $req->send()->getBody(); $xml = simplexml_load_string($xhtml); - $xml->registerXPathNamespace('h', reset($xml->getDocNamespaces())); + $xml->registerXPathNamespace('h', rreset($xml->getDocNamespaces())); $this->assertInstanceOf( 'SimpleXMLElement', $xml, @@ -58,7 +58,7 @@ class Api_OpenSearchTest extends TestBaseApi { $xml = $this->getRequest('api/opensearch.php')->send()->getBody(); $x = simplexml_load_string($xml); - $x->registerXPathNamespace('os', reset($x->getDocNamespaces())); + $x->registerXPathNamespace('os', rreset($x->getDocNamespaces())); $arElements = $x->xpath('//os:Url[@type="text/html"]'); $this->assertEquals( diff --git a/tests/TestBase.php b/tests/TestBase.php index 2914749..4bffd1b 100644 --- a/tests/TestBase.php +++ b/tests/TestBase.php @@ -87,7 +87,7 @@ class TestBase extends PHPUnit_Framework_TestCase protected function addUser( $username = null, $password = null, $privateKey = null ) { - return reset($this->addUserData($username, $password, $privateKey)); + return rreset($this->addUserData($username, $password, $privateKey)); } -- cgit v1.2.3-54-g00ecf