@@ -21,7 +21,7 @@ |
||
21 | 21 | |
22 | 22 | $next($command); |
23 | 23 | |
24 | - } catch (\Exception $e){ |
|
24 | + } catch (\Exception $e) { |
|
25 | 25 | $this->entityManager->rollback(); |
26 | 26 | throw $e; |
27 | 27 | } |
@@ -16,7 +16,7 @@ |
||
16 | 16 | public function execute(object $command, callable $next) |
17 | 17 | { |
18 | 18 | $commandName = \get_class($command); |
19 | - $commandHandler = $commandName.$this->handler; |
|
19 | + $commandHandler = $commandName . $this->handler; |
|
20 | 20 | app()->get($commandHandler)->handle($command); |
21 | 21 | } |
22 | 22 | } |
@@ -16,7 +16,7 @@ |
||
16 | 16 | public function execute(object $command, callable $next) |
17 | 17 | { |
18 | 18 | $commandName = \get_class($command); |
19 | - $commandHandler = $commandName.$this->handler; |
|
19 | + $commandHandler = $commandName . $this->handler; |
|
20 | 20 | return app()->get($commandHandler)->handle($command); |
21 | 21 | } |
22 | 22 | } |
@@ -37,7 +37,7 @@ discard block |
||
37 | 37 | self::$db->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION); |
38 | 38 | //self::$db->setAttribute(PDO::ATTR_DEFAULT_FETCH_MODE, PDO::FETCH_OBJ); |
39 | 39 | } catch (PDOException $e) { |
40 | - die($e->getMessage().' ('.$dbname.')'); |
|
40 | + die($e->getMessage() . ' (' . $dbname . ')'); |
|
41 | 41 | } |
42 | 42 | } |
43 | 43 | |
@@ -117,7 +117,7 @@ discard block |
||
117 | 117 | |
118 | 118 | public function createUser(User $user): void |
119 | 119 | { |
120 | - $ps = self::$db->prepare('INSERT INTO User (user_id, name, surname, login)'. |
|
120 | + $ps = self::$db->prepare('INSERT INTO User (user_id, name, surname, login)' . |
|
121 | 121 | ' VALUES(:user_id, :name, :surname, :login);'); |
122 | 122 | $this->executeOrFail($ps, [ |
123 | 123 | ':user_id' => $user->getId(), |
@@ -136,7 +136,7 @@ discard block |
||
136 | 136 | $this->executeOrFail($ps, [':user_id' => $id]); |
137 | 137 | |
138 | 138 | $resultSet = $ps->fetch(PDO::FETCH_ASSOC); |
139 | - if( $resultSet === false ) |
|
139 | + if ($resultSet === false) |
|
140 | 140 | throw new \InvalidArgumentException("User with id = $id not found"); |
141 | 141 | |
142 | 142 | $ref = new \ReflectionClass(User::class); |
@@ -154,10 +154,10 @@ discard block |
||
154 | 154 | |
155 | 155 | public function updateUser($id, $name, $surname, $login): void |
156 | 156 | { |
157 | - $ps = self::$db->prepare('UPDATE User SET '. |
|
158 | - 'name = :name,'. |
|
159 | - 'surname = :surname,'. |
|
160 | - 'login = :login'. |
|
157 | + $ps = self::$db->prepare('UPDATE User SET ' . |
|
158 | + 'name = :name,' . |
|
159 | + 'surname = :surname,' . |
|
160 | + 'login = :login' . |
|
161 | 161 | ' WHERE user_id = :user_id;'); |
162 | 162 | |
163 | 163 | $this->executeOrFail($ps, [ |
@@ -179,8 +179,8 @@ discard block |
||
179 | 179 | |
180 | 180 | public function getGroupsFromUser(User $user): array |
181 | 181 | { |
182 | - $ps = self::$db->prepare('SELECT group_pk, g.group_id, name, description FROM "Group" g'. |
|
183 | - ' INNER JOIN user_group rel ON g.group_pk = rel.group_fk'. |
|
182 | + $ps = self::$db->prepare('SELECT group_pk, g.group_id, name, description FROM "Group" g' . |
|
183 | + ' INNER JOIN user_group rel ON g.group_pk = rel.group_fk' . |
|
184 | 184 | ' WHERE rel.user_id = :user_id;'); |
185 | 185 | |
186 | 186 | $resultSet = $this->queryOrFail($ps, [ |
@@ -224,14 +224,14 @@ discard block |
||
224 | 224 | private function queryOrFail($ps, $params = [], $debug = 0): array |
225 | 225 | { |
226 | 226 | $this->executeOrFail($ps, $params, $debug); |
227 | - $resultSet = $ps->fetchAll(PDO::FETCH_ASSOC); |
|
227 | + $resultSet = $ps->fetchAll(PDO::FETCH_ASSOC); |
|
228 | 228 | |
229 | 229 | return $resultSet; |
230 | 230 | } |
231 | 231 | |
232 | 232 | private function executeOrFail($ps, $params = [], $debug = 0): void |
233 | 233 | { |
234 | - if($debug) { //TODO: toggle to enable |
|
234 | + if ($debug) { //TODO: toggle to enable |
|
235 | 235 | $sql = $ps->queryString; |
236 | 236 | $b = str_replace(array_keys($params), array_values($params), $sql); |
237 | 237 | echo "\n$b\n"; |
@@ -239,13 +239,13 @@ discard block |
||
239 | 239 | |
240 | 240 | try { |
241 | 241 | $result = $ps->execute($params); |
242 | - } catch (PDOException $e){ |
|
242 | + } catch (PDOException $e) { |
|
243 | 243 | $result = false; |
244 | 244 | } |
245 | 245 | |
246 | - if( $result === false ) { |
|
246 | + if ($result === false) { |
|
247 | 247 | $debug = 1; |
248 | - if($debug) { |
|
248 | + if ($debug) { |
|
249 | 249 | $sql = $ps->queryString; |
250 | 250 | $b = str_replace(array_keys($params), array_values($params), $sql); |
251 | 251 | echo "\n$b\n"; |
@@ -255,8 +255,8 @@ discard block |
||
255 | 255 | $Driver_specific_error_code = $errorInfo[1]; |
256 | 256 | $Driver_specific_error_message = $errorInfo[2]; |
257 | 257 | throw new \Exception( |
258 | - '['.$SQLSTATE_error_code.'] '.$Driver_specific_error_message. |
|
259 | - ' (Driver specific error code: '.$Driver_specific_error_code.')', |
|
258 | + '[' . $SQLSTATE_error_code . '] ' . $Driver_specific_error_message . |
|
259 | + ' (Driver specific error code: ' . $Driver_specific_error_code . ')', |
|
260 | 260 | $SQLSTATE_error_code); |
261 | 261 | } |
262 | 262 | } |
@@ -289,7 +289,7 @@ discard block |
||
289 | 289 | |
290 | 290 | public function createGroup(Group $group): void |
291 | 291 | { |
292 | - $ps = self::$db->prepare('INSERT INTO "Group" (group_id, name, description)'. |
|
292 | + $ps = self::$db->prepare('INSERT INTO "Group" (group_id, name, description)' . |
|
293 | 293 | ' VALUES(:group_id, :name, :description);'); |
294 | 294 | $this->executeOrFail($ps, [ |
295 | 295 | ':group_id' => $group->getId(), |
@@ -307,7 +307,7 @@ discard block |
||
307 | 307 | $this->executeOrFail($ps, [':group_id' => $id]); |
308 | 308 | |
309 | 309 | $resultSet = $ps->fetch(PDO::FETCH_ASSOC); |
310 | - if( $resultSet === false ) |
|
310 | + if ($resultSet === false) |
|
311 | 311 | throw new \InvalidArgumentException("Group with id = $id not found"); |
312 | 312 | |
313 | 313 | $ref = new \ReflectionClass(Group::class); |
@@ -327,9 +327,9 @@ discard block |
||
327 | 327 | |
328 | 328 | public function updateGroup($id, $name, $desc): void |
329 | 329 | { |
330 | - $ps = self::$db->prepare('UPDATE "Group" SET '. |
|
331 | - 'name = :name,'. |
|
332 | - 'description = :description'. |
|
330 | + $ps = self::$db->prepare('UPDATE "Group" SET ' . |
|
331 | + 'name = :name,' . |
|
332 | + 'description = :description' . |
|
333 | 333 | ' WHERE group_id = :group_id;'); |
334 | 334 | |
335 | 335 | $this->executeOrFail($ps, [ |
@@ -350,8 +350,8 @@ discard block |
||
350 | 350 | |
351 | 351 | public function getUsersFromGroup(Group $group): array |
352 | 352 | { |
353 | - $ps = self::$db->prepare('SELECT user_pk, u.user_id, name, surname, login FROM User u'. |
|
354 | - ' INNER JOIN user_group rel ON u.user_pk = rel.user_fk'. |
|
353 | + $ps = self::$db->prepare('SELECT user_pk, u.user_id, name, surname, login FROM User u' . |
|
354 | + ' INNER JOIN user_group rel ON u.user_pk = rel.user_fk' . |
|
355 | 355 | ' WHERE rel.group_id = :group_id;'); |
356 | 356 | |
357 | 357 | $resultSet = $this->queryOrFail($ps, [ |
@@ -406,7 +406,7 @@ discard block |
||
406 | 406 | |
407 | 407 | public function addUserToGroup(User $user, Group $group) |
408 | 408 | { |
409 | - $ps = self::$db->prepare('INSERT INTO user_group (user_fk, group_fk, user_id, group_id)'. |
|
409 | + $ps = self::$db->prepare('INSERT INTO user_group (user_fk, group_fk, user_id, group_id)' . |
|
410 | 410 | ' VALUES (:user_fk, :group_fk, :user_id, :group_id);'); |
411 | 411 | |
412 | 412 | $this->executeOrFail($ps, [ |
@@ -419,8 +419,8 @@ discard block |
||
419 | 419 | |
420 | 420 | public function removeUserFromGroup(User $user, Group $group) |
421 | 421 | { |
422 | - $ps = self::$db->prepare('DELETE FROM user_group'. |
|
423 | - ' WHERE user_id = :user_id'. |
|
422 | + $ps = self::$db->prepare('DELETE FROM user_group' . |
|
423 | + ' WHERE user_id = :user_id' . |
|
424 | 424 | ' AND group_id = :group_id;'); |
425 | 425 | |
426 | 426 | $this->executeOrFail($ps, [ |
@@ -431,7 +431,7 @@ discard block |
||
431 | 431 | |
432 | 432 | public function createRole(Role $role): void |
433 | 433 | { |
434 | - $ps = self::$db->prepare('INSERT INTO Role (role_id, name, description)'. |
|
434 | + $ps = self::$db->prepare('INSERT INTO Role (role_id, name, description)' . |
|
435 | 435 | ' VALUES(:role_id, :name, :description);'); |
436 | 436 | |
437 | 437 | $this->executeOrFail($ps, [ |
@@ -450,7 +450,7 @@ discard block |
||
450 | 450 | $this->executeOrFail($ps, [':role_id' => $id]); |
451 | 451 | |
452 | 452 | $resultSet = $ps->fetch(PDO::FETCH_ASSOC); |
453 | - if( $resultSet === false ) |
|
453 | + if ($resultSet === false) |
|
454 | 454 | throw new \InvalidArgumentException("Role with id = $id not found"); |
455 | 455 | |
456 | 456 | $ref = new \ReflectionClass(Role::class); |
@@ -475,7 +475,7 @@ discard block |
||
475 | 475 | |
476 | 476 | public function addGroupToRole(Group $group, Role $role) |
477 | 477 | { |
478 | - $ps = self::$db->prepare('INSERT INTO group_role (group_fk, role_fk, group_id, role_id)'. |
|
478 | + $ps = self::$db->prepare('INSERT INTO group_role (group_fk, role_fk, group_id, role_id)' . |
|
479 | 479 | ' VALUES (:group_fk, :role_fk, :group_id, :role_id);'); |
480 | 480 | |
481 | 481 | $this->executeOrFail($ps, [ |
@@ -488,8 +488,8 @@ discard block |
||
488 | 488 | |
489 | 489 | public function getGroupsFromRole(Role $role): array |
490 | 490 | { |
491 | - $ps = self::$db->prepare('SELECT group_pk, g.group_id, name, description FROM "Group" g'. |
|
492 | - ' INNER JOIN group_role rel ON g.group_pk = rel.group_fk'. |
|
491 | + $ps = self::$db->prepare('SELECT group_pk, g.group_id, name, description FROM "Group" g' . |
|
492 | + ' INNER JOIN group_role rel ON g.group_pk = rel.group_fk' . |
|
493 | 493 | ' WHERE rel.role_id = :role_id;'); |
494 | 494 | |
495 | 495 | $resultSet = $this->queryOrFail($ps, [ |
@@ -522,8 +522,8 @@ discard block |
||
522 | 522 | |
523 | 523 | public function removeGroupFromRole(Group $group, Role $role) |
524 | 524 | { |
525 | - $ps = self::$db->prepare('DELETE FROM group_role'. |
|
526 | - ' WHERE group_id = :group_id'. |
|
525 | + $ps = self::$db->prepare('DELETE FROM group_role' . |
|
526 | + ' WHERE group_id = :group_id' . |
|
527 | 527 | ' AND role_id = :role_id;'); |
528 | 528 | |
529 | 529 | $this->executeOrFail($ps, [ |
@@ -534,7 +534,7 @@ discard block |
||
534 | 534 | |
535 | 535 | public function addGroupToUser(Group $group, User $user) |
536 | 536 | { |
537 | - $ps = self::$db->prepare('INSERT INTO user_group (user_fk, group_fk, user_id, group_id)'. |
|
537 | + $ps = self::$db->prepare('INSERT INTO user_group (user_fk, group_fk, user_id, group_id)' . |
|
538 | 538 | ' VALUES (:user_fk, :group_fk, :user_id, :group_id);'); |
539 | 539 | |
540 | 540 | $this->executeOrFail($ps, [ |
@@ -547,8 +547,8 @@ discard block |
||
547 | 547 | |
548 | 548 | public function removeGroupFromUser(Group $group, User $user) |
549 | 549 | { |
550 | - $ps = self::$db->prepare('DELETE FROM user_group'. |
|
551 | - ' WHERE user_id = :user_id'. |
|
550 | + $ps = self::$db->prepare('DELETE FROM user_group' . |
|
551 | + ' WHERE user_id = :user_id' . |
|
552 | 552 | ' AND group_id = :group_id;'); |
553 | 553 | |
554 | 554 | $this->executeOrFail($ps, [ |
@@ -559,9 +559,9 @@ discard block |
||
559 | 559 | |
560 | 560 | public function updateRole($id, $name, $desc): void |
561 | 561 | { |
562 | - $ps = self::$db->prepare('UPDATE Role SET '. |
|
563 | - 'name = :name,'. |
|
564 | - 'description = :description'. |
|
562 | + $ps = self::$db->prepare('UPDATE Role SET ' . |
|
563 | + 'name = :name,' . |
|
564 | + 'description = :description' . |
|
565 | 565 | ' WHERE role_id = :role_id;'); |
566 | 566 | |
567 | 567 | $this->executeOrFail($ps, [ |
@@ -584,7 +584,7 @@ discard block |
||
584 | 584 | |
585 | 585 | public function addRoleToGroup(Role $role, Group $group) |
586 | 586 | { |
587 | - $ps = self::$db->prepare('INSERT INTO group_role (group_fk, role_fk, group_id, role_id)'. |
|
587 | + $ps = self::$db->prepare('INSERT INTO group_role (group_fk, role_fk, group_id, role_id)' . |
|
588 | 588 | ' VALUES (:group_fk, :role_fk, :group_id, :role_id);'); |
589 | 589 | |
590 | 590 | $this->executeOrFail($ps, [ |
@@ -597,8 +597,8 @@ discard block |
||
597 | 597 | |
598 | 598 | public function getRolesFromGroup(Group $group): array |
599 | 599 | { |
600 | - $ps = self::$db->prepare('SELECT role_pk, r.role_id, name, description FROM Role r'. |
|
601 | - ' INNER JOIN group_role rel ON r.role_pk = rel.role_fk'. |
|
600 | + $ps = self::$db->prepare('SELECT role_pk, r.role_id, name, description FROM Role r' . |
|
601 | + ' INNER JOIN group_role rel ON r.role_pk = rel.role_fk' . |
|
602 | 602 | ' WHERE rel.group_id = :group_id;'); |
603 | 603 | |
604 | 604 | $resultSet = $this->queryOrFail($ps, [ |
@@ -657,8 +657,8 @@ discard block |
||
657 | 657 | |
658 | 658 | public function removeRoleFromGroup(Role $role, Group $group) |
659 | 659 | { |
660 | - $ps = self::$db->prepare('DELETE FROM group_role'. |
|
661 | - ' WHERE role_id = :role_id'. |
|
660 | + $ps = self::$db->prepare('DELETE FROM group_role' . |
|
661 | + ' WHERE role_id = :role_id' . |
|
662 | 662 | ' AND group_id = :group_id;'); |
663 | 663 | |
664 | 664 | $this->executeOrFail($ps, [ |
@@ -669,7 +669,7 @@ discard block |
||
669 | 669 | |
670 | 670 | public function addModuleToRole(Module $module, Role $role) |
671 | 671 | { |
672 | - $ps = self::$db->prepare('INSERT INTO role_module (role_fk, module_fk, role_id, module_id)'. |
|
672 | + $ps = self::$db->prepare('INSERT INTO role_module (role_fk, module_fk, role_id, module_id)' . |
|
673 | 673 | ' VALUES (:role_fk, :module_fk, :role_id, :module_id);'); |
674 | 674 | |
675 | 675 | $this->executeOrFail($ps, [ |
@@ -682,8 +682,8 @@ discard block |
||
682 | 682 | |
683 | 683 | public function removeModuleFromRole(Module $module, Role $role) |
684 | 684 | { |
685 | - $ps = self::$db->prepare('DELETE FROM role_module'. |
|
686 | - ' WHERE role_id = :role_id'. |
|
685 | + $ps = self::$db->prepare('DELETE FROM role_module' . |
|
686 | + ' WHERE role_id = :role_id' . |
|
687 | 687 | ' AND module_id = :module_id;'); |
688 | 688 | |
689 | 689 | $this->executeOrFail($ps, [ |
@@ -694,8 +694,8 @@ discard block |
||
694 | 694 | |
695 | 695 | public function getModulesFromRole(Role $role): array |
696 | 696 | { |
697 | - $ps = self::$db->prepare('SELECT module_pk, m.module_id, name, description FROM Module m'. |
|
698 | - ' INNER JOIN role_module rel ON m.module_pk = rel.module_fk'. |
|
697 | + $ps = self::$db->prepare('SELECT module_pk, m.module_id, name, description FROM Module m' . |
|
698 | + ' INNER JOIN role_module rel ON m.module_pk = rel.module_fk' . |
|
699 | 699 | ' WHERE rel.role_id = :role_id;'); |
700 | 700 | |
701 | 701 | $resultSet = $this->queryOrFail($ps, [ |
@@ -759,7 +759,7 @@ discard block |
||
759 | 759 | |
760 | 760 | public function createModule(Module $module): void |
761 | 761 | { |
762 | - $ps = self::$db->prepare('INSERT INTO Module (module_id, name, description)'. |
|
762 | + $ps = self::$db->prepare('INSERT INTO Module (module_id, name, description)' . |
|
763 | 763 | ' VALUES(:module_id, :name, :description);'); |
764 | 764 | $this->executeOrFail($ps, [ |
765 | 765 | ':module_id' => $module->getId(), |
@@ -772,7 +772,7 @@ discard block |
||
772 | 772 | |
773 | 773 | public function readModule($id): Module |
774 | 774 | { |
775 | - $ps = self::$db->prepare('SELECT module_pk, module_id, name, description FROM Module'. |
|
775 | + $ps = self::$db->prepare('SELECT module_pk, module_id, name, description FROM Module' . |
|
776 | 776 | ' WHERE module_id = :module_id;'); |
777 | 777 | |
778 | 778 | $this->executeOrFail($ps, [ |
@@ -780,7 +780,7 @@ discard block |
||
780 | 780 | ]); |
781 | 781 | |
782 | 782 | $resultSet = $ps->fetch(PDO::FETCH_ASSOC); |
783 | - if( $resultSet === false ) |
|
783 | + if ($resultSet === false) |
|
784 | 784 | throw new \InvalidArgumentException("Module with id = $id not found"); |
785 | 785 | |
786 | 786 | $ref = new \ReflectionClass(Module::class); |
@@ -800,9 +800,9 @@ discard block |
||
800 | 800 | |
801 | 801 | public function updateModule($id, $name, $desc): void |
802 | 802 | { |
803 | - $ps = self::$db->prepare('UPDATE Module SET '. |
|
804 | - 'name = :name,'. |
|
805 | - 'description = :description'. |
|
803 | + $ps = self::$db->prepare('UPDATE Module SET ' . |
|
804 | + 'name = :name,' . |
|
805 | + 'description = :description' . |
|
806 | 806 | ' WHERE module_id = :module_id;'); |
807 | 807 | |
808 | 808 | $this->executeOrFail($ps, [ |
@@ -835,8 +835,8 @@ discard block |
||
835 | 835 | |
836 | 836 | public function getRolesFromModule(Module $module): array |
837 | 837 | { |
838 | - $ps = self::$db->prepare('SELECT role_pk, r.role_id, name, description FROM Role r'. |
|
839 | - ' INNER JOIN role_module rel ON r.role_pk = rel.role_fk'. |
|
838 | + $ps = self::$db->prepare('SELECT role_pk, r.role_id, name, description FROM Role r' . |
|
839 | + ' INNER JOIN role_module rel ON r.role_pk = rel.role_fk' . |
|
840 | 840 | ' WHERE rel.module_id = :module_id;'); |
841 | 841 | |
842 | 842 | $resultSet = $this->queryOrFail($ps, [ |
@@ -1,21 +1,21 @@ |
||
1 | 1 | <?php |
2 | 2 | |
3 | 3 | |
4 | -if( ! function_exists("app") ){ |
|
5 | - function app($alias = null){ |
|
4 | +if ( ! function_exists("app")) { |
|
5 | + function app($alias = null) { |
|
6 | 6 | static $app = null; |
7 | 7 | |
8 | - if( $app == null ){ |
|
8 | + if ($app == null) { |
|
9 | 9 | $app = new \League\Container\Container(); |
10 | 10 | } |
11 | 11 | |
12 | - if( $alias != null ) |
|
12 | + if ($alias != null) |
|
13 | 13 | return $app->get($alias); |
14 | 14 | |
15 | 15 | return $app; |
16 | 16 | } |
17 | 17 | |
18 | - if( ! function_exists("getConcrete") ) { |
|
18 | + if ( ! function_exists("getConcrete")) { |
|
19 | 19 | function getConcrete($entityManager): \ProyectoTAU\TAU\Common\Repository |
20 | 20 | { |
21 | 21 | $em_class = strstr($entityManager, '::', true); |