Skip to content

Commit

Permalink
Merge branch '6.0' into 6.1
Browse files Browse the repository at this point in the history
* 6.0:
  [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 ad53cf0 + 797757a commit 33ced92
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
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 33ced92

Please sign in to comment.