Skip to content

Commit 0f701cc

Browse files
committed
Merge pull request laravel#253 from crynobone/feature/cleanup
Clean-up multiple docblock and avoid redundant call to $this->app when under Laravel\Lumen\Application.
2 parents c6c7700 + 2b23c97 commit 0f701cc

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

src/Application.php

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -517,7 +517,7 @@ protected function registerConfigBindings()
517517
*/
518518
protected function registerComposerBindings()
519519
{
520-
$this->app->singleton('composer', function ($app) {
520+
$this->singleton('composer', function ($app) {
521521
return new Composer($app->make('files'), $this->basePath());
522522
});
523523
}
@@ -810,6 +810,7 @@ protected function loadComponent($config, $providers, $return = null)
810810
/**
811811
* Load a configuration file into the application.
812812
*
813+
* @param string $name
813814
* @return void
814815
*/
815816
public function configure($name)
@@ -890,7 +891,7 @@ public function withEloquent()
890891
* Register a set of routes with a set of shared attributes.
891892
*
892893
* @param array $attributes
893-
* @param Closure $callback
894+
* @param \Closure $callback
894895
* @return void
895896
*/
896897
public function group(array $attributes, Closure $callback)
@@ -1396,7 +1397,7 @@ protected function gatherMiddlewareClassNames($middleware)
13961397
* Send the request through the pipeline with the given callback.
13971398
*
13981399
* @param array $middleware
1399-
* @param Closure $then
1400+
* @param \Closure $then
14001401
* @return mixed
14011402
*/
14021403
protected function sendThroughPipeline(array $middleware, Closure $then)

src/Http/Middleware/VerifyCsrfToken.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ public function __construct(Encrypter $encrypter)
3333
*
3434
* @param \Illuminate\Http\Request $request
3535
* @param \Closure $next
36-
* @return mixed
36+
* @return \Illuminate\Http\Response
3737
*
3838
* @throws \Illuminate\Session\TokenMismatchException
3939
*/

0 commit comments

Comments
 (0)