Compiler: added list of all dependencies

Author: dg

src/DI/Compiler.php

@@ -27,6 +27,9 @@ class Compiler extends Nette\Object
 	/** @var array */
 	private $config;
 
+	/** @var string[] of file names */
+	private $dependencies = array();
+
 	/** @var array reserved section names */
 	private static $reserved = array('services' => 1, 'parameters' => 1);
 
@@ -81,6 +84,27 @@ public function getConfig()
 	}
 
 
+	/**
+	 * Adds a files to the list of dependencies.
+	 * @return self
+	 */
+	public function addDependencies(array $files)
+	{
+		$this->dependencies = array_merge($this->dependencies, $files);
+		return $this;
+	}
+
+
+	/**
+	 * Returns the unique list of dependent files.
+	 * @return array
+	 */
+	public function getDependencies()
+	{
+		return array_values(array_unique(array_filter($this->dependencies)));
+	}
+
+
 	/**
 	 * @return string
 	 */
@@ -155,11 +179,12 @@ public function generateCode($className, $parentName = NULL)
 		foreach ($this->extensions as $extension) {
 			$extension->beforeCompile();
 			$rc = new \ReflectionClass($extension);
-			$this->builder->addDependency($rc->getFileName());
+			$this->dependencies[] = $rc->getFileName();
 		}
 
 		$classes = $this->builder->generateClasses($className, $parentName);
 		$classes[0]->addMethod('initialize');
+		$this->addDependencies($this->builder->getDependencies());
 
 		foreach ($this->extensions as $extension) {
 			$extension->afterCompile($classes[0]);

src/DI/CompilerExtension.php

@@ -92,9 +92,7 @@ public function loadFromFile($file)
 	{
 		$loader = new Config\Loader;
 		$res = $loader->load($file);
-		foreach ($loader->getDependencies() as $file) {
-			$this->getContainerBuilder()->addDependency($file);
-		}
+		$this->compiler->addDependencies($loader->getDependencies());
 		return $res;
 	}
 

src/DI/ContainerBuilder.php

@@ -480,6 +480,7 @@ public function addExcludedClasses(array $classes)
 	/**
 	 * Adds a file to the list of dependencies.
 	 * @return self
+	 * @internal
 	 */
 	public function addDependency($file)
 	{

tests/DI/Compiler.dependencies.phpt

@@ -0,0 +1,32 @@
+<?php
+
+/**
+ * Test: Nette\DI\Compiler and dependencies.
+ */
+
+use Nette\DI,
+	Tester\Assert;
+
+
+require __DIR__ . '/../bootstrap.php';
+
+$compiler = new DI\Compiler;
+
+Assert::same(
+	array(),
+	$compiler->getDependencies()
+);
+
+$compiler->addDependencies(array('file1', 'file2'));
+
+Assert::same(
+	array('file1', 'file2'),
+	$compiler->getDependencies()
+);
+
+$compiler->addDependencies(array('file1', NULL, 'file3'));
+
+Assert::same(
+	array('file1', 'file2', 'file3'),
+	$compiler->getDependencies()
+);