DatabaseExtension: fixed compatibility with nette/di

dg · dg · commit 0e6aeb1797d9 · 2017-02-02T03:49:30.000+01:00
diff --git a/src/Bridges/DatabaseDI/DatabaseExtension.php b/src/Bridges/DatabaseDI/DatabaseExtension.php
@@ -102,8 +102,8 @@ private function setupDatabase($config, $name)
 				->setAutowired($config['autowired']);
 
 		} else {
-			$tmp = Nette\DI\Compiler::filterArguments([$config['conventions']]);
-			$conventions = reset($tmp);
+			$class = method_exists(Nette\DI\Helpers::class, 'filterArguments') ? Nette\DI\Helpers::class : Nette\DI\Compiler::class;
+			$conventions = $class::filterArguments([$config['conventions']])[0];
 		}
 
 		$builder->addDefinition($this->prefix("$name.context"))

Original file line number	Diff line number	Diff line change
`@@ -102,8 +102,8 @@ private function setupDatabase($config, $name)`
`102`	`102`	`->setAutowired($config['autowired']);`
`103`	`103`
`104`	`104`	`} else {`
`105`		`- $tmp = Nette\DI\Compiler::filterArguments([$config['conventions']]);`
`106`		`- $conventions = reset($tmp);`
	`105`	`+ $class = method_exists(Nette\DI\Helpers::class, 'filterArguments') ? Nette\DI\Helpers::class : Nette\DI\Compiler::class;`
	`106`	`+ $conventions = $class::filterArguments([$config['conventions']])[0];`
`107`	`107`	`}`
`108`	`108`
`109`	`109`	`$builder->addDefinition($this->prefix("$name.context"))`