Skip to content

Commit 2bbfbda

Browse files
committed
Merge branch '6.1' into 6.2
* 6.1: [Yaml] Minor: Update Inline parse phpdoc [DependencyInjection] Fix dumping inlined withers [HttpClient] Move Http clients data collecting at a late level [FrameworkBundle] restore call to addGlobalIgnoredName Allow EmailValidator 4 Fix detecting mapping with one line annotations
2 parents ab4d9cb + 468e41d commit 2bbfbda

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

Inline.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ public static function initialize(int $flags, int $parsedLineNumber = null, stri
5050
/**
5151
* Converts a YAML string to a PHP value.
5252
*
53-
* @param int $flags A bit field of PARSE_* constants to customize the YAML parser behavior
53+
* @param int $flags A bit field of Yaml::PARSE_* constants to customize the YAML parser behavior
5454
* @param array $references Mapping of variable names to values
5555
*
5656
* @throws ParseException

Parser.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ class Parser
4343
* Parses a YAML file into a PHP value.
4444
*
4545
* @param string $filename The path to the YAML file to be parsed
46-
* @param int $flags A bit field of PARSE_* constants to customize the YAML parser behavior
46+
* @param int $flags A bit field of Yaml::PARSE_* constants to customize the YAML parser behavior
4747
*
4848
* @throws ParseException If the file could not be read or the YAML is not valid
4949
*/
@@ -70,7 +70,7 @@ public function parseFile(string $filename, int $flags = 0): mixed
7070
* Parses a YAML string to a PHP value.
7171
*
7272
* @param string $value A YAML string
73-
* @param int $flags A bit field of PARSE_* constants to customize the YAML parser behavior
73+
* @param int $flags A bit field of Yaml::PARSE_* constants to customize the YAML parser behavior
7474
*
7575
* @throws ParseException If the YAML is not valid
7676
*/
@@ -696,7 +696,7 @@ private function moveToPreviousLine(): bool
696696
* Parses a YAML value.
697697
*
698698
* @param string $value A YAML value
699-
* @param int $flags A bit field of PARSE_* constants to customize the YAML parser behavior
699+
* @param int $flags A bit field of Yaml::PARSE_* constants to customize the YAML parser behavior
700700
* @param string $context The parser context (either sequence or mapping)
701701
*
702702
* @throws ParseException When reference does not exist

0 commit comments

Comments
 (0)