Commit 0450cacf authored by Bertrand Gauthier's avatar Bertrand Gauthier
Browse files

L'instanciation manuelle de la classe ModuleOptions pour fusionner avec la... 

L'instanciation manuelle de la classe ModuleOptions pour fusionner avec la config zfc-user était inutile : la factory fait la fusion !
parent 4f88b8da

src/UnicaenAuthentification/Authentication/Adapter/AbstractFactory.php

+6 −8
Original line number Diff line number Diff line
@@ -3,15 +3,14 @@ 
namespace UnicaenAuthentification\Authentication\Adapter;



use Interop\Container\ContainerInterface;

use UnicaenApp\Exception\LogicException;

use UnicaenAuthentification\Options\ModuleOptions;

use UnicaenAuthentification\Service\User;

use Laminas\EventManager\EventManager;

use Laminas\EventManager\EventManagerAwareInterface;

use Laminas\Router\Http\TreeRouteStack;

use Laminas\ServiceManager\AbstractFactoryInterface;

use Laminas\ServiceManager\ServiceLocatorInterface;

use UnicaenApp\Exception\LogicException;

use UnicaenApp\Mapper\Ldap\People as LdapPeopleMapper;

use UnicaenAuthentification\Options\ModuleOptions;

use UnicaenAuthentification\Service\User;



/**

 * Description of AbstractFactory
@@ -88,10 +87,9 @@ class AbstractFactory implements AbstractFactoryInterface 
                $ldapPeopleMapper = $container->get('ldap_people_mapper');

                $adapter->setLdapPeopleMapper($ldapPeopleMapper);



                $options = array_merge(

                    $container->get('zfcuser_module_options')->toArray(),

                    $container->get('unicaen-auth_module_options')->toArray());

                $adapter->setOptions(new ModuleOptions($options));

                /** @var ModuleOptions $moduleOptions */

                $moduleOptions = $container->get('unicaen-auth_module_options');

                $adapter->setModuleOptions($moduleOptions);



                /** @var \UnicaenApp\Options\ModuleOptions $appModuleOptions */

                $appModuleOptions = $container->get('unicaen-app_module_options');

src/UnicaenAuthentification/Authentication/Adapter/CasAdapterFactory.php

+3 −5
Original line number Diff line number Diff line
@@ -3,10 +3,10 @@ 
namespace UnicaenAuthentification\Authentication\Adapter;



use Interop\Container\ContainerInterface;

use Laminas\Authentication\Storage\Session;

use UnicaenApp\Mapper\Ldap\People as LdapPeopleMapper;

use UnicaenAuthentification\Options\ModuleOptions;

use UnicaenAuthentification\Service\User;

use Laminas\Authentication\Storage\Session;



class CasAdapterFactory

{
@@ -49,10 +49,8 @@ class CasAdapterFactory 
        $router = $container->get('router');

        $adapter->setRouter($router);



        $options = array_merge(

            $container->get('zfcuser_module_options')->toArray(),

            $container->get('unicaen-auth_module_options')->toArray());

        $moduleOptions = new ModuleOptions($options);

        /** @var ModuleOptions $moduleOptions */

        $moduleOptions = $container->get('unicaen-auth_module_options');

        $adapter->setModuleOptions($moduleOptions);



        $substitut = $moduleOptions->getCas()['type'] ?? null;

src/UnicaenAuthentification/Authentication/Adapter/DbAdapterFactory.php

+6 −8
Original line number Diff line number Diff line
@@ -2,16 +2,16 @@ 


namespace UnicaenAuthentification\Authentication\Adapter;



use Interop\Container\ContainerInterface;

use UnicaenAuthentification\Options\ModuleOptions;

use Laminas\Authentication\Storage\Session;

use Psr\Container\ContainerInterface;

use UnicaenAuthentification\Options\ModuleOptions;

use ZfcUser\Mapper\UserInterface as UserMapperInterface;



class DbAdapterFactory

{

    /**

     * @param ContainerInterface $container

     * @return Db

     * @throws \Psr\Container\NotFoundExceptionInterface

     * @throws \Psr\Container\ContainerExceptionInterface

     */

    public function __invoke(ContainerInterface $container): Db

    {
@@ -22,10 +22,8 @@ class DbAdapterFactory 
        $adapter->setStorage(new Session(Db::class));

        $adapter->setMapper($userMapper);



        $options = array_merge(

            $container->get('zfcuser_module_options')->toArray(),

            $container->get('unicaen-auth_module_options')->toArray());

        $moduleOptions = new ModuleOptions($options);

        /** @var ModuleOptions $moduleOptions */

        $moduleOptions = $container->get('unicaen-auth_module_options');

        $adapter->setModuleOptions($moduleOptions);



        $substitut = $moduleOptions->getDb()['type'] ?? null;

src/UnicaenAuthentification/Authentication/Adapter/LdapAdapterFactory.php

+3 −5
Original line number Diff line number Diff line
@@ -3,10 +3,10 @@ 
namespace UnicaenAuthentification\Authentication\Adapter;



use Interop\Container\ContainerInterface;

use Laminas\Authentication\Storage\Session;

use UnicaenApp\Mapper\Ldap\People as LdapPeopleMapper;

use UnicaenAuthentification\Options\ModuleOptions;

use UnicaenAuthentification\Service\User;

use Laminas\Authentication\Storage\Session;



class LdapAdapterFactory

{
@@ -49,10 +49,8 @@ class LdapAdapterFactory 
        $ldapPeopleMapper = $container->get('ldap_people_mapper');

        $adapter->setLdapPeopleMapper($ldapPeopleMapper);



        $options = array_merge(

            $container->get('zfcuser_module_options')->toArray(),

            $container->get('unicaen-auth_module_options')->toArray());

        $moduleOptions = new ModuleOptions($options);

        /** @var ModuleOptions $moduleOptions */

        $moduleOptions = $container->get('unicaen-auth_module_options');

        $adapter->setModuleOptions($moduleOptions);



        $substitut = $moduleOptions->getLdap()['type'] ?? null;

src/UnicaenAuthentification/Authentication/Adapter/ShibAdapterFactory.php

+5 −7
Original line number Diff line number Diff line
@@ -3,12 +3,12 @@ 
namespace UnicaenAuthentification\Authentication\Adapter;



use Interop\Container\ContainerInterface;

use UnicaenAuthentification\Options\ModuleOptions;

use UnicaenAuthentification\Service\ShibService;

use UnicaenAuthentification\Service\User;

use Laminas\Authentication\AuthenticationService;

use Laminas\Authentication\Storage\Session;

use Laminas\Router\RouteInterface;

use UnicaenAuthentification\Options\ModuleOptions;

use UnicaenAuthentification\Service\ShibService;

use UnicaenAuthentification\Service\User;



class ShibAdapterFactory

{
@@ -50,10 +50,8 @@ class ShibAdapterFactory 
        $userService = $container->get('unicaen-auth_user_service');

        $adapter->setUserService($userService);



        $options = array_merge(

            $container->get('zfcuser_module_options')->toArray(),

            $container->get('unicaen-auth_module_options')->toArray());

        $moduleOptions = new ModuleOptions($options);

        /** @var ModuleOptions $moduleOptions */

        $moduleOptions = $container->get('unicaen-auth_module_options');

        $adapter->setModuleOptions($moduleOptions);



        // type alias