From bc16b0524382f4639dc9a1c542a661e4baf02880 Mon Sep 17 00:00:00 2001 From: Roeland Jago Douma Date: Fri, 22 Nov 2019 10:06:07 +0100 Subject: [PATCH] Fix signCoretests Signed-off-by: Roeland Jago Douma --- tests/lib/Command/Integrity/SignCoreTest.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tests/lib/Command/Integrity/SignCoreTest.php b/tests/lib/Command/Integrity/SignCoreTest.php index c496b86400..6f67b86f47 100644 --- a/tests/lib/Command/Integrity/SignCoreTest.php +++ b/tests/lib/Command/Integrity/SignCoreTest.php @@ -150,7 +150,7 @@ class SignCoreTest extends TestCase { ->expects($this->at(0)) ->method('file_get_contents') ->with('privateKey') - ->will($this->returnValue(\OC::$SERVERROOT . '/tests/data/integritycheck/core.key')); + ->willReturn(file_get_contents(\OC::$SERVERROOT . '/tests/data/integritycheck/core.key')); $this->fileAccessHelper ->expects($this->at(1)) ->method('file_get_contents') @@ -189,12 +189,12 @@ class SignCoreTest extends TestCase { ->expects($this->at(0)) ->method('file_get_contents') ->with('privateKey') - ->will($this->returnValue(\OC::$SERVERROOT . '/tests/data/integritycheck/core.key')); + ->willReturn(file_get_contents(\OC::$SERVERROOT . '/tests/data/integritycheck/core.key')); $this->fileAccessHelper ->expects($this->at(1)) ->method('file_get_contents') ->with('certificate') - ->will($this->returnValue(\OC::$SERVERROOT . '/tests/data/integritycheck/core.crt')); + ->willReturn(file_get_contents(\OC::$SERVERROOT . '/tests/data/integritycheck/core.crt')); $this->checker ->expects($this->once()) @@ -233,12 +233,12 @@ class SignCoreTest extends TestCase { ->expects($this->at(0)) ->method('file_get_contents') ->with('privateKey') - ->will($this->returnValue(\OC::$SERVERROOT . '/tests/data/integritycheck/core.key')); + ->willReturn(file_get_contents(\OC::$SERVERROOT . '/tests/data/integritycheck/core.key')); $this->fileAccessHelper ->expects($this->at(1)) ->method('file_get_contents') ->with('certificate') - ->will($this->returnValue(\OC::$SERVERROOT . '/tests/data/integritycheck/core.crt')); + ->willReturn(file_get_contents(\OC::$SERVERROOT . '/tests/data/integritycheck/core.crt')); $this->checker ->expects($this->once())