SignApp fixes

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>

diff --git a/tests/lib/Command/Integrity/SignAppTest.php b/tests/lib/Command/Integrity/SignAppTest.php
index b30d465fcaa0712ca9b0111525a792b9da5228b3..689b046e24ec30c2cd554f6850c89a0e91763585 100644 (file)
--- a/tests/lib/Command/Integrity/SignAppTest.php
+++ b/tests/lib/Command/Integrity/SignAppTest.php
@@ -232,12 +232,12 @@ class SignAppTest 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())
@@ -276,12 +276,12 @@ class SignAppTest 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())