Merge branch 'master' into patch-1

ncjoes · Jul 3, 2023 · 9f88fd8 · 9f88fd8
2 parents 50bebcd + 0fc1081
commit 9f88fd8
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/composer.json b/composer.json
@@ -10,7 +10,7 @@
         }
     ],
     "require" : {
-        "php" : ">=5.4.4"
+        "php" : "^7.3|^8.0"
     },
     "require-dev" : {
         "phpunit/phpunit": "7.*",

diff --git a/src/OfficeConverter/OfficeConverter.php b/src/OfficeConverter/OfficeConverter.php
@@ -18,6 +18,7 @@ class OfficeConverter
     private $prefixExecWithExportHome;
     /** @var string */
     private $filter = '';
+    private $logPath;
 
     /**
      * OfficeConverter constructor.
@@ -27,10 +28,10 @@ class OfficeConverter
      * @param string      $bin
      * @param bool        $prefixExecWithExportHome
      */
-    public function __construct($filename, $tempPath = null, $bin = 'libreoffice', $prefixExecWithExportHome = true)
+    public function __construct($filename, $tempPath = null, $bin = 'libreoffice', $prefixExecWithExportHome = true, $logPath = null)
     {
         if ($this->open($filename)) {
-            $this->setup($tempPath, $bin, $prefixExecWithExportHome);
+            $this->setup($tempPath, $bin, $prefixExecWithExportHome, $logPath);
         }
     }
 
@@ -86,7 +87,7 @@ protected function open($filename)
      *
      * @throws OfficeConverterException
      */
-    protected function setup($tempPath, $bin, $prefixExecWithExportHome)
+    protected function setup($tempPath, $bin, $prefixExecWithExportHome, $logPath)
     {
         //basename
         $this->basename = pathinfo($this->file, PATHINFO_BASENAME);
@@ -116,6 +117,9 @@ protected function setup($tempPath, $bin, $prefixExecWithExportHome)
 
         //use prefix export home or not
         $this->prefixExecWithExportHome = $prefixExecWithExportHome;
+
+        // log path
+        $this->logPath = realpath($logPath);
     }
 
     /**
@@ -128,6 +132,7 @@ protected function makeCommand($outputDirectory, $outputExtension)
     {
         $oriFile = escapeshellarg($this->file);
         $outputDirectory = escapeshellarg($outputDirectory);
+        $logCmd = $this->logPath ? ">> {$this->logPath}" : "";
 
         return "{$this->bin} --headless --convert-to {$outputExtension}{$this->filter} {$oriFile} --outdir {$outputDirectory}";
     }
@@ -226,6 +231,7 @@ private function getAllowedConverter($extension = null)
             'Jfif' => ['pdf'],
             'rtf'  => ['docx', 'txt', 'pdf'],
             'txt'  => ['pdf', 'odt', 'doc', 'docx', 'html'],
+            'csv'  => ['pdf'],
         ];
 
         if (null !== $extension) {