updated for nette/di 3

Author: dg

composer.json

@@ -26,7 +26,7 @@
 	},
 	"require-dev": {
 		"nette/tester": "^2.0.1",
-		"nette/di": "^2.4 || ~3.0.0",
+		"nette/di": "dev-master",
 		"nette/forms": "^3.0.0-beta",
 		"nette/robot-loader": "^2.4.2 || ^3.0",
 		"nette/security": "^3.0",

src/Bridges/ApplicationDI/ApplicationExtension.php

@@ -65,16 +65,17 @@ public function loadConfiguration()
 		$application = $builder->addDefinition($this->prefix('application'))
 			->setFactory(Nette\Application\Application::class)
 			->addSetup('$catchExceptions', [$config['catchExceptions']])
-			->addSetup('$errorPresenter', [$config['errorPresenter']]);
+			->addSetup('$errorPresenter', [$config['errorPresenter']])
+			->setExported();
 
 		if ($config['debugger']) {
 			$application->addSetup('Nette\Bridges\ApplicationTracy\RoutingPanel::initializePanel');
 		}
 
 		$touch = $this->debugMode && $config['scanDirs'] ? $this->tempFile : null;
 		$presenterFactory = $builder->addDefinition($this->prefix('presenterFactory'))
-			->setClass(Nette\Application\IPresenterFactory::class)
-			->setFactory(Nette\Application\PresenterFactory::class, [new Nette\DI\Statement(
+			->setType(Nette\Application\IPresenterFactory::class)
+			->setFactory(Nette\Application\PresenterFactory::class, [new Nette\DI\Definitions\Statement(
 				Nette\Bridges\ApplicationDI\PresenterFactoryCallback::class, [1 => $this->invalidLinkMode, $touch]
 			)]);
 
@@ -84,8 +85,9 @@ public function loadConfiguration()
 
 		$builder->addDefinition($this->prefix('linkGenerator'))
 			->setFactory(Nette\Application\LinkGenerator::class, [
-				1 => new Nette\DI\Statement('@Nette\Http\IRequest::getUrl'),
-			]);
+				1 => new Nette\DI\Definitions\Statement('@Nette\Http\IRequest::getUrl'),
+			])
+			->setExported();
 
 		if ($this->name === 'application') {
 			$builder->addAlias('application', $this->prefix('application'));
@@ -100,21 +102,23 @@ public function beforeCompile()
 		$all = [];
 
 		foreach ($builder->findByType(Nette\Application\IPresenter::class) as $def) {
-			$all[$def->getClass()] = $def;
+			$all[$def->getType()] = $def;
 		}
 
 		$counter = 0;
 		foreach ($this->findPresenters() as $class) {
 			if (empty($all[$class])) {
-				$all[$class] = $builder->addDefinition($this->prefix((string) ++$counter))->setClass($class);
+				$all[$class] = $builder->addDefinition($this->prefix((string) ++$counter))
+					->setType($class)
+					->setExported();
 			}
 		}
 
 		foreach ($all as $def) {
 			$def->addTag(Nette\DI\Extensions\InjectExtension::TAG_INJECT)
-				->addTag('nette.presenter', $def->getClass());
+				->addTag('nette.presenter', $def->getType());
 
-			if (is_subclass_of($def->getClass(), UI\Presenter::class)) {
+			if (is_subclass_of($def->getType(), UI\Presenter::class)) {
 				$def->addSetup('$invalidLinkMode', [$this->invalidLinkMode]);
 			}
 		}

src/Bridges/ApplicationDI/LatteExtension.php

@@ -48,20 +48,22 @@ public function loadConfiguration()
 		$config = $this->validateConfig($this->defaults);
 		$builder = $this->getContainerBuilder();
 
-		$latteFactory = $builder->addDefinition($this->prefix('latteFactory'))
-			->setFactory(Latte\Engine::class)
-			->addSetup('setTempDirectory', [$this->tempDir])
-			->addSetup('setAutoRefresh', [$this->debugMode])
-			->addSetup('setContentType', [$config['xhtml'] ? Latte\Compiler::CONTENT_XHTML : Latte\Compiler::CONTENT_HTML])
-			->addSetup('Nette\Utils\Html::$xhtml = ?', [(bool) $config['xhtml']])
-			->setImplement(Nette\Bridges\ApplicationLatte\ILatteFactory::class);
+		$latteFactory = $builder->addFactoryDefinition($this->prefix('latteFactory'))
+			->setImplement(Nette\Bridges\ApplicationLatte\ILatteFactory::class)
+			->setExported()
+			->getResultDefinition()
+				->setFactory(Latte\Engine::class)
+				->addSetup('setTempDirectory', [$this->tempDir])
+				->addSetup('setAutoRefresh', [$this->debugMode])
+				->addSetup('setContentType', [$config['xhtml'] ? Latte\Compiler::CONTENT_XHTML : Latte\Compiler::CONTENT_HTML])
+				->addSetup('Nette\Utils\Html::$xhtml = ?', [(bool) $config['xhtml']]);
 
 		if ($config['strictTypes']) {
 			$latteFactory->addSetup('setStrictTypes', [true]);
 		}
 
 		$builder->addDefinition($this->prefix('templateFactory'))
-			->setClass(Nette\Application\UI\ITemplateFactory::class)
+			->setType(Nette\Application\UI\ITemplateFactory::class)
 			->setFactory(Nette\Bridges\ApplicationLatte\TemplateFactory::class)
 			->setArguments(['templateClass' => $config['templateClass']]);
 
@@ -79,7 +81,7 @@ public function loadConfiguration()
 	public function addMacro(string $macro): void
 	{
 		$builder = $this->getContainerBuilder();
-		$definition = $builder->getDefinition($this->prefix('latteFactory'));
+		$definition = $builder->getDefinition($this->prefix('latteFactory'))->getResultDefinition();
 
 		if (($macro[0] ?? null) === '@') {
 			if (strpos($macro, '::') === false) {

src/Bridges/ApplicationDI/RoutingExtension.php

@@ -42,8 +42,9 @@ public function loadConfiguration()
 		$builder = $this->getContainerBuilder();
 
 		$router = $builder->addDefinition($this->prefix('router'))
-			->setClass(Nette\Application\IRouter::class)
-			->setFactory(Nette\Application\Routers\RouteList::class);
+			->setType(Nette\Application\IRouter::class)
+			->setFactory(Nette\Application\Routers\RouteList::class)
+			->setExported();
 
 		$routeClass = $config['routeClass'] ?: 'Nette\Application\Routers\Route';
 		foreach ($config['routes'] as $mask => $action) {
@@ -62,7 +63,7 @@ public function beforeCompile()
 
 		if ($this->debugMode && $this->config['debugger'] && $application = $builder->getByType(Nette\Application\Application::class)) {
 			$builder->getDefinition($application)->addSetup('@Tracy\Bar::addPanel', [
-				new Nette\DI\Statement(Nette\Bridges\ApplicationTracy\RoutingPanel::class),
+				new Nette\DI\Definitions\Statement(Nette\Bridges\ApplicationTracy\RoutingPanel::class),
 			]);
 		}
 	}