Merge branch 'M1ke-preceeding-slash' into 4.x

thephpleague · Nov 10, 2024 · dcfc926 · dcfc926
2 parents e29dbde + 493b6b8
commit dcfc926
Show file tree

Hide file tree

Showing 4 changed files with 54 additions and 1 deletion.
diff --git a/src/Definition/Definition.php b/src/Definition/Definition.php
@@ -67,6 +67,8 @@ class Definition implements ArgumentResolverInterface, DefinitionInterface
      */
     public function __construct(string $id, $concrete = null)
     {
+        $id = Util::normalizeAlias($id);
+
         $concrete = $concrete ?? $id;
         $this->alias    = $id;
         $this->concrete = $concrete;
@@ -85,6 +87,8 @@ public function hasTag(string $tag): bool
 
     public function setAlias(string $id): DefinitionInterface
     {
+        $id = Util::normalizeAlias($id);
+
         $this->alias = $id;
         return $this;
     }

diff --git a/src/Definition/DefinitionAggregate.php b/src/Definition/DefinitionAggregate.php
@@ -43,6 +43,8 @@ public function addShared(string $id, $definition): DefinitionInterface
 
     public function has(string $id): bool
     {
+        $id = Util::normalizeAlias($id);
+
         foreach ($this->getIterator() as $definition) {
             if ($id === $definition->getAlias()) {
                 return true;
@@ -65,6 +67,8 @@ public function hasTag(string $tag): bool
 
     public function getDefinition(string $id): DefinitionInterface
     {
+        $id = Util::normalizeAlias($id);
+
         foreach ($this->getIterator() as $definition) {
             if ($id === $definition->getAlias()) {
                 return $definition->setContainer($this->getContainer());

diff --git a/src/Definition/Util.php b/src/Definition/Util.php
@@ -0,0 +1,17 @@
+<?php
+
+declare(strict_types=1);
+
+namespace League\Container\Definition;
+
+class Util
+{
+    public static function normalizeAlias(string $alias): string
+    {
+        if (strpos($alias, '\\') === 0) {
+            return substr($alias, 1);
+        }
+
+        return $alias;
+    }
+}
diff --git a/tests/Definition/DefinitionAggregateTest.php b/tests/Definition/DefinitionAggregateTest.php
@@ -5,7 +5,7 @@
 namespace League\Container\Test\Definition;
 
 use League\Container\Container;
-use League\Container\Definition\{DefinitionAggregate, DefinitionInterface};
+use League\Container\Definition\{Definition, DefinitionAggregate, DefinitionInterface};
 use League\Container\Exception\NotFoundException;
 use League\Container\Test\Asset\Foo;
 use PHPUnit\Framework\TestCase;
@@ -228,4 +228,32 @@ public function testAggregateThrowsExceptionWhenCannotResolve(): void
 
         $aggregate->resolveNew('alias');
     }
+
+    public function testDefinitionPreceedingSlash(): void
+    {
+        $container   = $this->getMockBuilder(Container::class)->getMock();
+        $aggregate   = new DefinitionAggregate();
+        $aggregate->setContainer($container);
+
+        $some_class = "\\League\\Container\\Test\\Asset\\Foo";
+        $aggregate->add($some_class, null);
+
+        $definition = $aggregate->getDefinition(Foo::class);
+
+        self::assertInstanceOf(Definition::class, $definition);
+    }
+
+    public function testGetPreceedingSlash(): void
+    {
+        $container   = $this->getMockBuilder(Container::class)->getMock();
+        $aggregate   = new DefinitionAggregate();
+        $aggregate->setContainer($container);
+
+        $some_class = Foo::class;
+        $aggregate->add($some_class, null);
+
+        $definition = $aggregate->getDefinition("\\League\\Container\\Test\\Asset\\Foo");
+
+        self::assertInstanceOf(Definition::class, $definition);
+    }
 }