bridge: removed support for nette/di 2.3

Author: dg

composer.json

@@ -20,9 +20,9 @@
 		"ext-json": "*"
 	},
 	"require-dev": {
-		"nette/utils": "~2.3",
-		"nette/di": "~2.3 || ~3.0.0",
-		"nette/tester": "~2.0"
+		"nette/utils": "^2.4 || ^3.0",
+		"nette/di": "^2.4 || ~3.0.0",
+		"nette/tester": "^2.0"
 	},
 	"suggest": {
 		"https://nette.org/donate": "Please support Tracy via a donation"

src/Bridges/Nette/TracyExtension.php

@@ -73,7 +73,6 @@ public function afterCompile(Nette\PhpGenerator\ClassType $class)
 	{
 		$initialize = $class->getMethod('initialize');
 		$builder = $this->getContainerBuilder();
-		$class = method_exists('Nette\DI\Helpers', 'filterArguments') ? 'Nette\DI\Helpers' : 'Nette\DI\Compiler';
 
 		$options = $this->config;
 		unset($options['bar'], $options['blueScreen'], $options['netteMailer']);
@@ -89,7 +88,7 @@ public function afterCompile(Nette\PhpGenerator\ClassType $class)
 				$key = ($key === 'fromEmail' ? 'getLogger()->' : '$') . $key;
 				$initialize->addBody($builder->formatPhp(
 					'Tracy\Debugger::' . $key . ' = ?;',
-					$class::filterArguments([$value])
+					Nette\DI\Helpers::filterArguments([$value])
 				));
 			}
 		}
@@ -114,7 +113,7 @@ public function afterCompile(Nette\PhpGenerator\ClassType $class)
 				}
 				$initialize->addBody($builder->formatPhp(
 					'$this->getService(?)->addPanel(?);',
-					$class::filterArguments([$this->prefix('bar'), $item])
+					Nette\DI\Helpers::filterArguments([$this->prefix('bar'), $item])
 				));
 			}
 
@@ -126,7 +125,7 @@ public function afterCompile(Nette\PhpGenerator\ClassType $class)
 		foreach ((array) $this->config['blueScreen'] as $item) {
 			$initialize->addBody($builder->formatPhp(
 				'$this->getService(?)->addPanel(?);',
-				$class::filterArguments([$this->prefix('blueScreen'), $item])
+				Nette\DI\Helpers::filterArguments([$this->prefix('blueScreen'), $item])
 			));
 		}
 

tests/Tracy.Bridges/TracyExtension.services.phpt

@@ -23,6 +23,7 @@ class CustomLogger implements ILogger
 
 
 $compiler = new DI\Compiler;
+$compiler->setClassName('Container');
 $compiler->addExtension('tracy', new TracyExtension);
 $compiler->addConfig([
 	'tracy' => [
@@ -33,7 +34,7 @@ $compiler->addConfig([
 	],
 ]);
 
-eval(@$compiler->compile([], 'Container')); // @ compatiblity with DI 2.3 & 2.4
+eval($compiler->compile());
 
 $container = new Container;
 $container->initialize();