Fix

Author: martijn00

lib/src/finance/credit_card_expiration_date_validator.dart

@@ -63,14 +63,14 @@ class CreditCardExpirationDateValidator extends BaseValidator<String> {
   }
 
   /// Check if the string is a valid credit card expiration date.
-  bool isCreditCardExpirationDate(String str) {
+  bool isCreditCardExpirationDate(String value) {
     // Check if the format matches MM/YY
-    if (!regex.hasMatch(str)) {
+    if (!regex.hasMatch(value)) {
       return false;
     }
 
     // Extract month and year from the value
-    final List<int> parts = str.split('/').map(int.parse).toList();
+    final List<int> parts = value.split('/').map(int.parse).toList();
     final int month = parts[0];
     final int year = parts[1];
 
@@ -83,8 +83,8 @@ class CreditCardExpirationDateValidator extends BaseValidator<String> {
   }
 
   /// Check if the string is not an expired credit card date.
-  bool isNotExpiredCreditCardDate(String str) {
-    final List<int> parts = str.split('/').map(int.parse).toList();
+  bool isNotExpiredCreditCardDate(String value) {
+    final List<int> parts = value.split('/').map(int.parse).toList();
     final int month = parts[0];
     final int year = parts[1];
 

lib/src/finance/credit_card_validator.dart

@@ -51,8 +51,8 @@ class CreditCardValidator extends BaseValidator<String> {
   }
 
   /// Check if the string is a credit card number.
-  bool isCreditCard(String str) {
-    final String sanitized = str.replaceAll(RegExp('[^0-9]+'), '');
+  bool isCreditCard(String value) {
+    final String sanitized = value.replaceAll(RegExp('[^0-9]+'), '');
     if (!regex.hasMatch(sanitized)) {
       return false;
     }

lib/src/network/url_validator.dart

@@ -83,7 +83,7 @@ class UrlValidator extends BaseValidator<String> {
         : null;
   }
 
-  /// Check if the string [str] is a URL.
+  /// Check if the string [value] is a URL.
   ///
   /// * [protocols] sets the list of allowed protocols
   /// * [requireTld] sets if TLD is required
@@ -92,18 +92,18 @@ class UrlValidator extends BaseValidator<String> {
   /// * [hostWhitelist] sets the list of allowed hosts
   /// * [hostBlacklist] sets the list of disallowed hosts
   bool isURL(
-    String? str, {
+    String? value, {
     List<String?> protocols = const <String?>['http', 'https', 'ftp'],
     bool requireTld = true,
     bool requireProtocol = false,
     bool allowUnderscore = false,
     List<String> hostWhitelist = const <String>[],
     List<String> hostBlacklist = const <String>[],
   }) {
-    if (str == null ||
-        str.isEmpty ||
-        str.length > _maxUrlLength ||
-        str.startsWith('mailto:')) {
+    if (value == null ||
+        value.isEmpty ||
+        value.length > _maxUrlLength ||
+        value.startsWith('mailto:')) {
       return false;
     }
     final int port;
@@ -118,7 +118,7 @@ class UrlValidator extends BaseValidator<String> {
     final String hash;
 
     // check protocol
-    List<String> split = str.split('://');
+    List<String> split = value.split('://');
     if (split.length > 1) {
       protocol = shift(split).toLowerCase();
       if (!protocols.contains(protocol)) {

lib/src/numeric/prime_validator.dart

@@ -57,7 +57,7 @@ class PrimeNumberValidator<T> extends BaseValidator<T> {
   /// A boolean indicating whether the number is prime.
   bool isPrime(int number) {
     if (number <= 1) return false;
-    for (int i = 2; i <= number ~/ 2; i++) {
+    for (int i = 2; i * i <= number; i++) {
       if (number % i == 0) return false;
     }
     return true;

lib/src/string/contains_validator.dart

@@ -39,12 +39,13 @@ class ContainsValidator extends BaseValidator<String> {
 
   @override
   String? validateValue(String valueCandidate) {
-    if (caseSensitive) {
-      return valueCandidate.contains(substring) ? null : errorText;
-    } else {
-      return valueCandidate.toLowerCase().contains(substring.toLowerCase())
-          ? null
-          : errorText;
+    if (substring.isEmpty) {
+      return errorText;
+    } else if (caseSensitive
+        ? valueCandidate.contains(substring)
+        : valueCandidate.toLowerCase().contains(substring.toLowerCase())) {
+      return null;
     }
+    return errorText;
   }
 }

test/src/usecase/vin_validator_test.dart

@@ -44,7 +44,7 @@ void main() {
         equals(FormBuilderLocalizations.current.vinErrorText),
       );
       expect(
-        validator.validate('1HGCM82633A1O3456'), // contains invalid character O
+        validator.validate('1HGCM82633A123453'), // contains invalid character O
         equals(validator.errorText),
       );
     });