Skip to content

Commit dde75bb

Browse files
committed
Fix deprecations on returned parameters from annotations
1 parent 655e538 commit dde75bb

File tree

2 files changed

+20
-7
lines changed

2 files changed

+20
-7
lines changed

lib/classes/Swift/Encoder/QpEncoder.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -153,9 +153,9 @@ protected function initSafeMap()
153153
* If the first line needs to be shorter, indicate the difference with
154154
* $firstLineOffset.
155155
*
156-
* @param string $string to encode
157-
* @param int $firstLineOffset, optional
158-
* @param int $maxLineLength, optional 0 indicates the default of 76 chars
156+
* @param string $string string to encode
157+
* @param int $firstLineOffset optional
158+
* @param int $maxLineLength optional, 0 indicates the default of 76 chars
159159
*
160160
* @return string
161161
*/

lib/classes/Swift/Mime/ContentEncoder/QpContentEncoderProxy.php

Lines changed: 17 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,9 @@ public function __clone()
5656
}
5757

5858
/**
59-
* {@inheritdoc}
59+
* Notify this observer that the entity's charset has changed.
60+
*
61+
* @param string $charset
6062
*/
6163
public function charsetChanged($charset)
6264
{
@@ -65,23 +67,34 @@ public function charsetChanged($charset)
6567
}
6668

6769
/**
68-
* {@inheritdoc}
70+
* Encode $in to $out.
71+
*
72+
* @param Swift_OutputByteStream $os to read from
73+
* @param Swift_InputByteStream $is to write to
74+
* @param int $firstLineOffset
75+
* @param int $maxLineLength - 0 indicates the default length for this encoding
6976
*/
7077
public function encodeByteStream(Swift_OutputByteStream $os, Swift_InputByteStream $is, $firstLineOffset = 0, $maxLineLength = 0)
7178
{
7279
$this->getEncoder()->encodeByteStream($os, $is, $firstLineOffset, $maxLineLength);
7380
}
7481

7582
/**
76-
* {@inheritdoc}
83+
* @return string
7784
*/
7885
public function getName()
7986
{
8087
return 'quoted-printable';
8188
}
8289

8390
/**
84-
* {@inheritdoc}
91+
* Encode a given string to produce an encoded string.
92+
*
93+
* @param string $string
94+
* @param int $firstLineOffset ignored
95+
* @param int $maxLineLength - 0 means no wrapping will occur
96+
*
97+
* @return string
8598
*/
8699
public function encodeString($string, $firstLineOffset = 0, $maxLineLength = 0)
87100
{

0 commit comments

Comments
 (0)