Commit ec8004d0 authored by David Surville's avatar David Surville
Browse files

Merge branch '5.x' into release/1.3.0

parents 7637cd25 c396b136

CHANGELOG.md

0 → 100755
+12 −0
Changes for CHANGELOG.md: 12 added lines, 0 removed lines.
Original line number Diff line number Diff line 
Journal des modifications

=========================



6.0.1 (21/03/2023)

-----

- Mise en place du changelog

- Réintégration de l'AssertionFactory, à utiliser pour les assertions

- [Fix] erreur ns \InvalidArgumentException : \ ajouté



5.0.7 (05/05/2023)

-----

- Correction bug d'affichage sur le tableau d'affectation lorsque deux catégories possèdent le même libellé

Module.php

+2 −2
Changes for Module.php: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -15,8 +15,8 @@ class Module 
    {

        $e->getApplication()->getServiceManager()->get('translator');

        $eventManager        = $e->getApplication()->getEventManager();

        $moduleRouteListener = new ModuleRouteListener();

        $moduleRouteListener->attach($eventManager);

//        $moduleRouteListener = new ModuleRouteListener();

//        $moduleRouteListener->attach($eventManager);



        /* Active un layout spécial si la requête est de type AJAX. Valable pour TOUS les modules de l'application. */

        $eventManager->getSharedManager()->attach('Laminas\Mvc\Controller\AbstractActionController', 'dispatch',

composer.json

+1 −1
Changes for composer.json: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ 
        }

    ],

    "require": {

        "unicaen/app": "^4.0",

        "unicaen/app": ">=5.0",

        "laminas/laminas-dependency-plugin": "^2.1"

    },

    "require-dev": {

config/merged/privilege.config.php

+1 −1
Changes for config/merged/privilege.config.php: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ return [ 
                        'attribuer',

                    ],

                    'privileges' => [

                        PrivilegePrivileges::PRIVILEGE_ATTRIBUER,

                        PrivilegePrivileges::PRIVILEGE_AFFECTER,

                    ],

                ],

                [

src/UnicaenPrivilege/Assertion/AssertionFactory.php

0 → 100644
+45 −0
Changes for src/UnicaenPrivilege/Assertion/AssertionFactory.php: 45 added lines, 0 removed lines.
Original line number Diff line number Diff line 
<?php



namespace UnicaenPrivilege\Assertion;



use BjyAuthorize\Service\Authorize;

use Psr\Container\ContainerInterface;

use Laminas\Authentication\AuthenticationService;

use Laminas\Mvc\Application;

use Laminas\ServiceManager\Factory\FactoryInterface;

use UnicaenAuthentification\Service\UserContext;



/**

 * Class AssertionFactory

 *

 * @package UnicaenPrivilege\Assertion

 */

class AssertionFactory implements FactoryInterface

{

    /**

     * @param ContainerInterface $container

     *

     * @return UserContext

     */

    public function __invoke(ContainerInterface $container, $requestedName, array $options = null)

    {

        /* @var $application Application */

        $application = $container->get('Application');

        $mvcEvent    = $application->getMvcEvent();



        /* @var $serviceAuthorize Authorize */

        $serviceAuthorize = $container->get('BjyAuthorize\Service\Authorize');



        /** @var UserContext $serviceUserContext */

        $serviceUserContext = $container->get(UserContext::class);



        /* @var $assertion AbstractAssertion */

        $assertion = new $requestedName;



        $assertion->setMvcEvent($mvcEvent);

        $assertion->setServiceAuthorize($serviceAuthorize);

        $assertion->setServiceUserContext($serviceUserContext);



        return $assertion;

    }

}