Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/5.x' into 5.x
Browse files Browse the repository at this point in the history
* origin/5.x:
  Scrutinizer Auto-Fixes
  • Loading branch information
Lars Moelleken committed Dec 8, 2015
2 parents b942417 + b7e0f52 commit 831ff0e
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion lib/classes/Swift/CharacterStream/MbCharacterStream.php
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ public function importString($string)
/**
* @param int $length
*
* @return bool|string
* @return false|string
*/
public function read($length)
{
Expand Down
2 changes: 1 addition & 1 deletion lib/classes/Swift/Events/Event.php
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ interface Swift_Events_Event
/**
* Get the source object of this event.
*
* @return object
* @return Swift_Transport
*/
public function getSource();

Expand Down
2 changes: 1 addition & 1 deletion lib/classes/Swift/Mime/Headers/IdentificationHeader.php
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ public function setFieldBodyModel($model)
*
* This method returns an array of IDs
*
* @return array
* @return string[]
*/
public function getFieldBodyModel()
{
Expand Down
2 changes: 1 addition & 1 deletion lib/classes/Swift/Transport/EsmtpTransport.php
Original file line number Diff line number Diff line change
Expand Up @@ -403,7 +403,7 @@ protected function _doRcptToCommand($address)
/**
* Determine ESMTP capabilities by function group
*
* @param $ehloResponse
* @param string $ehloResponse
*
* @return array
*/
Expand Down

0 comments on commit 831ff0e

Please sign in to comment.