Merge branch '6.4' into 7.1

xabbuh · xabbuh · commit c8e00fd77d22 · 2024-10-11T21:23:14.000+02:00
* 6.4: do not mix named and positional arguments in data provider definitions session names must not be empty fix Contracts directory name in PHPUnit configuration Passing null to parameter #2 ($subject) of type string is deprecated
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -34,7 +34,7 @@
             <directory>./src/Symfony/Component/*/Tests/</directory>
             <directory>./src/Symfony/Component/*/*/Tests/</directory>
             <directory>./src/Symfony/Component/*/*/*/Tests/</directory>
-            <directory>./src/Symfony/Contract/*/Tests/</directory>
+            <directory>./src/Symfony/Contracts/*/Tests/</directory>
             <directory>./src/Symfony/Bundle/*/Tests/</directory>
         </testsuite>
     </testsuites>
@@ -63,7 +63,7 @@
             <directory>./src/Symfony/Bundle/*/vendor</directory>
             <directory>./src/Symfony/Component/*/vendor</directory>
             <directory>./src/Symfony/Component/*/*/vendor</directory>
-            <directory>./src/Symfony/Contract/*/vendor</directory>
+            <directory>./src/Symfony/Contracts/*/vendor</directory>
         </exclude>
     </coverage>
 
diff --git a/src/Symfony/Bridge/Monolog/Handler/ChromePhpHandler.php b/src/Symfony/Bridge/Monolog/Handler/ChromePhpHandler.php
@@ -36,7 +36,7 @@ public function onKernelResponse(ResponseEvent $event): void
             return;
         }
 
-        if (!preg_match(static::USER_AGENT_REGEX, $event->getRequest()->headers->get('User-Agent'))) {
+        if (!preg_match(static::USER_AGENT_REGEX, $event->getRequest()->headers->get('User-Agent', ''))) {
             self::$sendHeaders = false;
             $this->headers = [];
 
diff --git a/src/Symfony/Bridge/Monolog/Tests/Handler/ChromePhpHandlerTest.php b/src/Symfony/Bridge/Monolog/Tests/Handler/ChromePhpHandlerTest.php
@@ -0,0 +1,40 @@
+<?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\Bridge\Monolog\Tests\Handler;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Bridge\Monolog\Handler\ChromePhpHandler;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\HttpKernel\Event\ResponseEvent;
+use Symfony\Component\HttpKernel\HttpKernelInterface;
+
+class ChromePhpHandlerTest extends TestCase
+{
+    public function testOnKernelResponseShouldNotTriggerDeprecation()
+    {
+        $request = Request::create('/');
+        $request->headers->remove('User-Agent');
+
+        $response = new Response('foo');
+        $event = new ResponseEvent($this->createMock(HttpKernelInterface::class), $request, HttpKernelInterface::MAIN_REQUEST, $response);
+
+        $error = null;
+        set_error_handler(function ($type, $message) use (&$error) { $error = $message; }, \E_DEPRECATED);
+
+        $listener = new ChromePhpHandler();
+        $listener->onKernelResponse($event);
+        restore_error_handler();
+
+        $this->assertNull($error);
+    }
+}
diff --git a/src/Symfony/Component/Cache/Tests/Traits/RedisTraitTest.php b/src/Symfony/Component/Cache/Tests/Traits/RedisTraitTest.php
@@ -73,7 +73,7 @@ public static function provideCreateConnection(): array
                 'Redis',
             ],
             [
-                'dsn' => sprintf('redis:?%s', implode('&', \array_slice($hosts, 0, 2))),
+                sprintf('redis:?%s', implode('&', \array_slice($hosts, 0, 2))),
                 'RedisArray',
             ],
         ];
diff --git a/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/AbstractRedisSessionHandlerTestCase.php b/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/AbstractRedisSessionHandlerTestCase.php
@@ -89,7 +89,7 @@ public function testUseSessionGcMaxLifetimeAsTimeToLive()
 
     public function testDestroySession()
     {
-        $this->storage->open('', '');
+        $this->storage->open('', 'test');
         $this->redisClient->set(self::PREFIX.'id', 'foo');
 
         $this->assertTrue((bool) $this->redisClient->exists(self::PREFIX.'id'));
diff --git a/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/MemcachedSessionHandlerTest.php b/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/MemcachedSessionHandlerTest.php
@@ -109,7 +109,7 @@ public function testWriteSessionWithLargeTTL()
 
     public function testDestroySession()
     {
-        $this->storage->open('', '');
+        $this->storage->open('', 'sid');
         $this->memcached
             ->expects($this->once())
             ->method('delete')

Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ public function onKernelResponse(ResponseEvent $event): void`
`36`	`36`	`return;`
`37`	`37`	`}`
`38`	`38`
`39`		`- if (!preg_match(static::USER_AGENT_REGEX, $event->getRequest()->headers->get('User-Agent'))) {`
	`39`	`+ if (!preg_match(static::USER_AGENT_REGEX, $event->getRequest()->headers->get('User-Agent', ''))) {`
`40`	`40`	`self::$sendHeaders = false;`
`41`	`41`	`$this->headers = [];`
`42`	`42`
Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,7 @@ public static function provideCreateConnection(): array`
`73`	`73`	`'Redis',`
`74`	`74`	`],`
`75`	`75`	`[`
`76`		`- 'dsn' => sprintf('redis:?%s', implode('&', \array_slice($hosts, 0, 2))),`
	`76`	`+ sprintf('redis:?%s', implode('&', \array_slice($hosts, 0, 2))),`
`77`	`77`	`'RedisArray',`
`78`	`78`	`],`
`79`	`79`	`];`
Original file line number	Diff line number	Diff line change
`@@ -89,7 +89,7 @@ public function testUseSessionGcMaxLifetimeAsTimeToLive()`
`89`	`89`
`90`	`90`	`public function testDestroySession()`
`91`	`91`	`{`
`92`		`- $this->storage->open('', '');`
	`92`	`+ $this->storage->open('', 'test');`
`93`	`93`	`$this->redisClient->set(self::PREFIX.'id', 'foo');`
`94`	`94`
`95`	`95`	`$this->assertTrue((bool) $this->redisClient->exists(self::PREFIX.'id'));`
Original file line number	Diff line number	Diff line change
`@@ -109,7 +109,7 @@ public function testWriteSessionWithLargeTTL()`
`109`	`109`
`110`	`110`	`public function testDestroySession()`
`111`	`111`	`{`
`112`		`- $this->storage->open('', '');`
	`112`	`+ $this->storage->open('', 'sid');`
`113`	`113`	`$this->memcached`
`114`	`114`	`->expects($this->once())`
`115`	`115`	`->method('delete')`