implement Tests\Server, ServerV2 and groupcompactsyntax namespaces

tests/groupcompactsyntax/FlightRouteCompactSyntaxTest.php

@@ -2,14 +2,14 @@
 
 declare(strict_types=1);
 
+namespace tests\groupcompactsyntax;
+
+use Flight;
 use PHPUnit\Framework\TestCase;
 use tests\groupcompactsyntax\PostsController;
 use tests\groupcompactsyntax\TodosController;
 use tests\groupcompactsyntax\UsersController;
 
-require_once __DIR__ . '/UsersController.php';
-require_once __DIR__ . '/PostsController.php';
-
 final class FlightRouteCompactSyntaxTest extends TestCase
 {
     public function setUp(): void

tests/server-v2/index.php

@@ -9,7 +9,23 @@ declare(strict_types=1);
  * @author Kristaps Muižnieks https://github.com/krmu
  */
 
-require file_exists(__DIR__ . '/../../vendor/autoload.php') ? __DIR__ . '/../../vendor/autoload.php' : __DIR__ . '/../../flight/autoload.php';
+namespace Tests\ServerV2 {
+    class AuthCheck
+    {
+        public function before(): void
+        {
+            if (!isset($_COOKIE['user'])) {
+                echo '<span id="infotext">Middleware text:</span> You are not authorized to access this route!';
+            }
+        }
+    }
+}
+
+namespace {
+
+    use Tests\ServerV2\AuthCheck;
+
+    require_once __DIR__ . '/../phpunit_autoload.php';
 
     Flight::set('flight.content_length', false);
     Flight::set('flight.views.path', './');
@@ -20,16 +36,18 @@ Flight::set('flight.v2.output_buffering', true);
     // Test 1: Root route
     Flight::route('/', function () {
         echo '<span id="infotext">Route text:</span> Root route works!';
-    if (Flight::request()->query->redirected) {
+
+        if (Flight::request()->query['redirected']) {
             echo '<br>Redirected from /redirect route successfully!';
         }
     });
+
     Flight::route('/querytestpath', function () {
         echo '<span id="infotext">Route text:</span> This ir query route<br>';
-    echo "I got such query parameters:<pre>";
+        echo 'I got such query parameters:<pre>';
         print_r(Flight::request()->query);
-    echo "</pre>";
+        echo '</pre>';
-}, false, "querytestpath");
+    }, false, 'querytestpath');
 
     // Test 2: Simple route
     Flight::route('/test', function () {
@@ -40,18 +58,21 @@ Flight::route('/test', function () {
     Flight::route('/user/@name', function ($name) {
         echo "<span id='infotext'>Route text:</span> Hello, $name!";
     });
+
     Flight::route('POST /postpage', function () {
         echo '<span id="infotext">Route text:</span> THIS IS POST METHOD PAGE';
-}, false, "postpage");
+    }, false, 'postpage');
 
     // Test 4: Grouped routes
     Flight::group('/group', function () {
         Flight::route('/test', function () {
             echo '<span id="infotext">Route text:</span> Group test route works!';
         });
+
         Flight::route('/user/@name', function ($name) {
             echo "<span id='infotext'>Route text:</span> There is variable called name and it is $name";
         });
+
         Flight::group('/group1', function () {
             Flight::group('/group2', function () {
                 Flight::group('/group3', function () {
@@ -62,7 +83,7 @@ Flight::group('/group', function () {
                                     Flight::group('/group8', function () {
                                         Flight::route('/final_group', function () {
                                             echo 'Mega Group test route works!';
-                                    }, false, "final_group");
+                                        }, false, 'final_group');
                                     });
                                 });
                             });
@@ -77,16 +98,9 @@ Flight::group('/group', function () {
     Flight::route('/alias', function () {
         echo '<span id="infotext">Route text:</span> Alias route works!';
     }, false, 'aliasroute');
-class AuthCheck
+
-{
-    public function before(): void
-    {
-        if (!isset($_COOKIE['user'])) {
-            echo '<span id="infotext">Middleware text:</span> You are not authorized to access this route!';
-        }
-    }
-}
     $middle = new AuthCheck();
+
     // Test 6: Route with middleware
     Flight::route('/protected', function () {
         echo '<span id="infotext">Route text:</span> Protected route works!';
@@ -131,6 +145,7 @@ Flight::route('/redirect', function () {
     });
 
     Flight::set('flight.views.path', './');
+
     Flight::map('error', function (Throwable $error) {
         echo "<h1> An error occurred, mapped  error method worked, error below </h1>";
         echo '<pre style="border: 2px solid red; padding: 21px; background: lightgray; font-weight: bold;">';
@@ -138,10 +153,12 @@ Flight::map('error', function (Throwable $error) {
         echo "</pre>";
         echo "<a href='/'>Go back</a>";
     });
+
     Flight::map('notFound', function () {
         echo '<span id="infotext">Route text:</span> The requested URL was not found';
         echo "<a href='/'>Go back</a>";
     });
+
     echo '
     <style>
         ul {
@@ -208,10 +225,12 @@ echo '
     <li><a href="/halt">Halt</a></li>
     <li><a href="/redirect">Redirect</a></li>
     </ul>';
-Flight::before('start', function ($params) {
+
+    Flight::before('start', function () {
         echo '<div id="container">';
     });
-Flight::after('start', function ($params) {
+
+    Flight::after('start', function () {
         echo '</div>';
         echo '<div id="debugrequest">';
         echo "Request information<pre>";
@@ -219,4 +238,6 @@ Flight::after('start', function ($params) {
         echo "</pre>";
         echo "</div>";
     });
+
     Flight::start();
+}

tests/server/AuthCheck.php

@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Tests\Server;
+
 class AuthCheck
 {
     public function before(): void

tests/server/LayoutMiddleware.php

@@ -2,6 +2,10 @@
 
 declare(strict_types=1);
 
+namespace Tests\Server;
+
+use Flight;
+
 class LayoutMiddleware
 {
     public function before(): void

tests/server/OverwriteBodyMiddleware.php

@@ -2,11 +2,20 @@
 
 declare(strict_types=1);
 
+namespace Tests\Server;
+
+use Flight;
+
 class OverwriteBodyMiddleware
 {
     public function after(): void
     {
         $response = Flight::response();
-        $response->write(str_replace('<span style="color:red; font-weight: bold;">failed</span>', '<span style="color:green; font-weight: bold;">successfully works!</span>', $response->getBody()), true);
+
+        $response->write(str_replace(
+            '<span style="color:red; font-weight: bold;">failed</span>',
+            '<span style="color:green; font-weight: bold;">successfully works!</span>',
+            $response->getBody()
+        ), true);
     }
 }

tests/server/Pascal_Snake_Case.php

@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Tests\Server;
+
 class Pascal_Snake_Case // phpcs:ignore
 {
     public function doILoad() // phpcs:ignore

tests/server/index.php

@@ -2,10 +2,15 @@
 
 declare(strict_types=1);
 
+use Dice\Dice;
 use flight\core\Loader;
 use flight\database\PdoWrapper;
 use tests\classes\Container;
 use tests\classes\ContainerDefault;
+use Tests\Server\AuthCheck;
+use Tests\Server\LayoutMiddleware;
+use Tests\Server\OverwriteBodyMiddleware;
+use Tests\Server\Pascal_Snake_Case;
 
 /*
  * This is the test file where we can open up a quick test server and make
@@ -14,7 +19,7 @@ use tests\classes\ContainerDefault;
  * @author Kristaps Muižnieks https://github.com/krmu
  */
 
-require file_exists(__DIR__ . '/../../vendor/autoload.php') ? __DIR__ . '/../../vendor/autoload.php' : __DIR__ . '/../../flight/autoload.php';
+require_once __DIR__ . '/../phpunit_autoload.php';
 
 Flight::set('flight.content_length', false);
 Flight::set('flight.views.path', './');
@@ -23,20 +28,20 @@ Loader::setV2ClassLoading(false);
 Flight::path(__DIR__);
 
 Flight::group('', function () {
-
     // Test 1: Root route
     Flight::route('/', function () {
         echo '<span id="infotext">Route text:</span> Root route works!';
-        if (Flight::request()->query->redirected) {
+        if (Flight::request()->query['redirected']) {
             echo '<br>Redirected from /redirect route successfully!';
         }
     });
+
     Flight::route('/querytestpath', function () {
         echo '<span id="infotext">Route text:</span> This is query route<br>';
-        echo "Query parameters:<pre>";
+        echo 'Query parameters:<pre>';
         print_r(Flight::request()->query);
-        echo "</pre>";
+        echo '</pre>';
-    }, false, "querytestpath");
+    }, false, 'querytestpath');
 
     // Test 2: Simple route
     Flight::route('/test', function () {
@@ -47,18 +52,21 @@ Flight::group('', function () {
     Flight::route('/user/@name', function ($name) {
         echo "<span id='infotext'>Route text:</span> Hello, $name!";
     });
+
     Flight::route('POST /postpage', function () {
         echo '<span id="infotext">Route text:</span> THIS IS POST METHOD PAGE';
-    }, false, "postpage");
+    }, false, 'postpage');
 
     // Test 4: Grouped routes
     Flight::group('/group', function () {
         Flight::route('/test', function () {
             echo '<span id="infotext">Route text:</span> Group test route works!';
         });
+
         Flight::route('/user/@name', function ($name) {
             echo "<span id='infotext'>Route text:</span> There is variable called name and it is $name";
         });
+
         Flight::group('/group1', function () {
             Flight::group('/group2', function () {
                 Flight::group('/group3', function () {
@@ -69,7 +77,7 @@ Flight::group('', function () {
                                     Flight::group('/group8', function () {
                                         Flight::route('/final_group', function () {
                                             echo 'Mega Group test route works!';
-                                        }, false, "final_group");
+                                        }, false, 'final_group');
                                     });
                                 });
                             });
@@ -86,8 +94,8 @@ Flight::group('', function () {
     }, false, 'aliasroute');
 
     /** Middleware test */
-    include_once 'AuthCheck.php';
     $middle = new AuthCheck();
+
     // Test 6: Route with middleware
     Flight::route('/protected', function () {
         echo '<span id="infotext">Route text:</span> Protected route works!';
@@ -119,44 +127,68 @@ Flight::group('', function () {
 
     // Test 12: Redirect with status code
     Flight::route('/streamResponse', function () {
-        echo "Streaming a response";
+        echo 'Streaming a response';
+
         for ($i = 1; $i <= 50; $i++) {
             echo ".";
             usleep(50000);
             ob_flush();
         }
-        echo "is successful!!";
+
+        echo 'is successful!!';
     })->stream();
 
     // Test 12: Redirect with status code
     Flight::route('/streamWithHeaders', function () {
-        echo "Streaming a response";
+        echo 'Streaming a response';
+
         for ($i = 1; $i <= 50; $i++) {
             echo ".";
             usleep(50000);
             ob_flush();
         }
-        echo "is successful!!";
+
+        echo 'is successful!!';
     })->streamWithHeaders(['Content-Type' => 'text/html', 'status' => 200]);
 
     // Test 14: Overwrite the body with a middleware
     Flight::route('/overwrite', function () {
-        echo '<span id="infotext">Route text:</span> This route status is that it <span style="color:red; font-weight: bold;">failed</span>';
+        echo <<<'html'
+            <span id="infotext">Route text:</span>
+            This route status is that it
+            <span style="color:red; font-weight: bold;">failed</span>
+        html;
     })->addMiddleware([new OverwriteBodyMiddleware()]);
 
     // Test 15: UTF8 Chars in url
     Flight::route('/わたしはひとです', function () {
-        echo '<span id="infotext">Route text:</span> This route status is that it <span style="color:green; font-weight: bold;">succeeded はい!!!</span>';
+        echo <<<'html'
+            <span id="infotext">Route text:</span>
+            This route status is that it
+            <span style="color:green; font-weight: bold;">succeeded はい!!!</span>
+        html;
     });
 
     // Test 16: UTF8 Chars in url with utf8 params
     Flight::route('/わたしはひとです/@name', function ($name) {
-        echo '<span id="infotext">Route text:</span> This route status is that it <span style="color:' . ($name === 'ええ' ? 'green' : 'red') . '; font-weight: bold;">' . ($name === 'ええ' ? 'succeeded' : 'failed') . ' URL Param: ' . $name . '</span>';
+        echo '<span id="infotext">Route text:</span> This route status is that it <span style="color:'
+            . ($name === 'ええ' ? 'green' : 'red')
+            . '; font-weight: bold;">'
+            . ($name === 'ええ' ? 'succeeded' : 'failed')
+            . ' URL Param: '
+            . $name
+            . '</span>';
     });
 
     // Test 17: Slash in param
     Flight::route('/redirect/@id', function ($id) {
-        echo '<span id="infotext">Route text:</span> This route status is that it <span style="color:' . ($id === 'before/after' ? 'green' : 'red') . '; font-weight: bold;">' . ($id === 'before/after' ? 'succeeded' : 'failed') . ' URL Param: ' . $id . '</span>';
+        echo '<span id="infotext">Route text:</span> This route status is that it <span style="color:'
+            . ($id === 'before/after' ? 'green' : 'red')
+            . '; font-weight: bold;">'
+            . ($id === 'before/after' ? 'succeeded' : 'failed')
+            . ' URL Param: '
+            . $id
+            . '</span>';
     });
 
     Flight::set('test_me_out', 'You got it boss!'); // used in /no-container route
@@ -195,23 +227,25 @@ Flight::map('error', function (Throwable $e) {
         $e->getCode(),
         str_replace(getenv('PWD'), '***CONFIDENTIAL***', $e->getTraceAsString())
     );
+
     echo "<br><a href='/'>Go back</a>";
 });
+
 Flight::map('notFound', function () {
     echo '<span id="infotext">Route text:</span> The requested URL was not found<br>';
     echo "<a href='/'>Go back</a>";
 });
 
 Flight::map('start', function () {
-
     if (Flight::request()->url === '/dice') {
-        $dice = new \Dice\Dice();
+        $dice = new Dice();
         $dice = $dice->addRules([
             PdoWrapper::class => [
                 'shared' => true,
                 'constructParams' => ['sqlite::memory:']
             ]
         ]);
+
         Flight::registerContainerHandler(function ($class, $params) use ($dice) {
             return $dice->create($class, $params);
         });