Merge pull request #29 from bc-luke/bump-composer

PHPMNT-100 Bump injector

Author: bc-luke

.phpstan/baseline.neon

@@ -89,8 +89,3 @@ parameters:
 			message: "#^Unable to resolve the template type T in call to method Prophecy\\\\Prophet\\:\\:prophesize\\(\\)$#"
 			count: 1
 			path: ../src/ProphecyMockingContainer.php
-
-		-
-			message: "#^Static property Bigcommerce\\\\MockInjector\\\\StaticArrayServiceCache\\:\\:\\$cache \\(Bigcommerce\\\\Injector\\\\Cache\\\\ArrayServiceCache\\) in isset\\(\\) is not nullable\\.$#"
-			count: 1
-			path: ../src/StaticArrayServiceCache.php

composer.json

@@ -23,7 +23,7 @@
     "prefer-stable": true,
     "require": {
         "php": "^8.1",
-        "bigcommerce/injector": "^3.0",
+        "bigcommerce/injector": "^4.1",
         "phpspec/prophecy-phpunit": "^2.0",
         "phpunit/phpunit": " ^10.0"
     },

src/MockInjector.php

@@ -1,9 +1,8 @@
 <?php
 namespace Bigcommerce\MockInjector;
 
-use Bigcommerce\Injector\Injector;
+use Bigcommerce\Injector\InjectorFactory;
 use Bigcommerce\Injector\InjectorInterface;
-use Bigcommerce\Injector\Reflection\ParameterInspector;
 use Prophecy\Exception\Prediction\AggregateException;
 use Prophecy\Prophecy\ObjectProphecy;
 use Prophecy\Prophet;
@@ -39,10 +38,7 @@ public function __construct(
     ) {
         $this->mockingContainer = $mockingContainer ?? new ProphecyMockingContainer(new Prophet());
         if (!$injector) {
-            $injector = new Injector(
-                $this->mockingContainer,
-                new ParameterInspector(new StaticArrayServiceCache())
-            );
+            $injector = InjectorFactory::create($this->mockingContainer, serviceCache: new StaticArrayServiceCache());
         }
         $this->injector = $injector;
     }

src/StaticArrayServiceCache.php

@@ -9,10 +9,12 @@
  * Test only "singleton" for MockInjector reflection.
  * This allows reflection between separate instances of the MockInjector created for each unit test (which otherwise
  * causes unnecessary reflection of classes that have already been inspected).
+ *
+ * @template T
  */
 class StaticArrayServiceCache implements ServiceCacheInterface
 {
-    /** @var  ArrayServiceCache */
+    /** @var ArrayServiceCache<T>|null */
     public static $cache;
     public function __construct()
     {
@@ -25,9 +27,9 @@ public function __construct()
      * Retrieve the value of a key in the cache.
      *
      * @param string $key
-     * @return mixed|false cached value or false when key not present in a cache
+     * @return T|false cached value or false when key not present in a cache
      */
-    public function get($key)
+    public function get(string $key): mixed
     {
         return self::$cache->get($key);
     }
@@ -36,10 +38,10 @@ public function get($key)
      * Save a key/value pair to the cache.
      *
      * @param string $key
-     * @param mixed $value
+     * @param T $value
      * @return void
      */
-    public function set($key, $value)
+    public function set(string $key, mixed $value)
     {
         self::$cache->set($key, $value);
     }
@@ -50,8 +52,19 @@ public function set($key, $value)
      * @param string $key
      * @return void
      */
-    public function remove($key)
+    public function remove($key): void
     {
         self::$cache->remove($key);
     }
+
+    /**
+     * Check if a key exists in the cache.
+     *
+     * @param string $key
+     * @return bool
+     */
+    public function has(string $key): bool
+    {
+        return self::$cache->has($key);
+    }
 }