Skip to content

Commit b86bf5a

Browse files
committed
renamed setTempDirectory() to setCacheDirectory() for consistency with Latte
1 parent ad3f4be commit b86bf5a

10 files changed

Lines changed: 30 additions & 23 deletions

readme.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ $loader->addDirectory(__DIR__ . '/app');
7575
$loader->addDirectory(__DIR__ . '/libs');
7676

7777
// Set caching to the 'temp' directory
78-
$loader->setTempDirectory(__DIR__ . '/temp');
78+
$loader->setCacheDirectory(__DIR__ . '/temp');
7979
$loader->register(); // Activate RobotLoader
8080
```
8181

@@ -112,7 +112,7 @@ $loader = new Nette\Loaders\RobotLoader;
112112
$loader->addDirectory(__DIR__ . '/app');
113113

114114
// Set caching to the 'temp' directory
115-
$loader->setTempDirectory(__DIR__ . '/temp');
115+
$loader->setCacheDirectory(__DIR__ . '/temp');
116116

117117
// Scans directories using cache
118118
$loader->refresh();

src/RobotLoader/RobotLoader.php

Lines changed: 17 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
* $loader = new Nette\Loaders\RobotLoader;
2222
* $loader->addDirectory('app');
2323
* $loader->excludeDirectory('app/exclude');
24-
* $loader->setTempDirectory('temp');
24+
* $loader->setCacheDirectory('temp');
2525
* $loader->register();
2626
* </code>
2727
*/
@@ -53,7 +53,7 @@ class RobotLoader
5353

5454
/** @var array<string, int> file => mtime */
5555
private array $emptyFiles = [];
56-
private ?string $tempDirectory = null;
56+
private ?string $cacheDirectory = null;
5757
private bool $needSave = false;
5858

5959

@@ -175,7 +175,7 @@ public function rebuild(): void
175175
$this->cacheLoaded = true;
176176
$this->classes = $this->missingClasses = $this->emptyFiles = [];
177177
$this->refreshClasses();
178-
if ($this->tempDirectory) {
178+
if ($this->cacheDirectory) {
179179
$this->saveCache();
180180
}
181181
}
@@ -390,19 +390,26 @@ public function setAutoRefresh(bool $state = true): static
390390

391391

392392
/**
393-
* Sets path to temporary directory.
393+
* Sets the directory for storing cache.
394394
*/
395-
public function setTempDirectory(string $dir): static
395+
public function setCacheDirectory(string $dir): static
396396
{
397397
if (!FileSystem::isAbsolute($dir)) {
398-
throw new Nette\InvalidArgumentException("Temporary directory must be absolute, '$dir' given.");
398+
throw new Nette\InvalidArgumentException("Cache directory must be absolute, '$dir' given.");
399399
}
400400
FileSystem::createDir($dir);
401-
$this->tempDirectory = $dir;
401+
$this->cacheDirectory = $dir;
402402
return $this;
403403
}
404404

405405

406+
/** @deprecated use setCacheDirectory() */
407+
public function setTempDirectory(string $dir): static
408+
{
409+
return $this->setCacheDirectory($dir);
410+
}
411+
412+
406413
/**
407414
* Loads class list from cache.
408415
*/
@@ -499,11 +506,11 @@ private function acquireLock(string $file, int $mode)
499506

500507
private function generateCacheFileName(): string
501508
{
502-
if (!$this->tempDirectory) {
503-
throw new \LogicException('Set path to temporary directory using setTempDirectory().');
509+
if (!$this->cacheDirectory) {
510+
throw new \LogicException('Set path to temporary directory using setCacheDirectory().');
504511
}
505512

506-
return $this->tempDirectory . '/' . hash('xxh128', serialize($this->generateCacheKey())) . '.php';
513+
return $this->cacheDirectory . '/' . hash('xxh128', serialize($this->generateCacheKey())) . '.php';
507514
}
508515

509516

tests/Loaders/RobotLoader.caseSensitivity.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ require __DIR__ . '/../bootstrap.php';
1212

1313

1414
$loader = new RobotLoader;
15-
$loader->setTempDirectory(getTempDir());
15+
$loader->setCacheDirectory(getTempDir());
1616
$loader->addDirectory(__DIR__ . '/files');
1717
$loader->register();
1818

tests/Loaders/RobotLoader.emptyArrayVariadicArgument.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ use Tester\Assert;
1111
require __DIR__ . '/../bootstrap.php';
1212

1313
$loader = new RobotLoader;
14-
$loader->setTempDirectory(getTempDir());
14+
$loader->setCacheDirectory(getTempDir());
1515

1616
Assert::noError(
1717
function () use ($loader) {

tests/Loaders/RobotLoader.phar.phpt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ Phar::loadPhar($pharFile, 'test.phar');
2828

2929

3030
$loader = new RobotLoader;
31-
$loader->setTempDirectory(getTempDir());
31+
$loader->setCacheDirectory(getTempDir());
3232
$loader->addDirectory("phar://$pharFile/sub");
3333
$loader->addDirectory("PHAR://$pharFile/class.B.php");
3434
$loader->addDirectory('phar://test.phar/class.C.php');
@@ -41,7 +41,7 @@ Assert::true(class_exists('D'));
4141

4242

4343
$loader = new RobotLoader;
44-
$loader->setTempDirectory(getTempDir());
44+
$loader->setCacheDirectory(getTempDir());
4545
$loader->addDirectory("phar://$pharFile/non-dir");
4646
Assert::exception(
4747
fn() => $loader->rebuild(),
@@ -51,7 +51,7 @@ Assert::exception(
5151

5252

5353
$loader = new RobotLoader;
54-
$loader->setTempDirectory(getTempDir());
54+
$loader->setCacheDirectory(getTempDir());
5555
$loader->addDirectory("phar://$pharFile/non-file.php");
5656
Assert::exception(
5757
fn() => $loader->rebuild(),

tests/Loaders/RobotLoader.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ require __DIR__ . '/../bootstrap.php';
1212

1313

1414
$loader = new RobotLoader;
15-
$loader->setTempDirectory(getTempDir());
15+
$loader->setCacheDirectory(getTempDir());
1616
$loader->addDirectory(__DIR__ . '/files');
1717
$loader->addDirectory(__DIR__ . '/files/'); // purposely doubled
1818
$loader->addDirectory(__DIR__ . '/file/interface.php'); // as file

tests/Loaders/RobotLoader.rebuild.phpt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ file_put_contents($dir . '/file1.php', '<?php class A {}');
1717
file_put_contents($dir . '/file2.php', '<?php class B {}');
1818

1919
$loader = new RobotLoader;
20-
$loader->setTempDirectory(getTempDir());
20+
$loader->setCacheDirectory(getTempDir());
2121
$loader->addDirectory($dir);
2222
$loader->register();
2323
class_exists('x'); // rebuilds cache
@@ -28,7 +28,7 @@ Assert::false(class_exists('A'));
2828

2929

3030
$loader2 = new RobotLoader;
31-
$loader2->setTempDirectory(getTempDir());
31+
$loader2->setCacheDirectory(getTempDir());
3232
$loader2->addDirectory($dir);
3333
$loader2->register();
3434

tests/Loaders/RobotLoader.relative.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ require __DIR__ . '/../bootstrap.php';
1212

1313

1414
$loader = new RobotLoader;
15-
$loader->setTempDirectory(getTempDir());
15+
$loader->setCacheDirectory(getTempDir());
1616
$loader->addDirectory(__DIR__ . '/../Loaders/files');
1717
$loader->excludeDirectory(__DIR__ . '/../Loaders/files/exclude');
1818
$loader->excludeDirectory(__DIR__ . '/../Loaders/files/exclude2/excluded.php');

tests/Loaders/RobotLoader.renamed.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ $dir = realpath(getTempDir()) . DIRECTORY_SEPARATOR . 'fixtures' . DIRECTORY_SEP
1515
mkdir($dir);
1616

1717
$loader = new RobotLoader;
18-
$loader->setTempDirectory(getTempDir());
18+
$loader->setCacheDirectory(getTempDir());
1919
$loader->addDirectory($dir);
2020

2121
file_put_contents($dir . 'file1.php', '<?php class A {}');

tests/Loaders/RobotLoader.stress.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ require __DIR__ . '/../../vendor/autoload.php';
88

99
$loader = new Nette\Loaders\RobotLoader;
1010
$loader->setAutoRefresh(true);
11-
$loader->setTempDirectory(__DIR__ . '/../tmp');
11+
$loader->setCacheDirectory(__DIR__ . '/../tmp');
1212
$loader->addDirectory(__DIR__);
1313
$loader->register();
1414

0 commit comments

Comments
 (0)