diff --git a/code/generator/privileges.php b/code/generator/privileges.php index 8feae7ac2300895c889ca4fdfe89d9886be66f8a..407fef6c296c8b9addef77b3caa0f59d978e2211 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 f13dc0f402305a4af643268bb385a4d796e15697..d747a60e59653bf9c699afcac5c5d5a66406e058 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 5ca6044398cc7bd925b4aa6433388643afa814ab..b2b976f559f392ee312ad8d5a17802dc535ee2fd 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 442c2eb0750ad921532493f7d9aecdd245da89f0..70279d2de233a80fad80a145a42e1d6362e45103 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); } }