From e071611a93ce117c0983ad824c817c0ba0d242bb Mon Sep 17 00:00:00 2001 From: David Grudl Date: Tue, 17 May 2016 18:00:56 +0200 Subject: [PATCH] tests: compatibility with DI & Latte 2.4 --- tests/Bridges.DI/ApplicationExtension.basic.phpt | 2 +- tests/Bridges.DI/ApplicationExtension.invalidLink.phpt | 8 ++++---- tests/Bridges.DI/ApplicationExtension.scan.phpt | 6 +++--- tests/Bridges.DI/LatteExtension.basic.phpt | 2 +- tests/Bridges.DI/RoutingExtension.basic.phpt | 2 +- tests/Bridges.DI/RoutingExtension.cache.phpt | 6 +++--- tests/Bridges.Latte/UIMacros.link.2.phpt | 4 ++-- 7 files changed, 15 insertions(+), 15 deletions(-) diff --git a/tests/Bridges.DI/ApplicationExtension.basic.phpt b/tests/Bridges.DI/ApplicationExtension.basic.phpt index ee98341..d3b74cd 100644 --- a/tests/Bridges.DI/ApplicationExtension.basic.phpt +++ b/tests/Bridges.DI/ApplicationExtension.basic.phpt @@ -21,7 +21,7 @@ test(function () { $builder->addDefinition('myHttpRequest')->setFactory('Nette\Http\Request', array(new DI\Statement('Nette\Http\UrlScript'))); $builder->addDefinition('myHttpResponse')->setClass('Nette\Http\Response'); - $code = $compiler->compile(array(), 'Container1'); + $code = @$compiler->compile(array(), 'Container1'); // @ compatibility with 2.4 eval($code); $container = new Container1; diff --git a/tests/Bridges.DI/ApplicationExtension.invalidLink.phpt b/tests/Bridges.DI/ApplicationExtension.invalidLink.phpt index 95d2fa4..fb11893 100644 --- a/tests/Bridges.DI/ApplicationExtension.invalidLink.phpt +++ b/tests/Bridges.DI/ApplicationExtension.invalidLink.phpt @@ -36,7 +36,7 @@ test(function () { presenter: Presenter1 '); $compiler->addExtension('application', new ApplicationExtension(TRUE)); - $code = $compiler->compile(NULL, 'Container4'); + $code = @$compiler->compile(NULL, 'Container4'); // @ compatibility with 2.4 eval($code); $container = new Container4; @@ -57,7 +57,7 @@ test(function () { presenter: Presenter1 '); $compiler->addExtension('application', new ApplicationExtension(TRUE)); - $code = $compiler->compile(NULL, 'Container5'); + $code = @$compiler->compile(NULL, 'Container5'); // @ compatibility with 2.4 eval($code); $container = new Container5; @@ -78,7 +78,7 @@ test(function () { presenter: Presenter1 '); $compiler->addExtension('application', new ApplicationExtension(FALSE)); - $code = $compiler->compile(NULL, 'Container6'); + $code = @$compiler->compile(NULL, 'Container6'); // @ compatibility with 2.4 eval($code); $container = new Container6; @@ -99,7 +99,7 @@ test(function () { presenter: Presenter1 '); $compiler->addExtension('application', new ApplicationExtension(FALSE)); - $code = $compiler->compile(NULL, 'Container7'); + $code = @$compiler->compile(NULL, 'Container7'); // @ compatibility with 2.4 eval($code); $container = new Container7; diff --git a/tests/Bridges.DI/ApplicationExtension.scan.phpt b/tests/Bridges.DI/ApplicationExtension.scan.phpt index 7535091..24e2e39 100644 --- a/tests/Bridges.DI/ApplicationExtension.scan.phpt +++ b/tests/Bridges.DI/ApplicationExtension.scan.phpt @@ -21,7 +21,7 @@ test(function () { $builder->addDefinition('myRouter')->setClass('Nette\Application\Routers\SimpleRouter'); $builder->addDefinition('myHttpRequest')->setFactory('Nette\Http\Request', array(new DI\Statement('Nette\Http\UrlScript'))); $builder->addDefinition('myHttpResponse')->setClass('Nette\Http\Response'); - $code = $compiler->compile(array( + $code = @$compiler->compile(array( // @ compatibility with 2.4 'application' => array('debugger' => FALSE), ), 'Container1'); eval($code); @@ -42,7 +42,7 @@ test(function () { $builder->addDefinition('myRouter')->setClass('Nette\Application\Routers\SimpleRouter'); $builder->addDefinition('myHttpRequest')->setFactory('Nette\Http\Request', array(new DI\Statement('Nette\Http\UrlScript'))); $builder->addDefinition('myHttpResponse')->setClass('Nette\Http\Response'); - $code = $compiler->compile(array( + $code = @$compiler->compile(array( // @ compatibility with 2.4 'application' => array( 'scanDirs' => array(__DIR__ . '/files'), 'debugger' => FALSE, @@ -77,7 +77,7 @@ test(function () { setup: - setView(test) ', 'neon')); - $code = $compiler->compile($config, 'Container3'); + $code = @$compiler->compile($config, 'Container3'); // @ compatibility with 2.4 eval($code); $container = new Container3; diff --git a/tests/Bridges.DI/LatteExtension.basic.phpt b/tests/Bridges.DI/LatteExtension.basic.phpt index 5f0d215..fc473f3 100644 --- a/tests/Bridges.DI/LatteExtension.basic.phpt +++ b/tests/Bridges.DI/LatteExtension.basic.phpt @@ -74,7 +74,7 @@ latte: $compiler = new DI\Compiler; $compiler->addExtension('latte', new Nette\Bridges\ApplicationDI\LatteExtension(NULL, FALSE)); $compiler->addExtension('another', new AnotherExtension); -$code = $compiler->compile($config, 'Container'); +$code = @$compiler->compile($config, 'Container'); // @ compatibility with 2.4 eval($code); $container = new Container; diff --git a/tests/Bridges.DI/RoutingExtension.basic.phpt b/tests/Bridges.DI/RoutingExtension.basic.phpt index b8d8f90..c05d116 100644 --- a/tests/Bridges.DI/RoutingExtension.basic.phpt +++ b/tests/Bridges.DI/RoutingExtension.basic.phpt @@ -23,7 +23,7 @@ test(function () { $compiler = new DI\Compiler; $compiler->addExtension('routing', new RoutingExtension(FALSE)); - $code = $compiler->compile($config, 'Container1'); + $code = @$compiler->compile($config, 'Container1'); // @ compatibility with 2.4 eval($code); $container = new Container1; diff --git a/tests/Bridges.DI/RoutingExtension.cache.phpt b/tests/Bridges.DI/RoutingExtension.cache.phpt index 9f1aad7..fd0d96d 100644 --- a/tests/Bridges.DI/RoutingExtension.cache.phpt +++ b/tests/Bridges.DI/RoutingExtension.cache.phpt @@ -39,7 +39,7 @@ test(function () { $compiler = new DI\Compiler; $compiler->addExtension('routing', new RoutingExtension(FALSE)); - $code = $compiler->compile($config, 'Container1'); + $code = @$compiler->compile($config, 'Container1'); // @ compatibility with 2.4 eval($code); $container = new Container1; @@ -60,7 +60,7 @@ test(function () { $compiler = new DI\Compiler; $compiler->addExtension('routing', new RoutingExtension(FALSE)); - $code = $compiler->compile($config, 'Container2'); + $code = @$compiler->compile($config, 'Container2'); // @ compatibility with 2.4 eval($code); $container = new Container2; @@ -88,5 +88,5 @@ Assert::exception(function () { $compiler = new DI\Compiler; $compiler->addExtension('routing', new RoutingExtension(FALSE)); - $compiler->compile($config, 'Container3'); + @$compiler->compile($config, 'Container3'); // @ compatibility with 2.4 }, 'Nette\DI\ServiceCreationException', 'Unable to cache router due to error: %a%'); diff --git a/tests/Bridges.Latte/UIMacros.link.2.phpt b/tests/Bridges.Latte/UIMacros.link.2.phpt index c1d88ea..a7d8421 100644 --- a/tests/Bridges.Latte/UIMacros.link.2.phpt +++ b/tests/Bridges.Latte/UIMacros.link.2.phpt @@ -87,7 +87,7 @@ link:['login'] EOD -, $latte->renderToString(<<renderToString(<< EOD -, $params)); +, $params), [''' => "'"]));