添加 alias

soliphp · May 15, 2018 · 6ffb1d1 · 6ffb1d1
1 parent edcb563
commit 6ffb1d1
Show file tree

Hide file tree

Showing 3 changed files with 95 additions and 1 deletion.
diff --git a/src/Di/Container.php b/src/Di/Container.php
@@ -34,6 +34,13 @@ class Container implements ContainerInterface, \ArrayAccess
  */
  protected $sharedInstances = [];
 
+ /**
+ * 别名列表
+ *
+ * @var array
+ */
+ public $aliases = [];
+
  /**
  * 初始化容器默认实例
  */
@@ -65,6 +72,8 @@ public static function instance()
  */
  public function set($id, $definition, $shared = true)
  {
+ unset($this->sharedInstances[$id], $this->aliases[$id]);
+
  $service = new Service($id, $definition, $shared);
  $this->services[$id] = $service;
  return $service;
@@ -81,6 +90,8 @@ public function set($id, $definition, $shared = true)
  */
  public function get($id, array $parameters = [])
  {
+ $id = $this->getAlias($id);
+
  // 如果是共享实例已解析，则返回
  if (isset($this->sharedInstances[$id])) {
  return $this->sharedInstances[$id];
@@ -112,6 +123,31 @@ public function get($id, array $parameters = [])
  return $instance;
  }
 
+ /**
+ * 为服务添加别名
+ *
+ * @param string $alias
+ * @param string $abstract
+ * @return void
+ */
+ public function alias($alias, $abstract)
+ {
+ $this->aliases[$abstract] = $alias;
+ }
+
+ public function getAlias($abstract)
+ {
+ if (!isset($this->aliases[$abstract])) {
+ return $abstract;
+ }
+
+ if ($this->aliases[$abstract] === $abstract) {
+ throw new \LogicException("[{$abstract}] is aliased to itself.");
+ }
+
+ return $this->getAlias($this->aliases[$abstract]);
+ }
+
  /**
  * 查询容器中是否存在某个服务
  *
@@ -120,7 +156,7 @@ public function get($id, array $parameters = [])
  */
  public function has($id)
  {
- return isset($this->services[$id]);
+ return isset($this->services[$id]) || isset($this->aliases[$id]);
  }
 
  /**
@@ -133,6 +169,7 @@ public function remove($id)
  {
  unset($this->services[$id]);
  unset($this->sharedInstances[$id]);
+ unset($this->aliases[$id]);
  }
 
  /**
@@ -144,6 +181,7 @@ public function clear()
  {
  $this->services = [];
  $this->sharedInstances = [];
+ $this->aliases = [];
  }
 
  // 实现 \ArrayAccess 方法

diff --git a/src/Di/ContainerInterface.php b/src/Di/ContainerInterface.php
@@ -31,6 +31,15 @@ public function set($id, $definition, $shared);
  */
  public function get($id);
 
+ /**
+ * 为服务添加别名
+ *
+ * @param string $alias
+ * @param string $abstract
+ * @return void
+ */
+ public function alias($alias, $abstract);
+
  /**
  * 查询容器中是否存在某个服务
  *

diff --git a/tests/Di/ContainerTest.php b/tests/Di/ContainerTest.php
@@ -219,4 +219,51 @@ public function testCannotResolved()
  {
  $this->container->get('notExistsService');
  }
+
+ public function testAlias()
+ {
+ $aliases = [
+ 'app' => [
+ \Soli\Application::class,
+ ],
+ 'container' => [
+ \Soli\Di\Container::class,
+ \Psr\Container\ContainerInterface::class,
+ ],
+ 'one' => [
+ 'two',
+ ],
+ 'two' => [
+ 'three',
+ ],
+ ];
+
+ $container = $this->container;
+ foreach ($aliases as $alias => $abstracts) {
+ foreach ($abstracts as $abstract) {
+ $container->alias($alias, $abstract);
+ }
+ }
+
+ $containerAlias = $container->getAlias(\Psr\Container\ContainerInterface::class);
+ $oneAlias = $container->getAlias('three');
+
+ $this->assertEquals('container', $containerAlias);
+ $this->assertEquals('one', $oneAlias);
+ }
+
+ /**
+ * @expectedException \Exception
+ * @expectedExceptionMessageRegExp /.+ is aliased to itself./
+ */
+ public function testAliasedItselfException()
+ {
+ $selfAlias = 'self_alias';
+
+ $container = $this->container;
+
+ $container->alias($selfAlias, $selfAlias);
+
+ $container->getAlias($selfAlias);
+ }
 }