Merge pull request #7 from DALTCORE/tcpdf-as-composer-dep

Tcpdf as composer dep
DALTCORE · Dec 5, 2019 · f3ebd88 · f3ebd88
2 parents 0e68fe3 + 75342a2
commit f3ebd88
Show file tree

Hide file tree

Showing 206 changed files with 6 additions and 89,622 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,3 @@
+.idea
+vendor
+composer.lock
diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 # lara-pdf-merger
 
-Drop-in replacement for the original package from [deltaaskii/lara-pdf-merger](https://github.com/deltaaskii/lara-pdf-merger) that works under *PHP 7.3*
+Drop-in replacement for the original package from [deltaaskii/lara-pdf-merger](https://github.com/deltaaskii/lara-pdf-merger) that also works under *PHP 7.4*
 
 
 Original written by http://pdfmerger.codeplex.com/team/view

diff --git a/composer.json b/composer.json
@@ -17,7 +17,8 @@
         }
     ],
     "require": {
-        "php" : ">=5.4"
+        "php" : ">=5.4",
+        "wfeller/tcpdi": "1.2"
     },
     "homepage" : "https://github.com/daltcore/lara-pdf-merger",
     "autoload": {

diff --git a/src/LynX39/LaraPdfMerger/PdfManage.php b/src/LynX39/LaraPdfMerger/PdfManage.php
@@ -5,9 +5,6 @@
 use Exception;
 use TCPDI;
 
-require_once('tcpdf/tcpdf.php');
-require_once('tcpdf/tcpdi.php');
-
 class PdfManage
 {
     private $_files;    //['form.pdf']  ["1,2,4, 5-19"]

diff --git a/src/LynX39/LaraPdfMerger/tcpdf/config/tcpdf_config.php b/src/LynX39/LaraPdfMerger/tcpdf/config/tcpdf_config.php