Commit 6f73fdf
committed
Merge branch '6.4' into 7.4
* 6.4:
[Ldap] Make the Adapter resettable
[Serializer] Remove needless line in changelog
[MonologBridge] Fix ConsoleHandler losing output after nested command terminates
[Cache] Fix tests
[EventDispatcher] Fix memory leak in TraceableEventDispatcher for long-running processes
[TwigBridge][Mime] Add missing tests
[TwigBridge] Refactor image method to use DataPart content ID
[Cache] Fix undefined property access
[Console] Fix performance regression in OutputFormatter for ASCII content
[Serializer] Fix can*() prefix support in GetSetMethodNormalizer
[Cache] Fix Psr16Cache::getMultiple() returning ValueWrapper with TagAwareAdapter
# Conflicts:
# src/Symfony/Bridge/Monolog/Handler/ConsoleHandler.php
# src/Symfony/Bridge/Monolog/Tests/Handler/ConsoleHandlerTest.php
# src/Symfony/Bridge/Twig/Mime/WrappedTemplatedEmail.php
# src/Symfony/Component/EventDispatcher/Debug/TraceableEventDispatcher.php
# src/Symfony/Component/Ldap/Tests/Adapter/ExtLdap/AdapterTest.php1 file changed
Lines changed: 3 additions & 2 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
30 | 30 | | |
31 | 31 | | |
32 | 32 | | |
33 | | - | |
34 | | - | |
| 33 | + | |
| 34 | + | |
| 35 | + | |
35 | 36 | | |
36 | 37 | | |
37 | 38 | | |
| |||
0 commit comments