Cleanups

Author: nicolas-grekas

UPGRADE-3.2.md

@@ -47,28 +47,6 @@ HttpKernel
  * `DataCollector::varToString()` is deprecated and will be removed in Symfony
    4.0. Use the `cloneVar()` method instead.
 
-   Before:
-
-   ```php
-   public function collect(Request $request, Response $response, \Exception $exception = null)
-   {
-       $this->data = [
-           'something' => $this->varToString($request->attributes->get('...')),
-       ];
-   }
-   ```
-
-   After:
-
-   ```php
-   public function collect(Request $request, Response $response, \Exception $exception = null)
-   {
-       $this->data = [
-           'something' => $this->cloneVar($request->attributes->get('...')),
-       ];
-   }
-   ```
-
 Validator
 ---------
 

UPGRADE-4.0.md

@@ -134,28 +134,6 @@ HttpKernel
 
  * The `DataCollector::varToString()` method has been removed in favor of `cloneVar()`.
 
-   Before:
-
-   ```php
-   public function collect(Request $request, Response $response, \Exception $exception = null)
-   {
-       $this->data = [
-           'something' => $this->varToString($request->attributes->get('...')),
-       ];
-   }
-   ```
-
-   After:
-
-   ```php
-   public function collect(Request $request, Response $response, \Exception $exception = null)
-   {
-       $this->data = [
-           'something' => $this->cloneVar($request->attributes->get('...')),
-       ];
-   }
-   ```
-
 Serializer
 ----------
 

src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/logger.html.twig

@@ -137,7 +137,7 @@
             <tr>
                 <th>{{ show_level ? 'Level' : 'Time' }}</th>
                 {% if channel_is_defined %}<th>Channel</th>{% endif %}
-                <th style="width: 100%">Message</th>
+                <th class="full-width">Message</th>
             </tr>
         </thead>
 
@@ -158,7 +158,7 @@
                     {% if channel_is_defined %}
                         <td class="font-normal text-small text-bold" nowrap>
                             {{ log.channel }}
-                            {% if log.errorCount is defined and log.errorCount > 0 %}
+                            {% if log.errorCount is defined and log.errorCount > 1 %}
                                 <span class="text-muted">({{ log.errorCount }} times)</span>
                             {% endif %}
                         </td>

src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/profiler.css.twig

@@ -184,6 +184,9 @@ table tbody ul {
 .block {
     display: block;
 }
+.full-width {
+    width: 100%;
+}
 .hidden {
     display: none;
 }

src/Symfony/Bundle/WebProfilerBundle/Twig/WebProfilerExtension.php

@@ -20,7 +20,7 @@
  *
  * @author Fabien Potencier <[email protected]>
  */
-class WebProfilerExtension extends \Twig_Extension
+class WebProfilerExtension extends \Twig_Extension_Profiler
 {
     /**
      * @var ValueExporter
@@ -37,20 +37,27 @@ class WebProfilerExtension extends \Twig_Extension
      */
     private $output;
 
+    /**
+     * @var int
+     */
+    private $stackLevel = 0;
+
     public function __construct(HtmlDumper $dumper = null)
     {
         $this->dumper = $dumper ?: new HtmlDumper(null, null, HtmlDumper::DUMP_LIGHT_ARRAY);
-        $this->reset();
+        $this->dumper->setOutput($this->output = fopen('php://memory', 'r+b'));
     }
 
-    public function reset()
+    public function enter(\Twig_Profiler_Profile $profile)
     {
-        $this->dumper->setOutput($this->output = fopen('php://memory', 'r+b'));
+        ++$this->stackLevel;
     }
 
-    public function getNodeVisitors()
+    public function leave(\Twig_Profiler_Profile $profile)
     {
-        return array(new WebProfilerNodeVisitor($this->getName()));
+        if (0 === --$this->stackLevel) {
+            $this->dumper->setOutput($this->output = fopen('php://memory', 'r+b'));
+        }
     }
 
     /**

src/Symfony/Bundle/WebProfilerBundle/Twig/WebProfilerNodeVisitor.php

@@ -11,18 +11,15 @@
 
 namespace Symfony\Component\HttpKernel\DataCollector\Util;
 
+@trigger_error('The '__NAMESPACE__.'\ValueExporter class is deprecated since version 3.2 and will be removed in 4.0. Use the VarDumper component instead.', E_USER_DEPRECATED);
+
 /**
  * @author Bernhard Schussek <[email protected]>
  *
- * @deprecated Deprecated since version 3.2, to be removed in 4.0. Use the VarDumper component instead.
+ * @deprecated since version 3.2, to be removed in 4.0. Use the VarDumper component instead.
  */
 class ValueExporter
 {
-    public function __construct()
-    {
-        @trigger_error(__CLASS__.' is deprecated since version 3.2 and will be removed in 4.0. Use the VarDumper component instead.', E_USER_DEPRECATED);
-    }
-
     /**
      * Converts a PHP value to a string.
      *