PresenterFactory: dependency on DI container moved to new class PresenterFactoryCallback (BC break)

Author: dg

src/Application/PresenterFactory.php

@@ -29,17 +29,16 @@ class PresenterFactory extends Nette\Object implements IPresenterFactory
 	/** @var array */
 	private $cache = array();
 
-	/** @var Nette\DI\Container */
-	private $container;
+	/** @var callable */
+	private $factory;
 
-	/** @var string */
-	private $touchToRebuild;
 
-
-	public function __construct(Nette\DI\Container $container, $touchToRebuild = NULL)
+	/**
+	 * @param  callable  function(string $class): IPresenter
+	 */
+	public function __construct($factory = NULL)
 	{
-		$this->container = $container;
-		$this->touchToRebuild = $touchToRebuild;
+		$this->factory = $factory ?: function($class) { return new $class; };
 	}
 
 
@@ -50,25 +49,7 @@ public function __construct(Nette\DI\Container $container, $touchToRebuild = NUL
 	 */
 	public function createPresenter($name)
 	{
-		$class = $this->getPresenterClass($name);
-		$services = array_keys($this->container->findByTag('nette.presenter'), $class);
-		if (count($services) > 1) {
-			throw new InvalidPresenterException("Multiple services of type $class found: " . implode(', ', $services) . '.');
-
-		} elseif (!$services) {
-			if ($this->touchToRebuild) {
-				touch($this->touchToRebuild);
-			}
-
-			$presenter = $this->container->createInstance($class);
-			$this->container->callInjects($presenter);
-			if ($presenter instanceof UI\Presenter && $presenter->invalidLinkMode === NULL) {
-				$presenter->invalidLinkMode = $this->container->parameters['debugMode'] ? UI\Presenter::INVALID_LINK_WARNING : UI\Presenter::INVALID_LINK_SILENT;
-			}
-			return $presenter;
-		}
-
-		return $this->container->createService($services[0]);
+		return call_user_func($this->factory, $this->getPresenterClass($name));
 	}
 
 

src/Bridges/ApplicationDI/ApplicationExtension.php

@@ -56,10 +56,13 @@ public function loadConfiguration()
 			$application->addSetup('Nette\Bridges\ApplicationTracy\RoutingPanel::initializePanel');
 		}
 
-		$touchToRebuild = $this->debugMode && $config['scanDirs'] ? reset($config['scanDirs']) : NULL;
+		$touch = $this->debugMode && $config['scanDirs'] ? reset($config['scanDirs']) : NULL; // dir added as dependency
+		$invalidLinkMode = $this->debugMode ? UI\Presenter::INVALID_LINK_WARNING : UI\Presenter::INVALID_LINK_SILENT;
 		$presenterFactory = $container->addDefinition($this->prefix('presenterFactory'))
 			->setClass('Nette\Application\IPresenterFactory')
-			->setFactory('Nette\Application\PresenterFactory', array(1 => $touchToRebuild));
+			->setFactory('Nette\Application\PresenterFactory', array(new Nette\DI\Statement(
+				'Nette\Bridges\ApplicationDI\PresenterFactoryCallback', array(1 => $invalidLinkMode, $touch)
+			)));
 
 		if ($config['mapping']) {
 			$presenterFactory->addSetup('setMapping', array($config['mapping']));

src/Bridges/ApplicationDI/PresenterFactoryCallback.php

@@ -0,0 +1,62 @@
+<?php
+
+/**
+ * This file is part of the Nette Framework (http://nette.org)
+ * Copyright (c) 2004 David Grudl (http://davidgrudl.com)
+ */
+
+namespace Nette\Bridges\ApplicationDI;
+
+use Nette;
+
+
+/**
+ * PresenterFactory callback.
+ * @internal
+ */
+class PresenterFactoryCallback
+{
+	/** @var Nette\DI\Container */
+	private $container;
+
+	/** @var int */
+	private $invalidLinkMode;
+
+	/** @var string|NULL */
+	private $touchToRefresh;
+
+
+	public function __construct(Nette\DI\Container $container, $invalidLinkMode, $touchToRefresh)
+	{
+		$this->container = $container;
+		$this->invalidLinkMode = $invalidLinkMode;
+		$this->touchToRefresh = $touchToRefresh;
+	}
+
+
+	/**
+	 * @return Nette\Application\IPresenter
+	 */
+	public function __invoke($class)
+	{
+		$services = array_keys($this->container->findByTag('nette.presenter'), $class);
+		if (count($services) > 1) {
+			throw new Nette\Application\InvalidPresenterException("Multiple services of type $class found: " . implode(', ', $services) . '.');
+
+		} elseif (!$services) {
+			if ($this->touchToRefresh) {
+				touch($this->touchToRefresh);
+			}
+
+			$presenter = $this->container->createInstance($class);
+			$this->container->callInjects($presenter);
+			if ($presenter instanceof Nette\Application\UI\Presenter && $presenter->invalidLinkMode === NULL) {
+				$presenter->invalidLinkMode = $this->invalidLinkMode;
+			}
+			return $presenter;
+		}
+
+		return $this->container->createService($services[0]);
+	}
+
+}

tests/Application.Routers/LinkGenerator.phpt

@@ -42,7 +42,7 @@ namespace {
 		Tester\Assert;
 
 
-	$pf = new PresenterFactory(new Nette\DI\Container);
+	$pf = new PresenterFactory;
 
 
 	test(function() use ($pf) {

tests/Application/PresenterFactory.formatPresenterClass.phpt

@@ -12,7 +12,7 @@ require __DIR__ . '/../bootstrap.php';
 
 
 test(function() {
-	$factory = new PresenterFactory(new Nette\DI\Container);
+	$factory = new PresenterFactory;
 
 	$factory->setMapping(array(
 		'Foo2' => 'App2\*\*Presenter',
@@ -35,7 +35,7 @@ test(function() {
 
 
 test(function() {
-	$factory = new PresenterFactory(new Nette\DI\Container);
+	$factory = new PresenterFactory;
 
 	$factory->setMapping(array(
 		'Foo2' => 'App2\*Presenter',

tests/Application/PresenterFactory.unformatPresenterClass.phpt

@@ -11,7 +11,7 @@ use Nette\Application\PresenterFactory,
 require __DIR__ . '/../bootstrap.php';
 
 
-$factory = new PresenterFactory(new Nette\DI\Container);
+$factory = new PresenterFactory;
 
 test(function() use ($factory) {
 	$factory->setMapping(array(