Skip to content

Commit 2884c26

Browse files
committed
Merge branch '3.0' into 3.1
* 3.0: fixed CS fixed CS fixed form tests [Console] Fix formatting of SymfonyStyle::comment() [Form] fix post max size translation type extension for >= 2.8 removed dots at the end of @param and @return fixed typo
2 parents 318dd06 + d7dfe7f commit 2884c26

File tree

4 files changed

+8
-8
lines changed

4 files changed

+8
-8
lines changed

Dumper.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ public function __construct($indentation = 4)
4040
/**
4141
* Sets the indentation.
4242
*
43-
* @param int $num The amount of spaces to use for indentation of nested nodes.
43+
* @param int $num The amount of spaces to use for indentation of nested nodes
4444
*/
4545
public function setIndentation($num)
4646
{

Escaper.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ class Escaper
4646
*
4747
* @param string $value A PHP value
4848
*
49-
* @return bool True if the value would require double quotes.
49+
* @return bool True if the value would require double quotes
5050
*/
5151
public static function requiresDoubleQuoting($value)
5252
{
@@ -70,7 +70,7 @@ public static function escapeWithDoubleQuotes($value)
7070
*
7171
* @param string $value A PHP value
7272
*
73-
* @return bool True if the value would require single quotes.
73+
* @return bool True if the value would require single quotes
7474
*/
7575
public static function requiresSingleQuoting($value)
7676
{

Unescaper.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@ class Unescaper
3131
/**
3232
* Unescapes a single quoted string.
3333
*
34-
* @param string $value A single quoted string.
34+
* @param string $value A single quoted string
3535
*
36-
* @return string The unescaped string.
36+
* @return string The unescaped string
3737
*/
3838
public function unescapeSingleQuotedString($value)
3939
{
@@ -43,9 +43,9 @@ public function unescapeSingleQuotedString($value)
4343
/**
4444
* Unescapes a double quoted string.
4545
*
46-
* @param string $value A double quoted string.
46+
* @param string $value A double quoted string
4747
*
48-
* @return string The unescaped string.
48+
* @return string The unescaped string
4949
*/
5050
public function unescapeDoubleQuotedString($value)
5151
{

Yaml.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ public static function parse($input, $flags = 0)
8686
*
8787
* @param array $array PHP array
8888
* @param int $inline The level where you switch to inline YAML
89-
* @param int $indent The amount of spaces to use for indentation of nested nodes.
89+
* @param int $indent The amount of spaces to use for indentation of nested nodes
9090
* @param int $flags A bit field of DUMP_* constants to customize the dumped YAML string
9191
*
9292
* @return string A YAML string representing the original PHP array

0 commit comments

Comments
 (0)