updated tests

Author: dg

tests/Bridges.DI/ApplicationExtension.basic.phpt

@@ -16,7 +16,7 @@ test('', function () {
 
 	$builder = $compiler->getContainerBuilder();
 	$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('myHttpRequest')->setFactory(Nette\Http\Request::class, [new DI\Definitions\Statement(Nette\Http\UrlScript::class)]);
 	$builder->addDefinition('myHttpResponse')->setFactory(Nette\Http\Response::class);
 
 	$code = $compiler->setClassName('Container1')->compile();

tests/Bridges.DI/ApplicationExtension.invalidLink.phpt

@@ -18,7 +18,7 @@ function createCompiler(string $config): DI\Compiler
 	$compiler->loadConfig(Tester\FileMock::create($config, 'neon'));
 	$builder = $compiler->getContainerBuilder();
 	$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('myHttpRequest')->setFactory(Nette\Http\Request::class, [new DI\Definitions\Statement(Nette\Http\UrlScript::class)]);
 	$builder->addDefinition('myHttpResponse')->setFactory(Nette\Http\Response::class);
 	return $compiler;
 }

tests/Bridges.DI/ApplicationExtension.scan.phpt

@@ -4,6 +4,7 @@ declare(strict_types=1);
 
 use Nette\Bridges\ApplicationDI\ApplicationExtension;
 use Nette\DI;
+use Nette\DI\Definitions\Statement;
 use Tester\Assert;
 
 
@@ -17,7 +18,7 @@ test('', function () {
 
 	$builder = $compiler->getContainerBuilder();
 	$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('myHttpRequest')->setFactory(Nette\Http\Request::class, [new Statement(Nette\Http\UrlScript::class)]);
 	$builder->addDefinition('myHttpResponse')->setFactory(Nette\Http\Response::class);
 	$code = $compiler->setClassName('Container1')->compile();
 	eval($code);
@@ -35,7 +36,7 @@ test('', function () {
 
 	$builder = $compiler->getContainerBuilder();
 	$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('myHttpRequest')->setFactory(Nette\Http\Request::class, [new Statement(Nette\Http\UrlScript::class)]);
 	$builder->addDefinition('myHttpResponse')->setFactory(Nette\Http\Response::class);
 	$code = $compiler->addConfig([
 		'application' => [
@@ -58,7 +59,7 @@ test('', function () {
 
 	$builder = $compiler->getContainerBuilder();
 	$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('myHttpRequest')->setFactory(Nette\Http\Request::class, [new Statement(Nette\Http\UrlScript::class)]);
 	$builder->addDefinition('myHttpResponse')->setFactory(Nette\Http\Response::class);
 	$loader = new DI\Config\Loader;
 	$config = $loader->load(Tester\FileMock::create('
@@ -94,7 +95,7 @@ test('', function () {
 
 	$builder = $compiler->getContainerBuilder();
 	$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('myHttpRequest')->setFactory(Nette\Http\Request::class, [new Statement(Nette\Http\UrlScript::class)]);
 	$builder->addDefinition('myHttpResponse')->setFactory(Nette\Http\Response::class);
 	$code = $compiler->setClassName('Container4')->compile();
 	eval($code);

tests/Bridges.Latte3/ControlMock.php

@@ -44,7 +44,7 @@ public function getComponents(bool $deep = false, ?string $filterType = null): I
 	}
 
 
-	public function getPresenter(): ?Nette\Application\UI\Presenter
+	public function getPresenter(): Nette\Application\UI\Presenter
 	{
 		$presenter = new class extends Nette\Application\UI\Presenter {
 		};

tests/Bridges.Latte3/{control}.3.phpt

@@ -53,5 +53,5 @@ Assert::same(
 Assert::exception(
 	fn() => $latte->renderToString('<style> {control x} </style>'),
 	Latte\RuntimeException::class,
-	'Filters: unable to convert content type HTML to HTML/CSS',
+	'Filters: unable to convert content type HTML to HTML/%a?%CSS',
 );