Merge pull request #195 from rafaelios/master

Escapes binary path of wkhtmltopdf on windows
FriendsOfCake · Feb 23, 2017 · c492102 · c492102
2 parents 5790f9e + b0ee351
commit c492102
Showing 1 changed file with 18 additions and 2 deletions.
diff --git a/src/Pdf/Engine/WkHtmlToPdfEngine.php b/src/Pdf/Engine/WkHtmlToPdfEngine.php
@@ -10,11 +10,17 @@ class WkHtmlToPdfEngine extends AbstractPdfEngine
     /**
      * Path to the wkhtmltopdf executable binary
      *
-     * @access protected
      * @var string
      */
     protected $_binary = '/usr/bin/wkhtmltopdf';
 
+    /**
+     * Flag to indicate if the environment is windows
+     *
+     * @var bool
+     */
+    protected $_windowsEnvironment;
+
     /**
      * Constructor
      *
@@ -23,6 +29,7 @@ class WkHtmlToPdfEngine extends AbstractPdfEngine
     public function __construct(CakePdf $Pdf)
     {
         parent::__construct($Pdf);
+        $this->_windowsEnvironment = strtoupper(substr(PHP_OS, 0, 3)) === 'WIN';
     }
 
     /**
@@ -114,7 +121,12 @@ protected function _getCommand()
         }
         $options = array_merge($options, (array)$this->config('options'));
 
-        $command = $this->_binary;
+        if ($this->_windowsEnvironment) {
+            $command = '"' . $this->_binary . '"';
+        } else {
+            $command = $this->_binary;
+        }
+
         foreach ($options as $key => $value) {
             if (empty($value)) {
                 continue;
@@ -139,6 +151,10 @@ protected function _getCommand()
         }
         $command .= " - -";
 
+        if ($this->_windowsEnvironment) {
+            $command = '"' . $command . '"';
+        }
+
         return $command;
     }
 }