Fix tests

Author: martijn00

lib/src/form_builder_validators.dart

@@ -323,8 +323,8 @@ class FormBuilderValidators {
     String? errorText,
   }) =>
       (valueCandidate) => true == valueCandidate?.isNotEmpty &&
-              !isCreditCardExpirationDate(valueCandidate!) &&
-              !isNotExpiredCreditCardDate(valueCandidate)
+              !isCreditCardExpirationDate(valueCandidate!) ||
+              !isNotExpiredCreditCardDate(valueCandidate!)
           ? errorText ??
               FormBuilderLocalizations.current.creditCardExpiredErrorText
           : null;
@@ -520,10 +520,10 @@ class FormBuilderValidators {
   }) =>
       (valueCandidate) => true == valueCandidate?.isNotEmpty &&
               specialCharLength(valueCandidate!) >= atLeast
-          ? errorText ??
+          ? null
+          : errorText ??
               FormBuilderLocalizations.current
-                  .containsSpecialCharErrorText(atLeast)
-          : null;
+                  .containsSpecialCharErrorText(atLeast);
 
   /// [FormFieldValidator] that requires the field's value to contain an amount of uppercase characters.
   static FormFieldValidator<String> hasUppercaseChars({
@@ -532,10 +532,10 @@ class FormBuilderValidators {
   }) =>
       (valueCandidate) => true == valueCandidate?.isNotEmpty &&
               uppercaseCharLength(valueCandidate!) >= atLeast
-          ? errorText ??
+          ? null
+          : errorText ??
               FormBuilderLocalizations.current
-                  .containsUppercaseCharErrorText(atLeast)
-          : null;
+                  .containsUppercaseCharErrorText(atLeast);
 
   /// [FormFieldValidator] that requires the field's value to contain an amount of lowercase characters.
   static FormFieldValidator<String> hasLowercaseChars({
@@ -544,10 +544,10 @@ class FormBuilderValidators {
   }) =>
       (valueCandidate) => true == valueCandidate?.isNotEmpty &&
               lowercaseCharLength(valueCandidate!) >= atLeast
-          ? errorText ??
+          ? null
+          : errorText ??
               FormBuilderLocalizations.current
-                  .containsLowercaseCharErrorText(atLeast)
-          : null;
+                  .containsLowercaseCharErrorText(atLeast);
 
   /// [FormFieldValidator] that requires the field's value to contain an amount of numeric characters.
   static FormFieldValidator<String> hasNumericChars({
@@ -556,7 +556,7 @@ class FormBuilderValidators {
   }) =>
       (valueCandidate) => true == valueCandidate?.isNotEmpty &&
               numberCharLength(valueCandidate!) >= atLeast
-          ? errorText ??
-              FormBuilderLocalizations.current.containsNumberErrorText(atLeast)
-          : null;
+          ? null
+          : errorText ??
+              FormBuilderLocalizations.current.containsNumberErrorText(atLeast);
 }

lib/src/utils/validators.dart

@@ -12,8 +12,7 @@ RegExp _creditCard = RegExp(
   r'^(?:4[0-9]{12}(?:[0-9]{3})?|5[1-5][0-9]{14}|6(?:011|5[0-9][0-9])[0-9]{12}|3[47][0-9]{13}|3(?:0[0-5]|[68][0-9])[0-9]{11}|(?:2131|1800|35\d{3})\d{11})$',
 );
 
-RegExp _phoneNumber =
-    RegExp(r'^(\+?\d{0,1})?\(?\d{3}\)?[-.\s]\d{3}[-.\s]\d{4}$');
+RegExp _phoneNumber = RegExp(r'^\+?(\d{1,4}[\s-])?(?!0+\s+,?$)\d{1,15}$');
 
 RegExp _creditCardExpirationDate = RegExp(r'^[0-1][0-9]/\d{2}$');
 
@@ -248,7 +247,7 @@ bool isDate(String str) {
 
 /// check if the string is a valid phone number
 bool isPhoneNumber(String str) {
-  return _phoneNumber.hasMatch(str);
+  return _phoneNumber.hasMatch(str.replaceAll(' ', ''));
 }
 
 /// check if the string is a valid credit card expiration date

test/form_builder_validators_test.dart

@@ -624,13 +624,13 @@ void main() {
     'FormBuilderValidators.conditional',
     (WidgetTester tester) => testValidations(tester, (context) {
       final validator = FormBuilderValidators.conditional(
-        (value) => value == 'test',
-        FormBuilderValidators.required(),
+        (value) => value != null,
+        FormBuilderValidators.hasUppercaseChars(atLeast: 3),
       );
       // Pass
-      expect(validator('test'), isNotNull);
+      expect(validator('HELLO'), isNull);
       // Fail
-      expect(validator('not_test'), isNull);
+      expect(validator('hello'), isNotNull);
     }),
   );