Refactored the Dompdf class

ohgoodlord · Mar 23, 2014 · cb247c2 · cb247c2
1 parent ba752b6
commit cb247c2
Show file tree

Hide file tree

Showing 11 changed files with 661 additions and 362 deletions.
diff --git a/lib/class.pdf.php → lib/Cpdf.php b/lib/class.pdf.php → lib/Cpdf.php
diff --git a/src/Dompdf/Adapter/CPDF.php b/src/Dompdf/Adapter/CPDF.php
@@ -19,8 +19,6 @@
 use Dompdf\Image\Cache;
 use Dompdf\PhpEvaluator;
 
-require_once(DOMPDF_LIB_DIR . "/class.pdf.php");
-
 /**
  * PDF rendering interface
  *

diff --git a/src/Dompdf/Adapter/TCPDF.php b/src/Dompdf/Adapter/TCPDF.php
@@ -10,8 +10,6 @@
 use Dompdf\Dompdf;
 use Dompdf\Canvas;
 
-require_once DOMPDF_LIB_DIR . '/tcpdf/tcpdf.php';
-
 /**
  * TCPDF PDF Rendering interface
  *

diff --git a/src/Dompdf/Autoloader.php b/src/Dompdf/Autoloader.php
@@ -25,6 +25,11 @@ public static function register()
      */
     public static function autoload($class)
     {
+        if ($class === 'Cpdf') {
+            require_once __DIR__ . "/../../lib/Cpdf.php";
+            return;
+        }
+
         $prefixLength = strlen(self::PREFIX);
         if (0 === strncmp(self::PREFIX, $class, $prefixLength)) {
             $file = str_replace('\\', DIRECTORY_SEPARATOR, substr($class, $prefixLength));

diff --git a/src/Dompdf/CanvasFactory.php b/src/Dompdf/CanvasFactory.php
@@ -17,7 +17,6 @@
  */
 class CanvasFactory
 {
-
     /**
      * Constructor is private: this is a static class
      */
@@ -35,13 +34,13 @@ private function __construct()
      */
     static function get_instance(Dompdf $dompdf, $paper = null, $orientation = null, $class = null)
     {
-
-        $backend = strtolower(DOMPDF_PDF_BACKEND);
+        $DOMPDF_PDF_BACKEND = defined('DOMPDF_PDF_BACKEND') ? DOMPDF_PDF_BACKEND : 'CPDF';
+        $backend = strtolower($DOMPDF_PDF_BACKEND);
 
         if (isset($class) && class_exists($class, false)) {
             $class .= "_Adapter";
         } else {
-            if ((DOMPDF_PDF_BACKEND === "auto" || $backend === "pdflib") &&
+            if (($DOMPDF_PDF_BACKEND === "auto" || $backend === "pdflib") &&
                 class_exists("PDFLib", false)
             ) {
                 $class = "Dompdf\\Adapter\\PDFLib";
@@ -66,4 +65,4 @@ class_exists("PDFLib", false)
 
         return new $class($paper, $orientation, $dompdf);
     }
-}
+}