Merge pull request #6 from morrislaptop/setasign/fpdf

Update dependencies to setaasign/fpdi
jurosh · Aug 14, 2018 · fe9c961 · fe9c961
2 parents 34df0ef + 72a723b
commit fe9c961
Show file tree

Hide file tree

Showing 3 changed files with 85 additions and 81 deletions.
diff --git a/composer.json b/composer.json
@@ -9,8 +9,8 @@
   "homepage": "https://github.com/jurosh/php-pdf-merge",
   "license": "MIT",
   "require": {
-    "php": ">=5.3.0",
-    "itbz/fpdi": "^1.5"
+    "php": ">=5.6.20",
+    "setasign/fpdi-fpdf": "^2.0"
   },
   "authors": [
     {

diff --git a/composer.lock b/composer.lock
diff --git a/src/Jurosh/PDFMerge/PDFMerger.php b/src/Jurosh/PDFMerge/PDFMerger.php
@@ -1,8 +1,7 @@
 <?php namespace Jurosh\PDFMerge;
 
 use Exception;
-use fpdi\FPDI;
-use fpdf\FPDF;
+use setasign\Fpdi\Fpdi AS FPDI;
 
 /**
  * Basic merging of PDF files into one file
@@ -73,7 +72,7 @@ public function merge($outputmode = 'browser', $outputpath = 'newfile.pdf') {
                     $template = $fpdi->importPage($i);
                     $size = $fpdi->getTemplateSize($template);
 
-                    $fpdi->AddPage($file->getOrientationCode(), array($size['w'], $size['h']));
+                    $fpdi->AddPage($file->getOrientationCode(), array($size['width'], $size['height']));
                     $fpdi->useTemplate($template);
                 }
             } else {