Skip to content

Commit

Permalink
Merge branch '6.1' into 6.2
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
fabpot committed Jan 10, 2023
2 parents ab4d9cb + 468e41d commit 2bbfbda
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion Inline.php
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ public static function initialize(int $flags, int $parsedLineNumber = null, stri
/**
* Converts a YAML string to a PHP value.
*
* @param int $flags A bit field of PARSE_* constants to customize the YAML parser behavior
* @param int $flags A bit field of Yaml::PARSE_* constants to customize the YAML parser behavior
* @param array $references Mapping of variable names to values
*
* @throws ParseException
Expand Down
6 changes: 3 additions & 3 deletions Parser.php
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ class Parser
* Parses a YAML file into a PHP value.
*
* @param string $filename The path to the YAML file to be parsed
* @param int $flags A bit field of PARSE_* constants to customize the YAML parser behavior
* @param int $flags A bit field of Yaml::PARSE_* constants to customize the YAML parser behavior
*
* @throws ParseException If the file could not be read or the YAML is not valid
*/
Expand All @@ -70,7 +70,7 @@ public function parseFile(string $filename, int $flags = 0): mixed
* Parses a YAML string to a PHP value.
*
* @param string $value A YAML string
* @param int $flags A bit field of PARSE_* constants to customize the YAML parser behavior
* @param int $flags A bit field of Yaml::PARSE_* constants to customize the YAML parser behavior
*
* @throws ParseException If the YAML is not valid
*/
Expand Down Expand Up @@ -696,7 +696,7 @@ private function moveToPreviousLine(): bool
* Parses a YAML value.
*
* @param string $value A YAML value
* @param int $flags A bit field of PARSE_* constants to customize the YAML parser behavior
* @param int $flags A bit field of Yaml::PARSE_* constants to customize the YAML parser behavior
* @param string $context The parser context (either sequence or mapping)
*
* @throws ParseException When reference does not exist
Expand Down

0 comments on commit 2bbfbda

Please sign in to comment.