fix(container): ensure has() returns false on circular aliases to satisfy PSR-11

Author: Fahl-Design

src/Container/SimpleContainer.php

@@ -10,6 +10,7 @@
 use function is_int;
 use function is_string;
 use Psr\Container\ContainerInterface;
+use Webmozart\Assert\Assert;
 use WebProject\PhpOpenApiMockServer\Container\Exception\ContainerException;
 use WebProject\PhpOpenApiMockServer\Container\Exception\NotFoundException;
 
@@ -33,7 +34,8 @@ final class SimpleContainer implements ContainerInterface
 
     public function get(string $id): mixed
     {
-        $resolved = $this->resolveAlias($id);
+        $resolved = $this->resolveAlias($id, true);
+        Assert::string($resolved);
 
         if (array_key_exists($resolved, $this->services)) {
             return $this->services[$resolved];
@@ -78,7 +80,11 @@ public function get(string $id): mixed
 
     public function has(string $id): bool
     {
-        $resolved = $this->resolveAlias($id);
+        $resolved = $this->resolveAlias($id, false);
+
+        if (null === $resolved) {
+            return false;
+        }
 
         return array_key_exists($resolved, $this->services) || isset($this->factories[$resolved]);
     }
@@ -142,13 +148,17 @@ public function setInvokableClass(string $name, string $class): void
         $this->factories[$name] = static fn (): object => new $class();
     }
 
-    private function resolveAlias(string $id): string
+    private function resolveAlias(string $id, bool $throwOnCircular = true): ?string
     {
         $seen = [];
 
         while (isset($this->aliases[$id])) {
             if (isset($seen[$id])) {
-                throw new ContainerException("Circular alias detected for '{$id}'.");
+                if ($throwOnCircular) {
+                    throw new ContainerException("Circular alias detected for '{$id}'.");
+                }
+
+                return null;
             }
 
             $seen[$id] = true;

tests/Unit/SimpleContainerTest.php

@@ -0,0 +1,40 @@
+<?php
+
+declare(strict_types=1);
+
+namespace WebProject\PhpOpenApiMockServer\Tests\Unit;
+
+use Codeception\Test\Unit;
+use WebProject\PhpOpenApiMockServer\Container\Exception\ContainerException;
+use WebProject\PhpOpenApiMockServer\Container\SimpleContainer;
+use WebProject\PhpOpenApiMockServer\Tests\Support\UnitTester;
+
+class SimpleContainerTest extends Unit
+{
+    /**
+     * @var UnitTester
+     */
+    protected $tester;
+
+    public function testHasReturnsFalseOnCircularAlias(): void
+    {
+        $container = new SimpleContainer();
+        $container->setAlias('a', 'b');
+        $container->setAlias('b', 'a');
+
+        // Current behavior: this throws ContainerException
+        // Desired behavior: this returns false
+        self::assertFalse($container->has('a'));
+    }
+
+    public function testGetThrowsOnCircularAlias(): void
+    {
+        $container = new SimpleContainer();
+        $container->setAlias('a', 'b');
+        $container->setAlias('b', 'a');
+
+        $this->expectException(ContainerException::class);
+        $this->expectExceptionMessage("Circular alias detected for 'a'.");
+        $container->get('a');
+    }
+}