Font temp dir hardcoded inside temp dir. Create if does not exist. (C…

…loses #152)
mpdf · Mar 8, 2017 · 4d00d2f · 4d00d2f
1 parent 16ff78b
commit 4d00d2f
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 3 deletions.
diff --git a/src/Cache.php b/src/Cache.php
@@ -14,7 +14,11 @@ class Cache
 	public function __construct($basePath, $cleanupInterval = 3600)
 	{
 		if (!is_writable($basePath)) {
-			throw new \Mpdf\MpdfException(sprintf('Temporary files directory "%s" is not writable', $basePath));
+			if (is_writable(dirname($basePath))) {
+				mkdir($basePath, 0777, true);
+			} else {
+				throw new \Mpdf\MpdfException(sprintf('Temporary files directory "%s" is not writable', $basePath));
+			}
 		}
 
 		$this->basePath = $basePath;

diff --git a/src/Config/ConfigVariables.php b/src/Config/ConfigVariables.php
@@ -418,7 +418,6 @@ public function __construct()
 
 			'fontDir' => __DIR__ . '/../../ttfonts',
 			'tempDir' => __DIR__ . '/../../tmp',
-			'fontTempDir' => __DIR__ . '/../../tmp/ttfontdata',
 
 			'hyphenationDictionaryFile' => __DIR__ . '/../../data/patterns/dictionary.txt',
 

diff --git a/src/Mpdf.php b/src/Mpdf.php
@@ -935,7 +935,7 @@ public function __construct(array $config = [])
 		$this->tableOfContents = new TableOfContents($this, $this->sizeConvertor);
 
 		$this->cache = new Cache($config['tempDir']);
-		$this->fontCache = new FontCache(new Cache($config['fontTempDir']));
+		$this->fontCache = new FontCache(new Cache($config['tempDir'] . '/ttfontdata'));
 
 		$this->fontFileFinder = new FontFileFinder($config['fontDir']);
 

diff --git a/tmp/ttfontdata/.gitkeep b/tmp/ttfontdata/.gitkeep