Fixed conflicting PDF facade namespace and corrected php version

Updated composer to have the correct config to install dependancies that work for 7.0
rosetta-ai · Dec 4, 2017 · 6ebe8bf · 6ebe8bf
1 parent 7668a99
commit 6ebe8bf
Show file tree

Hide file tree

Showing 5 changed files with 163 additions and 151 deletions.
diff --git a/app/Exceptions/Handler.php b/app/Exceptions/Handler.php
@@ -26,10 +26,10 @@ class Handler extends ExceptionHandler
 
     /**
      * Report or log an exception.
-     *
      * This is a great spot to send exceptions to Sentry, Bugsnag, etc.
      *
      * @param  \Exception $e
+     * @return mixed
      */
     public function report(Exception $e)
     {

diff --git a/app/Services/ExportService.php b/app/Services/ExportService.php
@@ -127,7 +127,7 @@ protected function htmlToPdf($html)
             $pdf = \SnappyPDF::loadHTML($containedHtml);
             $pdf->setOption('print-media-type', true);
         } else {
-            $pdf = \PDF::loadHTML($containedHtml);
+            $pdf = \DomPDF::loadHTML($containedHtml);
         }
         return $pdf->output();
     }

diff --git a/composer.json b/composer.json
@@ -74,6 +74,8 @@
     "config": {
         "optimize-autoloader": true,
         "preferred-install": "dist",
-        "php": "7.0"
+        "platform": {
+            "php": "7.0"
+        }
     }
 }