Merge branch '3.4' into 4.2

nicolas-grekas · nicolas-grekas · commit bc8656c57374 · 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/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/twig.html.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/twig.html.twig
@@ -31,7 +31,7 @@
 {% endblock %}
 
 {% block menu %}
-    <span class="label">
+    <span class="label {{ 0 == collector.templateCount ? 'disabled' }}">
         <span class="icon">{{ include('@WebProfiler/Icon/twig.svg') }}</span>
         <strong>Twig</strong>
     </span>
diff --git a/src/Symfony/Component/Config/Resource/ClassExistenceResource.php b/src/Symfony/Component/Config/Resource/ClassExistenceResource.php
@@ -95,7 +95,7 @@ public function isFresh($timestamp)
     }
 
     /**
-     * {@inheritdoc}
+     * @internal
      */
     public function serialize()
     {
@@ -107,7 +107,7 @@ public function serialize()
     }
 
     /**
-     * {@inheritdoc}
+     * @internal
      */
     public function unserialize($serialized)
     {
@@ -116,8 +116,10 @@ public function unserialize($serialized)
 
     /**
      * @throws \ReflectionException When $class is not found and is required
+     *
+     * @internal
      */
-    private static function throwOnRequiredClass($class)
+    public static function throwOnRequiredClass($class)
     {
         if (self::$autoloadedClass === $class) {
             return;
diff --git a/src/Symfony/Component/Config/Resource/ComposerResource.php b/src/Symfony/Component/Config/Resource/ComposerResource.php
@@ -51,11 +51,17 @@ public function isFresh($timestamp)
         return self::$runtimeVendors === $this->vendors;
     }
 
+    /**
+     * @internal
+     */
     public function serialize()
     {
         return serialize($this->vendors);
     }
 
+    /**
+     * @internal
+     */
     public function unserialize($serialized)
     {
         $this->vendors = unserialize($serialized);
diff --git a/src/Symfony/Component/Config/Resource/DirectoryResource.php b/src/Symfony/Component/Config/Resource/DirectoryResource.php
@@ -104,11 +104,17 @@ public function isFresh($timestamp)
         return true;
     }
 
+    /**
+     * @internal
+     */
     public function serialize()
     {
         return serialize([$this->resource, $this->pattern]);
     }
 
+    /**
+     * @internal
+     */
     public function unserialize($serialized)
     {
         list($this->resource, $this->pattern) = unserialize($serialized);
diff --git a/src/Symfony/Component/Config/Resource/FileExistenceResource.php b/src/Symfony/Component/Config/Resource/FileExistenceResource.php
@@ -59,15 +59,15 @@ public function isFresh($timestamp)
     }
 
     /**
-     * {@inheritdoc}
+     * @internal
      */
     public function serialize()
     {
         return serialize([$this->resource, $this->exists]);
     }
 
     /**
-     * {@inheritdoc}
+     * @internal
      */
     public function unserialize($serialized)
     {
diff --git a/src/Symfony/Component/Config/Resource/FileResource.php b/src/Symfony/Component/Config/Resource/FileResource.php
@@ -63,11 +63,17 @@ public function isFresh($timestamp)
         return false !== ($filemtime = @filemtime($this->resource)) && $filemtime <= $timestamp;
     }
 
+    /**
+     * @internal
+     */
     public function serialize()
     {
         return serialize($this->resource);
     }
 
+    /**
+     * @internal
+     */
     public function unserialize($serialized)
     {
         $this->resource = unserialize($serialized);
diff --git a/src/Symfony/Component/Config/Resource/GlobResource.php b/src/Symfony/Component/Config/Resource/GlobResource.php
@@ -77,6 +77,9 @@ public function isFresh($timestamp)
         return $this->hash === $hash;
     }
 
+    /**
+     * @internal
+     */
     public function serialize()
     {
         if (null === $this->hash) {
@@ -86,6 +89,9 @@ public function serialize()
         return serialize([$this->prefix, $this->pattern, $this->recursive, $this->hash, $this->forExclusion, $this->excludedPrefixes]);
     }
 
+    /**
+     * @internal
+     */
     public function unserialize($serialized)
     {
         list($this->prefix, $this->pattern, $this->recursive, $this->hash, $this->forExclusion, $this->excludedPrefixes) = unserialize($serialized) + [4 => false, []];
diff --git a/src/Symfony/Component/Config/Resource/ReflectionClassResource.php b/src/Symfony/Component/Config/Resource/ReflectionClassResource.php
@@ -58,6 +58,9 @@ public function __toString()
         return 'reflection.'.$this->className;
     }
 
+    /**
+     * @internal
+     */
     public function serialize()
     {
         if (null === $this->hash) {
@@ -68,6 +71,9 @@ public function serialize()
         return serialize([$this->files, $this->className, $this->hash]);
     }
 
+    /**
+     * @internal
+     */
     public function unserialize($serialized)
     {
         list($this->files, $this->className, $this->hash) = unserialize($serialized);
diff --git a/src/Symfony/Component/Config/ResourceCheckerConfigCache.php b/src/Symfony/Component/Config/ResourceCheckerConfigCache.php
@@ -156,18 +156,19 @@ private function safelyUnserialize($file)
     {
         $e = null;
         $meta = false;
+        $content = file_get_contents($file);
         $signalingException = new \UnexpectedValueException();
         $prevUnserializeHandler = ini_set('unserialize_callback_func', '');
         $prevErrorHandler = set_error_handler(function ($type, $msg, $file, $line, $context = []) use (&$prevErrorHandler, $signalingException) {
-            if (E_WARNING === $type && 'Class __PHP_Incomplete_Class has no unserializer' === $msg) {
+            if (__FILE__ === $file) {
                 throw $signalingException;
             }
 
             return $prevErrorHandler ? $prevErrorHandler($type, $msg, $file, $line, $context) : false;
         });
 
         try {
-            $meta = unserialize(file_get_contents($file));
+            $meta = unserialize($content);
         } catch (\Throwable $e) {
             if ($e !== $signalingException) {
                 throw $e;
diff --git a/src/Symfony/Component/DependencyInjection/Config/ContainerParametersResource.php b/src/Symfony/Component/DependencyInjection/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)
     {
diff --git a/src/Symfony/Component/Form/Extension/DataCollector/FormDataCollector.php b/src/Symfony/Component/Form/Extension/DataCollector/FormDataCollector.php
@@ -229,6 +229,9 @@ public function getData()
         return $this->data;
     }
 
+    /**
+     * @internal
+     */
     public function serialize()
     {
         foreach ($this->data['forms_by_hash'] as &$form) {
diff --git a/src/Symfony/Component/Form/FormError.php b/src/Symfony/Component/Form/FormError.php
@@ -135,9 +135,7 @@ public function getOrigin()
     }
 
     /**
-     * Serializes this error.
-     *
-     * @return string The serialized error
+     * @internal
      */
     public function serialize()
     {
@@ -151,9 +149,7 @@ public function serialize()
     }
 
     /**
-     * Unserializes a serialized error.
-     *
-     * @param string $serialized The serialized error
+     * @internal
      */
     public function unserialize($serialized)
     {
diff --git a/src/Symfony/Component/HttpKernel/DataCollector/DataCollector.php b/src/Symfony/Component/HttpKernel/DataCollector/DataCollector.php
@@ -34,6 +34,9 @@ abstract class DataCollector implements DataCollectorInterface, \Serializable
      */
     private $cloner;
 
+    /**
+     * @internal
+     */
     public function serialize()
     {
         $trace = debug_backtrace(DEBUG_BACKTRACE_PROVIDE_OBJECT, 2);
@@ -42,6 +45,9 @@ public function serialize()
         return $isCalledFromOverridingMethod ? $this->data : serialize($this->data);
     }
 
+    /**
+     * @internal
+     */
     public function unserialize($data)
     {
         $this->data = \is_array($data) ? $data : unserialize($data);
diff --git a/src/Symfony/Component/HttpKernel/DataCollector/DumpDataCollector.php b/src/Symfony/Component/HttpKernel/DataCollector/DumpDataCollector.php
@@ -133,6 +133,9 @@ public function reset()
         $this->clonesIndex = 0;
     }
 
+    /**
+     * @internal
+     */
     public function serialize()
     {
         if ($this->clonesCount !== $this->clonesIndex) {
@@ -149,9 +152,12 @@ public function serialize()
         return $ser;
     }
 
+    /**
+     * @internal
+     */
     public function unserialize($data)
     {
-        parent::unserialize($data);
+        $this->data = unserialize($data);
         $charset = array_pop($this->data);
         $fileLinkFormat = array_pop($this->data);
         $this->dataCount = \count($this->data);
diff --git a/src/Symfony/Component/HttpKernel/Debug/FileLinkFormatter.php b/src/Symfony/Component/HttpKernel/Debug/FileLinkFormatter.php
@@ -61,11 +61,17 @@ public function format($file, $line)
         return false;
     }
 
+    /**
+     * @internal
+     */
     public function serialize()
     {
         return serialize($this->getFileLinkFormat());
     }
 
+    /**
+     * @internal
+     */
     public function unserialize($serialized)
     {
         $this->fileLinkFormat = unserialize($serialized, ['allowed_classes' => false]);
diff --git a/src/Symfony/Component/Validator/Constraint.php b/src/Symfony/Component/Validator/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()
     {
diff --git a/src/Symfony/Component/VarDumper/Cloner/Stub.php b/src/Symfony/Component/VarDumper/Cloner/Stub.php
@@ -16,7 +16,7 @@
  *
  * @author Nicolas Grekas <p@tchwork.com>
  */
-class Stub implements \Serializable
+class Stub
 {
     const TYPE_REF = 1;
     const TYPE_STRING = 2;
@@ -42,16 +42,19 @@ class Stub implements \Serializable
     /**
      * @internal
      */
-    public function serialize()
+    public function __sleep()
     {
-        return \serialize([$this->class, $this->position, $this->cut, $this->type, $this->value, $this->handle, $this->refCount, $this->attr]);
+        $this->serialized = [$this->class, $this->position, $this->cut, $this->type, $this->value, $this->handle, $this->refCount, $this->attr];
+
+        return ['serialized'];
     }
 
     /**
      * @internal
      */
-    public function unserialize($serialized)
+    public function __wakeup()
     {
-        list($this->class, $this->position, $this->cut, $this->type, $this->value, $this->handle, $this->refCount, $this->attr) = \unserialize($serialized);
+        list($this->class, $this->position, $this->cut, $this->type, $this->value, $this->handle, $this->refCount, $this->attr) = $this->serialized;
+        unset($this->serialized);
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -95,7 +95,7 @@ public function isFresh($timestamp)`
`95`	`95`	`}`
`96`	`96`
`97`	`97`	`/**`
`98`		`- * {@inheritdoc}`
	`98`	`+ * @internal`
`99`	`99`	`*/`
`100`	`100`	`public function serialize()`
`101`	`101`	`{`
`@@ -107,7 +107,7 @@ public function serialize()`
`107`	`107`	`}`
`108`	`108`
`109`	`109`	`/**`
`110`		`- * {@inheritdoc}`
	`110`	`+ * @internal`
`111`	`111`	`*/`
`112`	`112`	`public function unserialize($serialized)`
`113`	`113`	`{`
`@@ -116,8 +116,10 @@ public function unserialize($serialized)`
`116`	`116`
`117`	`117`	`/**`
`118`	`118`	`* @throws \ReflectionException When $class is not found and is required`
	`119`	`+ *`
	`120`	`+ * @internal`
`119`	`121`	`*/`
`120`		`- private static function throwOnRequiredClass($class)`
	`122`	`+ public static function throwOnRequiredClass($class)`
`121`	`123`	`{`
`122`	`124`	`if (self::$autoloadedClass === $class) {`
`123`	`125`	`return;`
Original file line number	Diff line number	Diff line change
`@@ -51,11 +51,17 @@ public function isFresh($timestamp)`
`51`	`51`	`return self::$runtimeVendors === $this->vendors;`
`52`	`52`	`}`
`53`	`53`
	`54`	`+ /**`
	`55`	`+ * @internal`
	`56`	`+ */`
`54`	`57`	`public function serialize()`
`55`	`58`	`{`
`56`	`59`	`return serialize($this->vendors);`
`57`	`60`	`}`
`58`	`61`
	`62`	`+ /**`
	`63`	`+ * @internal`
	`64`	`+ */`
`59`	`65`	`public function unserialize($serialized)`
`60`	`66`	`{`
`61`	`67`	`$this->vendors = unserialize($serialized);`
Original file line number	Diff line number	Diff line change
`@@ -104,11 +104,17 @@ public function isFresh($timestamp)`
`104`	`104`	`return true;`
`105`	`105`	`}`
`106`	`106`
	`107`	`+ /**`
	`108`	`+ * @internal`
	`109`	`+ */`
`107`	`110`	`public function serialize()`
`108`	`111`	`{`
`109`	`112`	`return serialize([$this->resource, $this->pattern]);`
`110`	`113`	`}`
`111`	`114`
	`115`	`+ /**`
	`116`	`+ * @internal`
	`117`	`+ */`
`112`	`118`	`public function unserialize($serialized)`
`113`	`119`	`{`
`114`	`120`	`list($this->resource, $this->pattern) = unserialize($serialized);`
Original file line number	Diff line number	Diff line change
`@@ -59,15 +59,15 @@ public function isFresh($timestamp)`
`59`	`59`	`}`
`60`	`60`
`61`	`61`	`/**`
`62`		`- * {@inheritdoc}`
	`62`	`+ * @internal`
`63`	`63`	`*/`
`64`	`64`	`public function serialize()`
`65`	`65`	`{`
`66`	`66`	`return serialize([$this->resource, $this->exists]);`
`67`	`67`	`}`
`68`	`68`
`69`	`69`	`/**`
`70`		`- * {@inheritdoc}`
	`70`	`+ * @internal`
`71`	`71`	`*/`
`72`	`72`	`public function unserialize($serialized)`
`73`	`73`	`{`
Original file line number	Diff line number	Diff line change
`@@ -63,11 +63,17 @@ public function isFresh($timestamp)`
`63`	`63`	`return false !== ($filemtime = @filemtime($this->resource)) && $filemtime <= $timestamp;`
`64`	`64`	`}`
`65`	`65`
	`66`	`+ /**`
	`67`	`+ * @internal`
	`68`	`+ */`
`66`	`69`	`public function serialize()`
`67`	`70`	`{`
`68`	`71`	`return serialize($this->resource);`
`69`	`72`	`}`
`70`	`73`
	`74`	`+ /**`
	`75`	`+ * @internal`
	`76`	`+ */`
`71`	`77`	`public function unserialize($serialized)`
`72`	`78`	`{`
`73`	`79`	`$this->resource = unserialize($serialized);`
Original file line number	Diff line number	Diff line change
`@@ -77,6 +77,9 @@ public function isFresh($timestamp)`
`77`	`77`	`return $this->hash === $hash;`
`78`	`78`	`}`
`79`	`79`
	`80`	`+ /**`
	`81`	`+ * @internal`
	`82`	`+ */`
`80`	`83`	`public function serialize()`
`81`	`84`	`{`
`82`	`85`	`if (null === $this->hash) {`
`@@ -86,6 +89,9 @@ public function serialize()`
`86`	`89`	`return serialize([$this->prefix, $this->pattern, $this->recursive, $this->hash, $this->forExclusion, $this->excludedPrefixes]);`
`87`	`90`	`}`
`88`	`91`
	`92`	`+ /**`
	`93`	`+ * @internal`
	`94`	`+ */`
`89`	`95`	`public function unserialize($serialized)`
`90`	`96`	`{`
`91`	`97`	`list($this->prefix, $this->pattern, $this->recursive, $this->hash, $this->forExclusion, $this->excludedPrefixes) = unserialize($serialized) + [4 => false, []];`
Original file line number	Diff line number	Diff line change
`@@ -58,6 +58,9 @@ public function __toString()`
`58`	`58`	`return 'reflection.'.$this->className;`
`59`	`59`	`}`
`60`	`60`
	`61`	`+ /**`
	`62`	`+ * @internal`
	`63`	`+ */`
`61`	`64`	`public function serialize()`
`62`	`65`	`{`
`63`	`66`	`if (null === $this->hash) {`
`@@ -68,6 +71,9 @@ public function serialize()`
`68`	`71`	`return serialize([$this->files, $this->className, $this->hash]);`
`69`	`72`	`}`
`70`	`73`
	`74`	`+ /**`
	`75`	`+ * @internal`
	`76`	`+ */`
`71`	`77`	`public function unserialize($serialized)`
`72`	`78`	`{`
`73`	`79`	`list($this->files, $this->className, $this->hash) = 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`	`{`