Update psr-4 loader.

knapsack-cloud · Nov 14, 2023 · 332bedb · 332bedb
1 parent d9a0ee9
commit 332bedb
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 13 deletions.
diff --git a/composer.json b/composer.json
@@ -4,12 +4,12 @@
     "license": "MIT",
     "autoload": {
         "psr-4": {
-            "BasaltInc\\TwigRenderer\\": "dist/"
+            "BasaltInc\\": "dist/"
         }
     },
     "autoload-dev": {
         "psr-4": {
-            "BasaltInc\\TwigRenderer\\Tests\\": "tests/"
+            "BasaltInc\\Tests\\": "tests/"
         }
     },
     "config": {

diff --git a/composer.lock b/composer.lock
diff --git a/src/TwigRenderer.php b/src/TwigRenderer.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace BasaltInc\TwigRenderer;
+namespace BasaltInc;
 
 use Twig\Environment;
 use Twig\Loader\ArrayLoader;

diff --git a/src/server--async.php b/src/server--async.php
@@ -2,15 +2,15 @@
 
 declare(strict_types=1);
 
-use BasaltInc\TwigRenderer\TwigRenderer;
+use BasaltInc\TwigRenderer;
 use Psr\Http\Message\ServerRequestInterface;
 use React\EventLoop\Loop;
 use React\Http\Response;
 use React\Http\Server;
 use React\Promise\Promise;
 use React\Socket\SocketServer;
 
-require __DIR__.'/../vendor/autoload.php';
+require_once dirname(__DIR__).'/vendor/autoload.php';
 
 // CLI args
 $port = $argv[1];

diff --git a/src/server--sync.php b/src/server--sync.php
@@ -4,9 +4,9 @@
 
 // WARNING: not tested nor supported (though it's very close to working) - actual support is on `server--async.php`.
 
-require dirname(__DIR__).'/vendor/autoload.php';
+use BasaltInc\TwigRenderer;
 
-use BasaltInc\TwigRenderer\TwigRenderer;
+require dirname(__DIR__).'/vendor/autoload.php';
 
 // HTTP Status Codes Used
 // 200 OK - The standard response for successful HTTP requests.