improved code style and used more typehints

Signed-off-by: Christoph Massmann <[email protected]>

Author: ma4nn

src/Model/Document.php

@@ -1,7 +1,7 @@
 <?php
+declare(strict_types=1);
+
 /**
- * Pdf document class
- *
  * @section LICENSE
  * This file is created by vianetz <[email protected]>.
  * The code is distributed under the GPL license.
@@ -21,72 +21,43 @@
 
 class Document implements DocumentInterface
 {
-    /** @var string */
-    private $htmlContents;
-
-    /** @var string */
-    private $pdfBackgroundFile = '';
+    private string $htmlContents;
+    private string $pdfBackgroundFile = '';
+    private string $pdfBackgroundFileForFirstPage = '';
 
-    /** @var string */
-    private $pdfBackgroundFileForFirstPage = '';
-
-    /**
-     * @param string $htmlContents
-     *
-     * @return \Vianetz\Pdf\Model\Document
-     */
-    public function setHtmlContents($htmlContents)
+    public function setHtmlContents(string $htmlContents): self
     {
         $this->htmlContents = $htmlContents;
+
         return $this;
     }
 
-    /**
-     * @return string
-     */
-    public function getHtmlContents()
+    public function getHtmlContents(): string
     {
         return $this->htmlContents;
     }
 
-    /**
-     * @return string
-     */
-    public function getPdfBackgroundFile()
+    public function getPdfBackgroundFile(): string
     {
         return $this->pdfBackgroundFile;
     }
 
-    /**
-     * @param string $pdfFile
-     * @return void
-     */
-    public function setPdfBackgroundFile($pdfFile)
+    public function setPdfBackgroundFile(string $pdfBackgroundFile): void
     {
-        $this->pdfBackgroundFile = $pdfFile;
+        $this->pdfBackgroundFile = $pdfBackgroundFile;
     }
 
-    /**
-     * @return string
-     */
-    public function getPdfBackgroundFileForFirstPage()
+    public function getPdfBackgroundFileForFirstPage(): string
     {
         return $this->pdfBackgroundFileForFirstPage;
     }
 
-    /**
-     * @param string $pdfFile
-     * @return void
-     */
-    public function setPdfBackgroundFileForFirstPage($pdfFile)
+    public function setPdfBackgroundFileForFirstPage(string $pdfBackgroundFileForFirstPage): void
     {
-        $this->pdfBackgroundFileForFirstPage = $pdfFile;
+        $this->pdfBackgroundFileForFirstPage = $pdfBackgroundFileForFirstPage;
     }
 
-    /**
-     * @return string
-     */
-    public function getDocumentType()
+    public function getDocumentType(): string
     {
         return '';
     }

src/Model/DocumentInterface.php

@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 /**
  * @section LICENSE
  * This file is created by vianetz <[email protected]>.
@@ -17,42 +19,18 @@
 
 namespace Vianetz\Pdf\Model;
 
-/**
- * @todo rename to HtmlDocumentInterface
- */
+/** @todo rename to HtmlDocumentInterface */
 interface DocumentInterface
 {
-    /**
-     * Return HTML file contents for conversion to PDF.
-     *
-     * @return string
-     */
-    public function getHtmlContents();
-
-    /**
-     * @return string
-     */
-    public function getPdfBackgroundFile();
-
-    /**
-     * @param string $pdfFile
-     * @return void
-     */
-    public function setPdfBackgroundFile($pdfFile);
-
-    /**
-     * @return string
-     */
-    public function getPdfBackgroundFileForFirstPage();
-
-    /**
-     * @param string $pdfFile
-     * @return void
-     */
-    public function setPdfBackgroundFileForFirstPage($pdfFile);
-
-    /**
-     * @return string
-     */
-    public function getDocumentType();
+    public function getHtmlContents(): string;
+
+    public function getPdfBackgroundFile(): string;
+
+    public function setPdfBackgroundFile(string $pdfFile): void;
+
+    public function getPdfBackgroundFileForFirstPage(): string;
+
+    public function setPdfBackgroundFileForFirstPage(string $pdfFile): void;
+
+    public function getDocumentType(): string;
 }

src/Model/Generator/Dompdf.php

@@ -84,6 +84,7 @@ private function getDompdfOptions(): array
             'isPhpEnabled' => true,
             'isRemoteEnabled' => true,
             'chroot' => $this->config->getChrootDir(),
+            'fontCache' => $this->config->getTempDir(),
         ];
     }