Merge pull request #103 from remicollet/issue-php8

fix for PHP 8
khanamiryan · Apr 20, 2021 · 4676df0 · 4676df0
2 parents 07fceef + 534564d
commit 4676df0
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/composer.json b/composer.json
@@ -21,7 +21,7 @@
     "php": ">=5.6"
   },
   "require-dev": {
-    "phpunit/phpunit": "^9.0"
+    "phpunit/phpunit": "^5.7 | ^7.5 | ^8.0 | ^9.0"
   },
   "autoload": {
     "psr-4": {

diff --git a/lib/GDLuminanceSource.php b/lib/GDLuminanceSource.php
@@ -52,7 +52,7 @@ public function GDLuminanceSource($gdImage, $width, $height)
         $this->dataHeight = $height;
         $this->left       = 0;
         $this->top        = 0;
-        $this->$gdImage   = $gdImage;
+        $this->gdImage    = $gdImage;
 
 
 // In order to measure pure decoding speed, we convert the entire image to a greyscale array
@@ -65,8 +65,8 @@ public function GDLuminanceSource($gdImage, $width, $height)
 
         for ($j = 0; $j < $height; $j++) {
             for ($i = 0; $i < $width; $i++) {
-                $argb  = imagecolorat($this->$gdImage, $i, $j);
-                $pixel = imagecolorsforindex($this->$gdImage, $argb);
+                $argb  = imagecolorat($this->gdImage, $i, $j);
+                $pixel = imagecolorsforindex($this->gdImage, $argb);
                 $r     = $pixel['red'];
                 $g     = $pixel['green'];
                 $b     = $pixel['blue'];

diff --git a/lib/QrReader.php b/lib/QrReader.php
@@ -62,7 +62,7 @@ public function __construct($imgSource, $sourceType = QrReader::SOURCE_TYPE_FILE
             $height = $im->getImageHeight();
             $source = new IMagickLuminanceSource($im, $width, $height);
         } else {
-            if (!is_resource($im)) {
+            if (!is_resource($im) && !is_object($im)) {
                 throw new \InvalidArgumentException('Invalid image source.');
             }
             $width  = imagesx($im);