proyectotau / TAUonDDD

src/TAU/Common/SQLiteRepository.php

Spacing +55 added lines, -55 removed lines

@@ -37,7 +37,7 @@ 
             self::$db->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
             //self::$db->setAttribute(PDO::ATTR_DEFAULT_FETCH_MODE, PDO::FETCH_OBJ);
         } catch (PDOException $e) {
-            die($e->getMessage().' ('.$dbname.')');
+            die($e->getMessage() . ' (' . $dbname . ')');
         }
     }
 
@@ -98,7 +98,7 @@ 
 
     public function createUser(User $user): void
     {
-        $ps = self::$db->prepare('INSERT INTO User (user_id, name, surname, login)'.
+        $ps = self::$db->prepare('INSERT INTO User (user_id, name, surname, login)' .
                                             ' VALUES(:user_id, :name, :surname, :login);');
         $this->executeOrFail($ps, [
             ':user_id' => $user->getId(),
@@ -117,7 +117,7 @@ 
         $this->executeOrFail($ps, [':user_id' => $id]);
 
         $resultSet = $ps->fetch(PDO::FETCH_ASSOC);
-        if( $resultSet === false )
+        if ($resultSet === false)
             throw new \InvalidArgumentException("User with id = $id not found");
 
         $ref = new \ReflectionClass(User::class);
@@ -135,10 +135,10 @@ 
 
     public function updateUser($id, $name, $surname, $login): void
     {
-        $ps = self::$db->prepare('UPDATE User SET '.
-                                            'name = :name,'.
-                                            'surname = :surname,'.
-                                            'login = :login'.
+        $ps = self::$db->prepare('UPDATE User SET ' .
+                                            'name = :name,' .
+                                            'surname = :surname,' .
+                                            'login = :login' .
                                             ' WHERE user_id = :user_id;');
 
         $this->executeOrFail($ps, [
@@ -160,8 +160,8 @@ 
 
     public function getGroupsFromUser(User $user): array
     {
-        $ps = self::$db->prepare('SELECT group_pk, g.group_id, name, description FROM "Group" g'.
-                                        ' INNER JOIN user_group rel ON g.group_pk = rel.group_fk'.
+        $ps = self::$db->prepare('SELECT group_pk, g.group_id, name, description FROM "Group" g' .
+                                        ' INNER JOIN user_group rel ON g.group_pk = rel.group_fk' .
                                         ' WHERE rel.user_id = :user_id;');
 
         $resultSet = $this->queryOrFail($ps, [
@@ -205,14 +205,14 @@ 
     private function queryOrFail($ps, $params = [], $debug = 0): array
     {
         $this->executeOrFail($ps, $params, $debug);
-        $resultSet =  $ps->fetchAll(PDO::FETCH_ASSOC);
+        $resultSet = $ps->fetchAll(PDO::FETCH_ASSOC);
 
         return $resultSet;
     }
 
     private function executeOrFail($ps, $params = [], $debug = 0): void
     {
-        if($debug) { //TODO: toggle to enable
+        if ($debug) { //TODO: toggle to enable
             $sql = $ps->queryString;
             $b = str_replace(array_keys($params), array_values($params), $sql);
             echo "\n$b\n";
@@ -220,13 +220,13 @@ 
 
         try {
             $result = $ps->execute($params);
-        } catch (PDOException $e){
+        } catch (PDOException $e) {
             $result = false;
         }
 
-        if( $result === false ) {
+        if ($result === false) {
             $debug = 1;
-            if($debug) {
+            if ($debug) {
                 $sql = $ps->queryString;
                 $b = str_replace(array_keys($params), array_values($params), $sql);
                 echo "\n$b\n";
@@ -264,7 +264,7 @@ 
 
     public function createGroup(Group $group)
     {
-        $ps = self::$db->prepare('INSERT INTO "Group" (group_id, name, description)'.
+        $ps = self::$db->prepare('INSERT INTO "Group" (group_id, name, description)' .
                                             ' VALUES(:group_id, :name, :description);');
         $this->executeOrFail($ps, [
             ':group_id' => $group->getId(),
@@ -282,7 +282,7 @@ 
         $this->executeOrFail($ps, [':group_id' => $id]);
 
         $resultSet = $ps->fetch(PDO::FETCH_ASSOC);
-        if( $resultSet === false )
+        if ($resultSet === false)
             throw new \InvalidArgumentException("Group with id = $id not found");
 
         $ref = new \ReflectionClass(Group::class);
@@ -302,9 +302,9 @@ 
 
     public function updateGroup($id, $name, $desc)
     {
-        $ps = self::$db->prepare('UPDATE "Group" SET '.
-                                            'name = :name,'.
-                                            'description = :description'.
+        $ps = self::$db->prepare('UPDATE "Group" SET ' .
+                                            'name = :name,' .
+                                            'description = :description' .
                                             ' WHERE group_id = :group_id;');
 
         $this->executeOrFail($ps, [
@@ -325,8 +325,8 @@ 
 
     public function getUsersFromGroup(Group $group): array
     {
-        $ps = self::$db->prepare('SELECT user_pk, u.user_id, name, surname, login FROM User u'.
-                                        ' INNER JOIN user_group rel ON u.user_pk = rel.user_fk'.
+        $ps = self::$db->prepare('SELECT user_pk, u.user_id, name, surname, login FROM User u' .
+                                        ' INNER JOIN user_group rel ON u.user_pk = rel.user_fk' .
                                         ' WHERE rel.group_id = :group_id;');
 
         $resultSet = $this->queryOrFail($ps, [
@@ -381,7 +381,7 @@ 
 
     public function addUserToGroup(User $user, Group $group)
     {
-        $ps = self::$db->prepare('INSERT INTO user_group (user_fk, group_fk, user_id, group_id)'.
+        $ps = self::$db->prepare('INSERT INTO user_group (user_fk, group_fk, user_id, group_id)' .
                                         ' VALUES (:user_fk, :group_fk, :user_id, :group_id);');
 
         $this->executeOrFail($ps, [
@@ -394,8 +394,8 @@ 
 
     public function removeUserFromGroup(User $user, Group $group)
     {
-        $ps = self::$db->prepare('DELETE FROM user_group'.
-                                        ' WHERE user_id = :user_id'.
+        $ps = self::$db->prepare('DELETE FROM user_group' .
+                                        ' WHERE user_id = :user_id' .
                                         ' AND group_id = :group_id;');
 
         $this->executeOrFail($ps, [
@@ -406,7 +406,7 @@ 
 
     public function createRole(Role $role)
     {
-        $ps = self::$db->prepare('INSERT INTO Role (role_id, name, description)'.
+        $ps = self::$db->prepare('INSERT INTO Role (role_id, name, description)' .
                                         ' VALUES(:role_id, :name, :description);');
 
         $this->executeOrFail($ps, [
@@ -425,7 +425,7 @@ 
         $this->executeOrFail($ps, [':role_id' => $id]);
 
         $resultSet = $ps->fetch(PDO::FETCH_ASSOC);
-        if( $resultSet === false )
+        if ($resultSet === false)
             throw new \InvalidArgumentException("Role with id = $id not found");
 
         $ref = new \ReflectionClass(Role::class);
@@ -450,7 +450,7 @@ 
 
     public function addGroupToRole(Group $group, Role $role)
     {
-        $ps = self::$db->prepare('INSERT INTO group_role (group_fk, role_fk, group_id, role_id)'.
+        $ps = self::$db->prepare('INSERT INTO group_role (group_fk, role_fk, group_id, role_id)' .
                                         ' VALUES (:group_fk, :role_fk, :group_id, :role_id);');
 
         $this->executeOrFail($ps, [
@@ -463,8 +463,8 @@ 
 
     public function getGroupsFromRole(Role $role): array
     {
-        $ps = self::$db->prepare('SELECT group_pk, g.group_id, name, description FROM "Group" g'.
-                                        ' INNER JOIN group_role rel ON g.group_pk = rel.group_fk'.
+        $ps = self::$db->prepare('SELECT group_pk, g.group_id, name, description FROM "Group" g' .
+                                        ' INNER JOIN group_role rel ON g.group_pk = rel.group_fk' .
                                         ' WHERE rel.role_id = :role_id;');
 
         $resultSet = $this->queryOrFail($ps, [
@@ -497,8 +497,8 @@ 
 
     public function removeGroupFromRole(Group $group, Role $role)
     {
-        $ps = self::$db->prepare('DELETE FROM group_role'.
-                                        ' WHERE group_id = :group_id'.
+        $ps = self::$db->prepare('DELETE FROM group_role' .
+                                        ' WHERE group_id = :group_id' .
                                         ' AND role_id = :role_id;');
 
         $this->executeOrFail($ps, [
@@ -509,7 +509,7 @@ 
 
     public function addGroupToUser(Group $group, User $user)
     {
-        $ps = self::$db->prepare('INSERT INTO user_group (user_fk, group_fk, user_id, group_id)'.
+        $ps = self::$db->prepare('INSERT INTO user_group (user_fk, group_fk, user_id, group_id)' .
                                         ' VALUES (:user_fk, :group_fk, :user_id, :group_id);');
 
         $this->executeOrFail($ps, [
@@ -522,8 +522,8 @@ 
 
     public function removeGroupFromUser(Group $group, User $user)
     {
-        $ps = self::$db->prepare('DELETE FROM user_group'.
-                                        ' WHERE user_id = :user_id'.
+        $ps = self::$db->prepare('DELETE FROM user_group' .
+                                        ' WHERE user_id = :user_id' .
                                         ' AND group_id = :group_id;');
 
         $this->executeOrFail($ps, [
@@ -534,9 +534,9 @@ 
 
     public function updateRole($id, $name, $desc)
     {
-        $ps = self::$db->prepare('UPDATE Role SET '.
-                                        'name = :name,'.
-                                        'description = :description'.
+        $ps = self::$db->prepare('UPDATE Role SET ' .
+                                        'name = :name,' .
+                                        'description = :description' .
                                         ' WHERE role_id = :role_id;');
 
         $this->executeOrFail($ps, [
@@ -559,7 +559,7 @@ 
 
     public function addRoleToGroup(Role $role, Group $group)
     {
-        $ps = self::$db->prepare('INSERT INTO group_role (group_fk, role_fk, group_id, role_id)'.
+        $ps = self::$db->prepare('INSERT INTO group_role (group_fk, role_fk, group_id, role_id)' .
                                         ' VALUES (:group_fk, :role_fk, :group_id, :role_id);');
 
         $this->executeOrFail($ps, [
@@ -572,8 +572,8 @@ 
 
     public function getRolesFromGroup(Group $group): array
     {
-        $ps = self::$db->prepare('SELECT role_pk, r.role_id, name, description FROM Role r'.
-                                        ' INNER JOIN group_role rel ON r.role_pk = rel.role_fk'.
+        $ps = self::$db->prepare('SELECT role_pk, r.role_id, name, description FROM Role r' .
+                                        ' INNER JOIN group_role rel ON r.role_pk = rel.role_fk' .
                                         ' WHERE rel.group_id = :group_id;');
 
         $resultSet = $this->queryOrFail($ps, [
@@ -632,8 +632,8 @@ 
 
     public function removeRoleFromGroup(Role $role, Group $group)
     {
-        $ps = self::$db->prepare('DELETE FROM group_role'.
-                                        ' WHERE role_id = :role_id'.
+        $ps = self::$db->prepare('DELETE FROM group_role' .
+                                        ' WHERE role_id = :role_id' .
                                         ' AND group_id = :group_id;');
 
         $this->executeOrFail($ps, [
@@ -644,7 +644,7 @@ 
 
     public function addModuleToRole(Module $module, Role $role)
     {
-        $ps = self::$db->prepare('INSERT INTO role_module (role_fk, module_fk, role_id, module_id)'.
+        $ps = self::$db->prepare('INSERT INTO role_module (role_fk, module_fk, role_id, module_id)' .
                                         ' VALUES (:role_fk, :module_fk, :role_id, :module_id);');
 
         $this->executeOrFail($ps, [
@@ -657,8 +657,8 @@ 
 
     public function removeModuleFromRole(Module $module, Role $role)
     {
-        $ps = self::$db->prepare('DELETE FROM role_module'.
-                                        ' WHERE role_id = :role_id'.
+        $ps = self::$db->prepare('DELETE FROM role_module' .
+                                        ' WHERE role_id = :role_id' .
                                         ' AND module_id = :module_id;');
 
         $this->executeOrFail($ps, [
@@ -669,8 +669,8 @@ 
 
     public function getModulesFromRole(Role $role): array
     {
-        $ps = self::$db->prepare('SELECT module_pk, m.module_id, name, description FROM Module m'.
-                                        ' INNER JOIN role_module rel ON m.module_pk = rel.module_fk'.
+        $ps = self::$db->prepare('SELECT module_pk, m.module_id, name, description FROM Module m' .
+                                        ' INNER JOIN role_module rel ON m.module_pk = rel.module_fk' .
                                         ' WHERE rel.role_id = :role_id;');
 
         $resultSet = $this->queryOrFail($ps, [
@@ -734,7 +734,7 @@ 
 
     public function createModule(Module $module)
     {
-        $ps = self::$db->prepare('INSERT INTO Module (module_id, name, description)'.
+        $ps = self::$db->prepare('INSERT INTO Module (module_id, name, description)' .
                                         ' VALUES(:module_id, :name, :description);');
         $this->executeOrFail($ps, [
             ':module_id' => $module->getId(),
@@ -747,7 +747,7 @@ 
 
     public function readModule($id): Module
     {
-        $ps = self::$db->prepare('SELECT module_pk, module_id, name, description FROM Module'.
+        $ps = self::$db->prepare('SELECT module_pk, module_id, name, description FROM Module' .
                                         ' WHERE module_id = :module_id;');
 
         $this->executeOrFail($ps, [
@@ -755,7 +755,7 @@ 
         ]);
 
         $resultSet = $ps->fetch(PDO::FETCH_ASSOC);
-        if( $resultSet === false )
+        if ($resultSet === false)
             throw new \InvalidArgumentException("Module with id = $id not found");
 
         $ref = new \ReflectionClass(Module::class);
@@ -775,9 +775,9 @@ 
 
     public function updateModule($id, $name, $desc)
     {
-        $ps = self::$db->prepare('UPDATE Module SET '.
-                                        'name = :name,'.
-                                        'description = :description'.
+        $ps = self::$db->prepare('UPDATE Module SET ' .
+                                        'name = :name,' .
+                                        'description = :description' .
                                         ' WHERE module_id = :module_id;');
 
         $this->executeOrFail($ps, [
@@ -810,8 +810,8 @@ 
 
     public function getRolesFromModule(Module $module): array
     {
-        $ps = self::$db->prepare('SELECT role_pk, r.role_id, name, description FROM Role r'.
-                                        ' INNER JOIN role_module rel ON r.role_pk = rel.role_fk'.
+        $ps = self::$db->prepare('SELECT role_pk, r.role_id, name, description FROM Role r' .
+                                        ' INNER JOIN role_module rel ON r.role_pk = rel.role_fk' .
                                         ' WHERE rel.module_id = :module_id;');
 
         $resultSet = $this->queryOrFail($ps, [

Braces +12 added lines, -8 removed lines

@@ -117,8 +117,9 @@ 
         $this->executeOrFail($ps, [':user_id' => $id]);
 
         $resultSet = $ps->fetch(PDO::FETCH_ASSOC);
-        if( $resultSet === false )
-            throw new \InvalidArgumentException("User with id = $id not found");
+        if( $resultSet === false ) {
+                    throw new \InvalidArgumentException("User with id = $id not found");
+        }
 
         $ref = new \ReflectionClass(User::class);
         $user = $this->castUser($ref->newInstanceWithoutConstructor());
@@ -282,8 +283,9 @@ 
         $this->executeOrFail($ps, [':group_id' => $id]);
 
         $resultSet = $ps->fetch(PDO::FETCH_ASSOC);
-        if( $resultSet === false )
-            throw new \InvalidArgumentException("Group with id = $id not found");
+        if( $resultSet === false ) {
+                    throw new \InvalidArgumentException("Group with id = $id not found");
+        }
 
         $ref = new \ReflectionClass(Group::class);
         $group = $this->castGroup($ref->newInstanceWithoutConstructor());
@@ -425,8 +427,9 @@ 
         $this->executeOrFail($ps, [':role_id' => $id]);
 
         $resultSet = $ps->fetch(PDO::FETCH_ASSOC);
-        if( $resultSet === false )
-            throw new \InvalidArgumentException("Role with id = $id not found");
+        if( $resultSet === false ) {
+                    throw new \InvalidArgumentException("Role with id = $id not found");
+        }
 
         $ref = new \ReflectionClass(Role::class);
         $role = $this->castRole($ref->newInstanceWithoutConstructor());
@@ -755,8 +758,9 @@ 
         ]);
 
         $resultSet = $ps->fetch(PDO::FETCH_ASSOC);
-        if( $resultSet === false )
-            throw new \InvalidArgumentException("Module with id = $id not found");
+        if( $resultSet === false ) {
+                    throw new \InvalidArgumentException("Module with id = $id not found");
+        }
 
         $ref = new \ReflectionClass(Module::class);
         $module = $this->castModule($ref->newInstanceWithoutConstructor());