@@ -172,6 +172,9 @@ |
||
| 172 | 172 | |
| 173 | 173 | } |
| 174 | 174 | |
| 175 | + /** |
|
| 176 | + * @param integer $code |
|
| 177 | + */ |
|
| 175 | 178 | protected function sendReply($code, $message, $close = false) |
| 176 | 179 | { |
| 177 | 180 | $out = ''; |
@@ -8,7 +8,7 @@ discard block |
||
| 8 | 8 | use React\Socket\ConnectionInterface; |
| 9 | 9 | use React\Stream\WritableStream; |
| 10 | 10 | |
| 11 | -class Connection extends \React\Socket\Connection{ |
|
| 11 | +class Connection extends \React\Socket\Connection { |
|
| 12 | 12 | const STATUS_NEW = 0; |
| 13 | 13 | const STATUS_INIT = 1; |
| 14 | 14 | const STATUS_FROM = 2; |
@@ -99,7 +99,7 @@ discard block |
||
| 99 | 99 | $this->reset(self::STATUS_NEW); |
| 100 | 100 | $this->on('line', [$this, 'handleCommand']); |
| 101 | 101 | if ($this->bannerDelay > 0) { |
| 102 | - $loop->addTimer($this->bannerDelay, function () use ($disconnect) { |
|
| 102 | + $loop->addTimer($this->bannerDelay, function() use ($disconnect) { |
|
| 103 | 103 | $this->sendReply(220, $this->banner); |
| 104 | 104 | $this->removeListener('data', $disconnect); |
| 105 | 105 | }); |
@@ -117,7 +117,7 @@ discard block |
||
| 117 | 117 | { |
| 118 | 118 | // Socket is raw, not using fread as it's interceptable by filters |
| 119 | 119 | // See issues #192, #209, and #240 |
| 120 | - $data = stream_socket_recvfrom($stream, $this->bufferSize);; |
|
| 120 | + $data = stream_socket_recvfrom($stream, $this->bufferSize); ; |
|
| 121 | 121 | |
| 122 | 122 | $limit = $this->state == self::STATUS_DATA ? 1000 : 512; |
| 123 | 123 | if ('' !== $data && false !== $data) { |
@@ -128,7 +128,7 @@ discard block |
||
| 128 | 128 | } |
| 129 | 129 | |
| 130 | 130 | $delimiter = "\r\n"; |
| 131 | - while(false !== $pos = strpos($this->lineBuffer, $delimiter)) { |
|
| 131 | + while (false !== $pos = strpos($this->lineBuffer, $delimiter)) { |
|
| 132 | 132 | $line = substr($this->lineBuffer, 0, $pos); |
| 133 | 133 | $this->lineBuffer = substr($this->lineBuffer, $pos + strlen($delimiter)); |
| 134 | 134 | $this->emit('line', [$line, $this]); |
@@ -158,7 +158,7 @@ discard block |
||
| 158 | 158 | |
| 159 | 159 | protected function handleCommand($line) |
| 160 | 160 | { |
| 161 | - if ($line !=='') { |
|
| 161 | + if ($line !== '') { |
|
| 162 | 162 | $command = $this->parseCommand($line); |
| 163 | 163 | if ($command == null) { |
| 164 | 164 | $this->sendReply(500, "Unexpected or unknown command."); |
@@ -177,7 +177,7 @@ discard block |
||
| 177 | 177 | $out = ''; |
| 178 | 178 | if (is_array($message)) { |
| 179 | 179 | $last = array_pop($message); |
| 180 | - foreach($message as $line) { |
|
| 180 | + foreach ($message as $line) { |
|
| 181 | 181 | $out .= "$code-$line\r\n"; |
| 182 | 182 | } |
| 183 | 183 | $this->write($out); |
@@ -25,18 +25,21 @@ discard block |
||
| 25 | 25 | /** |
| 26 | 26 | * This function will throw an exception since replacing headers is will mangle SMTP messages. |
| 27 | 27 | * @throws \Exception |
| 28 | + * @return \GuzzleHttp\Psr7\MessageTrait |
|
| 28 | 29 | */ |
| 29 | 30 | public function withHeader($name, $value); |
| 30 | 31 | |
| 31 | 32 | /** |
| 32 | 33 | * This function will throw an exception since removing headers is will mangle SMTP messages. |
| 33 | 34 | * @throws \Exception |
| 35 | + * @return \GuzzleHttp\Psr7\MessageTrait |
|
| 34 | 36 | */ |
| 35 | 37 | public function withoutHeader($name); |
| 36 | 38 | |
| 37 | 39 | /** |
| 38 | 40 | * This function will throw an exception since removing headers is will mangle SMTP messages. |
| 39 | 41 | * @throws \Exception |
| 42 | + * @return string |
|
| 40 | 43 | */ |
| 41 | 44 | public function getHeaderLine($name); |
| 42 | 45 | |
@@ -96,7 +99,6 @@ discard block |
||
| 96 | 99 | * new and/or updated header and value. |
| 97 | 100 | * |
| 98 | 101 | * @return self |
| 99 | - * @param array $recipients Array of email => name pairs. |
|
| 100 | 102 | * @throws \InvalidArgumentException for invalid email. |
| 101 | 103 | */ |
| 102 | 104 | public function withAddedRecipient($email, $name = null); |
@@ -11,6 +11,10 @@ |
||
| 11 | 11 | throw new \Exception('SMTP Message does not support replacing headers.'); |
| 12 | 12 | } |
| 13 | 13 | |
| 14 | + /** |
|
| 15 | + * @param string $name |
|
| 16 | + * @param string $value |
|
| 17 | + */ |
|
| 14 | 18 | public function withAddedHeader($name, $value) |
| 15 | 19 | { |
| 16 | 20 | $new = clone $this; |
@@ -27,7 +27,7 @@ |
||
| 27 | 27 | { |
| 28 | 28 | $result = []; |
| 29 | 29 | $header = strtolower($header); |
| 30 | - foreach($this->headers as list($name, $value)) { |
|
| 30 | + foreach ($this->headers as list($name, $value)) { |
|
| 31 | 31 | if ($header == strtolower($name)) { |
| 32 | 32 | $result[] = [$name, $value]; |
| 33 | 33 | } |
@@ -38,7 +38,6 @@ |
||
| 38 | 38 | * new and/or updated header and value. |
| 39 | 39 | * |
| 40 | 40 | * @return self |
| 41 | - * @param array $recipients Array of email => name pairs. |
|
| 42 | 41 | * @throws \InvalidArgumentException for invalid email. |
| 43 | 42 | */ |
| 44 | 43 | public function withAddedRecipient($email, $name = null); |
@@ -27,7 +27,7 @@ discard block |
||
| 27 | 27 | public function withAddedRecipients(array $recipients) |
| 28 | 28 | { |
| 29 | 29 | $new = clone $this; |
| 30 | - foreach($recipients as $email => $name) { |
|
| 30 | + foreach ($recipients as $email => $name) { |
|
| 31 | 31 | $this->validateEmail($email); |
| 32 | 32 | $new->recipients[$email] = $name; |
| 33 | 33 | } |
@@ -46,7 +46,7 @@ discard block |
||
| 46 | 46 | public function withRecipients(array $recipients) { |
| 47 | 47 | $new = clone $this; |
| 48 | 48 | $new->recipients = []; |
| 49 | - foreach($recipients as $email => $name) { |
|
| 49 | + foreach ($recipients as $email => $name) { |
|
| 50 | 50 | $this->validateEmail($email); |
| 51 | 51 | $new->recipients[$email] = $name; |
| 52 | 52 | } |