Merge pull request #266 from mikehaertl/264-tmpdir-in-constructor

Issue #264 Make tmpDir configurable via constructor
mikehaertl · Feb 18, 2018 · 45974cc · 45974cc
2 parents 844f289 + c11bb8d
commit 45974cc
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/src/Pdf.php b/src/Pdf.php
@@ -215,6 +215,11 @@ public function toString()
      */
     public function setOptions($options = array())
     {
+        // #264 tmpDir must be set before calling processOptions
+        if (isset($options['tmpDir'])) {
+            $this->tmpDir = $options['tmpDir'];
+            unset($options['tmpDir']);
+        }
         $options = $this->processOptions($options);
         foreach ($options as $key => $val) {
             if (is_int($key)) {

diff --git a/tests/PdfTest.php b/tests/PdfTest.php
@@ -255,9 +255,13 @@ public function testCanPassGlobalOptionsInConstructor()
         $inFile = $this->getHtmlAsset();
         $outFile = $this->getOutFile();
         $binary = $this->getBinary();
+        $tmpDir = realpath(sys_get_temp_dir()) . DIRECTORY_SEPARATOR . uniqid();
+        mkdir($tmpDir);
 
         $pdf = new Pdf(array(
             'binary' => $binary,
+            'tmpDir' => $tmpDir,
+            'header-html' => '<p>header</p>',
             'no-outline',
             'margin-top'    => 0,
             'allow' => array(
@@ -266,11 +270,11 @@ public function testCanPassGlobalOptionsInConstructor()
             ),
         ));
         $this->assertInstanceOf('mikehaertl\wkhtmlto\Pdf', $pdf->addPage($inFile));
+        $this->assertEquals($tmpDir, $pdf->tmpDir);
         $this->assertTrue($pdf->saveAs($outFile));
 
-        $tmpFile = $pdf->getPdfFilename();
         $this->assertFileExists($outFile);
-        $this->assertEquals("$binary --no-outline --margin-top '0' --allow '/tmp' --allow '/test' '$inFile' '$tmpFile'", (string) $pdf->getCommand());
+        $this->assertRegExp("#$binary --header-html '$tmpDir/tmp_wkhtmlto_pdf_[^ ]+\.html' --no-outline --margin-top '0' --allow '/tmp' --allow '/test' '$inFile' '$tmpDir/tmp_wkhtmlto_pdf_[^ ]+\.pdf'#", (string) $pdf->getCommand());
         unlink($outFile);
     }
     public function testCanSetGlobalOptions()
@@ -402,7 +406,6 @@ public function testCanUseXvfbRun()
     }
 
 
-
     protected function getBinary()
     {
         return '/usr/local/bin/wkhtmltopdf';