Commit 7663161c authored by David Surville's avatar David Surville
Browse files

Merge branch 'auth_migration'

parents 743c8c78 b90cbaea
Loading
Loading
Loading
Loading
Loading
−44

File deleted.

−9

File deleted.

−100

File deleted.

+5 −12
Changes for config/merged/categorie.config.php: 5 added lines, 12 removed lines.
Original line number Diff line number Diff line
@@ -2,10 +2,10 @@

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\Form\Categorie\CategorieHydrator;
use UnicaenPrivilege\Form\Categorie\CategorieHydratorFactory;
use UnicaenPrivilege\Provider\Privilege\PrivilegePrivileges;
use UnicaenPrivilege\Service\Categorie\CategorieService;
use UnicaenPrivilege\Service\Categorie\CategorieServiceFactory;
@@ -38,11 +38,6 @@ return [
    'router' => [
        'routes' => [
            'unicaen-privilege' => [
                'type' => Literal::class,
                'options' => [
                    'route'    => '/unicaen-privilege',
                ],
                'may_terminate' => false,
                'child_routes' => [
                    'categorie' => [
                        'type' => Literal::class,
@@ -126,19 +121,17 @@ return [
            CategorieController::class => CategorieControllerFactory::class,
        ],
    ],

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

    'form_elements' => [
        'factories' => [
            CategorieForm::class => CategorieFormFactory::class,
        ],
    ],
    'hydrators' => [
        'factories' => [
            CategorieHydrator::class => CategorieHydratorFactory::class,
            CategorieFiltreForm::class => CategorieFiltreFormFactory::class,
        ],
    ],
];
 No newline at end of file
+51 −16
Changes for config/merged/privilege.config.php: 51 added lines, 16 removed lines.
Original line number Diff line number Diff line
@@ -4,13 +4,12 @@ use UnicaenPrivilege\Controller\PrivilegeController;
use UnicaenPrivilege\Controller\PrivilegeControllerFactory;
use UnicaenPrivilege\Form\Privilege\PrivilegeForm;
use UnicaenPrivilege\Form\Privilege\PrivilegeFormFactory;
use UnicaenPrivilege\Form\Privilege\PrivilegeHydrator;
use UnicaenPrivilege\Form\Privilege\PrivilegeHydratorFactory;
use UnicaenPrivilege\Provider\Privilege\PrivilegePrivileges;
use UnicaenPrivilege\Provider\Rule\PrivilegeRuleProvider;
use UnicaenPrivilege\Provider\Rule\PrivilegeRuleProviderFactory;
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;

@@ -19,15 +18,49 @@ return [
    'bjyauthorize' => [
        'guards' => [
            UnicaenPrivilege\Guard\PrivilegeController::class => [
                [
                    'controller' => PrivilegeController::class,
                    'action' => [
                        'index',
                    ],
                    'privileges' => [
                        PrivilegePrivileges::PRIVILEGE_VOIR,
                    ],
                ],
                [
                    'controller' => PrivilegeController::class,
                    'action' => [
                        'attribuer',
                    ],
                    'privileges' => [
                        PrivilegePrivileges::PRIVILEGE_ATTRIBUER,
                    ],
                ],
                [
                    'controller' => PrivilegeController::class,
                    'action' => [
                        'ajouter',
                    ],
                    'privileges' => [
                        PrivilegePrivileges::PRIVILEGE_AJOUTER,
                    ],
                ],
                [
                    'controller' => PrivilegeController::class,
                    'action' => [
                        'modifier',
                    ],
                    'privileges' => [
                        PrivilegePrivileges::PRIVILEGE_MODIFIER,
                    ],
                ],
                [
                    'controller' => PrivilegeController::class,
                    'action' => [
                        'supprimer',
                    ],
                    'privileges' => [
                        PrivilegePrivileges::PRIVILEGE_AJOUTER,
                        PrivilegePrivileges::PRIVILEGE_SUPPRIMER,
                    ],
                ],
            ],
@@ -39,20 +72,24 @@ return [
            'unicaen-privilege' => [
                'type' => Literal::class,
                'options' => [
                    'route'    => '/unicaen-privilege',
                    'route' => '/privilege',
                    'defaults' => [
                        'controller' => PrivilegeController::class,
                        'action' => 'index',
                    ],
                'may_terminate' => false,
                ],
                'may_terminate' => true,
                'child_routes' => [
                    'privilege' => [
                        'type' => Literal::class,
                    'attribuer' => [
                        'type' => Segment::class,
                        'options' => [
                            'route'    => '/privilege',
                            'route'    => '/attribuer/:role/:privilege',
                            'defaults' => [
                                'controller' => PrivilegeController::class,
                                'action' => 'attribuer',
                            ],
                        ],
                    ],
                        'may_terminate' => false,
                        'child_routes' => [
                    'ajouter' => [
                        'type' => Segment::class,
                        'options' => [
@@ -87,8 +124,6 @@ return [
            ],
        ],
    ],
        ],
    ],

    'controllers' => [
        'factories' => [
@@ -108,10 +143,10 @@ return [
            PrivilegeForm::class => PrivilegeFormFactory::class,
        ],
    ],
    'hydrators' => [
        'factories' => [
            PrivilegeHydrator::class => PrivilegeHydratorFactory::class,

    'view_helpers' => [
        'invokables' => [
            'privilege' => PrivilegeViewHelper::class,
        ],
    ],

];
 No newline at end of file
Loading