Skip to content

Commit 37456e5

Browse files
committed
[skip ci] fix setClasses when create models
1 parent 1cc1595 commit 37456e5

File tree

1 file changed

+7
-2
lines changed

1 file changed

+7
-2
lines changed

src/Ubiquity/security/acl/persistence/AclDAOProvider.php

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,12 @@ class AclDAOProvider implements AclProviderInterface {
3939
* @param array $classes
4040
* associative array['acl'=>'','role'=>'','resource'=>'','permission'=>'']
4141
*/
42-
public function __construct(array &$config,$classes = []) {
42+
public function __construct(array &$config, array $classes = []) {
4343
Startup::$config=$config;
44+
$this->setClasses($classes);
45+
}
46+
47+
private function setClasses(array $classes): void {
4448
$this->aclClass = $classes['acl'] ?? AclElement::class;
4549
$this->roleClass = $classes['role'] ?? Role::class;
4650
$this->resourceClass = $classes['resource'] ?? Resource::class;
@@ -69,7 +73,7 @@ public function setDbOffset(string $dbOffset = 'default',bool $persist=true):voi
6973
DAO::setModelDatabase($this->resourceClass, $dbOffset);
7074
DAO::setModelDatabase($this->roleClass, $dbOffset);
7175
DAO::setModelDatabase($this->permissionClass, $dbOffset);
72-
if($persist){
76+
if ($persist) {
7377
CacheManager::storeModelsDatabases(DAO::getModelsDatabase ());
7478
}
7579
}
@@ -82,6 +86,7 @@ public function createModels(?array $classes=null):void{
8286
$classes??=[
8387
'acl'=>'models\\AclElement','role'=>'models\\Role','resource'=>'models\\Resource','permission'=>'models\\Permission'
8488
];
89+
$this->setClasses($classes);
8590
$this->createModel($classes['acl'] ?? $this->aclClass,AclElement::class);
8691
$this->createModel($classes['role'] ?? $this->roleClass,Role::class);
8792
$this->createModel($classes['resource'] ?? $this->resourceClass,Resource::class);

0 commit comments

Comments
 (0)