Skip to content

Commit 92df075

Browse files
committed
Merge branch '6.4' into 7.0
* 6.4: fix tests fix merge fix typo Change ProxyCacheWarmer::warmUp signature CS fix [Serializer] Keep stack trace for enum value denormalizer error add the MailPace transport to the UnsupportedSchemeException add the Phrase translation provider to the UnsupportedSchemeException [Serializer] Fix partial denormalization with missing constructor arguments [Serializer] Moves dummy to fixtures folder [HttpKernel] Don't validate partially denormalized object fix(mailjet-smtp): disable tls for mailjet as it should use starttls instead
2 parents c2d059b + bd0455b commit 92df075

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

Tests/DeprecationErrorHandler/DeprecationTest.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -265,7 +265,7 @@ private static function removeDir($dir)
265265
rmdir($dir);
266266
}
267267

268-
public static function setupBeforeClass(): void
268+
public static function setUpBeforeClass(): void
269269
{
270270
foreach (get_declared_classes() as $class) {
271271
if ('C' === $class[0] && 0 === strpos($class, 'ComposerAutoloaderInit')) {

0 commit comments

Comments
 (0)