Updating robgridley/zebra to version 2

GBLIX · Dec 14, 2020 · 1cc97b4 · 1cc97b4
1 parent adc11e2
commit 1cc97b4
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 40 deletions.
diff --git a/composer.json b/composer.json
@@ -9,7 +9,7 @@
     ],
     "require": {
         "php": "^7.3 || ^8",
-        "robgridley/zebra": "^1.0"
+        "robgridley/zebra": "^2.0"
     },
     "require-dev": {
         "fzaninotto/faker": "^1.9.1",

diff --git a/composer.lock b/composer.lock
diff --git a/src/Weez/Zpl/Exceptions/InvalidZebraImageException.php b/src/Weez/Zpl/Exceptions/InvalidZebraImageException.php
diff --git a/src/Weez/Zpl/Model/Element/ZebraImage.php b/src/Weez/Zpl/Model/Element/ZebraImage.php
@@ -2,9 +2,9 @@
 
 namespace Weez\Zpl\Model\Element;
 
-use Weez\Zpl\Exceptions\InvalidZebraImageException;
 use Weez\Zpl\Model\ZebraElement;
 use Weez\Zpl\Utils\ZplUtils;
+use Zebra\Zpl\GdDecoder;
 use Zebra\Zpl\Image;
 
 /**
@@ -37,10 +37,8 @@ class ZebraImage extends ZebraElement
      */
     public function __construct($positionX, $positionY, $path, $compression = 'A')
     {
-        if (!$image = file_get_contents($path)) {
-            throw new InvalidZebraImageException();
-        }
-        $this->resource = new Image($image);
+        $decoder = GdDecoder::fromPath($path);
+        $this->resource = new Image($decoder);
         $this->compression = $compression;
         $this->positionX = $positionX;
         $this->positionY = $positionY;