improve package

pi-engine · Mar 20, 2022 · 5abb8e4 · 5abb8e4
1 parent 785b0be
commit 5abb8e4
Show file tree

Hide file tree

Showing 18 changed files with 68 additions and 64 deletions.
diff --git a/src/Factory/Repository/AccountRepositoryFactory.php b/src/Factory/Repository/AccountRepositoryFactory.php
@@ -8,8 +8,8 @@
 use Laminas\ServiceManager\Factory\FactoryInterface;
 use Psr\Container\ContainerExceptionInterface;
 use Psr\Container\NotFoundExceptionInterface;
-use User\Model\Account;
-use User\Model\Credential;
+use User\Model\Account\Account;
+use User\Model\Account\Credential;
 use User\Repository\AccountRepository;
 
 class AccountRepositoryFactory implements FactoryInterface

diff --git a/src/Factory/Repository/PermissionRepositoryFactory.php b/src/Factory/Repository/PermissionRepositoryFactory.php
@@ -8,9 +8,9 @@
 use Laminas\ServiceManager\Factory\FactoryInterface;
 use Psr\Container\ContainerExceptionInterface;
 use Psr\Container\NotFoundExceptionInterface;
-use User\Model\PermissionPage;
-use User\Model\PermissionResource;
-use User\Model\PermissionRole;
+use User\Model\Permission\Page;
+use User\Model\Permission\Resource;
+use User\Model\Permission\Role;
 use User\Repository\PermissionRepository;
 
 class PermissionRepositoryFactory implements FactoryInterface
@@ -29,9 +29,9 @@ public function __invoke(ContainerInterface $container, $requestedName, array $o
         return new PermissionRepository(
             $container->get(AdapterInterface::class),
             new ReflectionHydrator(),
-            new PermissionResource('', '','','', ''),
-            new PermissionRole('', '','',''),
-            new PermissionPage('', '','','','','','','','')
+            new Resource('', '','','', ''),
+            new Role('', '','',''),
+            new Page('', '','','','','','','','')
         );
     }
 }
diff --git a/src/Factory/Repository/ProfileRepositoryFactory.php b/src/Factory/Repository/ProfileRepositoryFactory.php
@@ -8,7 +8,7 @@
 use Laminas\ServiceManager\Factory\FactoryInterface;
 use Psr\Container\ContainerExceptionInterface;
 use Psr\Container\NotFoundExceptionInterface;
-use User\Model\Profile;
+use User\Model\Profile\Profile;
 use User\Repository\ProfileRepository;
 
 class ProfileRepositoryFactory implements FactoryInterface

diff --git a/src/Factory/Repository/RoleRepositoryFactory.php b/src/Factory/Repository/RoleRepositoryFactory.php
@@ -8,8 +8,8 @@
 use Laminas\ServiceManager\Factory\FactoryInterface;
 use Psr\Container\ContainerExceptionInterface;
 use Psr\Container\NotFoundExceptionInterface;
-use User\Model\Role;
-use User\Model\RoleAccount;
+use User\Model\Role\Role;
+use User\Model\Role\Account;
 use User\Repository\RoleRepository;
 
 class RoleRepositoryFactory implements FactoryInterface
@@ -29,7 +29,7 @@ public function __invoke(ContainerInterface $container, $requestedName, array $o
             $container->get(AdapterInterface::class),
             new ReflectionHydrator(),
             new Role('', '', ''),
-            new RoleAccount(0, '', '')
+            new Account(0, '', '')
         );
     }
 }
diff --git a/src/Model/Account.php → src/Model/Account/Account.php b/src/Model/Account.php → src/Model/Account/Account.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace User\Model;
+namespace User\Model\Account;
 
 class Account
 {

diff --git a/src/Model/Credential.php → src/Model/Account/Credential.php b/src/Model/Credential.php → src/Model/Account/Credential.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace User\Model;
+namespace User\Model\Account;
 
 class Credential
 {

diff --git a/src/Model/PermissionPage.php → src/Model/Permission/Page.php b/src/Model/PermissionPage.php → src/Model/Permission/Page.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace User\Model;
+namespace User\Model\Permission;
 
-class PermissionPage
+class Page
 {
     private        $id;
     private string $title;

diff --git a/src/Model/PermissionResource.php → src/Model/Permission/Resource.php b/src/Model/PermissionResource.php → src/Model/Permission/Resource.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace User\Model;
+namespace User\Model\Permission;
 
-class PermissionResource
+class Resource
 {
     private        $id;
     private string $title;

diff --git a/src/Model/PermissionRole.php → src/Model/Permission/Role.php b/src/Model/PermissionRole.php → src/Model/Permission/Role.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace User\Model;
+namespace User\Model\Permission;
 
-class PermissionRole
+class Role
 {
     private        $id;
     private string $resource;

diff --git a/src/Model/Profile.php → src/Model/Profile/Profile.php b/src/Model/Profile.php → src/Model/Profile/Profile.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace User\Model;
+namespace User\Model\Profile;
 
 class Profile
 {

diff --git a/src/Model/RoleAccount.php → src/Model/Role/Account.php b/src/Model/RoleAccount.php → src/Model/Role/Account.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace User\Model;
+namespace User\Model\Role;
 
-class RoleAccount
+class Account
 {
     private        $id;
     private ?int   $user_id;

diff --git a/src/Model/Role.php → src/Model/Role/Role.php b/src/Model/Role.php → src/Model/Role/Role.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace User\Model;
+namespace User\Model\Role;
 
 class Role
 {

diff --git a/src/Repository/AccountRepository.php b/src/Repository/AccountRepository.php
@@ -15,8 +15,8 @@
 use Laminas\Db\Sql\Update;
 use Laminas\Hydrator\HydratorInterface;
 use RuntimeException;
-use User\Model\Account;
-use User\Model\Credential;
+use User\Model\Account\Account;
+use User\Model\Account\Credential;
 
 class AccountRepository implements AccountRepositoryInterface
 {

diff --git a/src/Repository/AccountRepositoryInterface.php b/src/Repository/AccountRepositoryInterface.php
@@ -4,7 +4,7 @@
 
 use Laminas\Authentication\AuthenticationService;
 use Laminas\Db\ResultSet\HydratingResultSet;
-use User\Model\Account;
+use User\Model\Account\Account;
 
 interface AccountRepositoryInterface
 {

diff --git a/src/Repository/PermissionRepository.php b/src/Repository/PermissionRepository.php
@@ -4,29 +4,32 @@
 
 use Laminas\Db\Adapter\AdapterInterface;
 use Laminas\Hydrator\HydratorInterface;
-use User\Model\PermissionPage;
-use User\Model\PermissionResource;
-use User\Model\PermissionRole;
+use User\Model\Permission\Page;
+use User\Model\Permission\Resource;
+use User\Model\Permission\Role;
 
 class PermissionRepository implements PermissionRepositoryInterface
 {
     /**
      * Permission resource Table name
+     *
      * @var string
      */
-    private string $tablePermissionResource = 'permission_resource';
+    private string $tableresource = 'permission_resource';
 
     /**
      * Permission rule Table name
+     *
      * @var string
      */
     private string $tablePermissionRule = 'permission_rule';
 
     /**
      * Permission page Table name
+     *
      * @var string
      */
-    private string $tablePermissionPage = 'permission_page';
+    private string $tablepage = 'permission_page';
 
     /**
      * @var AdapterInterface
@@ -39,31 +42,31 @@ class PermissionRepository implements PermissionRepositoryInterface
     private HydratorInterface $hydrator;
 
     /**
-     * @var PermissionResource
+     * @var Resource
      */
-    private PermissionResource $permissionResourcePrototype;
+    private Resource $resourcePrototype;
 
     /**
-     * @var PermissionRole
+     * @var Role
      */
-    private PermissionRole $permissionRolePrototype;
+    private Role $rolePrototype;
 
     /**
-     * @var PermissionPage
+     * @var Page
      */
-    private PermissionPage $permissionPagePrototype;
+    private Page $pagePrototype;
 
     public function __construct(
         AdapterInterface $db,
         HydratorInterface $hydrator,
-        PermissionResource $permissionResourcePrototype,
-        PermissionRole $permissionRolePrototype,
-        PermissionPage $permissionPagePrototype
+        Resource $resourcePrototype,
+        Role $rolePrototype,
+        Page $pagePrototype
     ) {
-        $this->db                          = $db;
-        $this->hydrator                    = $hydrator;
-        $this->permissionResourcePrototype = $permissionResourcePrototype;
-        $this->permissionRolePrototype     = $permissionRolePrototype;
-        $this->permissionPagePrototype     = $permissionPagePrototype;
+        $this->db                = $db;
+        $this->hydrator          = $hydrator;
+        $this->resourcePrototype = $resourcePrototype;
+        $this->rolePrototype     = $rolePrototype;
+        $this->pagePrototype     = $pagePrototype;
     }
 }
diff --git a/src/Repository/ProfileRepository.php b/src/Repository/ProfileRepository.php
@@ -4,7 +4,7 @@
 
 use Laminas\Db\Adapter\AdapterInterface;
 use Laminas\Hydrator\HydratorInterface;
-use User\Model\Profile;
+use User\Model\Profile\Profile;
 
 class ProfileRepository implements AccountRoleRepositoryInterface
 {

diff --git a/src/Repository/RoleRepository.php b/src/Repository/RoleRepository.php
@@ -10,24 +10,26 @@
 use Laminas\Db\Sql\Sql;
 use Laminas\Db\Sql\Update;
 use Laminas\Hydrator\HydratorInterface;
-use User\Model\Role;
-use User\Model\RoleAccount;
+use User\Model\Role\Role;
+use User\Model\Role\Account;
 use RuntimeException;
 use InvalidArgumentException;
 
 class RoleRepository implements RoleRepositoryInterface
 {
     /**
      * Role Table name
+     *
      * @var string
      */
     private string $tableRole = 'role';
 
     /**
      * Role Account Table name
+     *
      * @var string
      */
-    private string $tableRoleAccount = 'role_account';
+    private string $tableaccount = 'role_account';
 
     /**
      * @var AdapterInterface
@@ -45,20 +47,20 @@ class RoleRepository implements RoleRepositoryInterface
     private Role $rolePrototype;
 
     /**
-     * @var RoleAccount
+     * @var Account
      */
-    private RoleAccount $roleAccountPrototype;
+    private Account $accountPrototype;
 
     public function __construct(
         AdapterInterface $db,
         HydratorInterface $hydrator,
         Role $rolePrototype,
-        RoleAccount $roleAccountPrototype
+        Account $accountPrototype
     ) {
-        $this->db                   = $db;
-        $this->hydrator             = $hydrator;
-        $this->rolePrototype        = $rolePrototype;
-        $this->roleAccountPrototype = $roleAccountPrototype;
+        $this->db               = $db;
+        $this->hydrator         = $hydrator;
+        $this->rolePrototype    = $rolePrototype;
+        $this->accountPrototype = $accountPrototype;
     }
 
     public function getRoleList($params = []): HydratingResultSet
@@ -180,7 +182,7 @@ public function deleteRole(string $roleName): void
         }
 
         // Delete from role_account table
-        $delete = new Delete($this->tableRoleAccount);
+        $delete = new Delete($this->tableaccount);
         $delete->where(['role' => $roleName]);
 
         $sql       = new Sql($this->db);
@@ -203,7 +205,7 @@ public function getUserRole($userId, $section = ''): HydratingResultSet
         }
 
         $sql       = new Sql($this->db);
-        $select    = $sql->select($this->tableRoleAccount)->where($where);
+        $select    = $sql->select($this->tableaccount)->where($where);
         $statement = $sql->prepareStatementForSqlObject($select);
         $result    = $statement->execute();
 
@@ -216,7 +218,7 @@ public function getUserRole($userId, $section = ''): HydratingResultSet
             );
         }
 
-        $resultSet = new HydratingResultSet($this->hydrator, $this->roleAccountPrototype);
+        $resultSet = new HydratingResultSet($this->hydrator, $this->accountPrototype);
         $resultSet->initialize($result);
 
         return $resultSet;
@@ -230,7 +232,7 @@ public function addUserRole(int $userId, string $roleName, string $section = 'ap
             'section' => $section,
         ];
 
-        $insert = new Insert($this->tableRoleAccount);
+        $insert = new Insert($this->tableaccount);
         $insert->values($value);
 
         $sql       = new Sql($this->db);
@@ -246,7 +248,7 @@ public function addUserRole(int $userId, string $roleName, string $section = 'ap
 
     public function deleteUserRole(int $userId, string $roleName): void
     {
-        $delete = new Delete($this->tableRoleAccount);
+        $delete = new Delete($this->tableaccount);
         $delete->where(['user_id' => $userId, 'role' => $roleName]);
 
         $sql       = new Sql($this->db);

diff --git a/src/Repository/RoleRepositoryInterface.php b/src/Repository/RoleRepositoryInterface.php
@@ -3,8 +3,7 @@
 namespace User\Repository;
 
 use Laminas\Db\ResultSet\HydratingResultSet;
-use User\Model\Role;
-use User\Model\RoleAccount;
+use User\Model\Role\Role;
 
 interface RoleRepositoryInterface
 {