Merge pull request #14 from jobcloud/chore/PRO-3016/php84-forward-compatibility

chore(PRO-3016): PHP 8.4 forward compatibility

Author: haeber

composer.json

@@ -10,24 +10,25 @@
     "authors": [
         {
             "name": "Piotr Śliwa",
-            "homepage": "http://ohey.pl",
+            "homepage": "https://ohey.pl",
             "email": "peter.pl7@gmail.com"
         }
     ],
     "repositories": [
+        {"type": "vcs", "no-api": true, "url": "git@github.com:jobcloud/laminas-memory.git"},
         {"type": "vcs", "no-api": true, "url": "git@github.com:jobcloud/zendpdf.git"}
     ],
     "require": {
-        "php": "^8.2",
+        "php": "^8.4",
         "ext-iconv": "*",
         "ext-libxml": "*",
         "ext-mbstring": "*",
         "ext-xmlreader": "*",
-        "jobcloud/zendpdf": "^3.0.0"
+        "jobcloud/zendpdf": "^4.0.0"
     },
     "require-dev": {
         "imagine/imagine": ">=0.2.0,<0.6.0",
-        "phpunit/phpunit": "^8.5.42"
+        "phpunit/phpunit": "^8.5.44"
     },
     "prefer-stable": true,
     "minimum-stability": "dev",

docker/php/Dockerfile

@@ -1,4 +1,4 @@
-FROM php:8.3-alpine3.22
+FROM php:8.4-alpine3.22
 
 ARG USER_ID
 

lib/PHPPdf/Bridge/Zend/Pdf/Resource/Image/Tiff.php

@@ -263,7 +263,7 @@ public function __construct($imageFileName)
         \ZendPdf\Resource\Image::__construct();
 
         $imageDictionary = $this->_resource->dictionary;
-        if(!isset($this->_width) || !isset($this->_width)) {
+        if(!isset($this->_width) || !isset($this->_height)) {
             throw new Exception\CorruptedImageException('Problem reading tiff file. Tiff is probably corrupt.');
         }
 

lib/PHPPdf/Cache/CacheImpl.php

@@ -69,7 +69,7 @@ private function createAdapter($name)
         return StorageFactory::adapterFactory($name);
     }
 
-    private function cacheEngineDosntExistException($engine, \Exception $e = null)
+    private function cacheEngineDosntExistException($engine, ?\Exception $e = null)
     {
         return new RuntimeException(sprintf('Cache engine "%s" dosn\'t exist.', $engine), 1, $e);
     }

lib/PHPPdf/Core/Document.php

@@ -155,7 +155,7 @@ public function draw($pages)
     {
         if($this->isProcessed())
         {
-            throw new LogicException(sprintf('Pdf has alredy been drawed.'));
+            throw new LogicException('Pdf has alredy been drawed.');
         }
 
         $this->processed = true;

lib/PHPPdf/Core/DrawingTaskHeap.php

@@ -19,7 +19,7 @@ class DrawingTaskHeap extends \SplHeap
 {
     private $elements = 0;
 
-    public function insert($value): bool
+    public function insert($value): true
     {
         $value->setOrder($this->elements++);
         parent::insert($value);

lib/PHPPdf/Core/Engine/AbstractEngine.php

@@ -8,7 +8,7 @@
 
 namespace PHPPdf\Core\Engine;
 
-use PHPPdf\Core\UnitConverter;
+use PHPPdf\Core\UnitConverter;
 
 /**
  * Abstract engine
@@ -19,7 +19,7 @@ abstract class AbstractEngine implements Engine
 {
     protected $unitConverter;
 
-    public function __construct(UnitConverter $unitConverter = null)
+    public function __construct(?UnitConverter $unitConverter = null)
     {
         $this->unitConverter = $unitConverter;
     }

lib/PHPPdf/Core/Engine/EngineFactoryImpl.php

@@ -8,9 +8,9 @@
 
 namespace PHPPdf\Core\Engine;
 
-use PHPPdf\Core\ImageUnitConverter;
-use PHPPdf\Core\PdfUnitConverter;
-use PHPPdf\Exception\DomainException;
+use PHPPdf\Core\ImageUnitConverter;
+use PHPPdf\Core\PdfUnitConverter;
+use PHPPdf\Exception\DomainException;
 use PHPPdf\Core\Engine\Imagine\Engine as ImagineEngine;
 use PHPPdf\Core\Engine\ZF\Engine as ZendEngine;
 
@@ -51,7 +51,7 @@ public function createEngine($type, array $options = array())
 
                 $imagineClass = sprintf('Imagine\%s\Imagine', $engine);   
 
-                if(!class_exists($imagineClass, true))
+                if(!class_exists($imagineClass))
                 {
                     throw new DomainException(sprintf('Unknown image engine type "%s" or Imagine library is not installed.', $engine));
                 }

lib/PHPPdf/Core/Engine/GraphicsContext.php

@@ -50,12 +50,12 @@ public function drawLine($x1, $y1, $x2, $y2);
     public function setFont(Font $font, $size);
 
     /**
-     * @param string String representing color
+     * @param string $color String representing color
      */
     public function setFillColor($color);
 
     /**
-     * @param string String representing color
+     * @param string $color String representing color
      */
     public function setLineColor($color);
 

lib/PHPPdf/Core/Engine/Imagine/Engine.php

@@ -8,7 +8,7 @@
 
 namespace PHPPdf\Core\Engine\Imagine;
 
-use PHPPdf\Exception\InvalidResourceException;
+use PHPPdf\Exception\InvalidResourceException;
 use PHPPdf\Core\Engine\AbstractEngine;
 use PHPPdf\Core\UnitConverter;
 use Imagine\Image\ImagineInterface;
@@ -23,11 +23,11 @@
 class Engine extends AbstractEngine
 {
     private $imagine;
-    private $graphicsContexts = array();
+    private $graphicsContexts = [];
     private $outputFormat;
     private $renderOptions;
 
-    public function __construct(ImagineInterface $imagine, $outputFormat, UnitConverter $unitConverter = null, array $renderOptions = array())
+    public function __construct(ImagineInterface $imagine, $outputFormat, ?UnitConverter $unitConverter = null, array $renderOptions = [])
     {
         parent::__construct($unitConverter);
         $this->imagine = $imagine;