Merge branch '6.4' into 7.0

nicolas-grekas · nicolas-grekas · commit 9e248b8bb696 · 2023-07-03T16:24:08.000+02:00
* 6.4:
  -
  [FrameworkBundle] fix tests
  [FrameworkBundle] Fix legacy test
  [WebProfilerBundle] Improve minify test after JS refactor
  [HttpKernel] Do not use ContainerAwareInterface anymore
  Allows to change element for form_help block
diff --git a/src/Symfony/Bridge/Twig/Resources/views/Form/form_div_layout.html.twig b/src/Symfony/Bridge/Twig/Resources/views/Form/form_div_layout.html.twig
@@ -329,9 +329,9 @@
 {% block form_help -%}
     {%- if help is not empty -%}
         {%- set help_attr = help_attr|merge({class: (help_attr.class|default('') ~ ' help-text')|trim}) -%}
-        <div id="{{ id }}_help"{% with { attr: help_attr } %}{{ block('attributes') }}{% endwith %}>
+        <{{ element|default('div') }} id="{{ id }}_help"{% with { attr: help_attr } %}{{ block('attributes') }}{% endwith %}>
             {{- block('form_help_content') -}}
-        </div>
+        </{{ element|default('div') }}>
     {%- endif -%}
 {%- endblock form_help %}
 
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Controller/ControllerResolverTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Controller/ControllerResolverTest.php
@@ -15,6 +15,7 @@
 use Psr\Log\LoggerInterface;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Bundle\FrameworkBundle\Controller\ControllerResolver;
+use Symfony\Bundle\FrameworkBundle\Tests\Fixtures\ContainerAwareController;
 use Symfony\Component\DependencyInjection\Container;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\HttpFoundation\Request;
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/ContainerAwareController.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/ContainerAwareController.php
@@ -0,0 +1,38 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bundle\FrameworkBundle\Tests\Fixtures;
+
+use Symfony\Component\DependencyInjection\ContainerAwareInterface;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+
+class ContainerAwareController implements ContainerAwareInterface
+{
+    private ?ContainerInterface $container = null;
+
+    public function setContainer(?ContainerInterface $container): void
+    {
+        $this->container = $container;
+    }
+
+    public function getContainer(): ?ContainerInterface
+    {
+        return $this->container;
+    }
+
+    public function testAction()
+    {
+    }
+
+    public function __invoke()
+    {
+    }
+}
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Tests/Resources/MinifyTest.php b/src/Symfony/Bundle/WebProfilerBundle/Tests/Resources/MinifyTest.php
@@ -23,8 +23,12 @@ class MinifyTest extends TestCase
     public function testNoSingleLineComments()
     {
         $dir = \dirname(__DIR__, 2).'/Resources/views/Profiler';
-        $message = 'There cannot be any single line comment in this file. Consider using multiple line comment. ';
-        $this->assertTrue(2 === substr_count(file_get_contents($dir.'/base_js.html.twig'), '//'), $message);
-        $this->assertTrue(0 === substr_count(file_get_contents($dir.'/toolbar.css.twig'), '//'), $message);
+
+        foreach (glob($dir.'/*js.html.twig') as $jsFile) {
+            $fileContents = file_get_contents($dir.'/base_js.html.twig');
+            $fileContents = str_replace('\'//\'', '', $fileContents);
+
+            $this->assertEquals(0, substr_count($fileContents, '//'), 'There cannot be any single line comment in "'.$jsFile.'". Consider using multiple line comment. ');
+        }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -23,8 +23,12 @@ class MinifyTest extends TestCase`
`23`	`23`	`public function testNoSingleLineComments()`
`24`	`24`	`{`
`25`	`25`	`$dir = \dirname(__DIR__, 2).'/Resources/views/Profiler';`
`26`		`- $message = 'There cannot be any single line comment in this file. Consider using multiple line comment. ';`
`27`		`- $this->assertTrue(2 === substr_count(file_get_contents($dir.'/base_js.html.twig'), '//'), $message);`
`28`		`- $this->assertTrue(0 === substr_count(file_get_contents($dir.'/toolbar.css.twig'), '//'), $message);`
	`26`	`+`
	`27`	`+ foreach (glob($dir.'/*js.html.twig') as $jsFile) {`
	`28`	`+ $fileContents = file_get_contents($dir.'/base_js.html.twig');`
	`29`	`+ $fileContents = str_replace('\'//\'', '', $fileContents);`
	`30`	`+`
	`31`	`+ $this->assertEquals(0, substr_count($fileContents, '//'), 'There cannot be any single line comment in "'.$jsFile.'". Consider using multiple line comment. ');`
	`32`	`+ }`
`29`	`33`	`}`
`30`	`34`	`}`