fix TypeError under php8.0 ($this->result can be false)

webmaster777 · webmaster777 · commit 6408c20dd70b · 2021-01-08T20:14:16.000+01:00
diff --git a/lib/QrReader.php b/lib/QrReader.php
@@ -91,7 +91,7 @@ public function text()
     {
         $this->decode();
 
-        if (method_exists($this->result, 'toString')) {
+        if ($this->result && method_exists($this->result, 'toString')) {
             return $this->result->toString();
         }
 
diff --git a/tests/QrReaderTest.php b/tests/QrReaderTest.php
@@ -15,4 +15,11 @@ public function testText1()
         $qrcode = new QrReader($image);
         $this->assertSame("Hello world!", $qrcode->text());
     }
+
+    public function testNoText()
+    {
+        $image = __DIR__ . "/qrcodes/empty.png";
+        $qrcode = new QrReader($image);
+        $this->assertSame(false, $qrcode->text());
+    }
 }
diff --git a/tests/qrcodes/empty.png b/tests/qrcodes/empty.png

Original file line number	Diff line number	Diff line change
`@@ -91,7 +91,7 @@ public function text()`
`91`	`91`	`{`
`92`	`92`	`$this->decode();`
`93`	`93`
`94`		`- if (method_exists($this->result, 'toString')) {`
	`94`	`+ if ($this->result && method_exists($this->result, 'toString')) {`
`95`	`95`	`return $this->result->toString();`
`96`	`96`	`}`
`97`	`97`
Original file line number	Diff line number	Diff line change
`@@ -15,4 +15,11 @@ public function testText1()`
`15`	`15`	`$qrcode = new QrReader($image);`
`16`	`16`	`$this->assertSame("Hello world!", $qrcode->text());`
`17`	`17`	`}`
	`18`	`+`
	`19`	`+ public function testNoText()`
	`20`	`+ {`
	`21`	`+ $image = __DIR__ . "/qrcodes/empty.png";`
	`22`	`+ $qrcode = new QrReader($image);`
	`23`	`+ $this->assertSame(false, $qrcode->text());`
	`24`	`+ }`
`18`	`25`	`}`