Fix container behavior

Author: coisa

src/Container/ConfigContainer.php

@@ -20,11 +20,17 @@
 use Psr\Container\ContainerInterface;
 
 /**
- * Class ConfigContainer.
+ * Class ConfigContainer
  *
  * Provides a PSR-11 compatible container interface for accessing configuration values.
- * This container MAY be used in dependency injection systems where configuration keys
- * should be resolvable via standard container access.
+ *
+ * This container implementation SHALL resolve configuration keys by prefix using the alias "config".
+ * For example, a request for "config.db.host" will attempt to fetch the key "db.host" from the underlying ConfigInterface.
+ *
+ * Identifiers such as 'config', ConfigInterface::class, and the concrete config class MUST return the configuration instance itself.
+ * Requests for unknown or invalid identifiers MUST result in a ContainerNotFoundException.
+ *
+ * @package FastForward\Config\Container
  */
 final class ConfigContainer implements ContainerInterface
 {
@@ -37,52 +43,68 @@ final class ConfigContainer implements ContainerInterface
      * Constructs a new ConfigContainer instance.
      *
      * This constructor SHALL wrap an existing ConfigInterface instance and expose it
-     * through PSR-11 `get()` and `has()` methods.
+     * through PSR-11 `get()` and `has()` methods with namespace-style key resolution.
      *
-     * @param ConfigInterface $config the configuration instance to expose as a container
+     * @param ConfigInterface $config The configuration instance to expose as a container.
      */
     public function __construct(
         private ConfigInterface $config,
     ) {}
 
     /**
-     * Determines if the container can return an entry for the given identifier.
+     * Determines whether the container can return an entry for the given identifier.
      *
-     * @param string $id identifier of the entry to look for
+     * This method SHALL return true if:
+     * - The identifier matches known internal bindings (alias, interface, or class).
+     * - The identifier is prefixed with 'config' and corresponds to an existing key in the configuration.
      *
-     * @return bool TRUE if the entry is known or exists in the configuration, FALSE otherwise
+     * @param string $id Identifier of the entry to look for.
+     * @return bool True if the entry can be resolved; false otherwise.
      */
     public function has(string $id): bool
     {
-        return $this->isResolvedByContainer($id)
-            || $this->config->has($id);
+        if ($this->isResolvedByContainer($id)) {
+            return true;
+        }
+
+        if (!str_starts_with($id, self::ALIAS)) {
+            return false;
+        }
+
+        return $this->config->has(mb_substr($id, mb_strlen(self::ALIAS) + 1));
     }
 
     /**
      * Retrieves an entry of the container by its identifier.
      *
-     * If the ID matches the container itself or the config class, it SHALL return itself.
-     * Otherwise, it SHALL retrieve the value from the configuration.
-     * If the key is not found, it MUST throw a ContainerNotFoundException.
-     *
-     * @param string $id identifier of the entry to retrieve
+     * This method SHALL resolve identifiers in the following order:
+     * - If the identifier matches 'config', ConfigInterface::class, or the concrete config class,
+     *   it SHALL return the ConfigInterface instance itself.
+     * - If the identifier is prefixed with 'config.', the suffix SHALL be used to query the configuration.
+     *   If the configuration key exists, its value SHALL be returned.
+     * - If the identifier cannot be resolved, a ContainerNotFoundException MUST be thrown.
      *
-     * @return mixed the value associated with the identifier
+     * @param string $id Identifier of the entry to retrieve.
+     * @return mixed The value associated with the identifier.
      *
-     * @throws ContainerNotFoundException if the identifier is not found
+     * @throws ContainerNotFoundException If the identifier cannot be resolved.
      */
     public function get(string $id)
     {
-        if ($id === self::class) {
+        if (self::class === $id) {
             return $this;
         }
 
         if ($this->isResolvedByContainer($id)) {
             return $this->config;
         }
 
-        if ($this->config->has($id)) {
-            return $this->config->get($id);
+        if (str_starts_with($id, self::ALIAS)) {
+            $id = mb_substr($id, mb_strlen(self::ALIAS) + 1);
+
+            if ($this->config->has($id)) {
+                return $this->config->get($id);
+            }
         }
 
         throw ContainerNotFoundException::forKey($id);
@@ -91,16 +113,13 @@ public function get(string $id)
     /**
      * Determines whether the given identifier is resolved internally by the container itself.
      *
-     * This method SHALL be used to check if the requested identifier corresponds to:
-     * - the container alias (e.g., 'config'),
-     * - the Config interface (`FastForward\Config\ConfigInterface`),
-     * - or the concrete configuration key.
-     *
-     * If any of these conditions match, the container MUST resolve the request by returning itself.
-     *
-     * @param string $id the identifier being checked for internal resolution
+     * This method SHALL match the identifier against:
+     * - the alias "config"
+     * - the ConfigInterface::class string
+     * - the concrete class of the injected configuration instance
      *
-     * @return bool TRUE if the container SHALL resolve the identifier itself; FALSE otherwise
+     * @param string $id The identifier to check.
+     * @return bool True if the identifier is resolved internally; false otherwise.
      */
     private function isResolvedByContainer(string $id): bool
     {

tests/Container/ConfigContainerTest.php

@@ -52,7 +52,7 @@ public function testHasReturnsTrueIfConfigContainsKey(): void
         $config    = new ArrayConfig([$key => $value]);
         $container = new ConfigContainer($config);
 
-        self::assertTrue($container->has($key));
+        self::assertTrue($container->has(ConfigContainer::ALIAS . '.' . $key));
     }
 
     #[Test]
@@ -70,9 +70,9 @@ public function testGetReturnsContainerForInternalIdentifiers(): void
         $config    = new ArrayConfig();
         $container = new ConfigContainer($config);
 
-        self::assertSame($container, $container->get(ConfigContainer::ALIAS));
-        self::assertSame($container, $container->get(ConfigInterface::class));
-        self::assertSame($container, $container->get($config::class));
+        self::assertSame($config, $container->get(ConfigContainer::ALIAS));
+        self::assertSame($config, $container->get(ConfigInterface::class));
+        self::assertSame($config, $container->get($config::class));
     }
 
     #[Test]
@@ -84,7 +84,7 @@ public function testGetReturnsConfigValueForKey(): void
         $config    = new ArrayConfig([$key => $value]);
         $container = new ConfigContainer($config);
 
-        self::assertSame($value, $container->get($key));
+        self::assertSame($value, $container->get(ConfigContainer::ALIAS . '.' . $key));
     }
 
     #[Test]