Skip to content

Commit

Permalink
Merge branch '4.4' into 5.0
Browse files Browse the repository at this point in the history
* 4.4:
  [PhpUnitBridge] fix leftover
  [PhpUnitBridge] fix installing under PHP >= 8
  Use ">=" for the "php" requirement
  bump icu 67.1
  • Loading branch information
nicolas-grekas committed May 20, 2020
2 parents e466c71 + a538e0a commit 84846a7
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 1 deletion.
2 changes: 2 additions & 0 deletions Resources/data/parents.json
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,7 @@
"es_US": "es_419",
"es_UY": "es_419",
"es_VE": "es_419",
"ff_Adlm": "root",
"pa_Arab": "root",
"pt_AO": "pt_PT",
"pt_CH": "pt_PT",
Expand All @@ -128,6 +129,7 @@
"pt_MZ": "pt_PT",
"pt_ST": "pt_PT",
"pt_TL": "pt_PT",
"sd_Deva": "root",
"sr_Latn": "root",
"uz_Arab": "root",
"uz_Cyrl": "root",
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
}
],
"require": {
"php": "^7.2.5",
"php": ">=7.2.5",
"symfony/polyfill-mbstring": "~1.0",
"symfony/translation-contracts": "^2"
},
Expand Down

0 comments on commit 84846a7

Please sign in to comment.