Skip to content

Commit 82f3ccf

Browse files
authored
Reverts #41557 (#41562)
1 parent 2428d1d commit 82f3ccf

File tree

4 files changed

+12
-24
lines changed

4 files changed

+12
-24
lines changed

src/Illuminate/Container/Container.php

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -461,11 +461,9 @@ public function extend($abstract, Closure $closure)
461461
/**
462462
* Register an existing instance as shared in the container.
463463
*
464-
* @template T
465-
*
466464
* @param string $abstract
467-
* @param T $instance
468-
* @return T
465+
* @param mixed $instance
466+
* @return mixed
469467
*/
470468
public function instance($abstract, $instance)
471469
{
@@ -685,11 +683,9 @@ public function makeWith($abstract, array $parameters = [])
685683
/**
686684
* Resolve the given type from the container.
687685
*
688-
* @template T
689-
*
690-
* @param class-string<T> $abstract
686+
* @param string|callable $abstract
691687
* @param array $parameters
692-
* @return T|mixed
688+
* @return mixed
693689
*
694690
* @throws \Illuminate\Contracts\Container\BindingResolutionException
695691
*/

src/Illuminate/Contracts/Container/Container.php

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -113,11 +113,9 @@ public function extend($abstract, Closure $closure);
113113
/**
114114
* Register an existing instance as shared in the container.
115115
*
116-
* @template T
117-
*
118116
* @param string $abstract
119-
* @param T $instance
120-
* @return T
117+
* @param mixed $instance
118+
* @return mixed
121119
*/
122120
public function instance($abstract, $instance);
123121

@@ -157,11 +155,9 @@ public function flush();
157155
/**
158156
* Resolve the given type from the container.
159157
*
160-
* @template T
161-
*
162-
* @param class-string<T> $abstract
158+
* @param string $abstract
163159
* @param array $parameters
164-
* @return T|mixed
160+
* @return mixed
165161
*
166162
* @throws \Illuminate\Contracts\Container\BindingResolutionException
167163
*/

src/Illuminate/Foundation/Application.php

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -829,11 +829,9 @@ public function registerDeferredProvider($provider, $service = null)
829829
/**
830830
* Resolve the given type from the container.
831831
*
832-
* @template T
833-
*
834-
* @param class-string<T> $abstract
832+
* @param string $abstract
835833
* @param array $parameters
836-
* @return T|mixed
834+
* @return mixed
837835
*/
838836
public function make($abstract, array $parameters = [])
839837
{

src/Illuminate/Foundation/helpers.php

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -106,11 +106,9 @@ function action($name, $parameters = [], $absolute = true)
106106
/**
107107
* Get the available container instance.
108108
*
109-
* @template T
110-
*
111-
* @param class-string<T>|mixed $abstract
109+
* @param string|null $abstract
112110
* @param array $parameters
113-
* @return mixed|T|\Illuminate\Contracts\Foundation\Application
111+
* @return mixed|\Illuminate\Contracts\Foundation\Application
114112
*/
115113
function app($abstract = null, array $parameters = [])
116114
{

0 commit comments

Comments
 (0)