Skip to content

Commit

Permalink
Merge branch '5.4' into 6.0
Browse files Browse the repository at this point in the history
* 5.4:
  Revert "minor #47721 [Notifier] Use local copy of stella-maris/clock when testing (nicolas-grekas)"
  [Yaml] Minor: Update Inline parse phpdoc
  [FrameworkBundle] Fix deprecation when accessing a "container.private" service from the test container
  [DependencyInjection] Fix dumping inlined withers
  [HttpClient] Move Http clients data collecting at a late level
  [DependencyInjection] Fix support for named arguments on non-autowired services
  [FrameworkBundle] restore call to addGlobalIgnoredName
  Allow EmailValidator 4
  Fix detecting mapping with one line annotations
  • Loading branch information
nicolas-grekas committed Jan 11, 2023
2 parents 1c9552c + 0526188 commit bcd79f7
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion composer.json
Expand Up @@ -22,7 +22,7 @@
},
"require-dev": {
"doctrine/annotations": "^1.12|^2",
"egulias/email-validator": "^2.1.10|^3",
"egulias/email-validator": "^2.1.10|^3|^4",
"phpdocumentor/reflection-docblock": "^3.0|^4.0|^5.0",
"symfony/asset": "^5.4|^6.0",
"symfony/dependency-injection": "^5.4|^6.0",
Expand Down

0 comments on commit bcd79f7

Please sign in to comment.