alias check updates (#5)

* - update the DI to check the abstract aliases when calling the other isAvailable and hasShared methods

* - update the DI slighly to respect additional inputs correctly
 - add some unit tests for the new functions

* - missed this assert

Author: msievenpiper

src/DependencyInjector.php

@@ -192,11 +192,21 @@ public function share($abstract, $instance, $mode = self::MODE_MUTABLE)
   public function hasShared($abstract, ?string $checkMode = null): bool
   {
     $exists = isset($this->_instances[$abstract]);
+
+    if(!$exists && isset($this->_aliases[$abstract]))
+    {
+      return $this->hasShared($this->_aliases[$abstract][0], $checkMode);
+    }
+
     return !$exists || $checkMode === null ? $exists : $this->_instances[$abstract]['mode'] === $checkMode;
   }
 
   public function isAvailable($abstract, $shared = null): bool
   {
+    if(isset($this->_aliases[$abstract]))
+    {
+      return $this->isAvailable($this->_aliases[$abstract][0], $shared);
+    }
     if($shared === false)
     {
       return isset($this->_factories[$abstract]);

tests/DependencyInjectorTest.php

@@ -254,6 +254,45 @@ public function testResolve()
     static::assertEquals('dark apple', $result);
   }
 
+  public function testAliasIsAvailable()
+  {
+    $di = new DependencyInjector();
+
+    $this->assertFalse($di->isAvailable(CacheInterface::class));
+    $di->aliasAbstract(CacheInterface::class, Cache::class);
+    $this->assertFalse($di->isAvailable(CacheInterface::class));
+
+    $di->share(Cache::class, new Cache());
+    $this->assertTrue($di->isAvailable(CacheInterface::class));
+    $this->assertTrue($di->isAvailable(CacheInterface::class, true));
+    $this->assertFalse($di->isAvailable(CacheInterface::class, false));
+
+    $di2 = new DependencyInjector();
+    $di2->aliasAbstract(CacheInterface::class, Cache::class);
+    $di2->factory(Cache::class, fn() => new Cache());
+    $this->assertTrue($di2->isAvailable(CacheInterface::class, false));
+  }
+
+  public function testAliasHasShared()
+  {
+    $di = new DependencyInjector();
+    $di->aliasAbstract(CacheInterface::class, Cache::class);
+    $this->assertFalse($di->hasShared(CacheInterface::class));
+
+    $di->share(Cache::class, new Cache());
+    $this->assertTrue($di->hasShared(CacheInterface::class));
+  }
+
+  public function testAliasHasSharedWithCheckMode()
+  {
+    $di = new DependencyInjector();
+    $di->aliasAbstract(CacheInterface::class, Cache::class);
+    $di->share(Cache::class, new Cache(), DependencyInjector::MODE_IMMUTABLE);
+
+    $this->assertTrue($di->hasShared(CacheInterface::class, DependencyInjector::MODE_IMMUTABLE));
+    $this->assertFalse($di->hasShared(CacheInterface::class, DependencyInjector::MODE_MUTABLE));
+  }
+
   public function testAliasAbstract()
   {
     $di = new DependencyInjector();