cleaner code

Author: tanthammar

README.md

@@ -0,0 +1,35 @@
+# My Validation rules for Laravel
+In this repository I will add validation rules that I use in my SaaS app. I think especially Swedish developers will find them handy.
+
+## Requirements
+- PHP 8.0|8.1+
+- Laravel v9.0+
+
+## Installation
+```bash
+composer require tanthammar/laravel-rules
+```
+
+## Rules
+See the src/Rules folder.
+
+## Documentation
+There won't be much documentation written, this repository will grow as I add items.
+Hopefully the source code contains enough hints to use the components.
+
+They are all used in the same way, following Laravel conventions. 
+
+Example:
+```php
+use Tanthammar\LaravelRules\Rules\PhoneNumber;
+use Tanthammar\LaravelRules\Rules\PersonNummer;
+
+SomeField::make('phone')
+    ->rules([ new PhoneNumber ])
+SomeField::make('person_nummer')
+    ->rules([ new PersonNummer ])
+```
+
+
+
+

composer.json

@@ -20,8 +20,9 @@
         "php": "^8.1",
         "brick/phonenumber": "^0.4.0",
         "byrokrat/banking": "^2.2",
-        "laravel/framework": "^9.0",
         "intervention/validation": "^3.2",
+        "laravel/framework": "^9.0",
+        "personnummer/personnummer": "^3.0",
         "spatie/laravel-package-tools": "^1.9.2"
     },
     "autoload": {

src/Rules/BankGiro.php

@@ -19,11 +19,10 @@ class BankGiro implements Rule
     public function passes($attribute, $value): bool
     {
         try {
-            $account = (new BankgiroFactory)->createAccount($value);
+            return (new BankgiroFactory)->createAccount($value)->getBankName() === BankNames::BANK_BANKGIRO;
         } catch (Exception $e) {
             return false;
         }
-        return $account->getBankName() === BankNames::BANK_BANKGIRO;
     }
 
     /**

src/Rules/BankKonto.php

@@ -18,11 +18,10 @@ class BankKonto implements Rule
     public function passes($attribute, $value): bool
     {
         try {
-            $account = (new AccountFactory)->createAccount($value);
+            return filled((new AccountFactory)->createAccount($value));
         } catch (Exception $e) {
             return false;
         }
-        return filled($account);
     }
 
     /**

src/Rules/OrgNummer.php

@@ -18,11 +18,10 @@ class OrgNummer implements Rule
     public function passes($attribute, $value): bool
     {
         try {
-            $boolean = (new Luhn)->passes(attribute: null, value: Helpers::clean_numbers($value));
+            return (new Luhn)->passes(attribute: null, value: Helpers::clean_numbers($value));
         } catch (\Exception $e) {
             return false;
         }
-        return $boolean;
     }
 
     /**

src/Rules/PersonNummer.php

@@ -2,10 +2,8 @@
 
 namespace Tanthammar\LaravelRules\Rules;
 
-use App\Helpers\BookonsHelpers;
 use Illuminate\Contracts\Validation\Rule;
 use Personnummer\Personnummer as PersonNummerVerifier;
-use Personnummer\PersonnummerException;
 use TantHammar\LaravelRules\Helpers;
 
 class PersonNummer implements Rule
@@ -20,11 +18,10 @@ class PersonNummer implements Rule
     public function passes($attribute, $value): bool
     {
         try {
-            $boolean = PersonNummerVerifier::valid(Helpers::clean_numbers($value));
+            return PersonNummerVerifier::valid(Helpers::clean_numbers($value));
         } catch (\Exception $e) {
             return false;
         }
-        return $boolean;
     }
 
     /**

src/Rules/PersonOrOrgNummer.php

@@ -2,13 +2,7 @@
 
 namespace Tanthammar\LaravelRules\Rules;
 
-use App\Helpers\BookonsHelpers;
 use Illuminate\Contracts\Validation\Rule;
-use Intervention\Validation\Validator;
-use Intervention\Validation\Exception\ValidationException;
-use Personnummer\Personnummer as PersonNummerVerifier;
-use Personnummer\PersonnummerException;
-use TantHammar\LaravelRules\Helpers;
 
 class PersonOrOrgNummer implements Rule
 {

src/Rules/PlusGiro.php

@@ -19,11 +19,10 @@ class PlusGiro implements Rule
     public function passes($attribute, $value): bool
     {
         try {
-            $boolean = (new PlusgiroFactory)->createAccount($value)->getBankName() === BankNames::BANK_PLUSGIRO;
+            return (new PlusgiroFactory)->createAccount($value)->getBankName() === BankNames::BANK_PLUSGIRO;
         } catch (Exception $e) {
             return false;
         }
-        return $boolean;
     }
 
     /**