used setFactory() instead of misused setClass()

nette · Aug 24, 2017 · f69175c · f69175c
1 parent c5a11d2
commit f69175c
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 12 deletions.
diff --git a/src/Bridges/ApplicationDI/ApplicationExtension.php b/src/Bridges/ApplicationDI/ApplicationExtension.php
@@ -61,7 +61,7 @@ public function loadConfiguration()
 			: UI\Presenter::INVALID_LINK_WARNING;
 
 		$application = $builder->addDefinition($this->prefix('application'))
-			->setClass(Nette\Application\Application::class)
+			->setFactory(Nette\Application\Application::class)
 			->addSetup('$catchExceptions', [$config['catchExceptions']])
 			->addSetup('$errorPresenter', [$config['errorPresenter']]);
 

diff --git a/src/Bridges/ApplicationDI/LatteExtension.php b/src/Bridges/ApplicationDI/LatteExtension.php
@@ -46,7 +46,7 @@ public function loadConfiguration()
 		$builder = $this->getContainerBuilder();
 
 		$builder->addDefinition($this->prefix('latteFactory'))
-			->setClass(Latte\Engine::class)
+			->setFactory(Latte\Engine::class)
 			->addSetup('setTempDirectory', [$this->tempDir])
 			->addSetup('setAutoRefresh', [$this->debugMode])
 			->addSetup('setContentType', [$config['xhtml'] ? Latte\Compiler::CONTENT_XHTML : Latte\Compiler::CONTENT_HTML])

diff --git a/tests/Bridges.DI/ApplicationExtension.basic.phpt b/tests/Bridges.DI/ApplicationExtension.basic.phpt
@@ -17,9 +17,9 @@ test(function () {
 	$compiler->addExtension('application', new ApplicationExtension(false));
 
 	$builder = $compiler->getContainerBuilder();
-	$builder->addDefinition('myRouter')->setClass(Nette\Application\Routers\SimpleRouter::class);
+	$builder->addDefinition('myRouter')->setFactory(Nette\Application\Routers\SimpleRouter::class);
 	$builder->addDefinition('myHttpRequest')->setFactory(Nette\Http\Request::class, [new DI\Statement(Nette\Http\UrlScript::class)]);
-	$builder->addDefinition('myHttpResponse')->setClass(Nette\Http\Response::class);
+	$builder->addDefinition('myHttpResponse')->setFactory(Nette\Http\Response::class);
 
 	$code = $compiler->setClassName('Container1')->compile();
 	eval($code);

diff --git a/tests/Bridges.DI/ApplicationExtension.invalidLink.phpt b/tests/Bridges.DI/ApplicationExtension.invalidLink.phpt
@@ -19,9 +19,9 @@ function createCompiler($config)
 	$compiler = new DI\Compiler;
 	$compiler->loadConfig(Tester\FileMock::create($config, 'neon'));
 	$builder = $compiler->getContainerBuilder();
-	$builder->addDefinition('myRouter')->setClass(Nette\Application\Routers\SimpleRouter::class);
+	$builder->addDefinition('myRouter')->setFactory(Nette\Application\Routers\SimpleRouter::class);
 	$builder->addDefinition('myHttpRequest')->setFactory(Nette\Http\Request::class, [new DI\Statement(Nette\Http\UrlScript::class)]);
-	$builder->addDefinition('myHttpResponse')->setClass(Nette\Http\Response::class);
+	$builder->addDefinition('myHttpResponse')->setFactory(Nette\Http\Response::class);
 	return $compiler;
 }
 

diff --git a/tests/Bridges.DI/ApplicationExtension.scan.phpt b/tests/Bridges.DI/ApplicationExtension.scan.phpt
@@ -18,9 +18,9 @@ test(function () {
 	$compiler->addExtension('application', new ApplicationExtension);
 
 	$builder = $compiler->getContainerBuilder();
-	$builder->addDefinition('myRouter')->setClass(Nette\Application\Routers\SimpleRouter::class);
+	$builder->addDefinition('myRouter')->setFactory(Nette\Application\Routers\SimpleRouter::class);
 	$builder->addDefinition('myHttpRequest')->setFactory(Nette\Http\Request::class, [new DI\Statement(Nette\Http\UrlScript::class)]);
-	$builder->addDefinition('myHttpResponse')->setClass(Nette\Http\Response::class);
+	$builder->addDefinition('myHttpResponse')->setFactory(Nette\Http\Response::class);
 	$code = $compiler->setClassName('Container1')->compile();
 	eval($code);
 
@@ -37,9 +37,9 @@ test(function () {
 	$compiler->addExtension('application', new ApplicationExtension);
 
 	$builder = $compiler->getContainerBuilder();
-	$builder->addDefinition('myRouter')->setClass(Nette\Application\Routers\SimpleRouter::class);
+	$builder->addDefinition('myRouter')->setFactory(Nette\Application\Routers\SimpleRouter::class);
 	$builder->addDefinition('myHttpRequest')->setFactory(Nette\Http\Request::class, [new DI\Statement(Nette\Http\UrlScript::class)]);
-	$builder->addDefinition('myHttpResponse')->setClass(Nette\Http\Response::class);
+	$builder->addDefinition('myHttpResponse')->setFactory(Nette\Http\Response::class);
 	$code = $compiler->addConfig([
 		'application' => [
 			'scanDirs' => [__DIR__ . '/files'],
@@ -60,9 +60,9 @@ test(function () {
 	$compiler->addExtension('application', new ApplicationExtension(false, [__DIR__ . '/files']));
 
 	$builder = $compiler->getContainerBuilder();
-	$builder->addDefinition('myRouter')->setClass(Nette\Application\Routers\SimpleRouter::class);
+	$builder->addDefinition('myRouter')->setFactory(Nette\Application\Routers\SimpleRouter::class);
 	$builder->addDefinition('myHttpRequest')->setFactory(Nette\Http\Request::class, [new DI\Statement(Nette\Http\UrlScript::class)]);
-	$builder->addDefinition('myHttpResponse')->setClass(Nette\Http\Response::class);
+	$builder->addDefinition('myHttpResponse')->setFactory(Nette\Http\Response::class);
 	$loader = new DI\Config\Loader;
 	$config = $loader->load(Tester\FileMock::create('
 	services: