From dbb8b5d990ea9774b93e8e3ff5f3d413fa6c6dd6 Mon Sep 17 00:00:00 2001 From: Antony Le Courtes <antony.lecourtes@unicaen.fr> Date: Wed, 22 Mar 2023 16:27:35 +0100 Subject: [PATCH] Migration vers UnicaenPrivilege pour les templates (cherry picked from commit 857091194840d843934fdf0c531af23e41cb1677) --- code/generator/privileges.php | 6 +++--- code/template/Assertion.php | 2 +- code/template/Privileges.php | 2 +- src/Manager/ServiceManager.php | 6 +++--- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/code/generator/privileges.php b/code/generator/privileges.php index 8feae7a..407fef6 100644 --- a/code/generator/privileges.php +++ b/code/generator/privileges.php @@ -2,8 +2,8 @@ use UnicaenCode\Util; -$sPrivileges = Util::getContainer()->get('UnicaenAuth\Service\Privilege'); -/* @var $sPrivileges \UnicaenAuth\Service\PrivilegeService */ +$sPrivileges = Util::getContainer()->get('UnicaenPrivilege\Service\Privilege'); +/* @var $sPrivileges \UnicaenPrivilege\Service\PrivilegeService */ $privileges = $sPrivileges->getList(); @@ -15,7 +15,7 @@ foreach ($privileges as $privilege) { $const = str_replace(['-', ' '], ['_', '_'], $const); if (strlen($const) > $constMaxLen) $constMaxLen = strlen($const); - if (!defined(\UnicaenAuth\Provider\Privilege\Privileges::class . '::' . $const)) { + if (!defined(\UnicaenPrivilege\Provider\Privilege\Privileges::class . '::' . $const)) { $privilegesConsts[$const] = $value; } } diff --git a/code/template/Assertion.php b/code/template/Assertion.php index f13dc0f..d747a60 100644 --- a/code/template/Assertion.php +++ b/code/template/Assertion.php @@ -24,7 +24,7 @@ class <classname> extends AbstractAssertion // switch (true) { // case $entity instanceof VotreEntite: // switch ($privilege) { -// case Privileges::VOTRE_PRIVILEGE: // Attention à bien avoir généré le fournisseur de privilèges si vous utilisez la gestion des privilèges d'UnicaenAuth +// case Privileges::VOTRE_PRIVILEGE: // Attention à bien avoir généré le fournisseur de privilèges si vous utilisez la gestion des privilèges d'UnicaenPrivilege // return $this->assertVotreAssertion($role, $entity); // } // break; diff --git a/code/template/Privileges.php b/code/template/Privileges.php index 5ca6044..b2b976f 100644 --- a/code/template/Privileges.php +++ b/code/template/Privileges.php @@ -9,7 +9,7 @@ namespace Application\Provider\Privilege; * * @author UnicaenCode */ -class Privileges extends \UnicaenAuth\Provider\Privilege\Privileges { +class Privileges extends \UnicaenPrivilege\Provider\Privilege\Privileges { <privileges> diff --git a/src/Manager/ServiceManager.php b/src/Manager/ServiceManager.php index 442c2eb..70279d2 100644 --- a/src/Manager/ServiceManager.php +++ b/src/Manager/ServiceManager.php @@ -45,11 +45,11 @@ class ServiceManager extends \Laminas\ServiceManager\ServiceManager 'ConsoleAdapter' => 'stdClass', 'BjyAuthorize\Service\RoleDbTableGateway' => 'Laminas\Db\TableGateway\TableGateway', 'BjyAuthorize\Provider\Role\ObjectRepositoryProvider' => 'BjyAuthorize\Provider\Role\ObjectRepositoryProvider', - 'BjyAuthorize\Provider\Identity\ZfcUserLaminasDb' => 'BjyAuthorize\Provider\Identity\ZfcUserLaminasDb', + 'BjyAuthorize\Provider\Identity\ZfcUserLaminasDb' => 'BjyAuthorize\Provider\Identity\ZfcUserLaminasDb', 'BjyAuthorize\Provider\Rule\Config' => 'BjyAuthorize\Provider\Rule\Config', 'BjyAuthorize\Guard\Route' => 'BjyAuthorize\Guard\Route', 'BjyAuthorize\Provider\Role\Config' => 'BjyAuthorize\Provider\Role\Config', - 'UnicaenAuth\Provider\Role\Username' => 'UnicaenAuth\Provider\Role\Username', + 'UnicaenUtilisateur\Provider\Role\Username' => 'UnicaenUtilisateur\Provider\Role\Username', ]; foreach ($names as $name) { @@ -57,7 +57,7 @@ class ServiceManager extends \Laminas\ServiceManager\ServiceManager $result[$name] = $forced[$name]; } else { if ($this->container->has($name)) { - $object = @$this->container->get($name); + $object = @$this->container->get($name); $result[$name] = is_object($object) ? get_class($object) : gettype($object); } } -- GitLab