Merge branch '5.0' of github.com:darkwebdesign/symfony-addon-pack into ISSUE-190

Author: raymondschouten

.gitignore

@@ -1,2 +1,3 @@
+/.phpunit.result.cache
 /composer.lock
 /vendor/

composer.json

@@ -14,7 +14,7 @@
         "symfony/validator": "5.0.*"
     },
     "require-dev": {
-        "phpunit/phpunit": "^7.5"
+        "phpunit/phpunit": "^8.5"
     },
     "suggest": {
         "darkwebdesign/symfony-addon-pack": "All Symfony add-ons bundled together"

tests/BsnValidatorTest.php

@@ -24,6 +24,7 @@
 use DarkWebDesign\SymfonyAddonConstraints\BsnValidator;
 use DarkWebDesign\SymfonyAddonConstraints\Tests\Models\ToStringObject;
 use Symfony\Component\Validator\Constraints as Assert;
+use Symfony\Component\Validator\Exception\UnexpectedTypeException;
 use Symfony\Component\Validator\Test\ConstraintValidatorTestCase;
 
 class BsnValidatorTest extends ConstraintValidatorTestCase
@@ -48,11 +49,10 @@ public function testValidate($bsn)
         $this->assertNoViolation();
     }
 
-    /**
-     * @expectedException \Symfony\Component\Validator\Exception\UnexpectedTypeException
-     */
     public function testValidateInvalidConstraint()
     {
+        $this->expectException(UnexpectedTypeException::class);
+
         $this->validator->validate([], new Assert\NotNull());
 
         $this->assertNoViolation();
@@ -76,11 +76,11 @@ public function testValidateEmptyString()
      * @param string $bsn
      *
      * @dataProvider providerNoScalar
-     *
-     * @expectedException \Symfony\Component\Validator\Exception\UnexpectedTypeException
      */
     public function testValidateNoScalar($bsn)
     {
+        $this->expectException(UnexpectedTypeException::class);
+
         $this->validator->validate($bsn, new Bsn());
 
         $this->assertNoViolation();

tests/CollectionTest.php

@@ -23,6 +23,8 @@
 use DarkWebDesign\SymfonyAddonConstraints\Collection;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Validator\Constraints as Assert;
+use Symfony\Component\Validator\Exception\ConstraintDefinitionException;
+use Symfony\Component\Validator\Exception\MissingOptionsException;
 
 class CollectionTest extends TestCase
 {
@@ -33,54 +35,55 @@ public function testConstruct()
                 new Assert\NotBlank(),
             ],
         ]);
+
+        $this->assertTrue(true);
     }
 
     public function testConstructDefaultOption()
     {
         new Collection([
             new Assert\NotBlank(),
         ]);
+
+        $this->assertTrue(true);
     }
 
-    /**
-     * @expectedException \Symfony\Component\Validator\Exception\MissingOptionsException
-     */
     public function testConstructMissingRequiredConstraintsOption()
     {
+        $this->expectException(MissingOptionsException::class);
+
         new Collection();
     }
 
     /**
      * @param mixed $constraints
      *
      * @dataProvider providerNoArray
-     *
-     * @expectedException \Symfony\Component\Validator\Exception\ConstraintDefinitionException
      */
     public function testConstructConstraintsOptionNoArray($constraints)
     {
+        $this->expectException(ConstraintDefinitionException::class);
+
         new Collection([
             'constraints' => $constraints,
         ]);
     }
 
-    /**
-     * @expectedException \Symfony\Component\Validator\Exception\ConstraintDefinitionException
-     */
     public function testConstructNoConstraint()
     {
+        $this->expectException(ConstraintDefinitionException::class);
+
         new Collection([
             'constraints' => [
                 'foo',
             ],
         ]);
     }
 
-    /**
-     * @expectedException \Symfony\Component\Validator\Exception\ConstraintDefinitionException
-     */
     public function testConstructValidConstraint()
     {
+        $this->expectException(ConstraintDefinitionException::class);
+
         new Collection([
             'constraints' => [
                 new Assert\Valid(),

tests/CollectionValidatorTest.php

@@ -24,6 +24,7 @@
 use DarkWebDesign\SymfonyAddonConstraints\CollectionValidator;
 use DarkWebDesign\SymfonyAddonConstraints\Tests\Models\TraversableObject;
 use Symfony\Component\Validator\Constraints as Assert;
+use Symfony\Component\Validator\Exception\UnexpectedTypeException;
 use Symfony\Component\Validator\Test\ConstraintValidatorTestCase;
 
 class CollectionValidatorTest extends ConstraintValidatorTestCase
@@ -61,11 +62,10 @@ public function testValidate($value)
         $this->assertNoViolation();
     }
 
-    /**
-     * @expectedException \Symfony\Component\Validator\Exception\UnexpectedTypeException
-     */
     public function testValidateInvalidConstraint()
     {
+        $this->expectException(UnexpectedTypeException::class);
+
         $this->validator->validate([], new Assert\NotNull());
 
         $this->assertNoViolation();
@@ -84,11 +84,11 @@ public function testValidateNull()
      * @param mixed $value
      *
      * @dataProvider providerNoArray
-     *
-     * @expectedException \Symfony\Component\Validator\Exception\UnexpectedTypeException
      */
     public function testValidateNoArray($value)
     {
+        $this->expectException(UnexpectedTypeException::class);
+
         $this->validator->validate($value, new Collection([
             new Assert\NotBlank(),
         ]));

tests/JsonValidatorTest.php

@@ -24,6 +24,7 @@
 use DarkWebDesign\SymfonyAddonConstraints\JsonValidator;
 use DarkWebDesign\SymfonyAddonConstraints\Tests\Models\ToStringObject;
 use Symfony\Component\Validator\Constraints as Assert;
+use Symfony\Component\Validator\Exception\UnexpectedTypeException;
 use Symfony\Component\Validator\Test\ConstraintValidatorTestCase;
 
 class JsonValidatorTest extends ConstraintValidatorTestCase
@@ -48,11 +49,10 @@ public function testValidate($json)
         $this->assertNoViolation();
     }
 
-    /**
-     * @expectedException \Symfony\Component\Validator\Exception\UnexpectedTypeException
-     */
     public function testValidateInvalidConstraint()
     {
+        $this->expectException(UnexpectedTypeException::class);
+
         $this->validator->validate([], new Assert\NotNull());
 
         $this->assertNoViolation();
@@ -76,11 +76,11 @@ public function testValidateEmptyString()
      * @param string $bsn
      *
      * @dataProvider providerNoScalar
-     *
-     * @expectedException \Symfony\Component\Validator\Exception\UnexpectedTypeException
      */
     public function testValidateNoScalar($bsn)
     {
+        $this->expectException(UnexpectedTypeException::class);
+
         $this->validator->validate($bsn, new Json());
 
         $this->assertNoViolation();