Merge branch '3.4' into 4.2

nicolas-grekas · nicolas-grekas · commit f051f6bdc89b · 2019-01-30T12:44:30.000+01:00
* 3.4:
  Add missing `@internal` annotations
  Disable Twig in the profiler menu when Twig is not used
  Mark some/most implementations of Serializable as `@internal`
  [Config] ensure moving away from Serializable wont break cache:clear
  [VarDumper] dont implement Serializable in Stub
  [Config] fix compat with wrapping autoloaders
diff --git a/Constraint.php b/Constraint.php
@@ -284,9 +284,7 @@ public function getTargets()
      *
      * @return array The properties to serialize
      *
-     * @internal This method may be replaced by an implementation of
-     *           {@link \Serializable} in the future. Please don't use or
-     *           overwrite it.
+     * @internal
      */
     public function __sleep()
     {

Original file line number	Diff line number	Diff line change
`@@ -284,9 +284,7 @@ public function getTargets()`
`284`	`284`	`*`
`285`	`285`	`* @return array The properties to serialize`
`286`	`286`	`*`
`287`		`- * @internal This method may be replaced by an implementation of`
`288`		`- * {@link \Serializable} in the future. Please don't use or`
`289`		`- * overwrite it.`
	`287`	`+ * @internal`
`290`	`288`	`*/`
`291`	`289`	`public function __sleep()`
`292`	`290`	`{`