Make autoloader service optional

aplus-framework · Jan 29, 2022 · e53face · e53face
1 parent 1e9b93a
commit e53face
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 1 deletion.
diff --git a/src/App.php b/src/App.php
@@ -116,7 +116,10 @@ protected function prepareToRun(array $options = []) : ?Router
             throw new LogicException('App is already running');
         }
         static::$isRunning = true;
-        $options['autoloader'] ??= 'default';
+        if ( ! isset($options['autoloader'])) {
+            $configs = static::config()->getInstances('autoloader');
+            $options['autoloader'] = isset($configs['default']) ? 'default' : false;
+        }
         if ($options['autoloader'] !== false) {
             static::autoloader($options['autoloader']);
         }

diff --git a/tests/AppTest.php b/tests/AppTest.php
@@ -171,6 +171,19 @@ public function testRunHttp() : void
         self::assertTrue(App::response()->isSent());
     }
 
+    public function testRunHttpWithOptions() : void
+    {
+        App::setIsCli(false);
+        \ob_start();
+        $this->app->runHttp([
+            'autoloader' => 'default',
+            'exceptions' => 'default',
+            'router' => 'default',
+        ]);
+        \ob_end_clean();
+        self::assertTrue(App::response()->isSent());
+    }
+
     public function testRunHttpWithInvalidRouterFile() : void
     {
         $file = __DIR__ . '/foobar.php';