[9.x] Update Container\Util::unwrapIfClosure to match value helper (#36995)

* Match Util::unwrapIfClosure to value helper

* Use helper when applicable

Author: netpok

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()) {

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;
     }
 
     /**