Merge branch 'develop'

dompdf · Dec 14, 2018 · 75f13c7 · 75f13c7
2 parents 6f9ff4b + c8a1a93
commit 75f13c7
Show file tree

Hide file tree

Showing 26 changed files with 435 additions and 219 deletions.
diff --git a/composer.json b/composer.json
@@ -26,7 +26,6 @@
     },
     "require": {
         "php": ">=5.4.0",
-        "ext-gd": "*",
         "ext-dom": "*",
         "ext-mbstring": "*",
         "phenx/php-font-lib": "0.5.*",
@@ -36,6 +35,11 @@
         "phpunit/phpunit": "^4.8|^5.5|^6.5",
         "squizlabs/php_codesniffer": "2.*"
     },
+    "suggest": {
+        "ext-gd": "Needed to process images",
+        "ext-imagick": "Improves image processing performance",
+        "ext-gmagick": "Improves image processing performance"
+    },
     "extra": {
         "branch-alias": {
             "dev-develop": "0.7-dev"

diff --git a/lib/Cpdf.php b/lib/Cpdf.php
@@ -464,28 +464,28 @@ protected function o_viewerPreferences($id, $action, $options = '')
                         // Named with limited valid values
                         case 'NonFullScreenPageMode':
                             if (!in_array($v, array('UseNone', 'UseOutlines', 'UseThumbs', 'UseOC'))) {
-                                continue;
+                                break;
                             }
                             $o['info'][$k] = $v;
                             break;
 
                         case 'Direction':
                             if (!in_array($v, array('L2R', 'R2L'))) {
-                                continue;
+                                break;
                             }
                             $o['info'][$k] = $v;
                             break;
 
                         case 'PrintScaling':
                             if (!in_array($v, array('None', 'AppDefault'))) {
-                                continue;
+                                break;
                             }
                             $o['info'][$k] = $v;
                             break;
 
                         case 'Duplex':
                             if (!in_array($v, array('None', 'AppDefault'))) {
-                                continue;
+                                break;
                             }
                             $o['info'][$k] = $v;
                             break;

diff --git a/lib/res/broken_image.svg b/lib/res/broken_image.svg
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -6,11 +6,10 @@
          convertNoticesToExceptions="true"
          convertWarningsToExceptions="true"
          processIsolation="false"
-         stopOnFailure="false"
-         syntaxCheck="false">
+         stopOnFailure="false">
     <testsuites>
         <testsuite name="Dompdf Test Suite">
             <directory>./tests/Dompdf/</directory>
         </testsuite>
     </testsuites>
-</phpunit>
+</phpunit>
diff --git a/src/Adapter/CPDF.php b/src/Adapter/CPDF.php
@@ -152,7 +152,7 @@ class CPDF implements Canvas
     private $_page_text;
 
     /**
-     * Array of pages for accesing after rendering is initially complete
+     * Array of pages for accessing after rendering is initially complete
      *
      * @var array
      */
@@ -275,7 +275,7 @@ public function add_info($label, $value)
     /**
      * Opens a new 'object'
      *
-     * While an object is open, all drawing actions are recored in the object,
+     * While an object is open, all drawing actions are recorded in the object,
      * as opposed to being drawn on the current page.  Objects can be added
      * later to a specific page or to several pages.
      *