Migrate 21 additional validator tests to catchAll() logic

This commit transitions 21 more files to the `catchAll()` function. This shift
ensures that every message template is verified in both default and inverted
templates, replacing ambiguous "Scenarios" with a predictable, template-aware
testing name.

With this update, 47% of the library (68 files) is now standardized.

Author: henriquemoody

tests/feature/Validators/ArrayTypeTest.php

@@ -7,22 +7,18 @@
 
 declare(strict_types=1);
 
-test('Scenario #1', catchMessage(
+test('Standard arrayType template validation', catchAll(
     fn() => v::arrayType()->assert('teste'),
-    fn(string $message) => expect($message)->toBe('"teste" must be an array'),
+    fn(string $message, string $fullMessage, array $messages) => expect()
+        ->and($message)->toBe('"teste" must be an array')
+        ->and($fullMessage)->toBe('- "teste" must be an array')
+        ->and($messages)->toBe(['arrayType' => '"teste" must be an array']),
 ));
 
-test('Scenario #2', catchMessage(
+test('Standard arrayType template validation (inverted)', catchAll(
     fn() => v::not(v::arrayType())->assert([]),
-    fn(string $message) => expect($message)->toBe('`[]` must not be an array'),
-));
-
-test('Scenario #3', catchFullMessage(
-    fn() => v::arrayType()->assert(new ArrayObject()),
-    fn(string $fullMessage) => expect($fullMessage)->toBe('- `ArrayObject { getArrayCopy() => [] }` must be an array'),
-));
-
-test('Scenario #4', catchFullMessage(
-    fn() => v::not(v::arrayType())->assert([1, 2, 3]),
-    fn(string $fullMessage) => expect($fullMessage)->toBe('- `[1, 2, 3]` must not be an array'),
+    fn(string $message, string $fullMessage, array $messages) => expect()
+        ->and($message)->toBe('`[]` must not be an array')
+        ->and($fullMessage)->toBe('- `[]` must not be an array')
+        ->and($messages)->toBe(['notArrayType' => '`[]` must not be an array']),
 ));

tests/feature/Validators/ContainsCountTest.php

@@ -7,27 +7,34 @@
 
 declare(strict_types=1);
 
-test('Scenario #1', catchMessage(
+test('Contains count times template validation', catchAll(
     fn() => v::containsCount('foo', 2)->assert('bar'),
-    fn(string $message) => expect($message)->toBe('"bar" must contain "foo" 2 time(s)'),
+    fn(string $message, string $fullMessage, array $messages) => expect()
+        ->and($message)->toBe('"bar" must contain "foo" 2 time(s)')
+        ->and($fullMessage)->toBe('- "bar" must contain "foo" 2 time(s)')
+        ->and($messages)->toBe(['containsCount' => '"bar" must contain "foo" 2 time(s)']),
 ));
 
-test('Scenario #2', catchMessage(
-    fn() => v::not(v::containsCount('foo', 2))->assert('foo bar foo'),
-    fn(string $message) => expect($message)->toBe('"foo bar foo" must not contain "foo" 2 time(s)'),
+test('Contains count times template validation (inverted)', catchAll(
+    fn() => v::not(v::containsCount('bar', 2))->assert('bar baz bar'),
+    fn(string $message, string $fullMessage, array $messages) => expect()
+        ->and($message)->toBe('"bar baz bar" must not contain "bar" 2 time(s)')
+        ->and($fullMessage)->toBe('- "bar baz bar" must not contain "bar" 2 time(s)')
+        ->and($messages)->toBe(['notContainsCount' => '"bar baz bar" must not contain "bar" 2 time(s)']),
 ));
 
-test('Scenario #3', catchFullMessage(
-    fn() => v::containsCount('foo', 2)->assert(['foo']),
-    fn(string $fullMessage) => expect($fullMessage)->toBe('- `["foo"]` must contain "foo" 2 time(s)'),
+test('Contains count once template validation', catchAll(
+    fn() => v::containsCount('foo', 1, true)->assert(['foo', 'foo']),
+    fn(string $message, string $fullMessage, array $messages) => expect()
+        ->and($message)->toBe('`["foo", "foo"]` must contain "foo" only once')
+        ->and($fullMessage)->toBe('- `["foo", "foo"]` must contain "foo" only once')
+        ->and($messages)->toBe(['containsCount' => '`["foo", "foo"]` must contain "foo" only once']),
 ));
 
-test('Scenario #4', catchFullMessage(
+test('Contains count once template validation (inverted)', catchAll(
     fn() => v::not(v::containsCount('foo', 1, true))->assert(['foo', 'bar']),
-    fn(string $fullMessage) => expect($fullMessage)->toBe('- `["foo", "bar"]` must not contain "foo" only once'),
-));
-
-test('Scenario #5', catchFullMessage(
-    fn() => v::containsCount('foo', 1, true)->assert(['foo', 'foo']),
-    fn(string $fullMessage) => expect($fullMessage)->toBe('- `["foo", "foo"]` must contain "foo" only once'),
+    fn(string $message, string $fullMessage, array $messages) => expect()
+        ->and($message)->toBe('`["foo", "bar"]` must not contain "foo" only once')
+        ->and($fullMessage)->toBe('- `["foo", "bar"]` must not contain "foo" only once')
+        ->and($messages)->toBe(['notContainsCount' => '`["foo", "bar"]` must not contain "foo" only once']),
 ));

tests/feature/Validators/CreditCardTest.php

@@ -7,22 +7,34 @@
 
 declare(strict_types=1);
 
-test('Scenario #1', catchMessage(
-    fn() => v::creditCard('Discover')->assert(3566002020360505),
-    fn(string $message) => expect($message)->toBe('3566002020360505 must be a valid Discover credit card number'),
+test('Standard credit card template validation', catchAll(
+    fn() => v::creditCard()->assert(1234567890123456),
+    fn(string $message, string $fullMessage, array $messages) => expect()
+        ->and($message)->toBe('1234567890123456 must be a valid credit card number')
+        ->and($fullMessage)->toBe('- 1234567890123456 must be a valid credit card number')
+        ->and($messages)->toBe(['creditCard' => '1234567890123456 must be a valid credit card number']),
 ));
 
-test('Scenario #2', catchMessage(
-    fn() => v::not(v::creditCard('Visa'))->assert(4024007153361885),
-    fn(string $message) => expect($message)->toBe('4024007153361885 must not be a valid Visa credit card number'),
+test('Standard credit card template validation (inverted)', catchAll(
+    fn() => v::not(v::creditCard())->assert(5555444433331111),
+    fn(string $message, string $fullMessage, array $messages) => expect()
+        ->and($message)->toBe('5555444433331111 must not be a valid credit card number')
+        ->and($fullMessage)->toBe('- 5555444433331111 must not be a valid credit card number')
+        ->and($messages)->toBe(['notCreditCard' => '5555444433331111 must not be a valid credit card number']),
 ));
 
-test('Scenario #3', catchFullMessage(
-    fn() => v::creditCard('MasterCard')->assert(3566002020360505),
-    fn(string $fullMessage) => expect($fullMessage)->toBe('- 3566002020360505 must be a valid MasterCard credit card number'),
+test('Branched credit card template validation', catchAll(
+    fn() => v::creditCard('Visa')->assert(3566002020360505),
+    fn(string $message, string $fullMessage, array $messages) => expect()
+        ->and($message)->toBe('3566002020360505 must be a valid Visa credit card number')
+        ->and($fullMessage)->toBe('- 3566002020360505 must be a valid Visa credit card number')
+        ->and($messages)->toBe(['creditCard' => '3566002020360505 must be a valid Visa credit card number']),
 ));
 
-test('Scenario #4', catchFullMessage(
-    fn() => v::not(v::creditCard())->assert(5555444433331111),
-    fn(string $fullMessage) => expect($fullMessage)->toBe('- 5555444433331111 must not be a valid credit card number'),
+test('Branched credit card template validation (inverted)', catchAll(
+    fn() => v::not(v::creditCard('MasterCard'))->assert(5555555555554444),
+    fn(string $message, string $fullMessage, array $messages) => expect()
+        ->and($message)->toBe('5555555555554444 must not be a valid MasterCard credit card number')
+        ->and($fullMessage)->toBe('- 5555555555554444 must not be a valid MasterCard credit card number')
+        ->and($messages)->toBe(['notCreditCard' => '5555555555554444 must not be a valid MasterCard credit card number']),
 ));

tests/feature/Validators/DateTimeTest.php

@@ -9,42 +9,34 @@
 
 date_default_timezone_set('UTC');
 
-test('Scenario #1', catchMessage(
+test('Standard date/time template validation', catchAll(
     fn() => v::dateTime()->assert('FooBarBazz'),
-    fn(string $message) => expect($message)->toBe('"FooBarBazz" must be a valid date/time'),
+    fn(string $message, string $fullMessage, array $messages) => expect()
+        ->and($message)->toBe('"FooBarBazz" must be a valid date/time')
+        ->and($fullMessage)->toBe('- "FooBarBazz" must be a valid date/time')
+        ->and($messages)->toBe(['dateTime' => '"FooBarBazz" must be a valid date/time']),
 ));
 
-test('Scenario #2', catchMessage(
-    fn() => v::dateTime('c')->assert('06-12-1995'),
-    fn(string $message) => expect($message)->toBe('"06-12-1995" must be a valid date/time in the format "2005-12-30T01:02:03+00:00"'),
-));
-
-test('Scenario #3', catchFullMessage(
-    fn() => v::dateTime()->assert('QuxQuuxx'),
-    fn(string $fullMessage) => expect($fullMessage)->toBe('- "QuxQuuxx" must be a valid date/time'),
-));
-
-test('Scenario #4', catchFullMessage(
-    fn() => v::dateTime('r')->assert(2018013030),
-    fn(string $fullMessage) => expect($fullMessage)->toBe('- 2018013030 must be a valid date/time in the format "Fri, 30 Dec 2005 01:02:03 +0000"'),
+test('Standard date/time template validation (inverted)', catchAll(
+    fn() => v::not(v::dateTime())->assert('1988-09-09'),
+    fn(string $message, string $fullMessage, array $messages) => expect()
+        ->and($message)->toBe('"1988-09-09" must not be a valid date/time')
+        ->and($fullMessage)->toBe('- "1988-09-09" must not be a valid date/time')
+        ->and($messages)->toBe(['notDateTime' => '"1988-09-09" must not be a valid date/time']),
 ));
 
-test('Scenario #5', catchMessage(
-    fn() => v::not(v::dateTime())->assert('4 days ago'),
-    fn(string $message) => expect($message)->toBe('"4 days ago" must not be a valid date/time'),
+test('Format date/time template validation', catchAll(
+    fn() => v::dateTime('c')->assert('06-12-1995'),
+    fn(string $message, string $fullMessage, array $messages) => expect()
+        ->and($message)->toBe('"06-12-1995" must be a valid date/time in the format "2005-12-30T01:02:03+00:00"')
+        ->and($fullMessage)->toBe('- "06-12-1995" must be a valid date/time in the format "2005-12-30T01:02:03+00:00"')
+        ->and($messages)->toBe(['dateTime' => '"06-12-1995" must be a valid date/time in the format "2005-12-30T01:02:03+00:00"']),
 ));
 
-test('Scenario #6', catchMessage(
+test('Format date/time template validation (inverted)', catchAll(
     fn() => v::not(v::dateTime('Y-m-d'))->assert('1988-09-09'),
-    fn(string $message) => expect($message)->toBe('"1988-09-09" must not be a valid date/time in the format "2005-12-30"'),
-));
-
-test('Scenario #7', catchFullMessage(
-    fn() => v::not(v::dateTime())->assert('+3 weeks'),
-    fn(string $fullMessage) => expect($fullMessage)->toBe('- "+3 weeks" must not be a valid date/time'),
-));
-
-test('Scenario #8', catchFullMessage(
-    fn() => v::not(v::dateTime('d/m/y'))->assert('23/07/99'),
-    fn(string $fullMessage) => expect($fullMessage)->toBe('- "23/07/99" must not be a valid date/time in the format "30/12/05"'),
+    fn(string $message, string $fullMessage, array $messages) => expect()
+        ->and($message)->toBe('"1988-09-09" must not be a valid date/time in the format "2005-12-30"')
+        ->and($fullMessage)->toBe('- "1988-09-09" must not be a valid date/time in the format "2005-12-30"')
+        ->and($messages)->toBe(['notDateTime' => '"1988-09-09" must not be a valid date/time in the format "2005-12-30"']),
 ));

tests/feature/Validators/DirectoryTest.php

@@ -7,22 +7,18 @@
 
 declare(strict_types=1);
 
-test('Scenario #1', catchMessage(
+test('Standard directory template validation', catchAll(
     fn() => v::directory()->assert('batman'),
-    fn(string $message) => expect($message)->toBe('"batman" must be a directory'),
+    fn(string $message, string $fullMessage, array $messages) => expect()
+        ->and($message)->toBe('"batman" must be a directory')
+        ->and($fullMessage)->toBe('- "batman" must be a directory')
+        ->and($messages)->toBe(['directory' => '"batman" must be a directory']),
 ));
 
-test('Scenario #2', catchMessage(
+test('Standard directory template validation (inverted)', catchAll(
     fn() => v::not(v::directory())->assert(dirname('/etc/')),
-    fn(string $message) => expect($message)->toBe('"/" must not be a directory'),
-));
-
-test('Scenario #3', catchFullMessage(
-    fn() => v::directory()->assert('ppz'),
-    fn(string $fullMessage) => expect($fullMessage)->toBe('- "ppz" must be a directory'),
-));
-
-test('Scenario #4', catchFullMessage(
-    fn() => v::not(v::directory())->assert(dirname('/etc/')),
-    fn(string $fullMessage) => expect($fullMessage)->toBe('- "/" must not be a directory'),
+    fn(string $message, string $fullMessage, array $messages) => expect()
+        ->and($message)->toBe('"/" must not be a directory')
+        ->and($fullMessage)->toBe('- "/" must not be a directory')
+        ->and($messages)->toBe(['notDirectory' => '"/" must not be a directory']),
 ));

tests/feature/Validators/DomainTest.php

@@ -7,22 +7,18 @@
 
 declare(strict_types=1);
 
-test('Scenario #1', catchMessage(
+test('Standard domain template validation', catchAll(
     fn() => v::domain()->assert('batman'),
-    fn(string $message) => expect($message)->toBe('"batman" must be a valid domain'),
+    fn(string $message, string $fullMessage, array $messages) => expect()
+        ->and($message)->toBe('"batman" must be a valid domain')
+        ->and($fullMessage)->toBe('- "batman" must be a valid domain')
+        ->and($messages)->toBe(['domain' => '"batman" must be a valid domain']),
 ));
 
-test('Scenario #2', catchMessage(
+test('Standard domain template validation (inverted)', catchAll(
     fn() => v::not(v::domain())->assert('r--w.com'),
-    fn(string $message) => expect($message)->toBe('"r--w.com" must not be a valid domain'),
-));
-
-test('Scenario #3', catchFullMessage(
-    fn() => v::domain()->assert('p-éz-.kk'),
-    fn(string $fullMessage) => expect($fullMessage)->toBe('- "p-éz-.kk" must be a valid domain'),
-));
-
-test('Scenario #4', catchFullMessage(
-    fn() => v::not(v::domain())->assert('github.com'),
-    fn(string $fullMessage) => expect($fullMessage)->toBe('- "github.com" must not be a valid domain'),
+    fn(string $message, string $fullMessage, array $messages) => expect()
+        ->and($message)->toBe('"r--w.com" must not be a valid domain')
+        ->and($fullMessage)->toBe('- "r--w.com" must not be a valid domain')
+        ->and($messages)->toBe(['notDomain' => '"r--w.com" must not be a valid domain']),
 ));

tests/feature/Validators/EmailTest.php

@@ -7,22 +7,18 @@
 
 declare(strict_types=1);
 
-test('Scenario #1', catchMessage(
+test('Standard email template validation', catchAll(
     fn() => v::email()->assert('batman'),
-    fn(string $message) => expect($message)->toBe('"batman" must be a valid email address'),
+    fn(string $message, string $fullMessage, array $messages) => expect()
+        ->and($message)->toBe('"batman" must be a valid email address')
+        ->and($fullMessage)->toBe('- "batman" must be a valid email address')
+        ->and($messages)->toBe(['email' => '"batman" must be a valid email address']),
 ));
 
-test('Scenario #2', catchMessage(
+test('Standard email template validation (inverted)', catchAll(
     fn() => v::not(v::email())->assert('bruce.wayne@gothancity.com'),
-    fn(string $message) => expect($message)->toBe('"bruce.wayne@gothancity.com" must not be an email address'),
-));
-
-test('Scenario #3', catchFullMessage(
-    fn() => v::email()->assert('bruce wayne'),
-    fn(string $fullMessage) => expect($fullMessage)->toBe('- "bruce wayne" must be a valid email address'),
-));
-
-test('Scenario #4', catchFullMessage(
-    fn() => v::not(v::email())->assert('iambatman@gothancity.com'),
-    fn(string $fullMessage) => expect($fullMessage)->toBe('- "iambatman@gothancity.com" must not be an email address'),
+    fn(string $message, string $fullMessage, array $messages) => expect()
+        ->and($message)->toBe('"bruce.wayne@gothancity.com" must not be an email address')
+        ->and($fullMessage)->toBe('- "bruce.wayne@gothancity.com" must not be an email address')
+        ->and($messages)->toBe(['notEmail' => '"bruce.wayne@gothancity.com" must not be an email address']),
 ));

tests/feature/Validators/EvenTest.php

@@ -7,22 +7,18 @@
 
 declare(strict_types=1);
 
-test('Scenario #1', catchMessage(
+test('Standard even template validation', catchAll(
     fn() => v::even()->assert(-1),
-    fn(string $message) => expect($message)->toBe('-1 must be an even number'),
+    fn(string $message, string $fullMessage, array $messages) => expect()
+        ->and($message)->toBe('-1 must be an even number')
+        ->and($fullMessage)->toBe('- -1 must be an even number')
+        ->and($messages)->toBe(['even' => '-1 must be an even number']),
 ));
 
-test('Scenario #2', catchFullMessage(
-    fn() => v::even()->assert(5),
-    fn(string $fullMessage) => expect($fullMessage)->toBe('- 5 must be an even number'),
-));
-
-test('Scenario #3', catchMessage(
-    fn() => v::not(v::even())->assert(6),
-    fn(string $message) => expect($message)->toBe('6 must be an odd number'),
-));
-
-test('Scenario #4', catchFullMessage(
-    fn() => v::not(v::even())->assert(8),
-    fn(string $fullMessage) => expect($fullMessage)->toBe('- 8 must be an odd number'),
+test('Standard even template validation (inverted)', catchAll(
+    fn() => v::not(v::even())->assert(2),
+    fn(string $message, string $fullMessage, array $messages) => expect()
+        ->and($message)->toBe('2 must be an odd number')
+        ->and($fullMessage)->toBe('- 2 must be an odd number')
+        ->and($messages)->toBe(['notEven' => '2 must be an odd number']),
 ));

tests/feature/Validators/FileTest.php

@@ -7,22 +7,18 @@
 
 declare(strict_types=1);
 
-test('Scenario #1', catchMessage(
+test('Standard file template validation', catchAll(
     fn() => v::file()->assert('tests/fixtures/non-existent.sh'),
-    fn(string $message) => expect($message)->toBe('"tests/fixtures/non-existent.sh" must be a valid file'),
+    fn(string $message, string $fullMessage, array $messages) => expect()
+        ->and($message)->toBe('"tests/fixtures/non-existent.sh" must be a valid file')
+        ->and($fullMessage)->toBe('- "tests/fixtures/non-existent.sh" must be a valid file')
+        ->and($messages)->toBe(['file' => '"tests/fixtures/non-existent.sh" must be a valid file']),
 ));
 
-test('Scenario #2', catchMessage(
+test('Standard file template validation (inverted)', catchAll(
     fn() => v::not(v::file())->assert('tests/fixtures/valid-image.png'),
-    fn(string $message) => expect($message)->toBe('"tests/fixtures/valid-image.png" must be an invalid file'),
-));
-
-test('Scenario #3', catchFullMessage(
-    fn() => v::file()->assert('tests/fixtures/non-existent.sh'),
-    fn(string $fullMessage) => expect($fullMessage)->toBe('- "tests/fixtures/non-existent.sh" must be a valid file'),
-));
-
-test('Scenario #4', catchFullMessage(
-    fn() => v::not(v::file())->assert('tests/fixtures/valid-image.png'),
-    fn(string $fullMessage) => expect($fullMessage)->toBe('- "tests/fixtures/valid-image.png" must be an invalid file'),
+    fn(string $message, string $fullMessage, array $messages) => expect()
+        ->and($message)->toBe('"tests/fixtures/valid-image.png" must be an invalid file')
+        ->and($fullMessage)->toBe('- "tests/fixtures/valid-image.png" must be an invalid file')
+        ->and($messages)->toBe(['notFile' => '"tests/fixtures/valid-image.png" must be an invalid file']),
 ));