proyectotau / TAUonDDD

src/TAU/Common/SQLiteRepository.php

Spacing +48 added lines, -48 removed lines

@@ -45,7 +45,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 . ')');
         }
     }
 
@@ -112,7 +112,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(),
@@ -131,7 +131,7 @@ 
         $this->executeOrFail($ps, [':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);
@@ -149,10 +149,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 = :id;');
 
         $this->executeOrFail($ps, [
@@ -176,8 +176,8 @@ 
 
     public function getGroupsFromUser(User $user): array // TODO id instead of User
     {
-        $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_fk = :user_fk;');
 
         $id = $user->getid();
@@ -222,7 +222,7 @@ 
     private function queryOrFail($ps, $params = []): array
     {
         $this->executeOrFail($ps, $params);
-        $resultSet =  $ps->fetchAll(PDO::FETCH_ASSOC);
+        $resultSet = $ps->fetchAll(PDO::FETCH_ASSOC);
 
         return $resultSet;
     }
@@ -230,7 +230,7 @@ 
     private function executeOrFail($ps, $params = [], $a = 0): void
     {
         $a = 1;
-        if($a) {
+        if ($a) {
             $sql = $ps->queryString;
             $b = str_replace(array_keys($params), array_values($params), $sql);
             echo "\n$b\n";
@@ -238,9 +238,9 @@ 
 
         $result = $ps->execute($params);
 
-        if( $result === false ) {
+        if ($result === false) {
             $a = 1;
-            if($a) {
+            if ($a) {
                 $sql = $ps->queryString;
                 $b = str_replace(array_keys($params), array_values($params), $sql);
                 echo "\n$b\n";
@@ -278,7 +278,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(),
@@ -296,7 +296,7 @@ 
         $this->executeOrFail($ps, [':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);
@@ -316,9 +316,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 = :id;');
 
         $this->executeOrFail($ps, [
@@ -341,8 +341,8 @@ 
 
     public function getUsersFromGroup(Group $group)
     {
-        $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_fk = :group_fk;');
 
         $id = $group->getId();
@@ -400,7 +400,7 @@ 
     {
         /*$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);');*/
-        $ps = self::$db->prepare('INSERT INTO user_group (user_fk, group_fk)'.
+        $ps = self::$db->prepare('INSERT INTO user_group (user_fk, group_fk)' .
                                         ' VALUES (:user_fk, :group_fk);');
 
         $this->executeOrFail($ps, [
@@ -413,7 +413,7 @@ 
 
     public function removeUserFromGroup(User $user, Group $group)
     {
-        $ps = self::$db->prepare('DELETE FROM user_group WHERE user_fk = :user_fk'.
+        $ps = self::$db->prepare('DELETE FROM user_group WHERE user_fk = :user_fk' .
                                         ' AND group_fk = :group_fk;');
 
         $this->executeOrFail($ps, [
@@ -426,7 +426,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, [
@@ -445,7 +445,7 @@ 
         $this->executeOrFail($ps, [':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);
@@ -470,7 +470,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, [
@@ -483,8 +483,8 @@ 
 
     public function getGroupsFromRole(Role $role)
     {
-        $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_fk = :role_fk;');
 
         $id = $role->getId();
@@ -518,7 +518,7 @@ 
 
     public function removeGroupFromRole(Group $group, Role $role)
     {
-        $ps = self::$db->prepare('DELETE FROM group_role WHERE group_fk = :group_fk'.
+        $ps = self::$db->prepare('DELETE FROM group_role WHERE group_fk = :group_fk' .
                                         ' AND role_fk = :role_fk;');
 
         $this->executeOrFail($ps, [
@@ -531,7 +531,7 @@ 
 
     public function addGroupToUser(Group $group, User $user)
     {
-        $ps = self::$db->prepare('INSERT INTO user_group (user_fk, group_fk, group_id, user_id)'.
+        $ps = self::$db->prepare('INSERT INTO user_group (user_fk, group_fk, group_id, user_id)' .
                                         ' VALUES (:user_fk, :group_fk, :user_id, :group_id);');
 
         $this->executeOrFail($ps, [
@@ -544,7 +544,7 @@ 
 
     public function removeGroupFromUser(Group $group, User $user)
     {
-        $ps = self::$db->prepare('DELETE FROM user_group WHERE user_fk = :user_fk'.
+        $ps = self::$db->prepare('DELETE FROM user_group WHERE user_fk = :user_fk' .
             ' AND group_fk = :group_fk;');
 
         $this->executeOrFail($ps, [
@@ -557,9 +557,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 = :id;');
 
         $this->executeOrFail($ps, [
@@ -582,7 +582,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, [
@@ -595,8 +595,8 @@ 
 
     public function getRolesFromGroup(Group $group)
     {
-        $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_fk = :group_fk;');
 
         $id = $group->getId();
@@ -656,7 +656,7 @@ 
 
     public function removeRoleFromGroup(Role $role, Group $group)
     {
-        $ps = self::$db->prepare('DELETE FROM group_role WHERE role_fk = :role_fk'.
+        $ps = self::$db->prepare('DELETE FROM group_role WHERE role_fk = :role_fk' .
                                         ' AND group_fk = :group_fk;');
 
         $this->executeOrFail($ps, [
@@ -669,7 +669,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, [
@@ -682,7 +682,7 @@ 
 
     public function removeModuleFromRole(Module $module, Role $role)
     {
-        $ps = self::$db->prepare('DELETE FROM role_module WHERE role_fk = :role_fk'.
+        $ps = self::$db->prepare('DELETE FROM role_module WHERE role_fk = :role_fk' .
                                         ' AND module_fk = :module_fk;');
 
         $this->executeOrFail($ps, [
@@ -695,8 +695,8 @@ 
 
     public function getModulesFromRole(Role $role)
     {
-        $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_fk = :role_fk;');
 
         $id = $role->getId();
@@ -761,7 +761,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(),
@@ -779,7 +779,7 @@ 
         $this->executeOrFail($ps, [':id' => $id]);
 
         $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);
@@ -799,9 +799,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 = :id;');
 
         $this->executeOrFail($ps, [
@@ -834,8 +834,8 @@ 
 
     public function getRolesFromModule(Module $module)
     {
-        $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_fk = :module_fk;');
 
         $id = $module->getId();

Braces +12 added lines, -8 removed lines

@@ -131,8 +131,9 @@ 
         $this->executeOrFail($ps, [':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());
@@ -296,8 +297,9 @@ 
         $this->executeOrFail($ps, [':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());
@@ -445,8 +447,9 @@ 
         $this->executeOrFail($ps, [':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());
@@ -779,8 +782,9 @@ 
         $this->executeOrFail($ps, [':id' => $id]);
 
         $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());

src/TAU/Common/AssertsArraySubset.php

Spacing +6 added lines, -6 removed lines

@@ -11,7 +11,7 @@ 
                 if ( ! array_key_exists($key, $actual)) {
                     $message = "Keys: Expected ($key) not found in Actual";
                     return false;
-                } elseif ( ! $this->AssertsArrayIsASubsetOf($expected[$key], $actual[$key], $message)){
+                } elseif ( ! $this->AssertsArrayIsASubsetOf($expected[$key], $actual[$key], $message)) {
                     $message .= " with key ($key)";
                     return false;
                 }
@@ -27,10 +27,10 @@ 
     {
         if (is_array($expected) && is_array($actual)) {
             foreach ($actual as $key => $value) {
-                if (!array_key_exists($key, $expected)) {
+                if ( ! array_key_exists($key, $expected)) {
                     $message = "Keys: Actual ($key) unexpected";
                     return false;
-                } elseif (!$this->AssertsReverseArrayIsASubsetOf($actual[$key], $expected[$key], $message)) {
+                } elseif ( ! $this->AssertsReverseArrayIsASubsetOf($actual[$key], $expected[$key], $message)) {
                     $message .= " in key ($key)";
                     return false;
                 }
@@ -47,14 +47,14 @@ 
         if (gettype($expected) != gettype($actual)) {
             $message = "Mismatched Types: Expected (gettype($expected)) != Actual (gettype($actual))";
             return false;
-        } elseif (gettype($expected) == 'object' ) {
+        } elseif (gettype($expected) == 'object') {
             $expected_class = get_class($expected);
             $actual_class = get_class($actual);
-            if( $expected_class != $actual_class ){
+            if ($expected_class != $actual_class) {
                 $message = "Objects classes: Expected ($expected_class) != Actual ($actual_class)";
                 return false;
             }
-            if( ! $expected->equals($actual) ) {
+            if ( ! $expected->equals($actual)) {
                 $message = "Objects: Expected ($expected) != Actual ($actual)";
                 return false;
             }

src/TAU/Common/SettersBag.php

Spacing +8 added lines, -8 removed lines

@@ -23,14 +23,14 @@ 
     public function __call($name, $arguments)
     {
         //TODO: hack ;-(
-        if( in_array($name, ['setPropertiesBag', 'setSettersBag'], true) ){
+        if (in_array($name, ['setPropertiesBag', 'setSettersBag'], true)) {
             $this->$name(...$arguments);
             return;
-        }elseif( in_array($name, ['getPropertiesBag','getSettersBag'], true) ){
+        }elseif (in_array($name, ['getPropertiesBag', 'getSettersBag'], true)) {
             return $this->$name(...$arguments);
         }
 
-        if( ! $this->isSetterAllowed($name) ) {
+        if ( ! $this->isSetterAllowed($name)) {
             $trace = debug_backtrace();
             trigger_error(
                 'Disallowed getter/setter ' . $name .
@@ -41,9 +41,9 @@ 
         }
 
         $attribute = strtolower(substr($name, 3));
-        if($this->isSetter($name)){
+        if ($this->isSetter($name)) {
             $this->$attribute = $arguments[0];
-        } elseif( $this->isGetter($name) ) {
+        } elseif ($this->isGetter($name)) {
             return $this->$attribute;
         } else {
             $name(...$arguments);
@@ -52,10 +52,10 @@ 
 
     public function equals($o): bool
     {
-        foreach ($this->setters as $getter){
-            if( $this->isGetter($getter) )
+        foreach ($this->setters as $getter) {
+            if ($this->isGetter($getter))
             {
-                if( $this->$getter() != $o->$getter() )
+                if ($this->$getter() != $o->$getter())
                     return false;
             }
         }

Braces +4 added lines, -3 removed lines

@@ -26,7 +26,7 @@ 
         if( in_array($name, ['setPropertiesBag', 'setSettersBag'], true) ){
             $this->$name(...$arguments);
             return;
-        }elseif( in_array($name, ['getPropertiesBag','getSettersBag'], true) ){
+        } elseif( in_array($name, ['getPropertiesBag','getSettersBag'], true) ){
             return $this->$name(...$arguments);
         }
 
@@ -55,8 +55,9 @@ 
         foreach ($this->setters as $getter){
             if( $this->isGetter($getter) )
             {
-                if( $this->$getter() != $o->$getter() )
-                    return false;
+                if( $this->$getter() != $o->$getter() ) {
+                                    return false;
+                }
             }
         }
         return true;