Skip to content

Commit c79722f

Browse files
Merge branch '5.1' into 5.x
* 5.1: fix merge fix merge Remove branch-version (keep them for contracts only) [HttpClient] relax auth bearer format requirements [PHPUnitBridge] Silence errors from mkdir() [DependencyInjection] Preload classes with union types correctly. [Serializer] fix decoding float XML attributes starting with 0 add missing dutch translations [TwigBridge] Remove "transchoice" from the code base Support PHPUnit 8 and PHPUnit 9 in constraint compatibility trait Add expectDeprecation, expectNotice, expectWarning, and expectError to TestCase polyfill [String] fix before/after[Last]() returning the empty string instead of the original one on non-match Add missing exporter function for PHPUnit 7 [Validator] Add missing romanian translations [String] fix slicing in UnicodeString [Cache] Use correct expiry in ChainAdapter do not translate null placeholders or titles
2 parents 325b02c + 183a36b commit c79722f

File tree

1 file changed

+1
-4
lines changed

1 file changed

+1
-4
lines changed

composer.json

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,5 @@
4141
"/Tests/"
4242
]
4343
},
44-
"minimum-stability": "dev",
45-
"extra": {
46-
"branch-version": "5.2"
47-
}
44+
"minimum-stability": "dev"
4845
}

0 commit comments

Comments
 (0)