Merge branch '3.4' into 4.2

nicolas-grekas · nicolas-grekas · commit 4f596684fe74 · 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/Config/ContainerParametersResource.php b/Config/ContainerParametersResource.php
@@ -39,15 +39,15 @@ public function __toString()
     }
 
     /**
-     * {@inheritdoc}
+     * @internal
      */
     public function serialize()
     {
         return serialize($this->parameters);
     }
 
     /**
-     * {@inheritdoc}
+     * @internal
      */
     public function unserialize($serialized)
     {

Original file line number	Diff line number	Diff line change
`@@ -39,15 +39,15 @@ public function __toString()`
`39`	`39`	`}`
`40`	`40`
`41`	`41`	`/**`
`42`		`- * {@inheritdoc}`
	`42`	`+ * @internal`
`43`	`43`	`*/`
`44`	`44`	`public function serialize()`
`45`	`45`	`{`
`46`	`46`	`return serialize($this->parameters);`
`47`	`47`	`}`
`48`	`48`
`49`	`49`	`/**`
`50`		`- * {@inheritdoc}`
	`50`	`+ * @internal`
`51`	`51`	`*/`
`52`	`52`	`public function unserialize($serialized)`
`53`	`53`	`{`