From ae13cdeb4f386f7974e3409b4ee977e9374c77cd Mon Sep 17 00:00:00 2001 From: Bertrand Gauthier <bertrand.gauthier@unicaen.fr> Date: Wed, 18 Sep 2019 13:48:54 +0200 Subject: [PATCH] =?UTF-8?q?Correction=20de=20ModuleOptionsFactory=20fusion?= =?UTF-8?q?n=C3=A9=20=C3=A0=20la=20l=C3=A9g=C3=A8re.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/UnicaenAuth/Options/ModuleOptionsFactory.php | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/src/UnicaenAuth/Options/ModuleOptionsFactory.php b/src/UnicaenAuth/Options/ModuleOptionsFactory.php index a07434a..d054bfa 100644 --- a/src/UnicaenAuth/Options/ModuleOptionsFactory.php +++ b/src/UnicaenAuth/Options/ModuleOptionsFactory.php @@ -4,26 +4,23 @@ namespace UnicaenAuth\Options; use Assert\Assertion; use Assert\AssertionFailedException; +use Interop\Container\ContainerInterface; use UnicaenApp\Exception\RuntimeException; -use Zend\ServiceManager\FactoryInterface; -use Zend\ServiceManager\ServiceLocatorInterface; /** - * Description of ModuleOptionsFactory - * * @author Bertrand GAUTHIER <bertrand.gauthier at unicaen.fr> */ -class ModuleOptionsFactory implements FactoryInterface +class ModuleOptionsFactory { /** * Create service * - * @param ServiceLocatorInterface $serviceLocator + * @param ContainerInterface $container * @return mixed */ - public function createService(ServiceLocatorInterface $serviceLocator) + public function __invoke(ContainerInterface $container) { - $config = $serviceLocator->get('Configuration'); + $config = $container->get('Configuration'); $moduleConfig = isset($config['unicaen-auth']) ? $config['unicaen-auth'] : []; $moduleConfig = array_merge($config['zfcuser'], $moduleConfig); -- GitLab