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 #2 ($subject) of type string is deprecated

Author: xabbuh

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();
         }

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