Merge pull request #50 from bigcommerce/revert-48-findable-container

Revert "Add findable container for single-lookup dependency resolution"

Author: TomA-R

src/Adapter/ArrayContainerAdapter.php

@@ -2,15 +2,15 @@
 namespace Bigcommerce\Injector\Adapter;
 
 use Bigcommerce\Injector\Adapter\Exception\ServiceNotFoundException;
-use Bigcommerce\Injector\FindableContainerInterface;
 use Psr\Container\ContainerExceptionInterface;
+use Psr\Container\ContainerInterface;
 use Psr\Container\NotFoundExceptionInterface;
 
 /**
  * Adapt a simple array container (i.e Pimple) to ContainerInterop Interface
  * @package Bigcommerce\Injector\Adapter
  */
-class ArrayContainerAdapter implements FindableContainerInterface
+class ArrayContainerAdapter implements ContainerInterface
 {
     /**
      * @var array|\ArrayAccess
@@ -56,17 +56,4 @@ public function has($id): bool
     {
         return isset($this->arrayContainer[$id]);
     }
-
-    /**
-     * Return the entry for the given id, or NULL if it isn't in the container. A single lookup, so callers can skip the
-     * separate ->has() call. Matches ->has()/->get(): a stored null is treated as absent (isset semantics), so a
-     * present entry is never NULL
-     *
-     * @param string $id
-     * @return mixed
-     */
-    public function find(string $id): mixed
-    {
-        return $this->arrayContainer[$id] ?? null;
-    }
 }

src/FindableContainerInterface.php

@@ -43,16 +43,8 @@ class Injector implements InjectorInterface
      */
     private array $autoCreateCache = [];
 
-    /**
-     * The container as a FindableContainerInterface when it supports find(), else NULL. Lets us resolve a dependency in
-     * a single lookup instead of ->has() + ->get(). Resolved once in the constructor as it can't change for a given
-     * container
-     */
-    private readonly ?FindableContainerInterface $findableContainer;
-
     public function __construct(private readonly ContainerInterface $container, private readonly ClassInspectorInterface $classInspector)
     {
-        $this->findableContainer = $container instanceof FindableContainerInterface ? $container : null;
     }
 
     /**
@@ -252,12 +244,7 @@ private function buildParameterArrayFromContainer($methodSignature)
             }
             $type = $parameterData['type'] ?? false;
             if ($type) {
-                $service = $this->findableContainer?->find($type);
-                if ($service !== null) {
-                    $parameters[$position] = $service;
-                    continue;
-                }
-                if ($this->findableContainer === null && $this->container->has($type)) {
+                if ($this->container->has($type)) {
                     $parameters[$position] = $this->container->get($type);
                     continue;
                 }
@@ -317,12 +304,7 @@ private function resolveParameter($position, $parameterData, &$providedParameter
                 unset($providedParameters[$type]);
                 return $result;
             }
-            $service = $this->findableContainer?->find($type);
-            if ($service !== null) {
-                // Found the dependency by type in the container
-                return $service;
-            }
-            if ($this->findableContainer === null && $this->container->has($type)) {
+            if ($this->container->has($type)) {
                 // Found the dependency by type in the container
                 return $this->container->get($type);
             }

src/Injector.php

@@ -1,7 +1,6 @@
 <?php
 namespace Tests;
 
-use Bigcommerce\Injector\Adapter\ArrayContainerAdapter;
 use Bigcommerce\Injector\Exception\InjectorInvocationException;
 use Bigcommerce\Injector\Injector;
 use Bigcommerce\Injector\Reflection\ClassInspector;
@@ -246,42 +245,6 @@ public function testAutoCreate()
         $this->assertEquals(25, $instance->getAge());
     }
 
-    public function testResolvesDependencyFromFindableContainer()
-    {
-        $dep = new DummySubDependency();
-        $this->mockDummyDependencySignature();
-
-        $injector = new Injector(
-            new ArrayContainerAdapter([DummySubDependency::class => $dep]),
-            $this->inspector->reveal()
-        );
-
-        $instance = $injector->create(DummyDependency::class);
-        $this->assertSame($dep, $instance->getDependency());
-    }
-
-    public function testFindableContainerAutoCreatesWhenDependencyAbsent()
-    {
-        $this->mockDummyDependencySignature();
-        $this->mockDummySubDependencySignature();
-
-        $injector = new Injector(new ArrayContainerAdapter([]), $this->inspector->reveal());
-        $injector->addAutoCreate(".*DummySubDependency");
-
-        $instance = $injector->create(DummyDependency::class);
-        $this->assertInstanceOf(DummySubDependency::class, $instance->getDependency());
-    }
-
-    public function testFindableContainerThrowsForMissingRequiredDependency()
-    {
-        $this->mockDummyDependencySignature();
-
-        $injector = new Injector(new ArrayContainerAdapter([]), $this->inspector->reveal());
-
-        $this->expectException(InjectorInvocationException::class);
-        $injector->create(DummyDependency::class);
-    }
-
     /**
      * Injector fails to create a sub-dependency. Should provided a wrapped stack exception message guiding
      * developers where to find the issue.