diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2017-07-24 13:54:30 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-24 13:54:30 +0200 |
| commit | 5bc0edbd297285f4ceded0bb9a8dcb59ba61ada4 (patch) | |
| tree | 84c375c5bb03066c8ba1fd12a7c1fc7a342b0352 /lib/private/Mail | |
| parent | 71f1ef9c1d0f826df5fa23c96b46575f1231f79c (diff) | |
| parent | 5f227bd93b23d8a528476e3d9243dae31c9d0050 (diff) | |
| download | nextcloud-server-5bc0edbd297285f4ceded0bb9a8dcb59ba61ada4.tar.gz nextcloud-server-5bc0edbd297285f4ceded0bb9a8dcb59ba61ada4.zip | |
Merge pull request #5844 from nextcloud/phpstorm_inspect2
More phpstorm inspection fixes
Diffstat (limited to 'lib/private/Mail')
| -rw-r--r-- | lib/private/Mail/Mailer.php | 4 | ||||
| -rw-r--r-- | lib/private/Mail/Message.php | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/private/Mail/Mailer.php b/lib/private/Mail/Mailer.php index b24f72316ba..e438f75d2ce 100644 --- a/lib/private/Mail/Mailer.php +++ b/lib/private/Mail/Mailer.php @@ -120,7 +120,7 @@ class Mailer implements IMailer { public function send(Message $message) { $debugMode = $this->config->getSystemValue('mail_smtpdebug', false); - if (sizeof($message->getFrom()) === 0) { + if (empty($message->getFrom())) { $message->setFrom([\OCP\Util::getDefaultEmailAddress($this->defaults->getName()) => $this->defaults->getName()]); } @@ -186,7 +186,7 @@ class Mailer implements IMailer { switch ($this->config->getSystemValue('mail_smtpmode', 'php')) { case 'smtp': - $this->instance = $this->getSMTPInstance(); + $this->instance = $this->getSmtpInstance(); break; case 'sendmail': // FIXME: Move into the return statement but requires proper testing diff --git a/lib/private/Mail/Message.php b/lib/private/Mail/Message.php index 3184f26848b..5ffc050360a 100644 --- a/lib/private/Mail/Message.php +++ b/lib/private/Mail/Message.php @@ -37,7 +37,7 @@ class Message { /** * @param Swift_Message $swiftMessage */ - function __construct(Swift_Message $swiftMessage) { + public function __construct(Swift_Message $swiftMessage) { $this->swiftMessage = $swiftMessage; } |