Skip to content

Commit f5ae0d0

Browse files
authored
Merge pull request #1187 from dunhamjared/8.x
[8.x] Fixed DocBlocks
2 parents e99afbe + 85c7cc6 commit f5ae0d0

File tree

3 files changed

+24
-14
lines changed

3 files changed

+24
-14
lines changed

src/Concerns/RoutesRequests.php

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ trait RoutesRequests
5757
/**
5858
* Add new middleware to the application.
5959
*
60-
* @param Closure|array $middleware
60+
* @param \Closure|array $middleware
6161
* @return $this
6262
*/
6363
public function middleware($middleware)
@@ -85,7 +85,10 @@ public function routeMiddleware(array $middleware)
8585
}
8686

8787
/**
88-
* {@inheritdoc}
88+
* Dispatch request and return response.
89+
*
90+
* @param \Symfony\Component\HttpFoundation\Request $request
91+
* @return \Illuminate\Http\Response
8992
*/
9093
public function handle(SymfonyRequest $request)
9194
{
@@ -101,7 +104,7 @@ public function handle(SymfonyRequest $request)
101104
/**
102105
* Run the application and send the response.
103106
*
104-
* @param SymfonyRequest|null $request
107+
* @param \Symfony\Component\HttpFoundation\Request|null $request
105108
* @return void
106109
*/
107110
public function run($request = null)
@@ -149,8 +152,8 @@ protected function callTerminableMiddleware($response)
149152
/**
150153
* Dispatch the incoming request.
151154
*
152-
* @param SymfonyRequest|null $request
153-
* @return Response
155+
* @param \Symfony\Component\HttpFoundation\Request|null $request
156+
* @return \Illuminate\Http\Response
154157
*/
155158
public function dispatch($request = null)
156159
{
@@ -195,7 +198,7 @@ protected function parseIncomingRequest($request)
195198
/**
196199
* Create a FastRoute dispatcher instance for the application.
197200
*
198-
* @return Dispatcher
201+
* @return \FastRoute\Dispatcher
199202
*/
200203
protected function createDispatcher()
201204
{
@@ -393,7 +396,7 @@ protected function callControllerCallable(callable $callable, array $parameters
393396
/**
394397
* Gather the full class names for the middleware short-cut string.
395398
*
396-
* @param string $middleware
399+
* @param string|array $middleware
397400
* @return array
398401
*/
399402
protected function gatherMiddlewareClassNames($middleware)
@@ -430,7 +433,7 @@ protected function sendThroughPipeline(array $middleware, Closure $then)
430433
* Prepare the response for sending.
431434
*
432435
* @param mixed $response
433-
* @return Response
436+
* @return \Illuminate\Http\Response
434437
*/
435438
public function prepareResponse($response)
436439
{

src/Http/Redirector.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,14 @@ class Redirector
1010
/**
1111
* The application instance.
1212
*
13-
* @var Application
13+
* @var \Laravel\Lumen\Application
1414
*/
1515
protected $app;
1616

1717
/**
1818
* Create a new redirector instance.
1919
*
20-
* @param Application $app
20+
* @param \Laravel\Lumen\Application $app
2121
* @return void
2222
*/
2323
public function __construct(Application $app)

src/Routing/ProvidesConvenienceMethods.php

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ public static function formatErrorsUsing(BaseClosure $callback)
5858
* @param array $customAttributes
5959
* @return array
6060
*
61-
* @throws ValidationException
61+
* @throws \Illuminate\Validation\ValidationException
6262
*/
6363
public function validate(Request $request, array $rules, array $messages = [], array $customAttributes = [])
6464
{
@@ -92,7 +92,7 @@ protected function extractInputFromRules(Request $request, array $rules)
9292
* @param \Illuminate\Contracts\Validation\Validator $validator
9393
* @return void
9494
*
95-
* @throws ValidationException
95+
* @throws \Illuminate\Validation\ValidationException
9696
*/
9797
protected function throwValidationException(Request $request, $validator)
9898
{
@@ -102,7 +102,11 @@ protected function throwValidationException(Request $request, $validator)
102102
}
103103

104104
/**
105-
* {@inheritdoc}
105+
* Build a response based on the given errors.
106+
*
107+
* @param \Illuminate\Http\Request $request
108+
* @param array $errors
109+
* @return \Illuminate\Http\JsonResponse|mixed
106110
*/
107111
protected function buildFailedValidationResponse(Request $request, array $errors)
108112
{
@@ -114,7 +118,10 @@ protected function buildFailedValidationResponse(Request $request, array $errors
114118
}
115119

116120
/**
117-
* {@inheritdoc}
121+
* Format validation errors.
122+
*
123+
* @param \Illuminate\Validation\Validator $validator
124+
* @return array|mixed
118125
*/
119126
protected function formatValidationErrors(Validator $validator)
120127
{

0 commit comments

Comments
 (0)