Switch to psr/container:2.0 and PHP8+

Author: e1himself

.github/workflows/test.yml

@@ -6,7 +6,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        php: [ '7.1', '7.2', '7.3', '7.4', '8.0' ]
+        php: [ '8.0' ]
 
     steps:
       - uses: actions/checkout@master

composer.json

@@ -11,8 +11,8 @@
         "simple"
     ],
     "require": {
-        "php": ">=7.1",
-        "psr/container": "^1.0"
+        "php": "^8.0",
+        "psr/container": "^2.0"
     },
     "require-dev": {
         "peridot-php/peridot": "^1.19"

src/ArrayContainer.php

@@ -7,13 +7,10 @@
 
 final class ArrayContainer implements ContainerInterface
 {
-    /**
-     * @var mixed[]
-     */
-    private $services;
+    private array $services;
 
     /**
-     * @param mixed[] $services
+     * @param array<string,mixed> $services
      */
     public function __construct(array $services = [])
     {
@@ -31,7 +28,7 @@ public function __construct(array $services = [])
      *
      * @return bool
      */
-    public function has($id)
+    public function has(string $id): bool
     {
         return array_key_exists($id, $this->services);
     }
@@ -45,7 +42,7 @@ public function has($id)
      *
      * @return mixed Entry.
      */
-    public function get($id)
+    public function get(string $id): mixed
     {
         if (array_key_exists($id, $this->services)) {
             return $this->services[$id];
@@ -62,15 +59,15 @@ public function get($id)
      *
      * @return void
      */
-    public function set($id, $entry)
+    public function set(string $id, mixed $entry): void
     {
         $this->services[$id] = $entry;
     }
 
     /**
      * Return an associative array of all container entries.
      *
-     * @return mixed[]
+     * @return array<string,mixed>
      */
     public function toArray(): array
     {