Commit e30bd738 authored by Thibaut Vallee's avatar Thibaut Vallee
Browse files

Merge remote-tracking branch 'origin/laminas_migration_bs5'

parents 5c98c70f c06aa72c

Module.php

+7 −7
Original line number Diff line number Diff line
@@ -3,11 +3,11 @@ 


namespace UnicaenPrivilege;



use Zend\Mvc\ModuleRouteListener;

use Zend\Mvc\MvcEvent;

use Zend\Stdlib\ArrayUtils;

use Zend\Stdlib\Glob;

use Zend\Config\Factory as ConfigFactory;

use Laminas\Mvc\ModuleRouteListener;

use Laminas\Mvc\MvcEvent;

use Laminas\Stdlib\ArrayUtils;

use Laminas\Stdlib\Glob;

use Laminas\Config\Factory as ConfigFactory;



class Module

{
@@ -19,7 +19,7 @@ class Module 
//        $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('Zend\Mvc\Controller\AbstractActionController', 'dispatch',

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

            function (MvcEvent $e) {

                $request = $e->getRequest();

                if ($request instanceof HttpRequest && $request->isXmlHttpRequest()) {
@@ -47,7 +47,7 @@ class Module 
    public function getAutoloaderConfig()

    {

        return array(

            'Zend\Loader\StandardAutoloader' => array(

            'Laminas\Loader\StandardAutoloader' => array(

                'namespaces' => array(

                    __NAMESPACE__ => __DIR__ . '/src/' . __NAMESPACE__,

                ),

composer.json

+22 −21
Original line number Diff line number Diff line 
{

    "name": "unicaen/privilege",

  "description": "Module reprenant la gestion des privileges",

    "description": "Module reprenant la gestion des privileges  - Version laminas",

    "repositories": [

        {

            "type": "composer",
@@ -8,7 +8,8 @@ 
        }

    ],

    "require": {

    "unicaen/app": "^3.0"

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

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

    },

    "require-dev": {

        "phpunit/phpunit": ">=3.7"

config/merged/privilege.config.php

+3 −3
Original line number Diff line number Diff line
@@ -18,8 +18,8 @@ use UnicaenPrivilege\Service\Privilege\PrivilegeCategorieServiceFactory; 
use UnicaenPrivilege\Service\Privilege\PrivilegeService;

use UnicaenPrivilege\Service\Privilege\PrivilegeServiceFactory;

use UnicaenPrivilege\View\Privilege\PrivilegeViewHelper;

use Zend\Router\Http\Literal;

use Zend\Router\Http\Segment;

use Laminas\Router\Http\Literal;

use Laminas\Router\Http\Segment;



return [
@@ -41,7 +41,7 @@ return [ 
                        'attribuer',

                    ],

                    'privileges' => [

                        PrivilegePrivileges::PRIVILEGE_ATTRIBUER,

                        PrivilegePrivileges::PRIVILEGE_AFFECTER,

                    ],

                ],

                [

data/sql/schema_postgresql.sql

+69 −118
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ CREATE UNIQUE INDEX UN_UNICAEN_PRIVILEGE_CATEGORIE_CODE ON UNICAEN_PRIVILEGE_CAT 
-- -----------------------------------------------------

-- TABLE UNICAEN_PRIVILEGE

-- -----------------------------------------------------

CREATE TABLE UNICAEN_PRIVILEGE (

CREATE TABLE UNICAEN_PRIVILEGE_PRIVILEGE (

                                   ID           SERIAL       PRIMARY KEY,

                                   CATEGORIE_ID INTEGER      NOT NULL,

                                   CODE         VARCHAR(150) NOT NULL,
@@ -23,23 +23,23 @@ CREATE TABLE UNICAEN_PRIVILEGE ( 
                                   CONSTRAINT FK_UNICAEN_PRIVILEGE_CATEGORIE FOREIGN KEY (CATEGORIE_ID) REFERENCES UNICAEN_PRIVILEGE_CATEGORIE (ID) DEFERRABLE INITIALLY IMMEDIATE

);



CREATE UNIQUE INDEX UN_UNICAEN_PRIVILEGE_CODE ON UNICAEN_PRIVILEGE(CATEGORIE_ID, CODE);

CREATE INDEX IX_UNICAEN_PRIVILEGE_CATEGORIE ON UNICAEN_PRIVILEGE(CATEGORIE_ID);

CREATE UNIQUE INDEX UN_UNICAEN_PRIVILEGE_CODE ON UNICAEN_PRIVILEGE_PRIVILEGE (CATEGORIE_ID, CODE);

CREATE INDEX IX_UNICAEN_PRIVILEGE_CATEGORIE ON UNICAEN_PRIVILEGE_PRIVILEGE(CATEGORIE_ID);





-- -----------------------------------------------------

-- TABLE UNICAEN_ROLE_PRIVILEGE_LINKER

-- -----------------------------------------------------

CREATE TABLE UNICAEN_ROLE_PRIVILEGE_LINKER (

CREATE TABLE UNICAEN_PRIVILEGE_PRIVILEGE_ROLE_LINKER (

                                                         ROLE_ID      INTEGER  NOT NULL,

                                                         PRIVILEGE_ID INTEGER  NOT NULL,

  CONSTRAINT PK_UNICAEN_ROLE_PRIVILEGE_LINKER PRIMARY KEY (ROLE_ID, PRIVILEGE_ID),

  CONSTRAINT FK_UNICAEN_ROLE_PRIVILEGE_LINKER_ROLE FOREIGN KEY (ROLE_ID) REFERENCES UNICAEN_ROLE (ID) DEFERRABLE INITIALLY IMMEDIATE,

  CONSTRAINT FK_UNICAEN_ROLE_PRIVILEGE_LINKER_PRIVILEGE FOREIGN KEY (PRIVILEGE_ID) REFERENCES UNICAEN_PRIVILEGE (ID) DEFERRABLE INITIALLY IMMEDIATE

                                                         CONSTRAINT PK_UNICAEN_PRIVILEGE_PRIVILEGE_ROLE_LINKER PRIMARY KEY (ROLE_ID, PRIVILEGE_ID),

                                                         CONSTRAINT FK_UNICAEN_PRIVILEGE_PRIVILEGE_ROLE_LINKER_ROLE FOREIGN KEY (ROLE_ID) REFERENCES UNICAEN_UTILISATEUR_ROLE (ID) DEFERRABLE INITIALLY IMMEDIATE,

                                                         CONSTRAINT FK_UNICAEN_PRIVILEGE_PRIVILEGE_ROLE_LINKER_PRIVILEGE FOREIGN KEY (PRIVILEGE_ID) REFERENCES UNICAEN_PRIVILEGE_PRIVILEGE (ID) DEFERRABLE INITIALLY IMMEDIATE

);



CREATE INDEX IX_UNICAEN_ROLE_PRIVILEGE_LINKER_ROLE ON UNICAEN_ROLE_PRIVILEGE_LINKER (ROLE_ID);

CREATE INDEX IX_UNICAEN_ROLE_PRIVILEGE_LINKER_PRIVILEGE ON UNICAEN_ROLE_PRIVILEGE_LINKER (PRIVILEGE_ID);

CREATE INDEX IX_UNICAEN_PRIVILEGE_PRIVILEGE_ROLE_LINKER_ROLE ON UNICAEN_PRIVILEGE_PRIVILEGE_ROLE_LINKER (ROLE_ID);

CREATE INDEX IX_UNICAEN_PRIVILEGE_PRIVILEGE_ROLE_LINKER_PRIVILEGE ON UNICAEN_PRIVILEGE_PRIVILEGE_ROLE_LINKER (PRIVILEGE_ID);





-- DATA
@@ -49,102 +49,53 @@ INSERT INTO UNICAEN_PRIVILEGE_CATEGORIE ( 
    CODE,

    LIBELLE,

    ORDRE)

WITH tmp AS (

  SELECT  1, 'utilisateur'  c, 'Gestion des utilisateurs' l, 1  o FROM dual

)

SELECT

  UNICAEN_PRIVILEGE_CATEGORIE_ID_SEQ.nextval,

  tmp.c,

  tmp.l,

  tmp.o

FROM tmp;

values (1, 'utilisateur', 'Gestion des utilisateurs', 1);



INSERT INTO UNICAEN_PRIVILEGE (

INSERT INTO UNICAEN_PRIVILEGE_PRIVILEGE (

    ID,

    CATEGORIE_ID,

    CODE,

    LIBELLE,

    ORDRE)

WITH tmp AS (

  SELECT 1, 1 ca, 'utilisateur_afficher'      c, 'Consulter un utilisateur'                       l, 1  o FROM dual UNION

  SELECT 2, 1 ca, 'utilisateur_ajouter'       c, 'Ajouter un utilisateur'                         l, 2  o FROM dual UNION

  SELECT 3, 1 ca, 'utilisateur_changerstatus' c, 'Changer le statut d''un utilisateur'            l, 3  o FROM dual UNION

  SELECT 4, 1 ca, 'utilisateur_modifierrole'  c, 'Modifier les rôles attribués à un utilisateur'  l, 4  o FROM dual

)

SELECT

  UNICAEN_PRIVILEGE_ID_SEQ.nextval,

  tmp.ca,

  UNICAEN_PRIVILEGE_CATEGORIE_ID_SEQ.currval,

  tmp.l,

  tmp.o

FROM tmp;

values

    (1, 1 , 'utilisateur_afficher', 'Consulter un utilisateur', 1),

    (2, 1 , 'utilisateur_ajouter', 'Ajouter un utilisateur', 1),

    (3, 1 , 'utilisateur_changerstatus', 'Changer le statut d''un utilisateur', 1),

    (4, 1 , 'utilisateur_modifierrole', 'Modifier les rôles attribués à un utilisateur', 1);



INSERT INTO UNICAEN_PRIVILEGE_CATEGORIE (

    ID,

    CODE,

    LIBELLE,

    ORDRE)

WITH tmp AS (

  SELECT  1, 'role'  c, 'Gestion des rôles' l, 1  o FROM dual

)

SELECT

  UNICAEN_PRIVILEGE_CATEGORIE_ID_SEQ.nextval,

  tmp.c,

  tmp.l,

  tmp.o

FROM tmp;

values(2, 'role', 'Gestion des rôles', 1);



INSERT INTO UNICAEN_PRIVILEGE (

INSERT INTO UNICAEN_PRIVILEGE_PRIVILEGE (

    ID,

    CATEGORIE_ID,

    CODE,

    LIBELLE,

    ORDRE)

WITH tmp AS (

  SELECT 1, 1 ca, 'role_afficher' c, 'Consulter les rôles'  l, 1  o FROM dual UNION

  SELECT 2, 1 ca, 'role_modifier' c, 'Modifier un rôle'     l, 2  o FROM dual UNION

  SELECT 3, 1 ca, 'role_effacer'  c, 'Supprimer un rôle'    l, 3  o FROM dual

)

SELECT

  UNICAEN_PRIVILEGE_ID_SEQ.nextval,

  tmp.ca,

  UNICAEN_PRIVILEGE_CATEGORIE_ID_SEQ.currval,

  tmp.l,

  tmp.o

FROM tmp;

values

    (5, 2, 'role_afficher', 'Consulter les rôles', 1),

    (6, 2, 'role_modifier', 'Modifier un rôle', 2),

    (7, 2, 'role_effacer', 'Supprimer un rôle', 3);



INSERT INTO UNICAEN_PRIVILEGE_CATEGORIE (

    ID,

    CODE,

    LIBELLE,

    ORDRE)

WITH tmp AS (

  SELECT  1, 'privilege'  c, 'Gestion des privilèges' l, 1  o FROM dual

)

SELECT

  UNICAEN_PRIVILEGE_CATEGORIE_ID_SEQ.nextval,

  tmp.c,

  tmp.l,

  tmp.o

FROM tmp;

values (3, 'privilege', 'Gestion des privilèges', 1);



INSERT INTO UNICAEN_PRIVILEGE (

INSERT INTO UNICAEN_PRIVILEGE_PRIVILEGE (

    ID,

    CATEGORIE_ID,

    CODE,

    LIBELLE,

    ORDRE)

WITH tmp AS (

  SELECT 1, 1 ca, 'privilege_voir'      c, 'Afficher les privilèges'  l, 1  o FROM dual UNION

  SELECT 2, 1 ca, 'privilege_ajouter'   c, 'Ajouter un privilège'     l, 2  o FROM dual UNION

  SELECT 3, 1 ca, 'privilege_modifier'  c, 'Modifier un privilège'    l, 3  o FROM dual UNION

  SELECT 4, 1 ca, 'privilege_supprimer' c, 'Supprimer un privilège'   l, 4  o FROM dual UNION

  SELECT 5, 1 ca, 'privilege_affecter'  c, 'Attribuer un privilège'   l, 5  o FROM dual

)

SELECT

  UNICAEN_PRIVILEGE_ID_SEQ.nextval,

  tmp.ca,

  UNICAEN_PRIVILEGE_CATEGORIE_ID_SEQ.currval,

  tmp.l,

  tmp.o

FROM tmp;
 
 No newline at end of file
 
values (8, 3, 'privilege_voir', 'Afficher les privilèges', 1),

       (9, 3, 'privilege_ajouter' , 'Ajouter un privilège', 2),

       (10, 3, 'privilege_modifier' , 'Modifier un privilège', 3),

       (11, 3, 'privilege_supprimer' , 'Supprimer un privilège', 4),

       (12, 3, 'privilege_affecter' , 'Attribuer un privilège', 5);

src/UnicaenPrivilege/Assertion/AbstractAssertion.php

+5 −5
Original line number Diff line number Diff line
@@ -5,11 +5,11 @@ namespace UnicaenPrivilege\Assertion; 
use BjyAuthorize\Service\Authorize;

use UnicaenAuthentification\Service\Traits\AuthorizeServiceAwareTrait;

use UnicaenAuthentification\Service\Traits\UserContextServiceAwareTrait;

use Zend\Mvc\MvcEvent;

use Zend\Permissions\Acl\Acl;

use Zend\Permissions\Acl\Assertion\AssertionInterface;

use Zend\Permissions\Acl\Resource\ResourceInterface;

use Zend\Permissions\Acl\Role\RoleInterface;

use Laminas\Mvc\MvcEvent;

use Laminas\Permissions\Acl\Acl;

use Laminas\Permissions\Acl\Assertion\AssertionInterface;

use Laminas\Permissions\Acl\Resource\ResourceInterface;

use Laminas\Permissions\Acl\Role\RoleInterface;



/**

 * Description of AbstractAssertion