From e5d56193810c23630ecd7ee2a6f87dbe040a9abd Mon Sep 17 00:00:00 2001
From: Graham Campbell <hello@gjcampbell.co.uk>
Date: Mon, 6 Sep 2021 19:14:52 +0100
Subject: [PATCH 1/2] Support the latest psr/container versions

---
 composer.json                          | 2 +-
 src/Illuminate/Container/Container.php | 2 +-
 src/Illuminate/Container/composer.json | 2 +-
 src/Illuminate/Contracts/composer.json | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/composer.json b/composer.json
index acb30f7d6344..ca1e555fde81 100644
--- a/composer.json
+++ b/composer.json
@@ -26,7 +26,7 @@
         "monolog/monolog": "^2.0",
         "nesbot/carbon": "^2.31",
         "opis/closure": "^3.6",
-        "psr/container": "^1.0",
+        "psr/container": "^1.1.1|^2.0.1",
         "psr/simple-cache": "^1.0",
         "ramsey/uuid": "^4.0",
         "swiftmailer/swiftmailer": "^6.2.7",
diff --git a/src/Illuminate/Container/Container.php b/src/Illuminate/Container/Container.php
index 3fd72d2d3fb1..f7a1df7f2770 100755
--- a/src/Illuminate/Container/Container.php
+++ b/src/Illuminate/Container/Container.php
@@ -189,7 +189,7 @@ public function bound($abstract)
     /**
      *  {@inheritdoc}
      */
-    public function has($id)
+    public function has($id): bool
     {
         return $this->bound($id);
     }
diff --git a/src/Illuminate/Container/composer.json b/src/Illuminate/Container/composer.json
index 023c891c10cd..2e7248d7f48d 100755
--- a/src/Illuminate/Container/composer.json
+++ b/src/Illuminate/Container/composer.json
@@ -16,7 +16,7 @@
     "require": {
         "php": "^8.0.2",
         "illuminate/contracts": "^9.0",
-        "psr/container": "^1.0"
+        "psr/container": "^1.1.1|^2.0.1"
     },
     "provide": {
         "psr/container-implementation": "1.0"
diff --git a/src/Illuminate/Contracts/composer.json b/src/Illuminate/Contracts/composer.json
index a39250afd2fe..4abec41b24ee 100644
--- a/src/Illuminate/Contracts/composer.json
+++ b/src/Illuminate/Contracts/composer.json
@@ -15,7 +15,7 @@
     ],
     "require": {
         "php": "^8.0.2",
-        "psr/container": "^1.0",
+        "psr/container": "^1.1.1|^2.0.1",
         "psr/simple-cache": "^1.0"
     },
     "autoload": {

From ac2ec96915d10f8d91717c83298663fada83bbf3 Mon Sep 17 00:00:00 2001
From: Graham Campbell <hello@gjcampbell.co.uk>
Date: Mon, 6 Sep 2021 19:17:03 +0100
Subject: [PATCH 2/2] Added types

---
 src/Illuminate/Container/Container.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Illuminate/Container/Container.php b/src/Illuminate/Container/Container.php
index f7a1df7f2770..10b83404c152 100755
--- a/src/Illuminate/Container/Container.php
+++ b/src/Illuminate/Container/Container.php
@@ -189,7 +189,7 @@ public function bound($abstract)
     /**
      *  {@inheritdoc}
      */
-    public function has($id): bool
+    public function has(string $id): bool
     {
         return $this->bound($id);
     }
@@ -695,7 +695,7 @@ public function make($abstract, array $parameters = [])
     /**
      *  {@inheritdoc}
      */
-    public function get($id)
+    public function get(string $id)
     {
         try {
             return $this->resolve($id);