management of dependencies moved to DependencyChecker

Author: dg

src/DI/Compiler.php

@@ -27,8 +27,8 @@ class Compiler
 	/** @var array */
 	private $config = [];
 
-	/** @var string[] of file names */
-	private $dependencies = [];
+	/** @var DependencyChecker */
+	private $dependencies;
 
 	/** @var string */
 	private $className = 'Container';
@@ -40,6 +40,7 @@ class Compiler
 	public function __construct(ContainerBuilder $builder = NULL)
 	{
 		$this->builder = $builder ?: new ContainerBuilder;
+		$this->dependencies = new DependencyChecker;
 	}
 
 
@@ -106,7 +107,7 @@ public function loadConfig($file)
 	{
 		$loader = new Config\Loader;
 		$this->addConfig($loader->load($file));
-		$this->addDependencies($loader->getDependencies());
+		$this->dependencies->add($loader->getDependencies());
 		return $this;
 	}
 
@@ -127,18 +128,18 @@ public function getConfig()
 	 */
 	public function addDependencies(array $files)
 	{
-		$this->dependencies = array_merge($this->dependencies, $files);
+		$this->dependencies->add($files);
 		return $this;
 	}
 
 
 	/**
-	 * Returns the unique list of dependent files.
+	 * Exports dependencies.
 	 * @return array
 	 */
-	public function getDependencies()
+	public function exportDependencies()
 	{
-		return array_values(array_unique(array_filter($this->dependencies)));
+		return $this->dependencies->export();
 	}
 
 
@@ -225,12 +226,12 @@ public function generateCode()
 
 		foreach ($this->extensions as $extension) {
 			$extension->beforeCompile();
-			$this->dependencies[] = (new \ReflectionClass($extension))->getFileName();
+			$this->dependencies->add([(new \ReflectionClass($extension))->getFileName()]);
 		}
 
 		$classes = $this->builder->generateClasses($this->className);
 		$classes[0]->addMethod('initialize');
-		$this->addDependencies($this->builder->getDependencies());
+		$this->dependencies->add($this->builder->getDependencies());
 
 		foreach ($this->extensions as $extension) {
 			$extension->afterCompile($classes[0]);

src/DI/ContainerLoader.php

@@ -100,8 +100,7 @@ private function isExpired($file)
 	{
 		if ($this->autoRebuild) {
 			$meta = @unserialize(file_get_contents("$file.meta")); // @ - file may not exist
-			$files = $meta ? array_combine($tmp = array_keys($meta), $tmp) : [];
-			return $meta !== @array_map('filemtime', $files); // @ - files may not exist
+			return empty($meta[0]) || DependencyChecker::isExpired($meta);
 		}
 		return FALSE;
 	}
@@ -116,10 +115,9 @@ protected function generate($class, $generator)
 		$compiler->setClassName($class);
 		$code = call_user_func_array($generator, [& $compiler]);
 		$code = $code ?: implode("\n\n\n", $compiler->compile());
-		$files = $compiler->getDependencies();
 		return [
 			"<?php\n$code",
-			serialize(@array_map('filemtime', array_combine($files, $files))) // @ - file may not exist
+			serialize($compiler->exportDependencies())
 		];
 	}
 

src/DI/DependencyChecker.php

@@ -0,0 +1,58 @@
+<?php
+
+/**
+ * This file is part of the Nette Framework (https://nette.org)
+ * Copyright (c) 2004 David Grudl (https://davidgrudl.com)
+ */
+
+namespace Nette\DI;
+
+use Nette;
+use ReflectionClass;
+
+
+/**
+ * Cache dependencies checker.
+ */
+class DependencyChecker
+{
+	use Nette\SmartObject;
+
+	/** @var array */
+	private $dependencies = [];
+
+
+	/**
+	 * Adds dependencies to the list.
+	 * @return self
+	 */
+	public function add(array $deps)
+	{
+		$this->dependencies = array_merge($this->dependencies, $deps);
+		return $this;
+	}
+
+
+	/**
+	 * Exports dependencies.
+	 * @return array
+	 */
+	public function export()
+	{
+		$files = array_filter($this->dependencies);
+		$files = @array_map('filemtime', array_combine($files, $files)); // @ - file may not exist
+		return $files;
+	}
+
+
+	/**
+	 * Are dependencies expired?
+	 * @return bool
+	 */
+	public static function isExpired($files)
+	{
+		$current = @array_map('filemtime', array_combine($tmp = array_keys($files), $tmp)); // @ - files may not exist
+		return $files !== $current;
+	}
+
+}

tests/DI/Compiler.dependencies.phpt

@@ -5,6 +5,7 @@
  */
 
 use Nette\DI;
+use Nette\DI\DependencyChecker;
 use Tester\Assert;
 
 
@@ -14,19 +15,25 @@ $compiler = new DI\Compiler;
 
 Assert::same(
 	[],
-	$compiler->getDependencies()
+	$compiler->exportDependencies()
 );
+Assert::false(DependencyChecker::isExpired($compiler->exportDependencies()));
 
-$compiler->addDependencies(['file1', 'file2']);
 
+$compiler->addDependencies(['file1', __FILE__]);
 Assert::same(
-	['file1', 'file2'],
-	$compiler->getDependencies()
+	['file1' => FALSE, __FILE__ => filemtime(__FILE__)],
+	$compiler->exportDependencies()
 );
+Assert::false(DependencyChecker::isExpired($compiler->exportDependencies()));
 
-$compiler->addDependencies(['file1', NULL, 'file3']);
 
+$compiler->addDependencies(['file1', NULL, 'file3']);
 Assert::same(
-	['file1', 'file2', 'file3'],
-	$compiler->getDependencies()
+	['file1' => FALSE, __FILE__ => filemtime(__FILE__), 'file3' => FALSE],
+	$compiler->exportDependencies()
 );
+
+$res = $compiler->exportDependencies();
+$res['file4'] = 123;
+Assert::true(DependencyChecker::isExpired($res));