Merge branch 'master' of github.com:ncjoes/office-converter

src/OfficeConverter/OfficeConverter.php

@@ -14,18 +14,20 @@ class OfficeConverter
     private $tempPath;
     private $extension;
     private $basename;
+    private $prefixExecWithExportHome;
 
     /**
      * OfficeConverter constructor.
      *
      * @param $filename
      * @param null $tempPath
      * @param string $bin
+     * @param bool $prefixExecWithExportHome
      */
-    public function __construct($filename, $tempPath = null, $bin = 'libreoffice')
+    public function __construct($filename, $tempPath = null, $bin = 'libreoffice', $prefixExecWithExportHome = true)
     {
         if ($this->open($filename)) {
-            $this->setup($tempPath, $bin);
+            $this->setup($tempPath, $bin, $prefixExecWithExportHome);
         }
     }
 
@@ -72,10 +74,11 @@ protected function open($filename)
     /**
      * @param $tempPath
      * @param $bin
+     * @param $prefixExecWithExportHome
      *
      * @throws OfficeConverterException
      */
-    protected function setup($tempPath, $bin)
+    protected function setup($tempPath, $bin, $prefixExecWithExportHome)
     {
         //basename
         $this->basename = pathinfo($this->file, PATHINFO_BASENAME);
@@ -97,6 +100,9 @@ protected function setup($tempPath, $bin)
 
         //binary location
         $this->bin = $bin;
+
+        //use prefix export home or not
+        $this->prefixExecWithExportHome = $prefixExecWithExportHome;
     }
 
     /**
@@ -221,9 +227,11 @@ private function exec($cmd, $input = '')
     {
         // Cannot use $_SERVER superglobal since that's empty during UnitUnishTestCase
         // getenv('HOME') isn't set on Windows and generates a Notice.
-        $home = getenv('HOME');
-        if (!is_writable($home)) {
-            $cmd = 'export HOME=/tmp && ' . $cmd;
+        if ($this->prefixExecWithExportHome) {
+          $home = getenv('HOME');
+          if (!is_writable($home)) {
+              $cmd = 'export HOME=/tmp && ' . $cmd;
+          }
         }
         $process = proc_open($cmd, [0 => ['pipe', 'r'], 1 => ['pipe', 'w'], 2 => ['pipe', 'w']], $pipes);
         fwrite($pipes[0], $input);