Commit 4092eaf1 authored by Bertrand Gauthier's avatar Bertrand Gauthier

Merge branch 'release-3.0.1'

parents 024799dd ae13cdeb
......@@ -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);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment