Removed querybuilder [SLE-197]

samuelgfeller · Apr 1, 2024 · 20cfdbb · 20cfdbb
1 parent 595f756
commit 20cfdbb
Show file tree

Hide file tree

Showing 6 changed files with 57 additions and 131 deletions.
diff --git a/.scrutinizer.yml b/.scrutinizer.yml
@@ -1,6 +1,7 @@
 filter:
   paths: [ "src/*" ]
-  excluded_paths: [ "vendor/*", "tests/*", "resources/", "public/" ]
+  excluded_paths: [ "vendor/*", "tests/*", "resources/", "public/", "src/Infrastructure/Console/**",
+                    "src/Application/ErrorHandler/**", ]
 
 checks:
   php:

diff --git a/public/frontend/home.html b/public/frontend/home.html
@@ -4,7 +4,7 @@
     <meta charset="UTF-8">
     <link rel="stylesheet" href="style.css">
     <link rel="shortcut icon" href="favicon.ico" type="image/x-icon"/>
-    <title>Example Frontend for Slim API Starter</title>
+    <title>Slim API Starter - frontend</title>
 </head>
 <body>
 <h1>Frontend for Slim API Starter</h1>

diff --git a/src/Domain/User/Repository/UserCreatorRepository.php b/src/Domain/User/Repository/UserCreatorRepository.php
@@ -2,13 +2,12 @@
 
 namespace App\Domain\User\Repository;
 
-use App\Infrastructure\Factory\QueryFactory;
+use Cake\Database\Connection;
 
 final readonly class UserCreatorRepository
 {
-    public function __construct(
-        private QueryFactory $queryFactory,
-    ) {
+    public function __construct(private Connection $connection)
+    {
     }
 
     /**
@@ -21,6 +20,10 @@ public function __construct(
     public function insertUser(array $userValues): int
     {
         // Insert user into database
-        return (int)$this->queryFactory->insertQueryWithData($userValues)->into('user')->execute()->lastInsertId();
+        return (int)$this->connection->insertQuery()
+            ->insert(array_keys($userValues))
+            ->values($userValues)
+            ->into('user')
+            ->execute()->lastInsertId();
     }
 }
diff --git a/src/Domain/User/Repository/UserFinderRepository.php b/src/Domain/User/Repository/UserFinderRepository.php
@@ -3,14 +3,14 @@
 namespace App\Domain\User\Repository;
 
 use App\Domain\User\Data\UserData;
-use App\Infrastructure\Factory\QueryFactory;
 use App\Infrastructure\Utility\Hydrator;
+use Cake\Database\Connection;
 
 final readonly class UserFinderRepository
 {
     public function __construct(
-        private QueryFactory $queryFactory,
-        private Hydrator $hydrator
+        private Connection $connection,
+        private Hydrator $hydrator,
     ) {
     }
 
@@ -21,7 +21,7 @@ public function __construct(
      */
     public function findAllUsers(): array
     {
-        $query = $this->queryFactory->selectQuery()->select([
+        $query = $this->connection->selectQuery()->select([
             'id',
             'first_name',
             'last_name',

diff --git a/src/Infrastructure/Factory/QueryFactory.php b/src/Infrastructure/Factory/QueryFactory.php
diff --git a/tests/Integration/ErrorHandler/NonFatalErrorHandlerMiddlewareTest.php b/tests/Integration/ErrorHandler/NonFatalErrorHandlerMiddlewareTest.php
@@ -0,0 +1,42 @@
+<?php
+
+namespace App\Test\Integration\ErrorHandler;
+
+use App\Test\Trait\AppTestTrait;
+use PHPUnit\Framework\TestCase;
+use TestTraits\Trait\HttpTestTrait;
+
+class NonFatalErrorHandlerMiddlewareTest extends TestCase
+{
+    use AppTestTrait;
+    use HttpTestTrait;
+
+    /**
+     * Test that when a non-fatal error occurs, the NonFatalErrorHandlerMiddleware
+     * makes an ErrorException. This is to make the app "exception-heavy"
+     * and display a proper stack trace and error page in development.
+     * Documentation: https://github.com/samuelgfeller/slim-example-project/wiki/Error-Handling.
+     *
+     * @return void
+     */
+    public function testNonFatalErrorHandler(): void
+    {
+        // Add a route that triggers a non-fatal error
+        $this->app->get('/error', function ($request, $response, $args) {
+            // This will trigger a PHP notice because $undefinedVar is not defined
+            /** @phpstan-ignore-next-line */
+            echo $undefinedVar;
+
+            return $response;
+        });
+
+        $request = $this->createRequest('GET', '/error');
+
+        // Expect that an ErrorException is thrown
+        $this->expectException(\ErrorException::class);
+        $this->expectExceptionMessage('Undefined variable $undefinedVar');
+
+        // Process the request through the application
+        $this->app->handle($request);
+    }
+}