Merge branch '6.2' of github.com:darkwebdesign/symfony-addon-pack

Author: raymondschouten

README.md

@@ -4,15 +4,15 @@
 [![Total Downloads](https://poser.pugx.org/darkwebdesign/symfony-addon-constraints/downloads?format=flat)](https://packagist.org/packages/darkwebdesign/symfony-addon-constraints)
 [![License](https://poser.pugx.org/darkwebdesign/symfony-addon-constraints/license?format=flat)](https://packagist.org/packages/darkwebdesign/symfony-addon-constraints)
 
-[![Build Status](https://github.com/darkwebdesign/symfony-addon-constraints/actions/workflows/build.yaml/badge.svg?branch=6.1)](https://github.com/darkwebdesign/symfony-addon-constraints/actions/workflows/build.yaml)
-[![Coverage Status](https://codecov.io/gh/darkwebdesign/symfony-addon-constraints/branch/6.1/graph/badge.svg)](https://codecov.io/gh/darkwebdesign/symfony-addon-constraints)
+[![Build Status](https://github.com/darkwebdesign/symfony-addon-constraints/actions/workflows/build.yaml/badge.svg?branch=6.2)](https://github.com/darkwebdesign/symfony-addon-constraints/actions/workflows/build.yaml)
+[![Coverage Status](https://codecov.io/gh/darkwebdesign/symfony-addon-constraints/branch/6.2/graph/badge.svg)](https://codecov.io/gh/darkwebdesign/symfony-addon-constraints)
 [![PHP Version](https://img.shields.io/badge/php-8.1%2B-777BB3.svg)](https://php.net/)
-[![Symfony Version](https://img.shields.io/badge/symfony-6.1-93C74B.svg)](https://symfony.com/)
+[![Symfony Version](https://img.shields.io/badge/symfony-6.2-93C74B.svg)](https://symfony.com/)
 
 Symfony Add-on Constraints is a collection of extra Symfony validation constraints that you can use in your Symfony
 applications.
 
-Learn more about it in its [documentation](https://darkwebdesign.github.io/symfony-addon-pack/docs/6.1).
+Learn more about it in its [documentation](https://darkwebdesign.github.io/symfony-addon-pack/docs/6.2).
 
 ## Features
 

composer.json

@@ -11,15 +11,15 @@
     "require": {
         "ext-json": "*",
         "php": "^8.1",
-        "symfony/validator": "6.1.*"
+        "symfony/validator": "6.2.*"
     },
     "require-dev": {
         "friendsofphp/php-cs-fixer": "^3.58",
         "phpstan/extension-installer": "^1.3",
         "phpstan/phpstan": "^1.11",
         "phpstan/phpstan-phpunit": "^1.4",
         "phpstan/phpstan-symfony": "^1.4",
-        "phpunit/phpunit": "^9.5",
+        "phpunit/phpunit": "^10.5",
         "rector/rector": "^1.1"
     },
     "suggest": {

phpunit.xml.dist

@@ -1,30 +1,29 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.6/phpunit.xsd"
+         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd"
          bootstrap="vendor/autoload.php"
-         cacheResultFile=".phpunit.cache/test-results"
+         cacheDirectory=".phpunit.cache"
          colors="true"
          executionOrder="depends,defects"
-         forceCoversAnnotation="true"
-         beStrictAboutCoversAnnotation="true"
+         requireCoverageMetadata="true"
+         beStrictAboutCoverageMetadata="true"
          beStrictAboutOutputDuringTests="true"
          beStrictAboutTodoAnnotatedTests="true"
-         convertDeprecationsToExceptions="true"
          failOnRisky="true"
-         failOnWarning="true"
-         verbose="true">
+         failOnWarning="true">
 
     <testsuites>
         <testsuite name="DarkWeb Design Symfony Add-on Constraints Test Suite">
             <directory>tests</directory>
         </testsuite>
     </testsuites>
 
-    <coverage cacheDirectory=".phpunit.cache/code-coverage"
-              processUncoveredFiles="true">
+    <source restrictDeprecations="true"
+            restrictNotices="true"
+            restrictWarnings="true">
         <include>
             <directory suffix=".php">src</directory>
         </include>
-    </coverage>
+    </source>
 
 </phpunit>

rector.php

@@ -13,7 +13,7 @@
     ])
     ->withSets([
         LevelSetList::UP_TO_PHP_81,
-        SymfonySetList::SYMFONY_61,
+        SymfonySetList::SYMFONY_62,
     ])
     ->withImportNames(
         importShortClasses: false,

tests/BsnValidatorTest.php

@@ -25,27 +25,26 @@
 use DarkWebDesign\SymfonyAddonConstraints\Bsn;
 use DarkWebDesign\SymfonyAddonConstraints\BsnValidator;
 use DarkWebDesign\SymfonyAddonConstraints\Tests\Models\ToStringObject;
+use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\DataProvider;
 use Symfony\Component\Validator\Constraints as Assert;
 use Symfony\Component\Validator\Exception\UnexpectedTypeException;
 use Symfony\Component\Validator\Test\ConstraintValidatorTestCase;
 
 /**
  * @template-extends ConstraintValidatorTestCase<BsnValidator>
  *
- * @covers \DarkWebDesign\SymfonyAddonConstraints\BsnValidator
- *
  * @internal
  */
+#[CoversClass(BsnValidator::class)]
 class BsnValidatorTest extends ConstraintValidatorTestCase
 {
     protected function createValidator(): BsnValidator
     {
         return new BsnValidator();
     }
 
-    /**
-     * @dataProvider providerValidBsn
-     */
+    #[DataProvider('providerValidBsn')]
     public function testValidate(string|\Stringable $value): void
     {
         $this->validator->validate($value, new Bsn());
@@ -76,9 +75,7 @@ public function testValidateEmptyString(): void
         $this->assertNoViolation();
     }
 
-    /**
-     * @dataProvider providerNoScalar
-     */
+    #[DataProvider('providerNoScalar')]
     public function testValidateNoScalar(mixed $value): void
     {
         $this->expectException(UnexpectedTypeException::class);
@@ -88,9 +85,7 @@ public function testValidateNoScalar(mixed $value): void
         $this->assertNoViolation();
     }
 
-    /**
-     * @dataProvider providerInvalidBsn
-     */
+    #[DataProvider('providerInvalidBsn')]
     public function testValidateViolation(string|\Stringable $value): void
     {
         $constraint = new Bsn();
@@ -105,7 +100,7 @@ public function testValidateViolation(string|\Stringable $value): void
     /**
      * @return array<string, array{string|\Stringable}>
      */
-    public function providerValidBsn(): array
+    public static function providerValidBsn(): array
     {
         return [
             'valid1' => ['111222333'],
@@ -117,7 +112,7 @@ public function providerValidBsn(): array
     /**
      * @return array<string, array{mixed}>
      */
-    public function providerNoScalar(): array
+    public static function providerNoScalar(): array
     {
         return [
             'array' => [['foo', 'bar']],
@@ -130,7 +125,7 @@ public function providerNoScalar(): array
     /**
      * @return array<string, array{string|\Stringable}>
      */
-    public function providerInvalidBsn(): array
+    public static function providerInvalidBsn(): array
     {
         return [
             'zeros' => ['000000000'],

tests/CollectionTest.php

@@ -23,16 +23,16 @@
 namespace DarkWebDesign\SymfonyAddonConstraints\Tests;
 
 use DarkWebDesign\SymfonyAddonConstraints\Collection;
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Validator\Constraints as Assert;
 use Symfony\Component\Validator\Exception\ConstraintDefinitionException;
 use Symfony\Component\Validator\Exception\MissingOptionsException;
 
 /**
- * @covers \DarkWebDesign\SymfonyAddonConstraints\Collection
- *
  * @internal
  */
+#[CoversClass(Collection::class)]
 class CollectionTest extends TestCase
 {
     public function testConstruct(): void

tests/CollectionValidatorTest.php

@@ -25,19 +25,20 @@
 use DarkWebDesign\SymfonyAddonConstraints\Collection;
 use DarkWebDesign\SymfonyAddonConstraints\CollectionValidator;
 use DarkWebDesign\SymfonyAddonConstraints\Tests\Models\TraversableObject;
+use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\DataProvider;
+use PHPUnit\Framework\Attributes\UsesClass;
 use Symfony\Component\Validator\Constraints as Assert;
 use Symfony\Component\Validator\Exception\UnexpectedTypeException;
 use Symfony\Component\Validator\Test\ConstraintValidatorTestCase;
 
 /**
  * @template-extends ConstraintValidatorTestCase<CollectionValidator>
  *
- * @covers \DarkWebDesign\SymfonyAddonConstraints\CollectionValidator
- *
- * @uses \DarkWebDesign\SymfonyAddonConstraints\Collection
- *
  * @internal
  */
+#[CoversClass(CollectionValidator::class)]
+#[UsesClass(Collection::class)]
 class CollectionValidatorTest extends ConstraintValidatorTestCase
 {
     protected function createValidator(): CollectionValidator
@@ -47,9 +48,8 @@ protected function createValidator(): CollectionValidator
 
     /**
      * @param string[]|iterable $value
-     *
-     * @dataProvider providerValidCollection
      */
+    #[DataProvider('providerValidCollection')]
     public function testValidate(iterable $value): void
     {
         $constraints = [
@@ -88,9 +88,7 @@ public function testValidateNull(): void
         $this->assertNoViolation();
     }
 
-    /**
-     * @dataProvider providerNoArray
-     */
+    #[DataProvider('providerNoArray')]
     public function testValidateNoArray(mixed $value): void
     {
         $this->expectException(UnexpectedTypeException::class);
@@ -105,7 +103,7 @@ public function testValidateNoArray(mixed $value): void
     /**
      * @return array<string, array{string[]|iterable}>
      */
-    public function providerValidCollection(): array
+    public static function providerValidCollection(): array
     {
         return [
             'empty' => [[]],
@@ -117,7 +115,7 @@ public function providerValidCollection(): array
     /**
      * @return array<string, array{mixed}>
      */
-    public function providerNoArray(): array
+    public static function providerNoArray(): array
     {
         return [
             'bool' => [true],

tests/JsonValidatorTest.php

@@ -25,27 +25,26 @@
 use DarkWebDesign\SymfonyAddonConstraints\Json;
 use DarkWebDesign\SymfonyAddonConstraints\JsonValidator;
 use DarkWebDesign\SymfonyAddonConstraints\Tests\Models\ToStringObject;
+use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\DataProvider;
 use Symfony\Component\Validator\Constraints as Assert;
 use Symfony\Component\Validator\Exception\UnexpectedTypeException;
 use Symfony\Component\Validator\Test\ConstraintValidatorTestCase;
 
 /**
  * @template-extends ConstraintValidatorTestCase<JsonValidator>
  *
- * @covers \DarkWebDesign\SymfonyAddonConstraints\JsonValidator
- *
  * @internal
  */
+#[CoversClass(JsonValidator::class)]
 class JsonValidatorTest extends ConstraintValidatorTestCase
 {
     protected function createValidator(): JsonValidator
     {
         return new JsonValidator();
     }
 
-    /**
-     * @dataProvider providerValidJson
-     */
+    #[DataProvider('providerValidJson')]
     public function testValidate(mixed $value): void
     {
         $this->validator->validate($value, new Json());
@@ -76,9 +75,7 @@ public function testValidateEmptyString(): void
         $this->assertNoViolation();
     }
 
-    /**
-     * @dataProvider providerNoScalar
-     */
+    #[DataProvider('providerNoScalar')]
     public function testValidateNoScalar(mixed $value): void
     {
         $this->expectException(UnexpectedTypeException::class);
@@ -88,9 +85,7 @@ public function testValidateNoScalar(mixed $value): void
         $this->assertNoViolation();
     }
 
-    /**
-     * @dataProvider providerInvalidJson
-     */
+    #[DataProvider('providerInvalidJson')]
     public function testValidateViolation(string $value): void
     {
         $constraint = new Json();
@@ -105,7 +100,7 @@ public function testValidateViolation(string $value): void
     /**
      * @return array<string, array{mixed}>
      */
-    public function providerValidJson(): array
+    public static function providerValidJson(): array
     {
         return [
             'bool' => [true],
@@ -121,7 +116,7 @@ public function providerValidJson(): array
     /**
      * @return array<string, array{mixed}>
      */
-    public function providerNoScalar(): array
+    public static function providerNoScalar(): array
     {
         return [
             'array' => [['foo', 'bar']],
@@ -134,7 +129,7 @@ public function providerNoScalar(): array
     /**
      * @return array<string, array{string}>
      */
-    public function providerInvalidJson(): array
+    public static function providerInvalidJson(): array
     {
         return [
             'string' => ['json'],