From 4ec945e83a7b71297310c602e9353e36344647be Mon Sep 17 00:00:00 2001 From: David Grudl Date: Wed, 24 Oct 2018 18:28:00 +0200 Subject: [PATCH] updated for nette/di 3 --- src/Bridges/DatabaseDI/DatabaseExtension.php | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/Bridges/DatabaseDI/DatabaseExtension.php b/src/Bridges/DatabaseDI/DatabaseExtension.php index 8e7266891..c7e705184 100644 --- a/src/Bridges/DatabaseDI/DatabaseExtension.php +++ b/src/Bridges/DatabaseDI/DatabaseExtension.php @@ -78,7 +78,8 @@ private function setupDatabase(array $config, string $name): void $connection = $builder->addDefinition($this->prefix("$name.connection")) ->setFactory(Nette\Database\Connection::class, [$config['dsn'], $config['user'], $config['password'], $config['options']]) - ->setAutowired($config['autowired']); + ->setAutowired($config['autowired']) + ->setPublic(); $structure = $builder->addDefinition($this->prefix("$name.structure")) ->setFactory(Nette\Database\Structure::class) @@ -107,13 +108,13 @@ private function setupDatabase(array $config, string $name): void ->setAutowired($config['autowired']); } else { - $class = method_exists(Nette\DI\Helpers::class, 'filterArguments') ? Nette\DI\Helpers::class : Nette\DI\Compiler::class; - $conventions = $class::filterArguments([$config['conventions']])[0]; + $conventions = Nette\DI\Config\Processor::filterArguments([$config['conventions']])[0]; } $builder->addDefinition($this->prefix("$name.context")) ->setFactory(Nette\Database\Context::class, [$connection, $structure, $conventions]) - ->setAutowired($config['autowired']); + ->setAutowired($config['autowired']) + ->setPublic(); if ($config['debugger']) { $connection->addSetup('@Tracy\BlueScreen::addPanel', [