Merge branch 'ticket/p/10013' into develop

* ticket/p/10013:
  [ticket/10013] Use mkdir to create directory trees.
  [ticket/10013] Fixed cache test to create intermediate directories.
  [ticket/10013] Changed cache test to use tests/tmp/cache as cache directory

.gitignore

@@ -7,4 +7,5 @@ phpBB/images/avatars/upload/*
 phpBB/store/*
 tests/phpbb_unit_tests.sqlite2
 tests/test_config.php
+tests/tmp
 tests/utf/data/*.txt

tests/cache/cache_test.php

@@ -11,21 +11,53 @@ require_once dirname(__FILE__) . '/../../phpBB/includes/functions.php';
 
 class phpbb_cache_test extends phpbb_test_case
 {
+	private $cache_dir;
+
+	public function __construct()
+	{
+		$this->cache_dir = dirname(__FILE__) . '/../tmp/cache/';
+	}
+
+	protected function setUp()
+	{
+		if (file_exists($this->cache_dir))
+		{
+			// cache directory possibly left after aborted
+			// or failed run earlier
+			$this->remove_cache_dir();
+		}
+		$this->create_cache_dir();
+	}
+
 	protected function tearDown()
 	{
-		$iterator = new DirectoryIterator(dirname(__FILE__) . '/tmp');
+		if (file_exists($this->cache_dir))
+		{
+			$this->remove_cache_dir();
+		}
+	}
+
+	private function create_cache_dir()
+	{
+		$this->get_test_case_helpers()->makedirs($this->cache_dir);
+	}
+
+	private function remove_cache_dir()
+	{
+		$iterator = new DirectoryIterator($this->cache_dir);
 		foreach ($iterator as $file)
 		{
-			if (is_file(dirname(__FILE__) . '/tmp/' . $file) && $file != '.gitkeep')
+			if ($file != '.' && $file != '..')
 			{
-				unlink(dirname(__FILE__) . '/tmp/' . $file);
+				unlink($this->cache_dir . '/' . $file);
 			}
 		}
+		rmdir($this->cache_dir);
 	}
 
 	public function test_cache_driver_file()
 	{
-		$driver = new phpbb_cache_driver_file(dirname(__FILE__) . '/tmp/');
+		$driver = new phpbb_cache_driver_file($this->cache_dir);
 		$driver->put('test_key', 'test_value');
 		$driver->save();
 

tests/test_framework/phpbb_test_case_helpers.php

@@ -41,4 +41,9 @@ class phpbb_test_case_helpers
 		$this->expectedTriggerError = true;
 		$this->test_case->setExpectedException($exceptionName, (string) $message, $errno);
 	}
+
+	public function makedirs($path)
+	{
+		mkdir($path, 0777, true);
+	}
 }