Handle strict typing in Checker and fix tests

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
nextcloud · Feb 21, 2018 · 72e745b · 72e745b
1 parent 4d5f2e6
commit 72e745b
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/lib/private/IntegrityCheck/Checker.php b/lib/private/IntegrityCheck/Checker.php
@@ -333,7 +333,12 @@ private function verify(string $signaturePath, string $basePath, string $certifi
 			return [];
 		}
 
-		$signatureData = json_decode($this->fileAccessHelper->file_get_contents($signaturePath), true);
+		$content = $this->fileAccessHelper->file_get_contents($signaturePath);
+		$signatureData = null;
+
+		if (\is_string($content)) {
+			$signatureData = json_decode($content, true);
+		}
 		if(!\is_array($signatureData)) {
 			throw new InvalidSignatureException('Signature data not found.');
 		}

diff --git a/tests/lib/IntegrityCheck/CheckerTest.php b/tests/lib/IntegrityCheck/CheckerTest.php
@@ -58,6 +58,9 @@ public function setUp() {
 		$this->cacheFactory = $this->createMock(ICacheFactory::class);
 		$this->appManager = $this->createMock(IAppManager::class);
 
+		$this->config->method('getAppValue')
+			->will($this->returnArgument(2));
+
 		$this->cacheFactory
 			->expects($this->any())
 			->method('createDistributed')