remove dependency on support

Author: taylorotwell

src/Illuminate/Container/Container.php

@@ -13,19 +13,18 @@
 use Illuminate\Contracts\Container\Container as ContainerContract;
 use Illuminate\Contracts\Container\ContextualAttribute;
 use Illuminate\Contracts\Container\SelfBuilding;
-use Illuminate\Support\Traits\ReflectsClosures;
 use LogicException;
 use ReflectionAttribute;
 use ReflectionClass;
 use ReflectionException;
 use ReflectionFunction;
+use ReflectionIntersectionType;
 use ReflectionParameter;
+use ReflectionUnionType;
 use TypeError;
 
 class Container implements ArrayAccess, ContainerContract
 {
-    use ReflectsClosures;
-
     /**
      * The current globally available container (if any).
      *
@@ -221,8 +220,6 @@ public function when($concrete)
     /**
      * Define a contextual binding based on an attribute.
      *
-     * @param  string  $attribute
-     * @param  \Closure  $handler
      * @return void
      */
     public function whenHasAttribute(string $attribute, Closure $handler)
@@ -245,8 +242,6 @@ public function bound($abstract)
 
     /**
      * {@inheritdoc}
-     *
-     * @return bool
      */
     public function has(string $id): bool
     {
@@ -568,11 +563,44 @@ protected function bindBasedOnClosureReturnTypes($abstract, $concrete = null, $s
         }
     }
 
+    /**
+     * Get the class names / types of the return type of the given Closure.
+     *
+     * @return list<class-string>
+     *
+     * @throws \ReflectionException
+     */
+    protected function closureReturnTypes(Closure $closure)
+    {
+        $reflection = new ReflectionFunction($closure);
+
+        if ($reflection->getReturnType() === null ||
+            $reflection->getReturnType() instanceof ReflectionIntersectionType) {
+            return [];
+        }
+
+        $types = $reflection->getReturnType() instanceof ReflectionUnionType
+            ? $reflection->getReturnType()->getTypes()
+            : [$reflection->getReturnType()];
+
+        $returnTypes = [];
+
+        foreach ($types as $type) {
+            if ($type->isBuiltin() ||
+                in_array($type->getName(), ['static', 'self'])) {
+                continue;
+            }
+
+            $returnTypes[] = $type->getName();
+        }
+
+        return $returnTypes;
+    }
+
     /**
      * "Extend" an abstract type in the container.
      *
      * @param  string  $abstract
-     * @param  \Closure  $closure
      * @return void
      *
      * @throws \InvalidArgumentException
@@ -711,7 +739,6 @@ public function alias($abstract, $alias)
      * Bind a new callback to an abstract's rebind event.
      *
      * @param  string  $abstract
-     * @param  \Closure  $callback
      * @return mixed
      */
     public function rebinding($abstract, Closure $callback)
@@ -771,8 +798,6 @@ protected function getReboundCallbacks($abstract)
     /**
      * Wrap the given closure such that its dependencies will be injected when executed.
      *
-     * @param  \Closure  $callback
-     * @param  array  $parameters
      * @return \Closure
      */
     public function wrap(Closure $callback, array $parameters = [])
@@ -848,7 +873,6 @@ public function factory($abstract)
      * @template TClass of object
      *
      * @param  string|class-string<TClass>|callable  $abstract
-     * @param  array  $parameters
      * @return ($abstract is class-string<TClass> ? TClass : mixed)
      *
      * @throws \Illuminate\Contracts\Container\BindingResolutionException
@@ -864,7 +888,6 @@ public function makeWith($abstract, array $parameters = [])
      * @template TClass of object
      *
      * @param  string|class-string<TClass>  $abstract
-     * @param  array  $parameters
      * @return ($abstract is class-string<TClass> ? TClass : mixed)
      *
      * @throws \Illuminate\Contracts\Container\BindingResolutionException
@@ -1297,7 +1320,6 @@ protected function getLastParameterOverride()
     /**
      * Resolve a non-class hinted primitive dependency.
      *
-     * @param  \ReflectionParameter  $parameter
      * @return mixed
      *
      * @throws \Illuminate\Contracts\Container\BindingResolutionException
@@ -1326,7 +1348,6 @@ protected function resolvePrimitive(ReflectionParameter $parameter)
     /**
      * Resolve a class based dependency from the container.
      *
-     * @param  \ReflectionParameter  $parameter
      * @return mixed
      *
      * @throws \Illuminate\Contracts\Container\BindingResolutionException
@@ -1367,7 +1388,6 @@ protected function resolveClass(ReflectionParameter $parameter)
     /**
      * Resolve a class based variadic dependency from the container.
      *
-     * @param  \ReflectionParameter  $parameter
      * @return mixed
      */
     protected function resolveVariadicClass(ReflectionParameter $parameter)
@@ -1386,7 +1406,6 @@ protected function resolveVariadicClass(ReflectionParameter $parameter)
     /**
      * Resolve a dependency based on an attribute.
      *
-     * @param  \ReflectionAttribute  $attribute
      * @return mixed
      */
     public function resolveFromAttribute(ReflectionAttribute $attribute)
@@ -1430,7 +1449,6 @@ protected function notInstantiable($concrete)
     /**
      * Throw an exception for an unresolvable primitive.
      *
-     * @param  \ReflectionParameter  $parameter
      * @return void
      *
      * @throws \Illuminate\Contracts\Container\BindingResolutionException
@@ -1446,7 +1464,6 @@ protected function unresolvablePrimitive(ReflectionParameter $parameter)
      * Register a new before resolving callback for all types.
      *
      * @param  \Closure|string  $abstract
-     * @param  \Closure|null  $callback
      * @return void
      */
     public function beforeResolving($abstract, ?Closure $callback = null)
@@ -1466,7 +1483,6 @@ public function beforeResolving($abstract, ?Closure $callback = null)
      * Register a new resolving callback.
      *
      * @param  \Closure|string  $abstract
-     * @param  \Closure|null  $callback
      * @return void
      */
     public function resolving($abstract, ?Closure $callback = null)
@@ -1486,7 +1502,6 @@ public function resolving($abstract, ?Closure $callback = null)
      * Register a new after resolving callback for all types.
      *
      * @param  \Closure|string  $abstract
-     * @param  \Closure|null  $callback
      * @return void
      */
     public function afterResolving($abstract, ?Closure $callback = null)
@@ -1505,8 +1520,6 @@ public function afterResolving($abstract, ?Closure $callback = null)
     /**
      * Register a new after resolving attribute callback for all types.
      *
-     * @param  string  $attribute
-     * @param  \Closure  $callback
      * @return void
      */
     public function afterResolvingAttribute(string $attribute, \Closure $callback)
@@ -1537,7 +1550,6 @@ protected function fireBeforeResolvingCallbacks($abstract, $parameters = [])
      *
      * @param  string  $abstract
      * @param  array  $parameters
-     * @param  array  $callbacks
      * @return void
      */
     protected function fireBeforeCallbackArray($abstract, $parameters, array $callbacks)
@@ -1614,7 +1626,6 @@ public function fireAfterResolvingAttributeCallbacks(array $attributes, $object)
      *
      * @param  string  $abstract
      * @param  object  $object
-     * @param  array  $callbacksPerType
      * @return array
      */
     protected function getCallbacksForType($abstract, $object, array $callbacksPerType)
@@ -1634,7 +1645,6 @@ protected function getCallbacksForType($abstract, $object, array $callbacksPerTy
      * Fire an array of callbacks with an object.
      *
      * @param  mixed  $object
-     * @param  array  $callbacks
      * @return void
      */
     protected function fireCallbackArray($object, array $callbacks)
@@ -1797,7 +1807,6 @@ public static function getInstance()
     /**
      * Set the shared instance of the container.
      *
-     * @param  \Illuminate\Contracts\Container\Container|null  $container
      * @return \Illuminate\Contracts\Container\Container|static
      */
     public static function setInstance(?ContainerContract $container = null)
@@ -1809,7 +1818,6 @@ public static function setInstance(?ContainerContract $container = null)
      * Determine if a given offset exists.
      *
      * @param  string  $key
-     * @return bool
      */
     public function offsetExists($key): bool
     {
@@ -1820,7 +1828,6 @@ public function offsetExists($key): bool
      * Get the value at a given offset.
      *
      * @param  string  $key
-     * @return mixed
      */
     public function offsetGet($key): mixed
     {
@@ -1832,7 +1839,6 @@ public function offsetGet($key): mixed
      *
      * @param  string  $key
      * @param  mixed  $value
-     * @return void
      */
     public function offsetSet($key, $value): void
     {
@@ -1843,7 +1849,6 @@ public function offsetSet($key, $value): void
      * Unset the value at a given offset.
      *
      * @param  string  $key
-     * @return void
      */
     public function offsetUnset($key): void
     {

src/Illuminate/Container/composer.json

@@ -16,7 +16,6 @@
     "require": {
         "php": "^8.2",
         "illuminate/contracts": "^12.0",
-        "illuminate/support": "^12.0",
         "psr/container": "^1.1.1|^2.0.1",
         "symfony/polyfill-php84": "^1.33",
         "symfony/polyfill-php85": "^1.33"