feat: Php8.1 update.

Signed-off-by: Johannes Tegnér <johannes@jitesoft.com>

Author: Johannestegner

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2019 Jitesoft
+Copyright (c) Jitesoft
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

composer.json

@@ -3,13 +3,13 @@
     "description": "PSR-11 container with constructor injection.",
     "type": "library",
     "require": {
-        "php": ">=8",
+        "php": ">=8.1",
         "psr/container": "^2",
         "jitesoft/exceptions": "^2.4"
     },
     "require-dev": {
         "phpunit/phpunit": "^9.5",
-        "squizlabs/php_codesniffer": "^3.6"
+        "squizlabs/php_codesniffer": "^3.7"
     },
     "license": "MIT",
     "authors": [

composer.lock

@@ -2,13 +2,14 @@
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
   Container.php - Part of the container project.
 
-  © - Jitesoft 2017
+  © - Jitesoft
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 namespace Jitesoft\Container;
 
-use ArrayAccess;
 use Jitesoft\Exceptions\Psr\Container\ContainerException;
 use Jitesoft\Exceptions\Psr\Container\NotFoundException;
+use Psr\Container\ContainerExceptionInterface;
+use Psr\Container\NotFoundExceptionInterface;
 
 /**
  * Simple naive implementation of a Dependency container with constructor injection.
@@ -57,7 +58,7 @@ public function clear(): void {
      * @param boolean $singleton If the created object is intended to be treated as a single instance on creation.
      *
      * @return boolean
-     * @throws ContainerException Thrown in case the entry already exist.
+     * @throws ContainerException|ContainerExceptionInterface Thrown in case the entry already exist.
      */
     public function set(string $abstract,
                         mixed $concrete,
@@ -85,7 +86,8 @@ public function set(string $abstract,
      * @param mixed   $concrete  Concrete value to bind to the abstract value.
      * @param boolean $singleton If the created object is intended to be treated as a single instance on creation.
      *
-     * @throws NotFoundException Thrown in case the 'abstract' does not exist.
+     * @throws NotFoundException|NotFoundExceptionInterface Thrown in case the 'abstract' does not exist.
+     * @throws ContainerException|ContainerExceptionInterface Thrown in case entry could not be set.
      *
      * @return void
      */
@@ -104,13 +106,13 @@ public function rebind(string $abstract,
     /**
      * Unset a given abstract removing it from the container.
      *
-     * @param string $id Identifier of the value to remove entry for.
+     * @param string|mixed $id Identifier of the value to remove entry for.
      *
-     * @throws NotFoundException Thrown if the abstract is not found.
+     * @throws NotFoundException|NotFoundExceptionInterface Thrown if the abstract is not found.
      *
      * @return void
      */
-    public function unset(string $id): void {
+    public function unset(mixed $id): void {
         if (!$this->has($id)) {
             throw new NotFoundException(
                 'Could not remove the given entity because it was not set.'
@@ -125,12 +127,12 @@ public function unset(string $id): void {
      *
      * @param string|mixed $id Identifier of the entry to look for.
      *
-     * @throws NotFoundException  No entry was found for **this** identifier.
-     * @throws ContainerException On resolve error.
+     * @throws NotFoundException|NotFoundExceptionInterface  No entry was found for **this** identifier.
+     * @throws ContainerException|ContainerExceptionInterface On resolve error.
      *
      * @return mixed Entry.
      */
-    public function get($id): mixed {
+    public function get(mixed $id): mixed {
         if (array_key_exists($id, $this->bindings)) {
             return $this->bindings[$id]->resolve(new Injector($this));
         }
@@ -154,7 +156,7 @@ public function get($id): mixed {
      *
      * @return boolean
      */
-    public function has($id): bool {
+    public function has(mixed $id): bool {
         return array_key_exists($id, $this->bindings);
     }
 
@@ -163,42 +165,42 @@ public function has($id): bool {
      *
      * @return boolean
      */
-    public function offsetExists($offset): bool {
+    public function offsetExists(mixed $offset): bool {
         return $this->has($offset);
     }
 
     /**
      * @param string|mixed $offset Offset to fetch.
      *
-     * @throws NotFoundException  No entry was found for **this** identifier.
-     * @throws ContainerException Error while retrieving the entry.
+     * @throws NotFoundException|NotFoundExceptionInterface  No entry was found for **this** identifier.
+     * @throws ContainerException|ContainerExceptionInterface Error while retrieving the entry.
      *
      * @return mixed
      */
-    public function offsetGet($offset): mixed {
+    public function offsetGet(mixed $offset): mixed {
         return $this->get($offset);
     }
 
     /**
      * @param string|mixed $offset Offset to set.
      * @param mixed        $value  Value to set to the offset.
      *
-     * @throws ContainerException Thrown if offset does not exist.
+     * @throws ContainerException|ContainerExceptionInterface Thrown if offset does not exist.
      *
      * @return void
      */
-    public function offsetSet($offset, $value): void {
+    public function offsetSet(mixed $offset, mixed $value): void {
         $this->set($offset, $value);
     }
 
     /**
      * @param string|mixed $offset Offset to unset
      *
-     * @throws NotFoundException Thrown if offset does not exist.
+     * @throws NotFoundException|NotFoundExceptionInterface Thrown if offset does not exist.
      *
      * @return void
      */
-    public function offsetUnset($offset): void {
+    public function offsetUnset(mixed $offset): void {
         $this->unset($offset);
     }
 
@@ -212,9 +214,10 @@ public function offsetUnset($offset): void {
      * @param mixed  $concrete  Concrete value to bind to the abstract value.
      *
      * @return boolean
-     * @throws ContainerException Thrown in case the entry already exist.
+     * @throws ContainerException|ContainerExceptionInterface Thrown in case the entry already exist.
      */
     public function singleton(string $abstract, mixed $concrete): bool {
         return $this->set($abstract, $concrete, true);
     }
+
 }

src/Container.php

@@ -2,22 +2,23 @@
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
   ContainerEntry.php - Part of the container project.
 
-  © - Jitesoft 2018
+  © - Jitesoft
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 namespace Jitesoft\Container;
 
 use Jitesoft\Exceptions\Psr\Container\ContainerException;
 use Jitesoft\Exceptions\Psr\Container\NotFoundException;
-use ReflectionFunction;
+use Psr\Container\ContainerExceptionInterface;
+use Psr\Container\NotFoundExceptionInterface;
+use ReflectionException;
 
 /**
  * Class ContainerEntry
  *
  * @internal
  */
 class ContainerEntry {
-    /** @var mixed */
-    protected $concrete;
+    protected mixed $concrete;
     protected bool $isSingleton;
     protected bool $isCreated;
     protected string $abstract;
@@ -47,8 +48,9 @@ public function __construct(string $abstract,
      *
      * @return mixed
      *
-     * @throws ContainerException Thrown in case the container fails in injection.
-     * @throws NotFoundException Thrown in case the value is not found.
+     * @throws ContainerException|ContainerExceptionInterface Thrown in case the container fails in injection.
+     * @throws NotFoundException|NotFoundExceptionInterface Thrown in case the value is not found.
+     * @throws ReflectionException Thrown if instantiation failed.
      * @internal
      */
     public function resolve(Injector $injector): mixed {
@@ -64,20 +66,17 @@ public function resolve(Injector $injector): mixed {
             }
         }
 
-
-        if (is_callable($this->concrete))  {
+        if (is_callable($this->concrete)) {
             $object = $injector->invoke($this->concrete);
             if ($this->isSingleton) {
                 $this->isCreated = true;
-                $this->concrete = $object;
+                $this->concrete  = $object;
             }
 
             return $object;
         }
 
-
-
-        return $object;
+        return $object ?? null;
     }
 
 }

src/ContainerEntry.php

@@ -1,13 +1,20 @@
 <?php
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+  ContainerInterface.php - Part of the container project.
 
+  © - Jitesoft
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 namespace Jitesoft\Container;
 
 use ArrayAccess;
 use Jitesoft\Exceptions\Psr\Container\ContainerException;
 use Jitesoft\Exceptions\Psr\Container\NotFoundException;
+use Psr\Container\ContainerExceptionInterface;
 use Psr\Container\ContainerInterface as PsrContainerInterface;
+use Psr\Container\NotFoundExceptionInterface;
 
 interface ContainerInterface extends PsrContainerInterface, ArrayAccess {
+
     /**
      * Clear the container.
      *
@@ -26,9 +33,11 @@ public function clear(): void;
      * @param boolean $singleton If the created object is intended to be treated as a single instance on creation.
      *
      * @return boolean
-     * @throws ContainerException Thrown in case the entry already exist.
+     * @throws ContainerException|ContainerExceptionInterface Thrown in case the entry already exist.
      */
-    public function set(string $abstract, mixed $concrete, bool $singleton = false): bool;
+    public function set(string $abstract,
+                        mixed $concrete,
+                        bool $singleton = false): bool;
 
     /**
      * Re-bind a value to a given abstract.
@@ -38,18 +47,21 @@ public function set(string $abstract, mixed $concrete, bool $singleton = false):
      * @param mixed   $concrete  Concrete value to bind to the abstract value.
      * @param boolean $singleton If the created object is intended to be treated as a single instance on creation.
      *
-     * @throws NotFoundException Thrown in case the 'abstract' does not exist.
+     * @throws NotFoundException|NotFoundExceptionInterface Thrown in case the 'abstract' does not exist.
+     * @throws ContainerException|ContainerExceptionInterface Thrown in case entry could not be set.
      *
      * @return void
      */
-    public function rebind(string $abstract, mixed $concrete, bool $singleton = false): void;
+    public function rebind(string $abstract,
+                           mixed $concrete,
+                           bool $singleton = false): void;
 
     /**
      * Unset a given abstract removing it from the container.
      *
      * @param string $id Identifier of the value to remove entry for.
      *
-     * @throws NotFoundException Thrown if the abstract is not found.
+     * @throws NotFoundException|NotFoundExceptionInterface Thrown if the abstract is not found.
      *
      * @return void
      */
@@ -65,7 +77,8 @@ public function unset(string $id): void;
      * @param mixed  $concrete  Concrete value to bind to the abstract value.
      *
      * @return boolean
-     * @throws ContainerException Thrown in case the entry already exist.
+     * @throws ContainerException|ContainerExceptionInterface Thrown in case the entry already exist.
      */
     public function singleton(string $abstract, mixed $concrete): bool;
+
 }

src/ContainerInterface.php

@@ -2,20 +2,20 @@
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
   Injector.php - Part of the container project.
 
-  © - Jitesoft 2018
+  © - Jitesoft
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 namespace Jitesoft\Container;
 
 use Jitesoft\Exceptions\Psr\Container\ContainerException;
 use Jitesoft\Exceptions\Psr\Container\NotFoundException;
+use Psr\Container\ContainerExceptionInterface;
 use Psr\Container\ContainerInterface;
+use Psr\Container\NotFoundExceptionInterface;
 use ReflectionClass;
 use ReflectionException;
 use ReflectionFunction;
 use ReflectionNamedType;
 use ReflectionParameter;
-use ReflectionType;
-use ReflectionUnionType;
 
 /**
  * Class Injector
@@ -48,8 +48,8 @@ public function __construct(?ContainerInterface $container = null) {
      * @param string $className Name of the class to create.
      * @param array  $bindings  Key value bindings list. Not required if a container exists.
      *
-     * @throws ContainerException Thrown if the container fails to create class.
-     * @throws NotFoundException Thrown if type hint was not found.
+     * @throws ContainerException|ContainerExceptionInterface Thrown if the container fails to create class.
+     * @throws NotFoundException|NotFoundExceptionInterface Thrown if type hint was not found.
      * @throws ReflectionException Thrown if instantiation failed.
      *
      * @internal
@@ -65,12 +65,12 @@ public function create(string $className, array $bindings = []): object {
 
         // Does the class have a constructor?
         if ($class->getConstructor() !== null) {
-            $ctr    = $class->getConstructor();
+            $ctr = $class->getConstructor();
 
             if ($ctr === null) {
                 throw new ContainerException(
                     sprintf(
-                        'Class with name %s does not have a resolvable constructor.',
+                        'Class with name %s does not have a constructor.',
                         $className
                     )
                 );
@@ -107,8 +107,8 @@ public function create(string $className, array $bindings = []): object {
      * If a binding array is passed through this method and a container already exists, the bindings will take
      * precedence over the container.
      *
-     * @throws ContainerException
-     * @throws NotFoundException
+     * @throws ContainerException|ContainerExceptionInterface
+     * @throws NotFoundException|NotFoundExceptionInterface
      */
     public function invoke(callable $callable,  array $bindings = []): mixed {
         try {
@@ -129,8 +129,8 @@ public function invoke(callable $callable,  array $bindings = []): mixed {
      *
      * @return array List of resolved parameters.
      *
-     * @throws ContainerException Thrown if the container fails to create class.
-     * @throws NotFoundException Thrown if type hint was not found.
+     * @throws ContainerException|ContainerExceptionInterface Thrown if the container fails to create class.
+     * @throws NotFoundException|NotFoundExceptionInterface Thrown if type hint was not found.
      */
     private function getParameters(array $params, array $bindings): array {
         // Get all the parameters that the class require, if any.
@@ -163,18 +163,17 @@ function ($param) use ($bindings) {
      */
     private function getTypeHint(ReflectionParameter $param): string {
         $type = $param->getType();
-        if (!$type || !($type instanceof ReflectionNamedType)) {
-            /** @noinspection ProperNullCoalescingOperatorUsageInspection */
+        if (!($type instanceof ReflectionNamedType)) {
+            // @noinspection ProperNullCoalescingOperatorUsageInspection
             throw new NotFoundException(
                 sprintf(
                     'Failed to resolve type for parameter %s (type %s).',
                     $param->getName(),
-                    $type ??  'null'
+                    $type ?? 'null'
                 )
             );
         }
 
-        /** @var $type ReflectionNamedType */
         return $type->getName();
     }