Merge branch '3.3' into 3.4

nicolas-grekas · nicolas-grekas · commit 31e64bf7c53e · 2017-11-05T17:59:57.000+01:00
* 3.3:
  [WebProfilerBundle] add missing tests
  Fix dump panel hidden when closing a dump
  FormInterface::getPropertyPath(): PropertyPathInterface|null
  [FrameworkBundle][Routing] Remove unused logger argument
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/routing.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/routing.xml
@@ -59,7 +59,6 @@
         </service>
 
         <service id="router.default" class="Symfony\Bundle\FrameworkBundle\Routing\Router">
-            <tag name="monolog.logger" channel="router" />
             <argument type="service" id="service_container" />
             <argument>%router.resource%</argument>
             <argument type="collection">
@@ -75,7 +74,6 @@
                 <argument key="matcher_cache_class">%router.options.matcher.cache_class%</argument>
             </argument>
             <argument type="service" id="router.request_context" on-invalid="ignore" />
-            <argument type="service" id="logger" on-invalid="ignore" />
             <call method="setConfigCacheFactory">
                 <argument type="service" id="config_cache_factory" />
             </call>
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/toolbar_js.html.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/toolbar_js.html.twig
@@ -98,6 +98,16 @@
 
                     Sfjs.toggleClass(this.parentNode, 'hover');
                 });
+
+                var dumpInfo = document.querySelector('.sf-toolbar-block-dump .sf-toolbar-info');
+                if (null !== dumpInfo) {
+                    Sfjs.addEventListener(dumpInfo, 'sfbeforedumpcollapse', function () {
+                        dumpInfo.style.minHeight = dumpInfo.getBoundingClientRect().height+'px';
+                    });
+                    Sfjs.addEventListener(dumpInfo, 'mouseleave', function () {
+                        dumpInfo.style.minHeight = '';
+                    });
+                }
             },
             function(xhr) {
                 if (xhr.status !== 0) {
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Tests/EventListener/WebDebugToolbarListenerTest.php b/src/Symfony/Bundle/WebProfilerBundle/Tests/EventListener/WebDebugToolbarListenerTest.php
@@ -84,12 +84,29 @@ public function testToolbarIsInjected()
         $this->assertEquals("<html><head></head><body>\nWDT\n</body></html>", $response->getContent());
     }
 
+    /**
+     * @depends testToolbarIsInjected
+     */
+    public function testToolbarIsNotInjectedOnNonHtmlContentType()
+    {
+        $response = new Response('<html><head></head><body></body></html>');
+        $response->headers->set('X-Debug-Token', 'xxxxxxxx');
+        $response->headers->set('Content-Type', 'text/xml');
+        $event = new FilterResponseEvent($this->getKernelMock(), $this->getRequestMock(), HttpKernelInterface::MASTER_REQUEST, $response);
+
+        $listener = new WebDebugToolbarListener($this->getTwigMock());
+        $listener->onKernelResponse($event);
+
+        $this->assertEquals('<html><head></head><body></body></html>', $response->getContent());
+    }
+
     /**
      * @depends testToolbarIsInjected
      */
     public function testToolbarIsNotInjectedOnContentDispositionAttachment()
     {
         $response = new Response('<html><head></head><body></body></html>');
+        $response->headers->set('X-Debug-Token', 'xxxxxxxx');
         $response->headers->set('Content-Disposition', 'attachment; filename=test.html');
         $event = new FilterResponseEvent($this->getKernelMock(), $this->getRequestMock(false, 'html'), HttpKernelInterface::MASTER_REQUEST, $response);
 
diff --git a/src/Symfony/Component/Form/FormInterface.php b/src/Symfony/Component/Form/FormInterface.php
@@ -171,7 +171,7 @@ public function getName();
     /**
      * Returns the property path that the form is mapped to.
      *
-     * @return \Symfony\Component\PropertyAccess\PropertyPathInterface The property path
+     * @return \Symfony\Component\PropertyAccess\PropertyPathInterface|null The property path
      */
     public function getPropertyPath();
 
diff --git a/src/Symfony/Component/Form/Tests/Fixtures/Descriptor/default_option_with_normalizer.txt b/src/Symfony/Component/Form/Tests/Fixtures/Descriptor/default_option_with_normalizer.txt
@@ -16,8 +16,8 @@ Symfony\Component\Form\Extension\Core\Type\ChoiceType (choice_translation_domain
   Allowed values   -                  %s 
  ---------------- --------------------%s 
   Normalizer       Closure {          %s 
-                     parameters: 2,   %s 
-                     file: "%s%eExtension%eCore%eType%eChoiceType.php",  
+                     parameters: 2    %s 
+                     file: "%s%eExtension%eCore%eType%eChoiceType.php"  
                      line: "%s to %s" %s 
                    }                  %s 
  ---------------- --------------------%s 
diff --git a/src/Symfony/Component/Form/Tests/Fixtures/Descriptor/overridden_option_with_default_closures.txt b/src/Symfony/Component/Form/Tests/Fixtures/Descriptor/overridden_option_with_default_closures.txt
@@ -9,13 +9,13 @@ Symfony\Component\Form\Tests\Console\Descriptor\FooType (empty_data)
                                         %s 
                    Closure(s): [        %s 
                      Closure {          %s 
-                       parameters: 1,   %s 
-                       file: "%s%eExtension%eCore%eType%eFormType.php",                     
+                       parameters: 1    %s 
+                       file: "%s%eExtension%eCore%eType%eFormType.php"                     
                        line: "%s to %s" %s 
                      },                 %s 
                      Closure {          %s 
-                       parameters: 2,   %s 
-                       file: "%s%eTests%eConsole%eDescriptor%eAbstractDescriptorTest.php",  
+                       parameters: 2    %s 
+                       file: "%s%eTests%eConsole%eDescriptor%eAbstractDescriptorTest.php"  
                        line: "%s to %s" %s 
                      }                  %s 
                    ]                    %s 
diff --git a/src/Symfony/Component/Form/Tests/Fixtures/Descriptor/required_option_with_allowed_values.txt b/src/Symfony/Component/Form/Tests/Fixtures/Descriptor/required_option_with_allowed_values.txt
@@ -17,8 +17,8 @@ Symfony\Component\Form\Tests\Console\Descriptor\FooType (foo)
                    ]                  %s 
  ---------------- --------------------%s 
   Normalizer       Closure {          %s 
-                     parameters: 2,   %s 
-                     file: "%s%eTests%eConsole%eDescriptor%eAbstractDescriptorTest.php",  
+                     parameters: 2    %s 
+                     file: "%s%eTests%eConsole%eDescriptor%eAbstractDescriptorTest.php"  
                      line: "%s to %s" %s 
                    }                  %s 
  ---------------- --------------------%s 
diff --git a/src/Symfony/Component/Form/composer.json b/src/Symfony/Component/Form/composer.json
@@ -32,7 +32,7 @@
         "symfony/http-kernel": "^3.3.5|~4.0",
         "symfony/security-csrf": "~2.8|~3.0|~4.0",
         "symfony/translation": "~2.8|~3.0|~4.0",
-        "symfony/var-dumper": "~3.3|~4.0",
+        "symfony/var-dumper": "^3.3.11|~4.0",
         "symfony/console": "~3.4|~4.0"
     },
     "conflict": {
diff --git a/src/Symfony/Component/VarDumper/Dumper/HtmlDumper.php b/src/Symfony/Component/VarDumper/Dumper/HtmlDumper.php
@@ -165,6 +165,13 @@ function toggle(a, recursive) {
         return false;
     }
 
+    if (doc.createEvent && s.dispatchEvent) {
+        var event = doc.createEvent('Event');
+        event.initEvent('sf-dump-expanded' === newClass ? 'sfbeforedumpexpand' : 'sfbeforedumpcollapse', true, false);
+
+        s.dispatchEvent(event);
+    }
+
     a.lastChild.innerHTML = arrow;
     s.className = s.className.replace(/\bsf-dump-(compact|expanded)\b/, newClass);
 
diff --git a/src/Symfony/Component/VarDumper/Tests/Dumper/CliDumperTest.php b/src/Symfony/Component/VarDumper/Tests/Dumper/CliDumperTest.php
@@ -147,10 +147,10 @@ public function testDumpWithCommaFlagsAndExceptionCodeExcerpt()
   #file: "%ACliDumperTest.php"
   #line: %d
   trace: {
-    %ACliDumperTest.php:%d: {
-      : 
-      : $ex = new \RuntimeException('foo');
-      : 
+    %ACliDumperTest.php:%d {
+      › 
+      › $ex = new \RuntimeException('foo');
+      › 
     }
     %A
   }

Original file line number	Diff line number	Diff line change
`@@ -171,7 +171,7 @@ public function getName();`
`171`	`171`	`/**`
`172`	`172`	`* Returns the property path that the form is mapped to.`
`173`	`173`	`*`
`174`		`- * @return \Symfony\Component\PropertyAccess\PropertyPathInterface The property path`
	`174`	`+ * @return \Symfony\Component\PropertyAccess\PropertyPathInterface\|null The property path`
`175`	`175`	`*/`
`176`	`176`	`public function getPropertyPath();`
`177`	`177`