WIP: Version 2

composer.json

@@ -23,27 +23,24 @@
         "sort-packages": true
     },
     "suggest": {
-        "makise-co/postgres": "To work with modern PostgreSQL Coroutine driver",
         "makise-co/orm-bundle": "To work with modern ORM",
-        "makise-co/postgres-spiral-driver": "To work with modern DBAL"
+        "makise-co/http": "To run HTTP server",
+        "makise-co/auth": "To authenticate/authrize HTTP requests"
     },
     "require": {
         "php": "^7.4",
         "ext-json": "*",
         "ext-swoole": "^4.4",
-        "laminas/laminas-diactoros": "^2.4",
-        "makise-co/http-router": "^1.0",
         "monolog/monolog": "^2.0",
         "nunomaduro/collision": "^4.1",
         "php-di/php-di": "^6.1",
         "psr/log": "^1.1",
         "symfony/console": "^5.0",
         "symfony/event-dispatcher": "^5.0",
         "symfony/finder": "^5.0",
-        "symfony/http-foundation": "^5.0",
         "symfony/property-access": "^5.0",
         "symfony/var-dumper": "^5.0",
-        "vlucas/phpdotenv": "^4.1"
+        "vlucas/phpdotenv": "^5.0"
     },
     "require-dev": {
         "phpstan/phpstan": "^0.12.18",
@@ -53,7 +50,8 @@
     },
     "autoload": {
         "psr-4": {
-            "MakiseCo\\": "src/"
+            "MakiseCo\\": "src/",
+            "MakiseCo\\Tests\\": "tests/"
         },
         "files": [
             "src/Env/functions.php"

phpunit.xml → phpunit.xml.dist

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit backupGlobals="false"
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         backupGlobals="false"
          backupStaticAttributes="false"
          beStrictAboutTestsThatDoNotTestAnything="false"
          bootstrap="vendor/autoload.php"
@@ -11,17 +12,17 @@
          stopOnError="false"
          stopOnFailure="false"
          verbose="true"
->
+         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
+    <coverage processUncoveredFiles="true">
+        <include>
+            <directory suffix=".php">./src</directory>
+        </include>
+    </coverage>
     <testsuites>
         <testsuite name="Makise-Co Test Suite">
             <directory suffix="Test.php">./tests</directory>
         </testsuite>
     </testsuites>
-    <filter>
-        <whitelist processUncoveredFilesFromWhitelist="true">
-            <directory suffix=".php">./src</directory>
-        </whitelist>
-    </filter>
     <php>
 
     </php>

src/Application.php

@@ -11,10 +11,6 @@
 namespace MakiseCo;
 
 use DI\Container;
-use Dotenv\Repository\Adapter\EnvConstAdapter;
-use Dotenv\Repository\Adapter\PutenvAdapter;
-use Dotenv\Repository\Adapter\ServerConstAdapter;
-use Dotenv\Repository\RepositoryBuilder;
 use MakiseCo\Config\ConfigRepositoryInterface;
 use MakiseCo\Config\Repository;
 use MakiseCo\Env\Env;
@@ -102,36 +98,26 @@ protected function bootDi(): void
         $this->container->set(ApplicationInterface::class, $this);
         // alias to ApplicationInterface
         $this->container->set(self::class, \DI\get(ApplicationInterface::class));
+        // add services bootstrapper
+        $this->container->set(Bootstrapper::class, new Bootstrapper());
     }
 
     protected function bootEnv(): void
     {
-        $repository = RepositoryBuilder::create()
-            ->withReaders([new EnvConstAdapter, new PutenvAdapter, new ServerConstAdapter])
-            ->withWriters([new EnvConstAdapter, new PutenvAdapter, new ServerConstAdapter])
+        $repository = \Dotenv\Repository\RepositoryBuilder::createWithDefaultAdapters()
             ->make();
 
         Env::setRepository($repository);
 
-        $dotenv = \Dotenv\Dotenv::create(
-            $repository,
-            [$this->appDir . DIRECTORY_SEPARATOR],
-            ['.env'],
-            true
-        );
-
-        $dotenv->safeLoad();
-
-        // load env-scoped variables
-        $env = Env::get('APP_ENV', null);
-        if (null !== $env) {
-            \Dotenv\Dotenv::create(
-                $repository,
-                [$this->appDir . DIRECTORY_SEPARATOR],
-                [".env.{$env}"],
-                true
-            )->safeLoad();
+        $envFile = '.env';
+
+        if (($input = new ArgvInput)->hasParameterOption('--env')) {
+            $envFile .= ".{$input->getParameterOption('--env')}";
+        } elseif (!empty($env = $repository->get('APP_ENV'))) {
+            $envFile .= ".{$env}";
         }
+
+        \Dotenv\Dotenv::create($repository, [$this->appDir], [$envFile])->safeLoad();
     }
 
     protected function bootConfig(): void
@@ -205,6 +191,6 @@ protected function bootCommands(): void
 
     public function getVersion(): string
     {
-        return '1.0.3';
+        return '2.0.0';
     }
 }