Loads and builds cache on demand

nette · Jul 10, 2020 · 58a999b · 58a999b
1 parent d38c688
commit 58a999b
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 6 deletions.
diff --git a/src/RobotLoader/RobotLoader.php b/src/RobotLoader/RobotLoader.php
@@ -51,6 +51,9 @@ class RobotLoader
 	/** @var array of class => [file, time] */
 	private $classes = [];
 
+	/** @var bool */
+	private $cacheLoaded = false;
+
 	/** @var bool */
 	private $refreshed = false;
 
@@ -74,7 +77,6 @@ public function __construct()
 	 */
 	public function register(bool $prepend = false): self
 	{
-		$this->loadCache();
 		spl_autoload_register([$this, 'tryLoad'], true, $prepend);
 		return $this;
 	}
@@ -85,6 +87,7 @@ public function register(bool $prepend = false): self
 	 */
 	public function tryLoad(string $type): void
 	{
+		$this->loadCache();
 		$type = ltrim($type, '\\'); // PHP namespace bug #49143
 		$info = $this->classes[$type] ?? null;
 
@@ -158,6 +161,7 @@ public function excludeDirectory(...$paths): self
 	 */
 	public function getIndexedClasses(): array
 	{
+		$this->loadCache();
 		$res = [];
 		foreach ($this->classes as $class => $info) {
 			$res[$class] = $info['file'];
@@ -171,6 +175,7 @@ public function getIndexedClasses(): array
 	 */
 	public function rebuild(): void
 	{
+		$this->cacheLoaded = true;
 		$this->classes = $this->missing = [];
 		$this->refreshClasses();
 		if ($this->tempDirectory) {
@@ -410,6 +415,11 @@ public function setTempDirectory(string $dir): self
 	 */
 	private function loadCache(): void
 	{
+		if ($this->cacheLoaded) {
+			return;
+		}
+		$this->cacheLoaded = true;
+
 		$file = $this->getCacheFile();
 
 		// Solving atomicity to work everywhere is really pain in the ass.

diff --git a/tests/Loaders/RobotLoader.phar.phpt b/tests/Loaders/RobotLoader.phar.phpt
@@ -45,14 +45,14 @@ Assert::true(class_exists('D'));
 $loader = new RobotLoader;
 $loader->setTempDirectory(getTempDir());
 $loader->addDirectory("phar://$pharFile/non-dir");
-Assert::exception(function () use ($loader, $pharFile) {
-	$loader->register();
+Assert::exception(function () use ($loader) {
+	$loader->rebuild();
 }, Nette\IOException::class, "File or directory 'phar://$pharFile/non-dir' not found.");
 
 
 $loader = new RobotLoader;
 $loader->setTempDirectory(getTempDir());
 $loader->addDirectory("phar://$pharFile/non-file.php");
-Assert::exception(function () use ($loader, $pharFile) {
-	$loader->register();
+Assert::exception(function () use ($loader) {
+	$loader->rebuild();
 }, Nette\IOException::class, "File or directory 'phar://$pharFile/non-file.php' not found.");
diff --git a/tests/Loaders/RobotLoader.rebuild.phpt b/tests/Loaders/RobotLoader.rebuild.phpt
@@ -21,7 +21,8 @@ file_put_contents($dir . '/file2.php', '<?php class B {}');
 $loader = new RobotLoader;
 $loader->setTempDirectory(getTempDir());
 $loader->addDirectory($dir);
-$loader->register(); // rebuilds cache
+$loader->register();
+class_exists('x'); // rebuilds cache
 
 rename($dir . '/file1.php', $dir . '/file3.php');