Improve validations/tests and add version number rule

Author: dvdheiden

.github/ISSUE_TEMPLATE/bug_report.md

@@ -3,7 +3,7 @@ name: Bug report
 about: Create a report to help us improve
 title: ""
 labels: bug
-assignees: vdhicts
+assignees: dvdheiden
 
 ---
 

.github/ISSUE_TEMPLATE/feature_request.md

@@ -3,7 +3,7 @@ name: Feature request
 about: Suggest an idea for this project
 title: ""
 labels: feature
-assignees: vdhicts
+assignees: dvdheiden
 
 ---
 

.github/workflows/ci.yml

@@ -13,7 +13,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2

README.md

@@ -38,7 +38,7 @@ The package includes both English and Dutch translations. The translations can b
 Validates the provided [BIC number](https://www.betaalvereniging.nl/en/focus/giro-based-and-online-payments/bank-identifier-code-bic-for-sepa-transactions/).
 
 ```php
-'field' => [new \BicNumber()],
+'field' => [new BicNumber()],
 ```
 
 ### Contains
@@ -89,7 +89,7 @@ When the date is not according to the 'Y-m-d H:i' format then you are able to sp
 
 ### DutchPhone
 
-Validates if the value is a valid dutch phone number. Both mobile or landlines are supported. See the `Phone` validation
+Validates if the value is a valid Dutch phone number. Both mobile or landlines are supported. See the `Phone` validation
 rule to validate a phone number which isn't limited to the Netherlands.
 
 ```php
@@ -98,7 +98,7 @@ rule to validate a phone number which isn't limited to the Netherlands.
 
 ### DutchPostalCode
 
-Validates if the value is a valid dutch zip code, like `1234AB`.
+Validates if the value is a valid Dutch zip code, like `1234AB`.
 
 ```php
 'field' => [new DutchPostalCode()],
@@ -196,7 +196,7 @@ Validates if the value is a valid version according to the [Semver](https://semv
 
 ### VatNumber
 
-Validates if the value is a valid formatted VAT number. 
+Validates if the value is a properly formatted VAT number. 
 
 ```php
 'field' => [new VatNumber()],
@@ -205,6 +205,16 @@ Validates if the value is a valid formatted VAT number.
 **Be aware**: It doesn't check if the number is known in the VAT database. If you need to know the VAT number is truly 
 legit, check with [VIES](https://ec.europa.eu/taxation_customs/vies/#/vat-validation).
 
+### VersionNumber
+
+Validates if the value is a valid version number. The rule accepts both `x.y.z` and `x.y` formats. The parameter 
+`requirePatch` allows you to require the `z` part of the version number. This is useful for validation PHP version 
+numbers for example.
+
+```php
+'field' => [new VersionNumber(requirePatch: true)],
+```
+
 ## Contribution
 
 Any contribution is welcome, but it should be (unit) tested and meet the PSR-12 standard and please create one pull 
@@ -218,8 +228,3 @@ instead of using the issue tracker.
 ## License
 
 This package is open-sourced software licensed under the [MIT license](http://opensource.org/licenses/MIT).
-
-## About vdhicts
-
-[Vdhicts](https://www.vdhicts.nl) is the name of my personal company. Vdhicts develops and implements IT solutions for
-businesses and educational institutions.

composer.json

@@ -12,8 +12,8 @@
     "authors": [
         {
             "name": "Dick van der Heiden",
-            "email": "info@vdhicts.nl",
-            "homepage": "https://www.vdhicts.nl",
+            "email": "dick@goedemiddag.nl",
+            "homepage": "https://www.goedemiddag.nl",
             "role": "Developer"
         }
     ],

pint.json

@@ -1,8 +1,3 @@
 {
-    "preset": "laravel",
-    "rules": {
-        "array_indentation": false,
-        "phpdoc_align": false,
-        "new_with_parentheses": false
-    }
+    "preset": "psr12"
 }

resources/lang/en/messages.php

@@ -9,21 +9,18 @@
     'date_has_specific_minutes' => 'The :attribute must have one of :minutes minutes',
     'dutch_phone' => 'The :attribute must be a valid dutch phone number',
     'dutch_postal_code' => 'The :attribute must be a valid dutch post code',
-    'hex_color' => 'The :attribute must be a valid Hex color',
     'hostname' => 'The :attribute must be a valid hostname',
     'iban' => 'The :attribute must be a valid IBAN',
     'interval' => 'The :attribute must be an interval',
     'maximum_hour_difference' => 'The start and end date differ more then :diff hours',
     'mime_type' => 'The :attribute must be a valid MIME',
     'not_contains' => 'The :attribute must not contain `:value`',
-    'not_ends_with' => 'The :attribute must not end with `:value',
-    'not_starts_with' => 'The :attribute must not start with `:value`',
-    'password_strength' => 'The :attribute must contains at least one capital letter, one lowercase letter and one number',
     'phone' => 'The :attribute must be a valid phone number',
     'positive_interval' => 'The :attribute must be a positive interval',
     'price_custom_decimal' => 'The :attribute must be a valid price like `10 :separator 95`',
     'price' => 'The :attribute must be a valid price like `10,95` or `10.50`',
-    'semver' => 'The :attribute must be a valid version according to the semver standard',
     'secure_url' => 'The :attribute must be a HTTPS url',
+    'semver' => 'The :attribute must be a valid version according to the semver standard',
     'vat_number' => 'The :attribute must be a valid VAT number',
+    'version' => 'The :attribute must be a valid version like `1.0` or `1.0.0`',
 ];

resources/lang/nl/messages.php

@@ -9,21 +9,18 @@
     'date_has_specific_minutes' => 'Het veld :attribute moet ingesteld zijn op een van :minutes minuten',
     'dutch_phone' => 'Het veld :attribute moet een geldig telefoonnummer bevatten',
     'dutch_postal_code' => 'Het veld :attribute moet een geldige postcode bevatten',
-    'hex_color' => 'Het veld :attribute moet een geldige Hex kleur bevatten',
     'hostname' => 'Het veld :attribute moet een geldige hostname bevatten',
     'iban' => 'Het veld :attribute moet een geldige IBAN bevatten',
     'interval' => 'Het veld :attribute moet een interval zijn',
     'maximum_hour_difference' => 'De start en eind datum moeten meer dan :diff uur verschil',
     'mime_type' => 'Het veld :attribute moet een geldig MIME-type zijn',
     'not_contains' => 'Het veld :attribute mag geen `:value` bevatten',
-    'not_ends_with' => 'Het veld :attribute mag niet eindigen met `:value`',
-    'not_starts_with' => 'Het veld :attribute mag niet beginnen `:value`',
-    'password' => 'Het veld :attribute moet minstens een hoofdletter, een kleine letter en een nummer bevatten',
     'phone' => 'Het veld :attribute moet een geldig telefoonnummer bevatten',
     'positive_interval' => 'Het veld :attribute moet een positieve interval bevatten',
     'price_custom_decimal' => 'Het veld :attribute moet een geldig bedrag bevatten, zoals `10 :separator 95`',
     'price' => 'Het veld :attribute moet een geldig bedrag bevatten, zoals `10,95` of `10.50`',
     'secure_url' => 'Het veld :attribute moet een HTTPS url zijn',
     'semver' => 'Het veld :attribute moet een geldige versie zijn volgens de semver standaard',
     'vat_number' => 'Het veld :attribute moet een geldig BTW nummer bevatten',
+    'version' => 'Het veld :attribute moet een geldige versie zijn zoals `1.0` of `1.0.0`',
 ];

src/Rules/BicNumber.php

@@ -8,6 +8,10 @@ class BicNumber extends AbstractRule
 {
     public function passes(mixed $value): bool
     {
+        if (! is_string($value)) {
+            return false;
+        }
+
         return Regex::match('/^([a-zA-Z]){4}([a-zA-Z]){2}([0-9a-zA-Z]){2}([0-9a-zA-Z]{3})?$/', $value)->hasMatch();
     }
 

src/Rules/Contains.php

@@ -7,11 +7,16 @@
 class Contains extends AbstractRule
 {
     public function __construct(
-        private readonly string $needle = ''
-    ) {}
+        private readonly string $needle = '',
+    ) {
+    }
 
     public function passes(mixed $value): bool
     {
+        if (! is_string($value)) {
+            return false;
+        }
+
         if (trim($this->needle) === '') {
             return false;
         }