Improve invalid font path handling

theInfinite · Apr 3, 2019 · 666a9c9 · 666a9c9
1 parent 9cc1eae
commit 666a9c9
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/QrCode.php b/src/QrCode.php
@@ -249,13 +249,13 @@ public function getLabelFontSize(): ?int
 
     public function setLabelFontPath(string $labelFontPath): void
     {
-        $labelFontPath = realpath($labelFontPath);
+        $resolvedLabelFontPath = realpath($labelFontPath);
 
-        if (!is_file($labelFontPath)) {
+        if (!is_string($resolvedLabelFontPath) || !is_file($resolvedLabelFontPath)) {
             throw new InvalidPathException('Invalid label font path: '.$labelFontPath);
         }
 
-        $this->labelFontPath = $labelFontPath;
+        $this->labelFontPath = $resolvedLabelFontPath;
     }
 
     public function getLabelFontPath(): ?string

diff --git a/tests/QrCodeTest.php b/tests/QrCodeTest.php
@@ -137,7 +137,7 @@ public function testSetLabel(): void
     {
         $qrCode = new QrCode('QR Code');
         $qrCode->setSize(300);
-        $qrCode->setLabel('Scan the code', 15);
+        $qrCode->setLabel('Scan the code', 15, 'test');
 
         $pngData = $qrCode->writeString();
         $this->assertTrue(is_string($pngData));