Fix issue with Reflection types, upgrade to phpunit 9

Author: Robin de Graaf

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Parable PHP DI
 
+## 0.3.1
+
+_Fixes_
+- Small fix for the new php8 reflection types.
+
 ## 0.3.0
 
 _Changes_

Makefile

@@ -9,11 +9,7 @@ tests: dependencies
 
 coverage: dependencies
 	rm -rf ./coverage
-	vendor/bin/phpunit --coverage-html ./coverage tests
+	XDEBUG_MODE=coverage vendor/bin/phpunit --coverage-html ./coverage tests
 
 tests-clean:
 	vendor/bin/phpunit --verbose tests
-
-coverage-clean:
-	rm -rf ./coverage
-	vendor/bin/phpunit --coverage-html ./coverage tests

composer.json

@@ -16,7 +16,7 @@
     "php": ">=8.0"
   },
   "require-dev": {
-    "phpunit/phpunit": "^8.0"
+    "phpunit/phpunit": "^9.0"
   },
   "autoload": {
     "psr-4": {

phpunit.xml

@@ -1,20 +1,13 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.4/phpunit.xsd"
-         backupGlobals="false"
-         backupStaticAttributes="false"
-         beStrictAboutTestsThatDoNotTestAnything="true"
-         beStrictAboutOutputDuringTests="true"
-         colors="true"
-         cacheResult="false"
-    >
-    <php>
-        <ini name="memory_limit" value="1024M" />
-        <ini name="display_errors" value="stdout" />
-        <ini name="error_log" value="/dev/null" />
-    </php>
-    <filter>
-        <whitelist processUncoveredFilesFromWhitelist="true">
-            <directory suffix=".php">./src</directory>
-        </whitelist>
-    </filter>
-</phpunit>
+<?xml version="1.0" encoding="UTF-8"?>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd" backupGlobals="false" backupStaticAttributes="false" beStrictAboutTestsThatDoNotTestAnything="true" beStrictAboutOutputDuringTests="true" colors="true" cacheResult="false">
+  <coverage processUncoveredFiles="true">
+    <include>
+      <directory suffix=".php">./src</directory>
+    </include>
+  </coverage>
+  <php>
+    <ini name="memory_limit" value="1024M"/>
+    <ini name="display_errors" value="stdout"/>
+    <ini name="error_log" value="/dev/null"/>
+  </php>
+</phpunit>

src/Container.php

@@ -28,11 +28,9 @@ public function __construct()
     }
 
     /**
-     * Returns a stored instance or creates a new one and stores it.
-     *
      * @throws ContainerException
      */
-    public function get(string $name)
+    public function get(string $name): object
     {
         $name = $this->getDefinitiveName($name);
 
@@ -54,12 +52,19 @@ public function has(string $name): bool
         return isset($this->instances[$name]);
     }
 
+    public function assertHas(string $name): void
+    {
+        if (!$this->has($name)) {
+            throw NotFoundException::fromName($name);
+        }
+    }
+
     /**
      * Build a new instance with stored dependencies.
      *
      * @throws ContainerException
      */
-    public function build(string $name)
+    public function build(string $name): object
     {
         return $this->createInstance($name, self::USE_STORED_DEPENDENCIES);
     }
@@ -69,7 +74,7 @@ public function build(string $name)
      *
      * @throws ContainerException
      */
-    public function buildAll(string $name)
+    public function buildAll(string $name): object
     {
         return $this->createInstance($name, self::USE_NEW_DEPENDENCIES);
     }
@@ -79,7 +84,7 @@ public function buildAll(string $name)
      *
      * @throws ContainerException
      */
-    protected function createInstance(string $name, int $useStoredDependencies)
+    protected function createInstance(string $name, int $useStoredDependencies): object
     {
         $name = $this->getDefinitiveName($name);
 
@@ -92,8 +97,8 @@ protected function createInstance(string $name, int $useStoredDependencies)
 
         try {
             $dependencies = $this->getDependenciesFor($name, $useStoredDependencies);
-        } catch (Throwable $e) {
-            throw new ContainerException($e->getMessage());
+        } catch (Throwable $t) {
+            throw new ContainerException($t->getMessage(), $t->getCode(), $t);
         }
 
         return new $name(...$dependencies);
@@ -120,6 +125,7 @@ protected function getMapIfExists(string $requested): string
      * Get the dependencies for an instance, based on the constructor.
      * Optionally use stored dependencies or always create new ones.
      *
+     * @return mixed[]
      * @throws ContainerException
      */
     public function getDependenciesFor(
@@ -135,10 +141,14 @@ public function getDependenciesFor(
              */
             $reflection = @new ReflectionClass($name);
         } catch (Throwable $t) {
-            throw new ContainerException(sprintf(
-                'Could not create instance for class `%s`.',
-                $name
-            ));
+            throw new ContainerException(
+                sprintf(
+                    'Could not create instance for class `%s`.',
+                    $name
+                ),
+                $t->getCode(),
+                $t
+            );
         }
 
         $constructor = $reflection->getConstructor();
@@ -153,15 +163,17 @@ public function getDependenciesFor(
         foreach ($parameters as $parameter) {
             $type = $parameter->getType();
 
+            $builtIn = false;
+
             if ($type instanceof ReflectionNamedType) {
                 $builtIn = $type->isBuiltin();
-            } else {
-                $builtIn = false;
             }
 
-            $class = $parameter->getType() && $builtIn === false
-                ? new ReflectionClass($parameter->getType()->getName())
-                : null;
+            $class = null;
+
+            if ($parameter->getType() instanceof ReflectionNamedType && $builtIn === false) {
+                $class = new ReflectionClass($parameter->getType()->getName());
+            }
 
             if ($class === null) {
                 if (!$parameter->isOptional()) {
@@ -173,6 +185,7 @@ public function getDependenciesFor(
 
                 $dependencies[] = $parameter->getDefaultValue();
 
+                // For the foreach loop
                 continue;
             }
 
@@ -196,15 +209,11 @@ public function getDependenciesFor(
     }
 
     /**
-     * Store the provided instance with the provided id, or the class name of the object.
+     * Store the provided instance with the provided name, or the class name of the object.
      */
-    public function store($instance, string $name = null): void
+    public function store(object $instance, string $name = null): void
     {
-        if ($name === null) {
-            $name = get_class($instance);
-        }
-
-        $name = $this->getDefinitiveName($name);
+        $name = $this->getDefinitiveName($name ?? $instance::class);
 
         $this->instances[$name] = $instance;
     }
@@ -218,9 +227,7 @@ public function clear(string $name): void
     {
         $name = $this->getDefinitiveName($name);
 
-        if (!$this->has($name)) {
-            throw NotFoundException::fromId($name);
-        }
+        $this->assertHas($name);
 
         unset($this->instances[$name]);
 
@@ -238,12 +245,11 @@ public function clear(string $name): void
     public function clearExcept(array $keep): void
     {
         $kept = [];
+
         foreach ($keep as $name) {
             $name = $this->getDefinitiveName($name);
 
-            if (!$this->has($name)) {
-                throw NotFoundException::fromId($name);
-            }
+            $this->assertHas($name);
 
             $kept[$name] = $this->get($name);
         }
@@ -269,7 +275,10 @@ protected function storeRelationship(string $class, string $dependency): void
     {
         $this->relationships[$class][$dependency] = true;
 
-        if (isset($this->relationships[$class][$dependency]) && isset($this->relationships[$dependency][$class])) {
+        if (isset(
+            $this->relationships[$class][$dependency],
+            $this->relationships[$dependency][$class]
+        )) {
             throw new ContainerException(sprintf(
                 'Cyclical dependency found between `%s` and `%s`.',
                 $class,

src/Exceptions/NotFoundException.php

@@ -6,7 +6,7 @@
 
 class NotFoundException extends Exception
 {
-    public static function fromId(string $id)
+    public static function fromName(string $id)
     {
         return new self(sprintf(
             "No instance found stored for `%s`.",