Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[5.5] Fix some docblocks and missing properties. #19825

Merged
merged 1 commit into from
Jun 29, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions src/Illuminate/Foundation/Bus/PendingDispatch.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,13 @@

class PendingDispatch
{
/**
* The job.
*
* @var mixed
*/
protected $job;

/**
* Create a new pending job dispatch.
*
Expand Down
2 changes: 1 addition & 1 deletion src/Illuminate/Mail/Markdown.php
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ public function renderText($view, array $data = [])
* Parse the given Markdown text into HTML.
*
* @param string $text
* @return string
* @return \Illuminate\Support\HtmlString
*/
public static function parse($text)
{
Expand Down
2 changes: 1 addition & 1 deletion src/Illuminate/Mail/PendingMail.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ class PendingMail
/**
* The mailer instance.
*
* @var array
* @var \Illuminate\Mail\Mailer
*/
protected $mailer;

Expand Down
2 changes: 1 addition & 1 deletion src/Illuminate/Mail/Transport/SparkPostTransport.php
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ public function setKey($key)
/**
* Get the transmission options being used by the transport.
*
* @return string
* @return array
*/
public function getOptions()
{
Expand Down
2 changes: 1 addition & 1 deletion src/Illuminate/Notifications/Channels/MailChannel.php
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ class MailChannel
/**
* The markdown implementation.
*
* @var \Illuminate\Contracts\Mail\Mailer
* @var \Illuminate\Mail\Markdown
*/
protected $markdown;

Expand Down
4 changes: 2 additions & 2 deletions src/Illuminate/Pagination/LengthAwarePaginator.php
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ protected function setCurrentPage($currentPage, $pageName)
*
* @param string $view
* @param array $data
* @return string
* @return \Illuminate\Support\HtmlString
*/
public function links($view = null, $data = [])
{
Expand All @@ -83,7 +83,7 @@ public function links($view = null, $data = [])
*
* @param string $view
* @param array $data
* @return \Illuminate\Support\HtmlString
* @return string
*/
public function render($view = null, $data = [])
{
Expand Down
2 changes: 1 addition & 1 deletion src/Illuminate/Pagination/Paginator.php
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ public function links($view = null, $data = [])
*
* @param string|null $view
* @param array $data
* @return \Illuminate\Support\HtmlString
* @return string
*/
public function render($view = null, $data = [])
{
Expand Down