From 1541d5186533f0bb38b5f2ab0e8902f301b0cb43 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bal=C3=A1zs=20V=C3=A1radi?= <netpok@gmail.com>
Date: Thu, 15 Apr 2021 08:58:40 +0200
Subject: [PATCH 1/2] Match Util::unwrapIfClosure to value helper

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

diff --git a/src/Illuminate/Container/Util.php b/src/Illuminate/Container/Util.php
index 8180a45a5798..fa09f538d00c 100644
--- a/src/Illuminate/Container/Util.php
+++ b/src/Illuminate/Container/Util.php
@@ -33,11 +33,12 @@ public static function arrayWrap($value)
      * From global value() helper in Illuminate\Support.
      *
      * @param  mixed  $value
+     * @param  mixed  ...$args
      * @return mixed
      */
-    public static function unwrapIfClosure($value)
+    public static function unwrapIfClosure($value, ...$args)
     {
-        return $value instanceof Closure ? $value() : $value;
+        return $value instanceof Closure ? $value(...$args) : $value;
     }
 
     /**

From c89c8afd250b6ce01566db5119c2345bf5e82f7e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bal=C3=A1zs=20V=C3=A1radi?= <netpok@gmail.com>
Date: Thu, 15 Apr 2021 08:59:11 +0200
Subject: [PATCH 2/2] Use helper when applicable

---
 src/Illuminate/Container/Container.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Illuminate/Container/Container.php b/src/Illuminate/Container/Container.php
index 642d1e082e6d..b64c27a2b8ec 100755
--- a/src/Illuminate/Container/Container.php
+++ b/src/Illuminate/Container/Container.php
@@ -961,7 +961,7 @@ protected function getLastParameterOverride()
     protected function resolvePrimitive(ReflectionParameter $parameter)
     {
         if (! is_null($concrete = $this->getContextualConcrete('$'.$parameter->getName()))) {
-            return $concrete instanceof Closure ? $concrete($this) : $concrete;
+            return Util::unwrapIfClosure($concrete, $this);
         }
 
         if ($parameter->isDefaultValueAvailable()) {