Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
lib
unicaen
auth
Commits
55a9cb1c
Commit
55a9cb1c
authored
Oct 09, 2013
by
Bertrand Gauthier
Browse files
Renommage "UnicaenAuth\Provider\Role\Db" en "UnicaenAuth\Provider\Role\DbRole".
parent
68a72222
Changes
4
Hide whitespace changes
Inline
Side-by-side
config/module.config.php
View file @
55a9cb1c
...
...
@@ -94,7 +94,7 @@ $bjyauthorize = array(
* NB: si le rôle par défaut 'guest' est fourni ici, il ne sera pas ajouté en double dans les ACL.
* NB: si la connexion à la base échoue, ce n'est pas bloquant!
*/
'UnicaenAuth\Provider\Role\Db'
=>
array
(
'UnicaenAuth\Provider\Role\Db
Role
'
=>
array
(
'object_manager'
=>
'doctrine.entitymanager.orm_default'
,
'role_entity_class'
=>
'UnicaenAuth\Entity\Db\Role'
,
),
...
...
@@ -174,7 +174,7 @@ return array(
'UnicaenAuth\Provider\Identity\Ldap'
=>
'UnicaenAuth\Provider\Identity\LdapServiceFactory'
,
'UnicaenAuth\Provider\Identity\Db'
=>
'UnicaenAuth\Provider\Identity\DbServiceFactory'
,
'UnicaenAuth\Provider\Role\Config'
=>
'UnicaenAuth\Provider\Role\ConfigServiceFactory'
,
'UnicaenAuth\Provider\Role\Db
'
=>
'UnicaenAuth\Provider\Role\DbServiceFactory'
,
'UnicaenAuth\Provider\Role\Db
Role'
=>
'UnicaenAuth\Provider\Role\Db
Role
ServiceFactory'
,
),
),
'controllers'
=>
array
(
...
...
src/UnicaenAuth/Provider/Role/Db.php
deleted
100644 → 0
View file @
68a72222
<?php
namespace
UnicaenAuth\Provider\Role
;
use
Doctrine\DBAL\DBALException
;
use
PDOException
;
use
Zend\Permissions\Acl\Role\RoleInterface
;
use
UnicaenAuth\Acl\NamedRole
;
use
BjyAuthorize\Provider\Role\ObjectRepositoryProvider
;
use
BjyAuthorize\Acl\HierarchicalRoleInterface
;
/**
* Role provider based on a {@see \Doctrine\Common\Persistence\ObjectRepository}
*/
class
Db
extends
ObjectRepositoryProvider
{
/**
* {@inheritDoc}
*/
public
function
getRoles
()
{
// try {
// $result = $this->objectRepository->findAll();
// }
// catch (PDOException $exc) {
// return array();
// }
//
// $roles = array();
//
// // Pass One: Build each object
// foreach ($result as $role) { /* @var $role \UnicaenAuth\Entity\Db\Role */
// if (!$role instanceof RoleInterface) {
// continue;
// }
//
// $roleId = $role->getRoleId();
// $parent = null;
//
// if ($role instanceof HierarchicalRoleInterface && $parent = $role->getParent()) {
// $parent = $parent->getRoleId();
// }
//
// $roles[$roleId] = new NamedRole($roleId, $parent, $role->getName());
// }
//
// // Pass Two: Re-inject parent objects to preserve hierarchy
// /* @var $roleObj NamedRole */
// foreach ($roles as $roleObj) {
// $parentRoleObj = $roleObj->getParent();
//
// if ($parentRoleObj && $parentRoleObj->getRoleId()) {
// $roleObj->setParent($roles[$parentRoleObj->getRoleId()]);
// }
// }
//
// return array_values($roles);
try
{
$roles
=
parent
::
getRoles
();
}
catch
(
DBALException
$exc
)
{
$roles
=
array
();
}
catch
(
PDOException
$exc
)
{
$roles
=
array
();
}
return
$roles
;
}
}
\ No newline at end of file
src/UnicaenAuth/Provider/Role/DbRole.php
0 → 100644
View file @
55a9cb1c
<?php
namespace
UnicaenAuth\Provider\Role
;
use
Doctrine\DBAL\DBALException
;
use
PDOException
;
use
BjyAuthorize\Provider\Role\ObjectRepositoryProvider
;
/**
* Role provider based on a {@see \Doctrine\Common\Persistence\ObjectRepository}
*/
class
DbRole
extends
ObjectRepositoryProvider
{
/**
* {@inheritDoc}
*/
public
function
getRoles
()
{
try
{
$roles
=
parent
::
getRoles
();
}
catch
(
DBALException
$exc
)
{
$roles
=
array
();
}
catch
(
PDOException
$exc
)
{
$roles
=
array
();
}
return
$roles
;
}
}
\ No newline at end of file
src/UnicaenAuth/Provider/Role/DbServiceFactory.php
→
src/UnicaenAuth/Provider/Role/Db
Role
ServiceFactory.php
View file @
55a9cb1c
...
...
@@ -7,26 +7,26 @@ use Zend\ServiceManager\FactoryInterface;
use
Zend\ServiceManager\ServiceLocatorInterface
;
/**
* Factory responsible of instantiating {@see \UnicaenAuth\Provider\Role\Db}
* Factory responsible of instantiating {@see \UnicaenAuth\Provider\Role\Db
Role
}
*/
class
DbServiceFactory
implements
FactoryInterface
class
Db
Role
ServiceFactory
implements
FactoryInterface
{
/**
* {@inheritDoc}
*
* @return Db
* @return Db
Role
*/
public
function
createService
(
ServiceLocatorInterface
$serviceLocator
)
{
$config
=
$serviceLocator
->
get
(
'BjyAuthorize\Config'
);
if
(
!
isset
(
$config
[
'role_providers'
][
'UnicaenAuth\Provider\Role\Db'
]))
{
if
(
!
isset
(
$config
[
'role_providers'
][
'UnicaenAuth\Provider\Role\Db
Role
'
]))
{
throw
new
InvalidArgumentException
(
'Config for "UnicaenAuth\Provider\Role\Db" not set'
'Config for "UnicaenAuth\Provider\Role\Db
Role
" not set'
);
}
$providerConfig
=
$config
[
'role_providers'
][
'UnicaenAuth\Provider\Role\Db'
];
$providerConfig
=
$config
[
'role_providers'
][
'UnicaenAuth\Provider\Role\Db
Role
'
];
if
(
!
isset
(
$providerConfig
[
'role_entity_class'
]))
{
throw
new
InvalidArgumentException
(
'role_entity_class not set in the bjyauthorize role_providers config.'
);
...
...
@@ -39,6 +39,6 @@ class DbServiceFactory implements FactoryInterface
/* @var $objectManager \Doctrine\Common\Persistence\ObjectManager */
$objectManager
=
$serviceLocator
->
get
(
$providerConfig
[
'object_manager'
]);
return
new
Db
(
$objectManager
->
getRepository
(
$providerConfig
[
'role_entity_class'
]));
return
new
Db
Role
(
$objectManager
->
getRepository
(
$providerConfig
[
'role_entity_class'
]));
}
}
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment