Merge branch '3.3' into 3.4

* 3.3: (33 commits)
  Preserve HttpOnly value when deserializing a header
  [DX] [TwigBundle] Enhance the new exception page design
  Fix deprecated message
  [DI][Security] Prevent unwanted deprecation notices when using Expression Languages
  bumped Symfony version to 3.3.5
  updated VERSION for 3.3.4
  updated CHANGELOG for 3.3.4
  [VarDumper] Reduce size of serialized Data objects
  bumped Symfony version to 3.2.12
  updated VERSION for 3.2.11
  updated CHANGELOG for 3.2.11
  fixed bad merge
  Fix indent of methods
  [Cache] Handle APCu failures gracefully
  [DoctrineBridge] Use normalizedIds for resetting entity manager services
  [FrameworkBundle] Do not remove files from assets dir
  [FrameworkBundle] 3.3: Don't get() private services from debug:router
  bumped Symfony version to 3.3.4
  updated VERSION for 3.3.3
  updated CHANGELOG for 3.3.3
  ...

Author: nicolas-grekas

Adapter/RenameEntryInterface.php

@@ -5,9 +5,9 @@
 use Symfony\Component\Ldap\Entry;
 
 /**
- * @deprecated This interface will be deprecated in 4.0, and merged with `EntryManagerInterface`
- *
  * @author Kevin Schuurmans <kevin.schuurmans@freshheads.com>
+ *
+ * @deprecated since version 3.3, will be merged with {@link EntryManagerInterface} in 4.0.
  */
 interface RenameEntryInterface
 {

CHANGELOG.md

@@ -1,6 +1,11 @@
 CHANGELOG
 =========
 
+3.3.0
+-----
+
+* The `RenameEntryInterface` inferface is deprecated, and will be merged with `EntryManagerInterface` in 4.0.
+
 3.1.0
 -----