From 4ff5f3463a04e63acf2f4efd207c1049da7e7182 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Eli=C3=A1=C5=A1?= Date: Fri, 22 Mar 2019 12:04:10 +0100 Subject: [PATCH] Compatibility with PHP ~7.1 --- composer.json | 2 +- src/DI/Extension.php | 2 +- src/Document.php | 10 +++++----- src/DocumentFactory.php | 21 +++++++++------------ 4 files changed, 16 insertions(+), 19 deletions(-) diff --git a/composer.json b/composer.json index c4b6f6a..40f9ce0 100644 --- a/composer.json +++ b/composer.json @@ -23,7 +23,7 @@ "source": "https://github.com/dotblue/nette-pdf" }, "require": { - "mpdf/mpdf": "~5.7|~6.0", + "mpdf/mpdf": "~7.1", "nette/application": "~2.4", "nette/di": "~2.4", "nette/utils": "~2.4" diff --git a/src/DI/Extension.php b/src/DI/Extension.php index 44519a1..3936b5f 100755 --- a/src/DI/Extension.php +++ b/src/DI/Extension.php @@ -59,7 +59,7 @@ private function configureFonts(array $fonts) return []; } - $reflection = new ReflectionClass('mPDF'); + $reflection = new ReflectionClass('Mpdf\Mpdf'); $fontsDir = substr($reflection->getFileName(), 0, -8) . 'ttfonts'; foreach ($fonts as $font => $details) { diff --git a/src/Document.php b/src/Document.php index d276aa6..0fd067d 100755 --- a/src/Document.php +++ b/src/Document.php @@ -2,7 +2,7 @@ namespace DotBlue\Mpdf; -use mPDF; +use Mpdf\Mpdf; use Nette; use Nette\Application\UI; use Nette\Utils\Image; @@ -13,7 +13,7 @@ class Document use Nette\SmartObject; - /** @var mPDF */ + /** @var Mpdf */ private $mpdf; /** @var UI\ITemplate */ @@ -21,7 +21,7 @@ class Document - public function __construct(mPDF $mpdf, UI\ITemplate $template) + public function __construct(Mpdf $mpdf, UI\ITemplate $template) { $this->mpdf = $mpdf; $this->template = $template; @@ -105,9 +105,9 @@ public function printPdf() /** - * Returns instance of mPDF. + * Returns instance of Mpdf. * - * @return mPDF + * @return Mpdf */ public function getMpdf() { diff --git a/src/DocumentFactory.php b/src/DocumentFactory.php index 52300f1..f4b6a2f 100755 --- a/src/DocumentFactory.php +++ b/src/DocumentFactory.php @@ -3,7 +3,7 @@ namespace DotBlue\Mpdf; use LogicException; -use mPDF; +use Mpdf\Mpdf; use Nette; use Nette\Application\Application; use Nette\Utils\Strings; @@ -112,7 +112,7 @@ public function createPdf($theme, $variant = 'default.latte', array $setup = []) /** * @param string * @param array|NULL - * @return mPDF + * @return Mpdf */ private function createThemedMpdf($theme, array $setup = []) { @@ -122,16 +122,13 @@ private function createThemedMpdf($theme, array $setup = []) $setup = array_replace_recursive($this->themes[$theme], $setup); - $mpdf = new mPDF( - $setup['encoding'], - $setup['size'], - '', - '', - $setup['margin']['left'], - $setup['margin']['right'], - $setup['margin']['top'], - $setup['margin']['bottom'] - ); + $mpdf = new Mpdf([ + 'format' => $setup['size'], + 'margin_left' => $setup['margin']['left'], + 'margin_right' => $setup['margin']['right'], + 'margin_top' => $setup['margin']['top'], + 'margin_bottom'=> $setup['margin']['bottom'] + ]); $mpdf->showImageErrors = TRUE; $mpdf->img_dpi = $setup['img_dpi']; return $mpdf;