wrap directory creation in try / catch.

laravel · Oct 2, 2013 · 4841dc8 · 4841dc8 · robclancy · Oct 11, 2013
1 parent 2e6e27f
commit 4841dc8
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/src/Illuminate/Cache/FileStore.php b/src/Illuminate/Cache/FileStore.php
@@ -94,9 +94,13 @@ public function put($key, $value, $minutes)
 	 */
 	protected function createCacheDirectory($path)
 	{
-		if ( ! $this->files->isDirectory($directory = dirname($path)))
+		try
+		{
+			$this->files->makeDirectory(dirname($path), 0777, true);
+		}
+		catch (\Exception $e)
 		{
-			$this->files->makeDirectory($directory, 0777, true);
+			//
 		}
 	}
 

diff --git a/tests/Cache/CacheFileStoreTest.php b/tests/Cache/CacheFileStoreTest.php
@@ -19,7 +19,6 @@ public function testPutCreatesMissingDirectories()
 		$files = $this->mockFilesystem();
 		$md5 = md5('foo');
 		$full_dir = __DIR__.'/'.substr($md5, 0, 2).'/'.substr($md5, 2, 2);
-		$files->expects($this->once())->method('isDirectory')->with($this->equalTo($full_dir))->will($this->returnValue(false));
 		$files->expects($this->once())->method('makeDirectory')->with($this->equalTo($full_dir), $this->equalTo(0777), $this->equalTo(true));
 		$files->expects($this->once())->method('put')->with($this->equalTo($full_dir.'/'.$md5));
 		$store = new FileStore($files, __DIR__);