Commit 1e92e39
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
+16
-6
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
123 | 123 | | |
124 | 124 | | |
125 | 125 | | |
| 126 | + | |
| 127 | + | |
| 128 | + | |
| 129 | + | |
126 | 130 | | |
127 | 131 | | |
128 | 132 | | |
| |||
137 | 141 | | |
138 | 142 | | |
139 | 143 | | |
140 | | - | |
141 | | - | |
142 | | - | |
143 | | - | |
144 | | - | |
| 144 | + | |
| 145 | + | |
| 146 | + | |
| 147 | + | |
| 148 | + | |
| 149 | + | |
| 150 | + | |
| 151 | + | |
| 152 | + | |
| 153 | + | |
| 154 | + | |
145 | 155 | | |
146 | 156 | | |
147 | 157 | | |
| |||
162 | 172 | | |
163 | 173 | | |
164 | 174 | | |
165 | | - | |
| 175 | + | |
166 | 176 | | |
167 | 177 | | |
168 | 178 | | |
| |||
0 commit comments