added ContainerLoader: humble replacement for ContainerFactory

src/DI/ContainerFactory.php

@@ -14,6 +14,7 @@
  * DI container generator.
  *
  * @author     David Grudl
+ * @deprecated
  */
 class ContainerFactory extends Nette\Object
 {
@@ -122,7 +123,7 @@ private function loadClass()
 			flock($handle, LOCK_SH);
 			foreach ((array) @unserialize(file_get_contents("$file.meta")) as $f => $time) { // @ - file may not exist
 				if (@filemtime($f) !== $time) { // @ - stat may fail
-					unlink($file);
+					@unlink($file); // @ - file may not exist
 					break;
 				}
 			}

src/DI/ContainerLoader.php

@@ -0,0 +1,104 @@
+<?php
+
+/**
+ * This file is part of the Nette Framework (http://nette.org)
+ * Copyright (c) 2004 David Grudl (http://davidgrudl.com)
+ */
+
+namespace Nette\DI;
+
+use Nette;
+
+
+/**
+ * DI container loader.
+ *
+ * @author     David Grudl
+ */
+class ContainerLoader extends Nette\Object
+{
+	/** @var bool */
+	private $autoRebuild = FALSE;
+
+	/** @var string */
+	private $tempDirectory;
+
+
+	public function __construct($tempDirectory, $autoRebuild = FALSE)
+	{
+		$this->tempDirectory = $tempDirectory;
+		$this->autoRebuild = $autoRebuild;
+	}
+
+
+	/**
+	 * @param  mixed
+	 * @param  callable  function(string $class): [code, files]
+	 * @return string
+	 */
+	public function load($key, $generator)
+	{
+		$class = $this->getClassName($key);
+		if (!class_exists($class)) {
+			$this->loadFile($class, $generator);
+		}
+		return $class;
+	}
+
+
+	/**
+	 * @return string
+	 */
+	public function getClassName($key)
+	{
+		return 'Container_' . substr(md5(serialize($key)), 0, 10);
+	}
+
+
+	/**
+	 * @return void
+	 */
+	private function loadFile($class, $generator)
+	{
+		$file = "$this->tempDirectory/$class.php";
+		if (!$this->autoRebuild && (@include $file) !== FALSE) { // @ - file may not exist
+			return;
+		}
+
+		if (!is_dir($this->tempDirectory)) {
+			@mkdir($this->tempDirectory); // @ - directory may already exist
+		}
+		$handle = fopen("$file.tmp", 'c+');
+		if (!$handle) {
+			throw new Nette\IOException("Unable to open or create file '$file.tmp'.");
+		}
+
+		if ($this->autoRebuild) {
+			flock($handle, LOCK_SH);
+			foreach ((array) @unserialize(file_get_contents("$file.meta")) as $f => $time) { // @ - file may not exist
+				if (@filemtime($f) !== $time) { // @ - stat may fail
+					unlink($file);
+					break;
+				}
+			}
+		}
+
+		if (!is_file($file)) {
+			flock($handle, LOCK_EX);
+			if (!is_file($file)) {
+				list($code, $dependencies) = call_user_func($generator, $class);
+				if (!file_put_contents($file, "<?php\n" . $code)) {
+					throw new Nette\IOException("Unable to write file '$file'.");
+				}
+				$tmp = array();
+				foreach ((array) $dependencies as $f) {
+					$tmp[$f] = @filemtime($f); // @ - stat may fail
+				}
+				file_put_contents("$file.meta", serialize($tmp));
+			}
+		}
+
+		require $file;
+	}
+
+}

tests/DI/ContainerLoader.basic.phpt

@@ -0,0 +1,23 @@
+<?php
+
+/**
+ * Test: Nette\DI\ContainerLoader basic usage.
+ */
+
+use Nette\DI,
+	Tester\Assert;
+
+
+require __DIR__ . '/../bootstrap.php';
+
+
+$cache = new DI\ContainerLoader(TEMP_DIR . '/subdir');
+
+$key = array(1, 2);
+$className = $cache->getClassName($key);
+Assert::match('Container%[\w]+%', $className);
+
+$container = $cache->load($key, function($class) {
+	return array("class $class {}", array());
+});
+Assert::type($className, new $container);