Skip to content

Commit 5b4568a

Browse files
Merge branch '5.4' into 6.0
* 5.4: [Serializer] cs fix Cleanup more `@return` annotations [Form] Fix phpdoc on FormBuilderInterface
2 parents ad0c49e + 9cb8298 commit 5b4568a

File tree

5 files changed

+2
-25
lines changed

5 files changed

+2
-25
lines changed

Dumper.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,6 @@ public function __construct(int $indentation = 4)
4545
* @param int $inline The level where you switch to inline YAML
4646
* @param int $indent The level of indentation (used internally)
4747
* @param int $flags A bit field of Yaml::DUMP_* constants to customize the dumped YAML string
48-
*
49-
* @return string The YAML representation of the PHP value
5048
*/
5149
public function dump(mixed $input, int $inline = 0, int $indent = 0, int $flags = 0): string
5250
{

Escaper.php

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,6 @@ class Escaper
4949
* Determines if a PHP value would require double quoting in YAML.
5050
*
5151
* @param string $value A PHP value
52-
*
53-
* @return bool True if the value would require double quotes
5452
*/
5553
public static function requiresDoubleQuoting(string $value): bool
5654
{
@@ -61,8 +59,6 @@ public static function requiresDoubleQuoting(string $value): bool
6159
* Escapes and surrounds a PHP value with double quotes.
6260
*
6361
* @param string $value A PHP value
64-
*
65-
* @return string The quoted, escaped string
6662
*/
6763
public static function escapeWithDoubleQuotes(string $value): string
6864
{
@@ -73,8 +69,6 @@ public static function escapeWithDoubleQuotes(string $value): string
7369
* Determines if a PHP value would require single quoting in YAML.
7470
*
7571
* @param string $value A PHP value
76-
*
77-
* @return bool True if the value would require single quotes
7872
*/
7973
public static function requiresSingleQuoting(string $value): bool
8074
{
@@ -93,8 +87,6 @@ public static function requiresSingleQuoting(string $value): bool
9387
* Escapes and surrounds a PHP value with single quotes.
9488
*
9589
* @param string $value A PHP value
96-
*
97-
* @return string The quoted, escaped string
9890
*/
9991
public static function escapeWithSingleQuotes(string $value): string
10092
{

Exception/ParseException.php

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,6 @@ public function __construct(string $message, int $parsedLine = -1, string $snipp
4343

4444
/**
4545
* Gets the snippet of code near the error.
46-
*
47-
* @return string The snippet of code
4846
*/
4947
public function getSnippet(): string
5048
{
@@ -65,8 +63,6 @@ public function setSnippet(string $snippet)
6563
* Gets the filename where the error occurred.
6664
*
6765
* This method returns null if a string is parsed.
68-
*
69-
* @return string The filename
7066
*/
7167
public function getParsedFile(): string
7268
{
@@ -85,8 +81,6 @@ public function setParsedFile(string $parsedFile)
8581

8682
/**
8783
* Gets the line where the error occurred.
88-
*
89-
* @return int The file line
9084
*/
9185
public function getParsedLine(): int
9286
{

Inline.php

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,8 @@ public static function initialize(int $flags, int $parsedLineNumber = null, stri
5050
/**
5151
* Converts a YAML string to a PHP value.
5252
*
53-
* @param string|null $value A YAML string
54-
* @param int $flags A bit field of PARSE_* constants to customize the YAML parser behavior
55-
* @param array $references Mapping of variable names to values
53+
* @param int $flags A bit field of PARSE_* constants to customize the YAML parser behavior
54+
* @param array $references Mapping of variable names to values
5655
*
5756
* @throws ParseException
5857
*/

Unescaper.php

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,6 @@ class Unescaper
3232
* Unescapes a single quoted string.
3333
*
3434
* @param string $value A single quoted string
35-
*
36-
* @return string The unescaped string
3735
*/
3836
public function unescapeSingleQuotedString(string $value): string
3937
{
@@ -44,8 +42,6 @@ public function unescapeSingleQuotedString(string $value): string
4442
* Unescapes a double quoted string.
4543
*
4644
* @param string $value A double quoted string
47-
*
48-
* @return string The unescaped string
4945
*/
5046
public function unescapeDoubleQuotedString(string $value): string
5147
{
@@ -61,8 +57,6 @@ public function unescapeDoubleQuotedString(string $value): string
6157
* Unescapes a character that was found in a double-quoted string.
6258
*
6359
* @param string $value An escaped character
64-
*
65-
* @return string The unescaped character
6660
*/
6761
private function unescapeCharacter(string $value): string
6862
{

0 commit comments

Comments
 (0)