ContainerLoader: changed parameters and returned value of $generator (BC break!)

Author: dg

src/DI/ContainerLoader.php

@@ -33,7 +33,7 @@ public function __construct($tempDirectory, $autoRebuild = FALSE)
 
 	/**
 	 * @param  mixed
-	 * @param  callable  function(string $class): [code, files]
+	 * @param  callable  function(Nette\DI\Compiler $compiler): string|NULL
 	 * @return string
 	 */
 	public function load($key, $generator)
@@ -108,7 +108,11 @@ private function isExpired($file)
 	 */
 	protected function generate($class, $generator)
 	{
-		list($code, $files) = call_user_func($generator, $class);
+		$compiler = new Compiler;
+		$compiler->getContainerBuilder()->setClassName($class);
+		$code = call_user_func_array($generator, array(& $compiler));
+		$code = $code ?: implode("\n\n\n", $compiler->compile());
+		$files = $compiler->getDependencies();
 		$files = $files ? array_combine($files, $files) : array(); // workaround for PHP 5.3 array_combine
 		return array(
 			"<?php\n$code",

tests/DI/ContainerLoader.basic.phpt

@@ -17,7 +17,7 @@ $key = array(1, 2);
 $className = $cache->getClassName($key);
 Assert::match('Container%[\w]+%', $className);
 
-$container = $cache->load($key, function($class) {
-	return array("class $class {}", array());
+$container = $cache->load($key, function() use ($className) {
+	return "class $className {}";
 });
 Assert::type($className, new $container);