Merge branch 'release/2.0.0'

Author: ma4nn

CHANGELOG.md

@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## [2.0.0] - 2020-11-05
+### Changed
+- Upgraded DomPPDF dependency to 0.8.6 and added chroot setting
+
 ## [1.4.0] - 2020-10-15
 ### Changed
 - `PdfMerge` class can now automatically instantiate the merger class

composer.json

@@ -26,17 +26,18 @@
   },
   "require": {
     "php": "^5.6|^7",
-    "dompdf/dompdf": "<=0.8.5",
-    "setasign/fpdi": "*",
+    "dompdf/dompdf": "^0.8",
+    "setasign/fpdi": "^2.0",
     "setasign/fpdi-fpdf": "^2"
   },
   "require-dev": {
     "phpunit/phpunit": "^7",
     "phpstan/phpstan": "^0.12.11",
-    "phpstan/phpstan-phpunit": "^0.12.6"
+    "phpstan/phpstan-phpunit": "^0.12.6",
+    "roave/backward-compatibility-check": "^5.0"
   },
   "suggest": {
     "vianetz/signaturportal-api": "Use this library to sign your generated PDF documents.",
     "zf1/zend-pdf": "Necessary if you want to use Zend_Pdf for merging. By default this package uses the fpdi merger."
   }
-}
+}

src/Model/Config.php

@@ -21,14 +21,10 @@
 
 final class Config
 {
-    /**
-     * @var string
-     */
+    /** @var string */
     const PAPER_ORIENTATION_LANDSCAPE = 'landscape';
 
-    /**
-     * @var string
-     */
+    /** @var string */
     const PAPER_ORIENTATION_PORTRAIT = 'portrait';
 
     /**
@@ -37,30 +33,23 @@ final class Config
      */
     private $pdfSize = 'a4';
 
-    /**
-     * @var string
-     */
+    /** @var string */
     private $pdfOrientation;
 
-    /**
-     * @var string
-     */
+    /** @var string */
     private $pdfAuthor = '';
 
-    /**
-     * @var string
-     */
+    /** @var string */
     private $pdfTitle = '';
 
-    /**
-     * @var boolean
-     */
+    /** @var boolean */
     private $isDebugMode = false;
 
-    /**
-     * @var string
-     */
-    private $tempDir = '';
+    /** @var string */
+    private $tempDir;
+
+    /** @var string */
+    private $chrootDir = '/';
 
     public function __construct()
     {
@@ -113,14 +102,21 @@ public function getTempDir()
         return $this->tempDir;
     }
 
+    /**
+     * @return string
+     */
+    public function getChrootDir()
+    {
+        return $this->chrootDir;
+    }
+
     /**
      * @param string $pdfSize
      * @return Config
      */
     public function setPdfSize($pdfSize)
     {
         $this->pdfSize = $pdfSize;
-
         return $this;
     }
 
@@ -131,7 +127,6 @@ public function setPdfSize($pdfSize)
     public function setPdfOrientation($pdfOrientation)
     {
         $this->pdfOrientation = $pdfOrientation;
-
         return $this;
     }
 
@@ -142,7 +137,6 @@ public function setPdfOrientation($pdfOrientation)
     public function setPdfAuthor($pdfAuthor)
     {
         $this->pdfAuthor = $pdfAuthor;
-
         return $this;
     }
 
@@ -153,7 +147,6 @@ public function setPdfAuthor($pdfAuthor)
     public function setPdfTitle($pdfTitle)
     {
         $this->pdfTitle = $pdfTitle;
-
         return $this;
     }
 
@@ -164,7 +157,6 @@ public function setPdfTitle($pdfTitle)
     public function setIsDebugMode($isDebugMode)
     {
         $this->isDebugMode = $isDebugMode;
-
         return $this;
     }
 
@@ -175,7 +167,17 @@ public function setIsDebugMode($isDebugMode)
     public function setTempDir($tempDir)
     {
         $this->tempDir = $tempDir;
+        return $this;
+    }
 
+    /**
+     * @param string $chrootDir
+     *
+     * @return $this
+     */
+    public function setChrootDir($chrootDir)
+    {
+        $this->chrootDir = $chrootDir;
         return $this;
     }
 }

src/Model/Generator/AbstractGenerator.php

@@ -35,14 +35,10 @@
  */
 abstract class AbstractGenerator implements GeneratorInterface
 {
-    /**
-     * @var string
-     */
+    /** @var string */
     const DEBUG_FILE_NAME = 'vianetz_pdf_generator_debug.html';
 
-    /**
-     * @var \Vianetz\Pdf\Model\Config $config
-     */
+    /** @var \Vianetz\Pdf\Model\Config $config */
     protected $config;
 
     /**

src/Model/Generator/Dompdf.php

@@ -102,7 +102,8 @@ private function getDompdfOptions()
     {
         return array(
             'isPhpEnabled' => true,
-            'isRemoteEnabled' => true
+            'isRemoteEnabled' => true,
+            'chroot' => $this->config->getChrootDir(),
         );
     }
 }