Merge branch '6.4' into 7.0

nicolas-grekas · nicolas-grekas · commit a54bcbc5f8fa · 2023-10-31T09:22:02.000+01:00
* 6.4:
  [Console] Fix horizontal table top border is incorrectly rendered
  [Tests] Streamline
  [AssetMapper] Fixing bug where JSCompiler used non-absolute importmap entry path
  [FrameworkBundle] Fix BC break about enable_annotations in validation and serializer configuration
  [Uid] Fix UuidV7 collisions within the same ms
  [Validator] updated Romanian translation
diff --git a/Tests/Controller/ProfilerControllerTest.php b/Tests/Controller/ProfilerControllerTest.php
@@ -342,7 +342,7 @@ public function testPhpinfoActionWithProfilerDisabled()
         $twig = $this->createMock(Environment::class);
 
         $controller = new ProfilerController($urlGenerator, null, $twig, []);
-        $controller->phpinfoAction(Request::create('/_profiler/phpinfo'));
+        $controller->phpinfoAction();
     }
 
     public function testPhpinfoAction()
@@ -391,7 +391,7 @@ public function testDownloadFontAction()
         $this->assertStringContainsString('font/woff2', $client->getResponse()->headers->get('content-type'));
     }
 
-    public static function provideCspVariants()
+    public static function provideCspVariants(): array
     {
         return [
             [true],
diff --git a/Tests/Csp/ContentSecurityPolicyHandlerTest.php b/Tests/Csp/ContentSecurityPolicyHandlerTest.php
@@ -46,7 +46,7 @@ public function testOnKernelResponse($nonce, $expectedNonce, Request $request, R
         }
     }
 
-    public static function provideRequestAndResponses()
+    public static function provideRequestAndResponses(): array
     {
         $nonce = bin2hex(random_bytes(16));
 
@@ -73,7 +73,7 @@ public static function provideRequestAndResponses()
         ];
     }
 
-    public static function provideRequestAndResponsesForOnKernelResponse()
+    public static function provideRequestAndResponsesForOnKernelResponse(): array
     {
         $nonce = bin2hex(random_bytes(16));
 
diff --git a/Tests/EventListener/WebDebugToolbarListenerTest.php b/Tests/EventListener/WebDebugToolbarListenerTest.php
@@ -148,7 +148,7 @@ public function testToolbarIsNotInjectedOnRedirection($statusCode)
         $this->assertEquals('<html><head></head><body></body></html>', $response->getContent());
     }
 
-    public static function provideRedirects()
+    public static function provideRedirects(): array
     {
         return [
             [301],
diff --git a/Tests/Resources/IconTest.php b/Tests/Resources/IconTest.php
@@ -32,7 +32,7 @@ public function testIconFileContents($iconFilePath)
         $this->assertMatchesRegularExpression('~<svg .* viewBox="0 0 \d+ \d+".+>.*</svg>~s', file_get_contents($iconFilePath), sprintf('The SVG file of the "%s" icon must include a "viewBox" attribute.', $iconFilePath));
     }
 
-    public static function provideIconFilePaths()
+    public static function provideIconFilePaths(): array
     {
         return array_map(fn ($filePath) => (array) $filePath, glob(__DIR__.'/../../Resources/views/Icon/*.svg'));
     }

Original file line number	Diff line number	Diff line change
`@@ -342,7 +342,7 @@ public function testPhpinfoActionWithProfilerDisabled()`
`342`	`342`	`$twig = $this->createMock(Environment::class);`
`343`	`343`
`344`	`344`	`$controller = new ProfilerController($urlGenerator, null, $twig, []);`
`345`		`- $controller->phpinfoAction(Request::create('/_profiler/phpinfo'));`
	`345`	`+ $controller->phpinfoAction();`
`346`	`346`	`}`
`347`	`347`
`348`	`348`	`public function testPhpinfoAction()`
`@@ -391,7 +391,7 @@ public function testDownloadFontAction()`
`391`	`391`	`$this->assertStringContainsString('font/woff2', $client->getResponse()->headers->get('content-type'));`
`392`	`392`	`}`
`393`	`393`
`394`		`- public static function provideCspVariants()`
	`394`	`+ public static function provideCspVariants(): array`
`395`	`395`	`{`
`396`	`396`	`return [`
`397`	`397`	`[true],`
Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ public function testOnKernelResponse($nonce, $expectedNonce, Request $request, R`
`46`	`46`	`}`
`47`	`47`	`}`
`48`	`48`
`49`		`- public static function provideRequestAndResponses()`
	`49`	`+ public static function provideRequestAndResponses(): array`
`50`	`50`	`{`
`51`	`51`	`$nonce = bin2hex(random_bytes(16));`
`52`	`52`
`@@ -73,7 +73,7 @@ public static function provideRequestAndResponses()`
`73`	`73`	`];`
`74`	`74`	`}`
`75`	`75`
`76`		`- public static function provideRequestAndResponsesForOnKernelResponse()`
	`76`	`+ public static function provideRequestAndResponsesForOnKernelResponse(): array`
`77`	`77`	`{`
`78`	`78`	`$nonce = bin2hex(random_bytes(16));`
`79`	`79`
Original file line number	Diff line number	Diff line change
`@@ -148,7 +148,7 @@ public function testToolbarIsNotInjectedOnRedirection($statusCode)`
`148`	`148`	`$this->assertEquals('<html><head></head><body></body></html>', $response->getContent());`
`149`	`149`	`}`
`150`	`150`
`151`		`- public static function provideRedirects()`
	`151`	`+ public static function provideRedirects(): array`
`152`	`152`	`{`
`153`	`153`	`return [`
`154`	`154`	`[301],`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ public function testIconFileContents($iconFilePath)`
`32`	`32`	`$this->assertMatchesRegularExpression('~<svg .* viewBox="0 0 \d+ \d+".+>.*</svg>~s', file_get_contents($iconFilePath), sprintf('The SVG file of the "%s" icon must include a "viewBox" attribute.', $iconFilePath));`
`33`	`33`	`}`
`34`	`34`
`35`		`- public static function provideIconFilePaths()`
	`35`	`+ public static function provideIconFilePaths(): array`
`36`	`36`	`{`
`37`	`37`	`return array_map(fn ($filePath) => (array) $filePath, glob(__DIR__.'/../../Resources/views/Icon/*.svg'));`
`38`	`38`	`}`