Check for process constructor deprecation in Symfony 4.2 and use from…

…ShellCommandline if available
bobvandevijver · Sep 2, 2020 · 0f82276 · 0f82276
1 parent a0a2564
commit 0f82276
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 3 deletions.
diff --git a/Generator/LatexGenerator.php b/Generator/LatexGenerator.php
@@ -349,13 +349,19 @@ protected function compilePdf($texLocation, array $compileOptions = array()) {
       }
       unset($output);
 
-      $process = new Process(sprintf(
+      $commandLine = sprintf(
           'cd %s && HOME="/tmp" %s %s -interaction=nonstopmode -output-directory="%s" "%s"',
           $this->outputDir,
           $this->pdfLatexLocation,
           $optionsString,
           $this->outputDir,
-          $texLocation));
+          $texLocation);
+      if (method_exists(Process::class, 'fromShellCommandline')) {
+        $process = Process::fromShellCommandline($commandLine);
+      } else {
+        $process = new Process($commandLine);
+      }
+
       $process->setTimeout($this->timeout);
       $process->run();
       $output = explode("\n", $process->getOutput());

diff --git a/Latex/Element/IncludePdf.php b/Latex/Element/IncludePdf.php
@@ -56,7 +56,13 @@ public function __construct($fileLocation, $skipFirstWallpaper = true)
    */
   private function getPDFPages($document)
   {
-    $process = new Process("pdfinfo $document");
+    $commandLine     = sprintf('pdfinfo %s', $document);
+    if (method_exists(Process::class, 'fromShellCommandline')) {
+      $process = Process::fromShellCommandline($commandLine);
+    } else {
+      $process = new Process($commandLine);
+    }
+
     $process->run();
     if($process->getExitCode() !== 0){
       return 0;