Merge branch 'master' into auth_migration (9fec706c) · Commits · lib / unicaen / privilege

config/merged/categorie.config.php

deleted100644 → 0

+0 −137

Original line number	Diff line number	Diff line
		<?php

		use UnicaenPrivilege\Controller\CategorieController;
		use UnicaenPrivilege\Controller\CategorieControllerFactory;
		use UnicaenPrivilege\Form\Categorie\CategorieFiltreForm;
		use UnicaenPrivilege\Form\Categorie\CategorieFiltreFormFactory;
		use UnicaenPrivilege\Form\Categorie\CategorieForm;
		use UnicaenPrivilege\Form\Categorie\CategorieFormFactory;
		use UnicaenPrivilege\Provider\Privilege\PrivilegePrivileges;
		use UnicaenPrivilege\Service\Categorie\CategorieService;
		use UnicaenPrivilege\Service\Categorie\CategorieServiceFactory;
		use Zend\Router\Http\Literal;
		use Zend\Router\Http\Segment;

		return [

		'bjyauthorize' => [
		'guards' => [
		UnicaenPrivilege\Guard\PrivilegeController::class => [
		[
		'controller' => CategorieController::class,
		'action' => [
		'index',
		'ajouter',
		'gerer',
		'provider',
		'modifier',
		'supprimer',
		],
		'privileges' => [
		PrivilegePrivileges::PRIVILEGE_AJOUTER,
		],
		],
		],
		],
		],

		'router' => [
		'routes' => [
		'unicaen-privilege' => [
		'child_routes' => [
		'categorie' => [
		'type' => Literal::class,
		'options' => [
		'route' => '/categorie',
		'defaults' => [
		'controller' => CategorieController::class,
		'action' => 'index',
		],
		],
		'may_terminate' => true,
		'child_routes' => [
		'ajouter' => [
		'type' => Literal::class,
		'options' => [
		'route' => '/ajouter',
		'defaults' => [
		'controller' => CategorieController::class,
		'action' => 'ajouter',
		],
		],
		],
		'gerer' => [
		'type' => Segment::class,
		'options' => [
		'route' => '/gerer/:categorie',
		'defaults' => [
		'controller' => CategorieController::class,
		'action' => 'gerer',
		],
		],
		'may_terminate' => true,
		],
		'provider' => [
		'type' => Segment::class,
		'options' => [
		'route' => '/provider/:categorie',
		'defaults' => [
		'controller' => CategorieController::class,
		'action' => 'provider',
		],
		],
		'may_terminate' => true,
		],
		'modifier' => [
		'type' => Segment::class,
		'options' => [
		'route' => '/modifier/:categorie',
		'defaults' => [
		'controller' => CategorieController::class,
		'action' => 'modifier',
		],
		],
		'may_terminate' => true,
		],
		'supprimer' => [
		'type' => Segment::class,
		'options' => [
		'route' => '/supprimer/:categorie',
		'defaults' => [
		'controller' => CategorieController::class,
		'action' => 'supprimer',
		],
		],
		'may_terminate' => true,
		],
		],
		],
		],
		],
		],
		],

		'navigation' => [
		'default' => [
		],
		],

		'controllers' => [
		'factories' => [
		CategorieController::class => CategorieControllerFactory::class,
		],
		],

		'service_manager' => [
		'factories' => [
		CategorieService::class => CategorieServiceFactory::class,
		],
		],

		'form_elements' => [
		'factories' => [
		CategorieForm::class => CategorieFormFactory::class,
		CategorieFiltreForm::class => CategorieFiltreFormFactory::class,
		],
		],
		];
		No newline at end of file

config/merged/privilege.config.php

+117 −0

Original line number	Diff line number	Diff line
		<?php

		use UnicaenPrivilege\Controller\PrivilegeCategorieController;
		use UnicaenPrivilege\Controller\PrivilegeCategorieControllerFactory;
		use UnicaenPrivilege\Controller\PrivilegeController;
		use UnicaenPrivilege\Controller\PrivilegeControllerFactory;
		use UnicaenPrivilege\Form\Privilege\CategorieFiltreForm;
		use UnicaenPrivilege\Form\Privilege\CategorieFiltreFormFactory;
		use UnicaenPrivilege\Form\Privilege\CategorieForm;
		use UnicaenPrivilege\Form\Privilege\CategorieFormFactory;
		use UnicaenPrivilege\Form\Privilege\PrivilegeForm;
		use UnicaenPrivilege\Form\Privilege\PrivilegeFormFactory;
		use UnicaenPrivilege\Provider\Privilege\PrivilegePrivileges;
		use UnicaenPrivilege\Provider\Rule\PrivilegeRuleProvider;
		use UnicaenPrivilege\Provider\Rule\PrivilegeRuleProviderFactory;
		use UnicaenPrivilege\Service\Privilege\PrivilegeCategorieService;
		use UnicaenPrivilege\Service\Privilege\PrivilegeCategorieServiceFactory;
		use UnicaenPrivilege\Service\Privilege\PrivilegeService;
		use UnicaenPrivilege\Service\Privilege\PrivilegeServiceFactory;
		use UnicaenPrivilege\View\Privilege\PrivilegeViewHelper;
		@@ -63,6 +71,44 @@ return [
		PrivilegePrivileges::PRIVILEGE_SUPPRIMER,
		],
		],
		[
		'controller' => PrivilegeCategorieController::class,
		'action' => [
		'index',
		'gerer',
		'provider'
		],
		'privileges' => [
		PrivilegePrivileges::PRIVILEGE_VOIR,
		],
		],
		[
		'controller' => PrivilegeCategorieController::class,
		'action' => [
		'ajouter',
		],
		'privileges' => [
		PrivilegePrivileges::PRIVILEGE_AJOUTER,
		],
		],
		[
		'controller' => PrivilegeCategorieController::class,
		'action' => [
		'modifier',
		],
		'privileges' => [
		PrivilegePrivileges::PRIVILEGE_MODIFIER,
		],
		],
		[
		'controller' => PrivilegeCategorieController::class,
		'action' => [
		'supprimer',
		],
		'privileges' => [
		PrivilegePrivileges::PRIVILEGE_SUPPRIMER,
		],
		],
		],
		],
		],
		@@ -120,6 +166,73 @@ return [
		],
		],
		],
		'categorie' => [
		'type' => Literal::class,
		'options' => [
		'route' => '/categorie',
		'defaults' => [
		'controller' => PrivilegeCategorieController::class,
		'action' => 'index',
		],
		],
		'may_terminate' => true,
		'child_routes' => [
		'ajouter' => [
		'type' => Literal::class,
		'options' => [
		'route' => '/ajouter',
		'defaults' => [
		'controller' => PrivilegeCategorieController::class,
		'action' => 'ajouter',
		],
		],
		],
		'gerer' => [
		'type' => Segment::class,
		'options' => [
		'route' => '/gerer/:categorie',
		'defaults' => [
		'controller' => PrivilegeCategorieController::class,
		'action' => 'gerer',
		],
		],
		'may_terminate' => true,
		],
		'provider' => [
		'type' => Segment::class,
		'options' => [
		'route' => '/provider/:categorie',
		'defaults' => [
		'controller' => PrivilegeCategorieController::class,
		'action' => 'provider',
		],
		],
		'may_terminate' => true,
		],
		'modifier' => [
		'type' => Segment::class,
		'options' => [
		'route' => '/modifier/:categorie',
		'defaults' => [
		'controller' => PrivilegeCategorieController::class,
		'action' => 'modifier',
		],
		],
		'may_terminate' => true,
		],
		'supprimer' => [
		'type' => Segment::class,
		'options' => [
		'route' => '/supprimer/:categorie',
		'defaults' => [
		'controller' => PrivilegeCategorieController::class,
		'action' => 'supprimer',
		],
		],
		'may_terminate' => true,
		],
		],
		],
		],
		],
		],
		@@ -127,12 +240,14 @@ return [

		'controllers' => [
		'factories' => [
		PrivilegeCategorieController::class => PrivilegeCategorieControllerFactory::class,
		PrivilegeController::class => PrivilegeControllerFactory::class,
		],
		],

		'service_manager' => [
		'factories' => [
		PrivilegeCategorieService::class => PrivilegeCategorieServiceFactory::class,
		PrivilegeService::class => PrivilegeServiceFactory::class,
		PrivilegeRuleProvider::class => PrivilegeRuleProviderFactory::class,
		],
		@@ -140,6 +255,8 @@ return [

		'form_elements' => [
		'factories' => [
		CategorieFiltreForm::class => CategorieFiltreFormFactory::class,
		CategorieForm::class => CategorieFormFactory::class,
		PrivilegeForm::class => PrivilegeFormFactory::class,
		],
		],

data/sql/schema_oracle.sql

+19 −19

Original line number	Diff line number	Diff line
		@@ -15,37 +15,37 @@ CREATE TABLE UNICAEN_PRIVILEGE_CATEGORIE (


		-- -----------------------------------------------------
		-- TABLE UNICAEN_PRIVILEGE_PRIVILEGE
		-- TABLE UNICAEN_PRIVILEGE
		-- -----------------------------------------------------
		CREATE SEQUENCE UNICAEN_PRIVILEGE_PRIVILEGE_ID_SEQ NOCYCLE START WITH 1 INCREMENT BY 1 MINVALUE 0;
		CREATE SEQUENCE UNICAEN_PRIVILEGE_ID_SEQ NOCYCLE START WITH 1 INCREMENT BY 1 MINVALUE 0;

		CREATE TABLE UNICAEN_PRIVILEGE_PRIVILEGE (
		CREATE TABLE UNICAEN_PRIVILEGE (
		ID NUMBER(*, 0) NOT NULL,
		CATEGORIE_ID NUMBER(*, 0) NOT NULL,
		CODE VARCHAR2(150 CHAR) NOT NULL,
		LIBELLE VARCHAR2(200 CHAR) NOT NULL,
		ORDRE INT DEFAULT 0,
		CONSTRAINT PK_UNICAEN_PRIVILEGE_PRIVILEGE PRIMARY KEY (ID),
		CONSTRAINT UN_UNICAEN_PRIVILEGE_CODE UNIQUE (CODE),
		CONSTRAINT PK_UNICAEN_PRIVILEGE PRIMARY KEY (ID),
		CONSTRAINT UN_UNICAEN_PRIVILEGE_CODE UNIQUE (CATEGORIE_ID, CODE),
		CONSTRAINT FK_UNICAEN_PRIVILEGE_CATEGORIE FOREIGN KEY (CATEGORIE_ID) REFERENCES UNICAEN_PRIVILEGE_CATEGORIE (ID) DEFERRABLE INITIALLY IMMEDIATE
		);

		CREATE INDEX IX_UNICAEN_PRIVILEGE_CATEGORIE ON UNICAEN_PRIVILEGE_PRIVILEGE(CATEGORIE_ID);
		CREATE INDEX IX_UNICAEN_PRIVILEGE_CATEGORIE ON UNICAEN_PRIVILEGE(CATEGORIE_ID);


		-- -----------------------------------------------------
		-- TABLE UNICAEN_PRIVILEGE_PRIVILEGE_ROLE_LINKER
		-- TABLE UNICAEN_ROLE_PRIVILEGE_LINKER
		-- -----------------------------------------------------
		CREATE TABLE UNICAEN_PRIVILEGE_PRIVILEGE_ROLE_LINKER (
		CREATE TABLE UNICAEN_ROLE_PRIVILEGE_LINKER (
		ROLE_ID NUMBER(*, 0) NOT NULL,
		PRIVILEGE_ID NUMBER(*, 0) NOT NULL,
		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
		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
		);

		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);
		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);


		-- DATA
		@@ -65,7 +65,7 @@ SELECT
		tmp.o
		FROM tmp;

		INSERT INTO UNICAEN_PRIVILEGE_PRIVILEGE (
		INSERT INTO UNICAEN_PRIVILEGE (
		ID,
		CATEGORIE_ID,
		CODE,
		@@ -78,7 +78,7 @@ WITH tmp AS (
		SELECT 4, 1 ca, 'utilisateur_modifierrole' c, 'Modifier les rôles attribués à un utilisateur' l, 4 o FROM dual
		)
		SELECT
		UNICAEN_PRIVILEGE_PRIVILEGE_ID_SEQ.nextval,
		UNICAEN_PRIVILEGE_ID_SEQ.nextval,
		tmp.ca,
		UNICAEN_PRIVILEGE_CATEGORIE_ID_SEQ.currval,
		tmp.l,
		@@ -100,7 +100,7 @@ SELECT
		tmp.o
		FROM tmp;

		INSERT INTO UNICAEN_PRIVILEGE_PRIVILEGE (
		INSERT INTO UNICAEN_PRIVILEGE (
		ID,
		CATEGORIE_ID,
		CODE,
		@@ -112,7 +112,7 @@ WITH tmp AS (
		SELECT 3, 1 ca, 'role_effacer' c, 'Supprimer un rôle' l, 3 o FROM dual
		)
		SELECT
		UNICAEN_PRIVILEGE_PRIVILEGE_ID_SEQ.nextval,
		UNICAEN_PRIVILEGE_ID_SEQ.nextval,
		tmp.ca,
		UNICAEN_PRIVILEGE_CATEGORIE_ID_SEQ.currval,
		tmp.l,
		@@ -134,7 +134,7 @@ SELECT
		tmp.o
		FROM tmp;

		INSERT INTO UNICAEN_PRIVILEGE_PRIVILEGE (
		INSERT INTO UNICAEN_PRIVILEGE (
		ID,
		CATEGORIE_ID,
		CODE,
		@@ -148,7 +148,7 @@ WITH tmp AS (
		SELECT 5, 1 ca, 'privilege_affecter' c, 'Attribuer un privilège' l, 5 o FROM dual
		)
		SELECT
		UNICAEN_PRIVILEGE_PRIVILEGE_ID_SEQ.nextval,
		UNICAEN_PRIVILEGE_ID_SEQ.nextval,
		tmp.ca,
		UNICAEN_PRIVILEGE_CATEGORIE_ID_SEQ.currval,
		tmp.l,

data/sql/schema_postgresql.sql

+18 −18

Original line number	Diff line number	Diff line
		@@ -12,34 +12,34 @@ CREATE TABLE UNICAEN_PRIVILEGE_CATEGORIE (
		CREATE UNIQUE INDEX UN_UNICAEN_PRIVILEGE_CATEGORIE_CODE ON UNICAEN_PRIVILEGE_CATEGORIE (CODE);

		-- -----------------------------------------------------
		-- TABLE UNICAEN_PRIVILEGE_PRIVILEGE
		-- TABLE UNICAEN_PRIVILEGE
		-- -----------------------------------------------------
		CREATE TABLE UNICAEN_PRIVILEGE_PRIVILEGE (
		CREATE TABLE UNICAEN_PRIVILEGE (
		ID SERIAL PRIMARY KEY,
		CATEGORIE_ID INTEGER NOT NULL,
		CODE VARCHAR(150) NOT NULL,
		LIBELLE VARCHAR(200) NOT NULL,
		ORDRE INTEGER NOT NULL,
		ORDRE INTEGER DEFAULT 0,
		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_PRIVILEGE(CODE);
		CREATE INDEX IX_UNICAEN_PRIVILEGE_CATEGORIE ON UNICAEN_PRIVILEGE_PRIVILEGE(CATEGORIE_ID);
		CREATE UNIQUE INDEX UN_UNICAEN_PRIVILEGE_CODE ON UNICAEN_PRIVILEGE(CATEGORIE_ID, CODE);
		CREATE INDEX IX_UNICAEN_PRIVILEGE_CATEGORIE ON UNICAEN_PRIVILEGE(CATEGORIE_ID);


		-- -----------------------------------------------------
		-- TABLE UNICAEN_PRIVILEGE_PRIVILEGE_ROLE_LINKER
		-- TABLE UNICAEN_ROLE_PRIVILEGE_LINKER
		-- -----------------------------------------------------
		CREATE TABLE UNICAEN_PRIVILEGE_PRIVILEGE_ROLE_LINKER (
		CREATE TABLE UNICAEN_ROLE_PRIVILEGE_LINKER (
		ROLE_ID INTEGER NOT NULL,
		PRIVILEGE_ID INTEGER NOT NULL,
		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
		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
		);

		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);
		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);


		-- DATA
		@@ -59,7 +59,7 @@ SELECT
		tmp.o
		FROM tmp;

		INSERT INTO UNICAEN_PRIVILEGE_PRIVILEGE (
		INSERT INTO UNICAEN_PRIVILEGE (
		ID,
		CATEGORIE_ID,
		CODE,
		@@ -72,7 +72,7 @@ WITH tmp AS (
		SELECT 4, 1 ca, 'utilisateur_modifierrole' c, 'Modifier les rôles attribués à un utilisateur' l, 4 o FROM dual
		)
		SELECT
		UNICAEN_PRIVILEGE_PRIVILEGE_ID_SEQ.nextval,
		UNICAEN_PRIVILEGE_ID_SEQ.nextval,
		tmp.ca,
		UNICAEN_PRIVILEGE_CATEGORIE_ID_SEQ.currval,
		tmp.l,
		@@ -94,7 +94,7 @@ SELECT
		tmp.o
		FROM tmp;

		INSERT INTO UNICAEN_PRIVILEGE_PRIVILEGE (
		INSERT INTO UNICAEN_PRIVILEGE (
		ID,
		CATEGORIE_ID,
		CODE,
		@@ -106,7 +106,7 @@ WITH tmp AS (
		SELECT 3, 1 ca, 'role_effacer' c, 'Supprimer un rôle' l, 3 o FROM dual
		)
		SELECT
		UNICAEN_PRIVILEGE_PRIVILEGE_ID_SEQ.nextval,
		UNICAEN_PRIVILEGE_ID_SEQ.nextval,
		tmp.ca,
		UNICAEN_PRIVILEGE_CATEGORIE_ID_SEQ.currval,
		tmp.l,
		@@ -128,7 +128,7 @@ SELECT
		tmp.o
		FROM tmp;

		INSERT INTO UNICAEN_PRIVILEGE_PRIVILEGE (
		INSERT INTO UNICAEN_PRIVILEGE (
		ID,
		CATEGORIE_ID,
		CODE,
		@@ -142,7 +142,7 @@ WITH tmp AS (
		SELECT 5, 1 ca, 'privilege_affecter' c, 'Attribuer un privilège' l, 5 o FROM dual
		)
		SELECT
		UNICAEN_PRIVILEGE_PRIVILEGE_ID_SEQ.nextval,
		UNICAEN_PRIVILEGE_ID_SEQ.nextval,
		tmp.ca,
		UNICAEN_PRIVILEGE_CATEGORIE_ID_SEQ.currval,
		tmp.l,

src/UnicaenPrivilege/Controller/CategorieController.php→src/UnicaenPrivilege/Controller/PrivilegeCategorieController.php

+18 −20

File changed and moved.

Preview size limit exceeded, changes collapsed.