tests: TEMP_DIR replaced with getTempDir()

nette · Sep 18, 2019 · 29a7eca · 29a7eca
1 parent 587d5fd
commit 29a7eca
Show file tree

Hide file tree

Showing 15 changed files with 34 additions and 30 deletions.
diff --git a/tests/Bootstrap/Configurator.addDynamicParameters.phpt b/tests/Bootstrap/Configurator.addDynamicParameters.phpt
@@ -10,7 +10,7 @@ require __DIR__ . '/../bootstrap.php';
 
 
 $configurator = new Configurator;
-$configurator->setTempDirectory(TEMP_DIR);
+$configurator->setTempDirectory(getTempDir());
 $configurator->addConfig(Tester\FileMock::create('
 parameters:
 	dynamic: default

diff --git a/tests/Bootstrap/Configurator.addServices.phpt b/tests/Bootstrap/Configurator.addServices.phpt
@@ -33,7 +33,7 @@ class TestExistingService
 }
 
 $configurator = new Configurator;
-$configurator->setTempDirectory(TEMP_DIR);
+$configurator->setTempDirectory(getTempDir());
 $configurator->addConfig(Tester\FileMock::create('
 services:
 	existingService:

diff --git a/tests/Bootstrap/Configurator.autowireExcluded.phpt b/tests/Bootstrap/Configurator.autowireExcluded.phpt
@@ -19,7 +19,7 @@ class Foo extends stdClass
 
 
 $configurator = new Configurator;
-$configurator->setTempDirectory(TEMP_DIR);
+$configurator->setTempDirectory(getTempDir());
 
 $configurator->addConfig(Tester\FileMock::create('
 services:

diff --git a/tests/Bootstrap/Configurator.basic.phpt b/tests/Bootstrap/Configurator.basic.phpt
@@ -16,7 +16,7 @@ require __DIR__ . '/../bootstrap.php';
 date_default_timezone_set('America/Los_Angeles');
 
 $configurator = new Configurator;
-$configurator->setTempDirectory(TEMP_DIR);
+$configurator->setTempDirectory(getTempDir());
 $configurator->addParameters([
 	'wwwDir' => 'overwritten', // overwrites default value
 	'foo2' => '%foo%',         // uses parameter from config file

diff --git a/tests/Bootstrap/Configurator.developmentContainer.phpt b/tests/Bootstrap/Configurator.developmentContainer.phpt
@@ -15,7 +15,7 @@ require __DIR__ . '/../bootstrap.php';
 
 $configurator = new Configurator;
 $configurator->setDebugMode(true);
-$configurator->setTempDirectory(TEMP_DIR);
+$configurator->setTempDirectory(getTempDir());
 $configurator->addConfig(Tester\FileMock::create('
 session:
 	debugger: yes
@@ -40,7 +40,7 @@ Assert::same([
 	'debugMode' => true,
 	'productionMode' => false,
 	'consoleMode' => PHP_SAPI === 'cli',
-	'tempDir' => TEMP_DIR,
+	'tempDir' => getTempDir(),
 ], $container->parameters);
 
 Assert::true($container->getService('nette.cacheJournal') instanceof Nette\Caching\Storages\FileJournal || $container->getService('nette.cacheJournal') instanceof Nette\Caching\Storages\SQLiteJournal);

diff --git a/tests/Bootstrap/Configurator.include.params.phpt b/tests/Bootstrap/Configurator.include.params.phpt
@@ -10,7 +10,7 @@ require __DIR__ . '/../bootstrap.php';
 
 
 $configurator = new Configurator;
-$configurator->setTempDirectory(TEMP_DIR);
+$configurator->setTempDirectory(getTempDir());
 $configurator->addConfig(__DIR__ . '/files/includes.params.neon');
 $configurator->addParameters(['name' => 'includes.params.child']);
 $container = $configurator->createContainer();

diff --git a/tests/Bootstrap/Configurator.inheritance1.phpt b/tests/Bootstrap/Configurator.inheritance1.phpt
@@ -20,7 +20,7 @@ class MyApp extends Nette\Application\Application
 
 $configurator = new Configurator;
 $configurator->setDebugMode(false);
-$configurator->setTempDirectory(TEMP_DIR);
+$configurator->setTempDirectory(getTempDir());
 $configurator->addConfig(Tester\FileMock::create('
 services:
 	application: # alter original application

diff --git a/tests/Bootstrap/Configurator.inheritance2.phpt b/tests/Bootstrap/Configurator.inheritance2.phpt
@@ -20,7 +20,7 @@ class MyApp extends Nette\Application\Application
 
 $configurator = new Configurator;
 $configurator->setDebugMode(false);
-$configurator->setTempDirectory(TEMP_DIR);
+$configurator->setTempDirectory(getTempDir());
 $configurator->addConfig(Tester\FileMock::create('
 services:
 	application!: # overwrites original application

diff --git a/tests/Bootstrap/Configurator.inheritance4.phpt b/tests/Bootstrap/Configurator.inheritance4.phpt
@@ -15,7 +15,7 @@ require __DIR__ . '/../bootstrap.php';
 
 $configurator = new Configurator;
 $configurator->setDebugMode(false);
-$configurator->setTempDirectory(TEMP_DIR);
+$configurator->setTempDirectory(getTempDir());
 $configurator->addConfig(Tester\FileMock::create('
 services:
 	application:

diff --git a/tests/Bootstrap/Configurator.minimalContainer.phpt b/tests/Bootstrap/Configurator.minimalContainer.phpt
@@ -14,7 +14,7 @@ require __DIR__ . '/../bootstrap.php';
 
 
 $configurator = new Configurator;
-$configurator->setTempDirectory(TEMP_DIR);
+$configurator->setTempDirectory(getTempDir());
 $configurator->addParameters([
 	'hello' => 'world',
 ]);
@@ -29,7 +29,7 @@ Assert::same([
 	'debugMode' => false,
 	'productionMode' => true,
 	'consoleMode' => PHP_SAPI === 'cli',
-	'tempDir' => TEMP_DIR,
+	'tempDir' => getTempDir(),
 	'hello' => 'world',
 ], $container->parameters);
 

diff --git a/tests/Bootstrap/Configurator.onCompile.phpt b/tests/Bootstrap/Configurator.onCompile.phpt
@@ -23,7 +23,7 @@ class FooExtension extends Nette\DI\CompilerExtension
 
 
 $configurator = new Configurator;
-$configurator->setTempDirectory(TEMP_DIR);
+$configurator->setTempDirectory(getTempDir());
 $configurator->onCompile[] = function (Configurator $configurator, Nette\DI\Compiler $compiler) {
 	$compiler->addExtension('foo', new FooExtension);
 };

diff --git a/tests/Bootstrap/Configurator.presentersDecoration.phpt b/tests/Bootstrap/Configurator.presentersDecoration.phpt
@@ -16,7 +16,7 @@ require __DIR__ . '/files/MyPresenter.php';
 test(function () {
 	$configurator = new Configurator;
 	$configurator->setDebugMode(false);
-	$configurator->setTempDirectory(TEMP_DIR);
+	$configurator->setTempDirectory(getTempDir());
 	$configurator->addConfig(Tester\FileMock::create('
 		parameters:
 			param: \'test\'
@@ -37,7 +37,7 @@ test(function () {
 test(function () {
 	$configurator = new Configurator;
 	$configurator->setDebugMode(false);
-	$configurator->setTempDirectory(TEMP_DIR);
+	$configurator->setTempDirectory(getTempDir());
 	$configurator->addConfig(Tester\FileMock::create('
 		decorator:
 			BasePresenter:

diff --git a/tests/Bootstrap/Configurator.robotLoader.phpt b/tests/Bootstrap/Configurator.robotLoader.phpt
@@ -20,7 +20,7 @@ Assert::exception(function () use ($configurator) {
 }, Nette\InvalidStateException::class, 'Set path to temporary directory using setTempDirectory().');
 
 
-$configurator->setTempDirectory(TEMP_DIR);
+$configurator->setTempDirectory(getTempDir());
 $loader = $configurator->createRobotLoader();
 
 Assert::type(Nette\Loaders\RobotLoader::class, $loader);
diff --git a/tests/Bootstrap/Configurator.timezone.phpt b/tests/Bootstrap/Configurator.timezone.phpt
@@ -16,7 +16,7 @@ require __DIR__ . '/../bootstrap.php';
 date_default_timezone_set('America/Los_Angeles');
 
 $configurator = new Configurator;
-$configurator->setTempDirectory(TEMP_DIR);
+$configurator->setTempDirectory(getTempDir());
 $configurator->setTimeZone('Europe/Prague');
 
 Assert::same('Europe/Prague', date_default_timezone_get());

diff --git a/tests/bootstrap.php b/tests/bootstrap.php
@@ -16,21 +16,25 @@
 date_default_timezone_set('Europe/Prague');
 
 
-// create temporary directory
-(function () {
-	define('TEMP_DIR', __DIR__ . '/tmp/' . getmypid());
-
-	// garbage collector
-	$GLOBALS['\\lock'] = $lock = fopen(__DIR__ . '/lock', 'w');
-	if (rand(0, 100)) {
-		flock($lock, LOCK_SH);
-		@mkdir(dirname(TEMP_DIR));
-	} elseif (flock($lock, LOCK_EX)) {
-		Tester\Helpers::purge(dirname(TEMP_DIR));
+function getTempDir(): string
+{
+	$dir = __DIR__ . '/tmp/' . getmypid();
+
+	if (empty($GLOBALS['\\lock'])) {
+		// garbage collector
+		$GLOBALS['\\lock'] = $lock = fopen(__DIR__ . '/lock', 'w');
+		if (rand(0, 100)) {
+			flock($lock, LOCK_SH);
+			@mkdir(dirname($dir));
+		} elseif (flock($lock, LOCK_EX)) {
+			Tester\Helpers::purge(dirname($dir));
+		}
+
+		@mkdir($dir);
 	}
 
-	@mkdir(TEMP_DIR);
-})();
+	return $dir;
+}
 
 
 function test(\Closure $function): void