Merge pull request #18 from hyperf/feature-dependiences

Fixed custom dependencies do not work.

Author: limingxinleo

CHANGELOG.md

@@ -1,3 +1,5 @@
 # v1.0.3 - TBD
 
+## Fixed
 
+- [#18](https://github.com/hyperf/nano/pull/18) Fixed custom dependencies do not work.

example/index.php

@@ -19,15 +19,22 @@
 
 require_once __DIR__ . '/../vendor/autoload.php';
 
-class Foo
+interface FooInterface
 {
-    public function bar()
+    public function bar(): string;
+}
+
+class Foo implements FooInterface
+{
+    public function bar(): string
     {
         return 'bar';
     }
 }
 
-$app = AppFactory::createBase();
+$app = AppFactory::createBase('0.0.0.0', 9501, [
+    FooInterface::class => Foo::class,
+]);
 $app->config([
     'server' => [
         'settings' => [
@@ -60,6 +67,11 @@ public function bar()
     return $foo->bar();
 });
 
+$app->get('/foo', function () {
+    /* @var ContainerProxy $this */
+    return $this->get(FooInterface::class)->bar();
+});
+
 $app->get('/middleware', function () {
     return $this->request->getAttribute('key');
 });

src/Factory/AppFactory.php

@@ -32,9 +32,9 @@ class AppFactory
     /**
      * Create an application.
      */
-    public static function create(string $host = '0.0.0.0', int $port = 9501): App
+    public static function create(string $host = '0.0.0.0', int $port = 9501, array $dependencies = []): App
     {
-        $app = self::createApp();
+        $app = self::createApp($dependencies);
         $app->config([
             'server' => Preset::default(),
             'server.servers.0.host' => $host,
@@ -47,9 +47,9 @@ public static function create(string $host = '0.0.0.0', int $port = 9501): App
     /**
      * Create a single worker application in base mode, with max_requests = 0.
      */
-    public static function createBase(string $host = '0.0.0.0', int $port = 9501): App
+    public static function createBase(string $host = '0.0.0.0', int $port = 9501, array $dependencies = []): App
     {
-        $app = self::createApp();
+        $app = self::createApp($dependencies);
         $app->config([
             'server' => Preset::base(),
             'server.servers.0.host' => $host,
@@ -59,7 +59,21 @@ public static function createBase(string $host = '0.0.0.0', int $port = 9501): A
         return $app;
     }
 
-    protected static function prepareContainer(): ContainerInterface
+    /**
+     * Create an application with a chosen preset.
+     */
+    public static function createApp(array $dependencies = []): App
+    {
+        // Setting ini and flags
+        self::prepareFlags();
+
+        // Prepare container
+        $container = self::prepareContainer($dependencies);
+
+        return new App($container);
+    }
+
+    protected static function prepareContainer(array $dependencies = []): ContainerInterface
     {
         $config = new Config(ProviderConfig::load());
         $config->set(StdoutLoggerInterface::class, [
@@ -74,7 +88,8 @@ protected static function prepareContainer(): ContainerInterface
                 LogLevel::WARNING,
             ],
         ]);
-        $container = new Container(new DefinitionSource($config->get('dependencies')));
+        $dependencies = array_merge($config->get('dependencies', []), $dependencies);
+        $container = new Container(new DefinitionSource($dependencies));
         $container->set(ConfigInterface::class, $config);
         $container->define(DispatcherFactory::class, DispatcherFactory::class);
         $container->define(BoundInterface::class, ContainerProxy::class);
@@ -96,18 +111,4 @@ protected static function prepareFlags(int $hookFlags = SWOOLE_HOOK_ALL)
         ! defined('BASE_PATH') && define('BASE_PATH', $projectRootPath);
         ! defined('SWOOLE_HOOK_FLAGS') && define('SWOOLE_HOOK_FLAGS', $hookFlags);
     }
-
-    /**
-     * Create an application with a chosen preset.
-     */
-    protected static function createApp(): App
-    {
-        // Setting ini and flags
-        self::prepareFlags();
-
-        // Prepare container
-        $container = self::prepareContainer();
-
-        return new App($container);
-    }
 }

tests/Cases/Http/ContainerTest.php

@@ -0,0 +1,35 @@
+<?php
+
+declare(strict_types=1);
+/**
+ * This file is part of Hyperf Nano.
+ *
+ * @link     https://www.hyperf.io
+ * @document https://nano.hyperf.wiki
+ * @contact  [email protected]
+ * @license  https://github.com/hyperf/nano/blob/master/LICENSE
+ */
+namespace HyperfTest\Nano\Cases\Http;
+
+use HyperfTest\Nano\HttpTestCase;
+
+/**
+ * @internal
+ * @coversNothing
+ */
+class ContainerTest extends HttpTestCase
+{
+    public function testDi()
+    {
+        $response = $this->client()->get('/di');
+        $this->assertSame(200, $response->getStatusCode());
+        $this->assertSame('bar', $response->getBody()->getContents());
+    }
+
+    public function testDependencies()
+    {
+        $response = $this->client()->get('/foo');
+        $this->assertSame(200, $response->getStatusCode());
+        $this->assertSame('bar', $response->getBody()->getContents());
+    }
+}