Skip to content

Commit b10544f

Browse files
Merge branch '6.1' into 6.2
* 6.1: (26 commits) Exclude from baseline generation deprecations triggered in legacy test [HttpFoundation] Update "[Session] Overwrite invalid session id" to only validate when files session storage is used [HttpClient] Fix Copy as curl with base uri [DoctrineBridge] Add missing break [PropertyInfo] CS fix [Serializer] Try all possible denormalization route with union types when ALLOW_EXTRA_ATTRIBUTES=false CS fix [Cache] Respect $save option in ChainAdapter [ExpressionLanguage] fix tests (bis) [ExpressionLanguage] fix tests Allow passing null in twig_is_selected_choice [Cache] Respect $save option in ArrayAdapter [HttpKernel] Disable session tracking while collecting profiler data [MonologBridge] Fixed support of elasticsearch 7.+ in ElasticsearchLogstashHandler Fix HttpClientTrait::jsonEncode flags usage [DoctrineBridge] Extend type guessing on enum fields [FrameworkBundle] Lower JsonSerializableNormalizer priority [WebProfilerBundle] Bump http-kernel requirement to ^6.1 [Messenger] move resetting services at worker stopped into ResetServicesListener [PropertyInfo] Fix multi phpdoc covered promoted properties ...
2 parents 2521d3c + 7309cdd commit b10544f

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

DeprecationErrorHandler/Configuration.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -208,6 +208,10 @@ public function isIgnoredDeprecation(Deprecation $deprecation): bool
208208
*/
209209
public function isBaselineDeprecation(Deprecation $deprecation)
210210
{
211+
if ($deprecation->isLegacy()) {
212+
return false;
213+
}
214+
211215
if ($deprecation->originatesFromAnObject()) {
212216
$location = $deprecation->originatingClass().'::'.$deprecation->originatingMethod();
213217
} else {

0 commit comments

Comments
 (0)