Skip to content

Commit

Permalink
Merge pull request #19092 from themsaid/5.4
Browse files Browse the repository at this point in the history
Multiple docblock fixes
  • Loading branch information
themsaid authored May 6, 2017
2 parents 304da26 + fa058b5 commit 0f3003d
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 4 deletions.
1 change: 0 additions & 1 deletion src/Illuminate/Foundation/Testing/TestResponse.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
use Closure;
use Illuminate\Support\Arr;
use Illuminate\Support\Str;
use Illuminate\Http\Response;
use Illuminate\Contracts\View\View;
use Illuminate\Support\Traits\Macroable;
use PHPUnit\Framework\Assert as PHPUnit;
Expand Down
2 changes: 1 addition & 1 deletion src/Illuminate/Notifications/Messages/SlackMessage.php
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ public function from($username, $icon = null)
/**
* Set a custom image icon the message should use.
*
* @param string $channel
* @param string $image
* @return $this
*/
public function image($image)
Expand Down
4 changes: 2 additions & 2 deletions src/Illuminate/Validation/Concerns/FormatsMessages.php
Original file line number Diff line number Diff line change
Expand Up @@ -328,7 +328,7 @@ protected function getAttributeList(array $values)
* @param string $attribute
* @param string $rule
* @param array $parameters
* @param Illuminate\Validation\Validator $validator
* @param \Illuminate\Validation\Validator $validator
* @return string|null
*/
protected function callReplacer($message, $attribute, $rule, $parameters, $validator)
Expand All @@ -350,7 +350,7 @@ protected function callReplacer($message, $attribute, $rule, $parameters, $valid
* @param string $attribute
* @param string $rule
* @param array $parameters
* @param Illuminate\Validation\Validator $validator
* @param \Illuminate\Validation\Validator $validator
* @return string
*/
protected function callClassBasedReplacer($callback, $message, $attribute, $rule, $parameters, $validator)
Expand Down

0 comments on commit 0f3003d

Please sign in to comment.