Skip to content

Commit 81d5b8d

Browse files
Merge branch '3.4' into 4.0
* 3.4: Clean up Update return type in docblock. PHP CS Fixer: no need to exclude xml and yml files PHP CS Fixer: no need to exclude json file Update LICENSE year... forever fixed some deprecation messages fixed CS Fixes for Oracle in PdoSessionHandler fixed some deprecation messages fixed some deprecation messages fixed some deprecation messages fixed some deprecation messages [TwigBundle/Brige] catch missing requirements to throw meaningful exceptions [HttpKernel] Call Response->setPrivate() instead of sending raw header() when session is started [FrameworkBundle] Make cache:clear "atomic" and consistent with cache:warmup Suggest to write an implementation if the interface cannot be autowired [Debug] Skip DebugClassLoader checks for already parsed files [2.7][DX] Use constant message contextualisation for deprecations Remove group options without data and fix normalization Remove redundant translation path
2 parents 75fdda3 + fcdee41 commit 81d5b8d

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

CHANGELOG.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ CHANGELOG
3131
* deprecated OptionsResolver::isKnown() in favor of isDefined()
3232
* [BC BREAK] OptionsResolver::isRequired() returns true now if a required
3333
option has a default value set
34-
* [BC BREAK] merged Options into OptionsResolver and turned Options into an
34+
* [BC BREAK] merged Options into OptionsResolver and turned Options into an
3535
interface
3636
* deprecated Options::overload() (now in OptionsResolver)
3737
* deprecated Options::set() (now in OptionsResolver)
@@ -42,7 +42,7 @@ CHANGELOG
4242
lazy option/normalizer closures now
4343
* [BC BREAK] removed Traversable interface from Options since using within
4444
lazy option/normalizer closures resulted in exceptions
45-
* [BC BREAK] removed Options::all() since using within lazy option/normalizer
45+
* [BC BREAK] removed Options::all() since using within lazy option/normalizer
4646
closures resulted in exceptions
4747
* [BC BREAK] OptionDefinitionException now extends LogicException instead of
4848
RuntimeException

LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright (c) 2004-2017 Fabien Potencier
1+
Copyright (c) 2004-present Fabien Potencier
22

33
Permission is hereby granted, free of charge, to any person obtaining a copy
44
of this software and associated documentation files (the "Software"), to deal

0 commit comments

Comments
 (0)