Merge branch '7.1' into 7.2

* 7.1:
  do not mix named and positional arguments in data provider definitions
  session names must not be empty
  add missing properties
  fix Contracts directory name in PHPUnit configuration
  [Validator][CidrValidator] Fix error message for `OutOfRangeNetmask` validation
  Passing null to parameter symfony#2 ($subject) of type string is deprecated

Author: xabbuh

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>
 

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 = [];
 

src/Symfony/Bridge/Monolog/Tests/Handler/ChromePhpHandlerTest.php

@@ -0,0 +1,40 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <[email protected]>
+ *
+ * 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);
+    }
+}

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',
             ],
         ];

src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/AbstractRedisSessionHandlerTestCase.php

@@ -85,7 +85,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'));

src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/MemcachedSessionHandlerTest.php

@@ -107,7 +107,7 @@ public function testWriteSessionWithLargeTTL()
 
     public function testDestroySession()
     {
-        $this->storage->open('', '');
+        $this->storage->open('', 'sid');
         $this->memcached
             ->expects($this->once())
             ->method('delete')

src/Symfony/Component/Validator/Constraints/CidrValidator.php

@@ -81,7 +81,7 @@ public function validate($value, Constraint $constraint): void
             $this->context
                 ->buildViolation($constraint->netmaskRangeViolationMessage)
                 ->setParameter('{{ min }}', $constraint->netmaskMin)
-                ->setParameter('{{ max }}', $constraint->netmaskMax)
+                ->setParameter('{{ max }}', $netmaskMax)
                 ->setCode(Cidr::OUT_OF_RANGE_ERROR)
                 ->addViolation();
         }

src/Symfony/Component/Validator/Tests/Constraints/CidrValidatorTest.php

@@ -106,7 +106,7 @@ public function testInvalidIpAddressAndNetmask(string|\Stringable $cidr)
     /**
      * @dataProvider getOutOfRangeNetmask
      */
-    public function testOutOfRangeNetmask(string $cidr, ?string $version = null, ?int $min = null, ?int $max = null)
+    public function testOutOfRangeNetmask(string $cidr, int $maxExpected, ?string $version = null, ?int $min = null, ?int $max = null)
     {
         $cidrConstraint = new Cidr([
             'version' => $version,
@@ -118,7 +118,7 @@ public function testOutOfRangeNetmask(string $cidr, ?string $version = null, ?in
         $this
             ->buildViolation('The value of the netmask should be between {{ min }} and {{ max }}.')
             ->setParameter('{{ min }}', $cidrConstraint->netmaskMin)
-            ->setParameter('{{ max }}', $cidrConstraint->netmaskMax)
+            ->setParameter('{{ max }}', $maxExpected)
             ->setCode(Cidr::OUT_OF_RANGE_ERROR)
             ->assertRaised();
     }
@@ -240,9 +240,9 @@ public static function getWithInvalidMasksAndIps(): array
     public static function getOutOfRangeNetmask(): array
     {
         return [
-            ['10.0.0.0/24', Ip::V4, 10, 20],
-            ['10.0.0.0/128'],
-            ['2001:0DB8:85A3:0000:0000:8A2E:0370:7334/24', Ip::V6, 10, 20],
+            ['10.0.0.0/24', 20, Ip::V4, 10, 20],
+            ['10.0.0.0/128', 32],
+            ['2001:0DB8:85A3:0000:0000:8A2E:0370:7334/24', 20, Ip::V6, 10, 20],
         ];
     }
 

src/Symfony/Contracts/Tests/Service/LegacyTestService.php

@@ -33,6 +33,8 @@ class LegacyTestService extends LegacyParentTestService implements ServiceSubscr
 {
     use ServiceSubscriberTrait;
 
+    protected $container;
+
     #[SubscribedService]
     public function aService(): Service2
     {

src/Symfony/Contracts/Tests/Service/ServiceSubscriberTraitTest.php

@@ -56,6 +56,8 @@ public function testParentNotCalledIfHasMagicCall()
         };
         $service = new class extends ParentWithMagicCall {
             use ServiceSubscriberTrait;
+
+            private $container;
         };
 
         $this->assertNull($service->setContainer($container));
@@ -69,6 +71,8 @@ public function testParentNotCalledIfNoParent()
         };
         $service = new class {
             use ServiceSubscriberTrait;
+
+            private $container;
         };
 
         $this->assertNull($service->setContainer($container));