From 72e745be26647b1ce1ca3240cb2ffbe20cfe91dc Mon Sep 17 00:00:00 2001 From: Roeland Jago Douma Date: Wed, 21 Feb 2018 21:09:08 +0100 Subject: Handle strict typing in Checker and fix tests Signed-off-by: Roeland Jago Douma --- lib/private/IntegrityCheck/Checker.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'lib/private/IntegrityCheck') diff --git a/lib/private/IntegrityCheck/Checker.php b/lib/private/IntegrityCheck/Checker.php index f1a04d0eac4..44544b6770e 100644 --- a/lib/private/IntegrityCheck/Checker.php +++ b/lib/private/IntegrityCheck/Checker.php @@ -333,7 +333,12 @@ class Checker { 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.'); } -- cgit v1.2.3