ApplicationExtension & PresenterFactory: used clean way to refresh DI container

Author: dg

src/Application/PresenterFactory.php

@@ -32,14 +32,14 @@ class PresenterFactory extends Nette\Object implements IPresenterFactory
 	/** @var Nette\DI\Container */
 	private $container;
 
-	/** @var bool */
-	private $autoRebuild;
+	/** @var string */
+	private $touchToRebuild;
 
 
-	public function __construct(Nette\DI\Container $container, $autoRebuild = FALSE)
+	public function __construct(Nette\DI\Container $container, $touchToRebuild = NULL)
 	{
 		$this->container = $container;
-		$this->autoRebuild = $autoRebuild;
+		$this->touchToRebuild = $touchToRebuild;
 	}
 
 
@@ -56,9 +56,8 @@ public function createPresenter($name)
 			throw new InvalidPresenterException("Multiple services of type $class found: " . implode(', ', $services) . '.');
 
 		} elseif (!$services) {
-			if ($this->autoRebuild) {
-				$rc = new \ReflectionClass($this->container);
-				@unlink($rc->getFileName()); // @ file may not exists
+			if ($this->touchToRebuild) {
+				touch($this->touchToRebuild);
 			}
 
 			$presenter = $this->container->createInstance($class);

src/Bridges/ApplicationDI/ApplicationExtension.php

@@ -56,9 +56,10 @@ public function loadConfiguration()
 			$application->addSetup('Nette\Bridges\ApplicationTracy\RoutingPanel::initializePanel');
 		}
 
+		$touchToRebuild = $this->debugMode && $config['scanDirs'] ? reset($config['scanDirs']) : NULL;
 		$presenterFactory = $container->addDefinition($this->prefix('presenterFactory'))
 			->setClass('Nette\Application\IPresenterFactory')
-			->setFactory('Nette\Application\PresenterFactory', array(1 => $this->debugMode));
+			->setFactory('Nette\Application\PresenterFactory', array(1 => $touchToRebuild));
 
 		if ($config['mapping']) {
 			$presenterFactory->addSetup('setMapping', array($config['mapping']));
@@ -116,6 +117,7 @@ private function findPresenters()
 			$robot->acceptFiles = '*' . $config['scanFilter'] . '*.php';
 			$robot->rebuild();
 			$classes = array_keys($robot->getIndexedClasses());
+			$this->getContainerBuilder()->addDependency(reset($config['scanDirs']));
 		}
 
 		if ($config['scanComposer']) {