Fix unit test error

Author: ivanlanin

src/PhpWord/Writer/AbstractWriter.php

@@ -49,25 +49,25 @@ abstract class AbstractWriter implements WriterInterface
     private $diskCachingDirectory = './';
 
     /**
-     * Original file name
+     * Temporary directory
      *
      * @var string
      */
-    private $originalFilename;
+    private $tempDir = '';
 
     /**
-     * Temporary file name
+     * Original file name
      *
      * @var string
      */
-    private $tempFilename;
+    private $originalFilename;
 
     /**
-     * Temporary directory
+     * Temporary file name
      *
      * @var string
      */
-    private $tempDir;
+    private $tempFilename;
 
     /**
      * Get PhpWord object
@@ -88,7 +88,7 @@ public function getPhpWord()
      * Set PhpWord object
      *
      * @param PhpWord
-     * @return $this
+     * @return self
      */
     public function setPhpWord(PhpWord $phpWord = null)
     {
@@ -126,7 +126,7 @@ public function getUseDiskCaching()
      *
      * @param boolean $pValue
      * @param string $pDirectory
-     * @return $this
+     * @return self
      */
     public function setUseDiskCaching($pValue = false, $pDirectory = null)
     {
@@ -153,6 +153,32 @@ public function getDiskCachingDirectory()
         return $this->diskCachingDirectory;
     }
 
+    /**
+     * Get temporary directory
+     *
+     * @return string
+     */
+    public function getTempDir()
+    {
+        return $this->tempDir;
+    }
+
+    /**
+     * Set temporary directory
+     *
+     * @param string $value
+     * @return self
+     */
+    public function setTempDir($value)
+    {
+        if (!is_dir($value)) {
+            mkdir($value);
+        }
+        $this->tempDir = $value;
+
+        return $this;
+    }
+
     /**
      * Get temporary file name
      *
@@ -164,7 +190,7 @@ public function getDiskCachingDirectory()
     protected function getTempFile($filename)
     {
         // Temporary directory
-        $this->setTempDir();
+        $this->setTempDir(sys_get_temp_dir() . '/PHPWordWriter/');
 
         // Temporary file
         $this->originalFilename = $filename;
@@ -179,26 +205,6 @@ protected function getTempFile($filename)
         return $this->tempFilename;
     }
 
-    /**
-     * Get temporary directory
-     */
-    protected function getTempDir()
-    {
-        return $this->tempDir;
-    }
-
-    /**
-     * Set temporary directory
-     */
-    protected function setTempDir()
-    {
-        $tempDir = sys_get_temp_dir() . '/PHPWordMedia/';
-        if (!is_dir($tempDir)) {
-            mkdir($tempDir);
-        }
-        $this->tempDir = $tempDir;
-    }
-
     /**
      * Cleanup temporary file
      */

src/PhpWord/Writer/HTML.php

@@ -60,7 +60,7 @@ public function __construct(PhpWord $phpWord = null)
     public function save($filename = null)
     {
         if (!is_null($this->getPhpWord())) {
-            $this->setTempDir();
+            $this->setTempDir(sys_get_temp_dir() . '/PHPWordWriter/');
             $hFile = fopen($filename, 'w') or die("can't open file");
             fwrite($hFile, $this->writeDocument());
             fclose($hFile);