Merge pull request #90 from milwad-dev/refactor

[1.x] Refactor
milwad-dev · Jun 8, 2024 · d5ba2b9 · d5ba2b9
2 parents 8eb0af8 + 7f5c2b6
commit d5ba2b9
Show file tree

Hide file tree

Showing 44 changed files with 161 additions and 438 deletions.
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -1,29 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     backupGlobals="false"
-     backupStaticAttributes="false"
-     beStrictAboutTestsThatDoNotTestAnything="false"
-     bootstrap="vendor/autoload.php"
-     colors="true"
-     convertErrorsToExceptions="true"
-     convertNoticesToExceptions="true"
-     convertWarningsToExceptions="true"
-     processIsolation="false"
-     stopOnFailure="false"
-     verbose="true"
-     xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
-
-    <testsuites>
-        <testsuite name="Tests">
-            <directory suffix="Test.php">./tests/</directory>
-        </testsuite>
-    </testsuites>
-    <coverage includeUncoveredFiles="false">
-        <include>
-            <directory suffix=".php">src/</directory>
-        </include>
-    </coverage>
-    <php>
-        <env name="APP_ENV" value="testing" />
-    </php>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" backupGlobals="false" beStrictAboutTestsThatDoNotTestAnything="false" bootstrap="vendor/autoload.php" colors="true" processIsolation="false" stopOnFailure="false" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd" cacheDirectory=".phpunit.cache" backupStaticProperties="false">
+  <testsuites>
+    <testsuite name="Tests">
+      <directory suffix="Test.php">./tests/</directory>
+    </testsuite>
+  </testsuites>
+  <php>
+    <env name="APP_ENV" value="testing"/>
+  </php>
+  <source>
+    <include>
+      <directory suffix=".php">src/</directory>
+    </include>
+  </source>
 </phpunit>
diff --git a/phpunit.xml.dist.bak b/phpunit.xml.dist.bak
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+     backupGlobals="false"
+     backupStaticAttributes="false"
+     beStrictAboutTestsThatDoNotTestAnything="false"
+     bootstrap="vendor/autoload.php"
+     colors="true"
+     convertErrorsToExceptions="true"
+     convertNoticesToExceptions="true"
+     convertWarningsToExceptions="true"
+     processIsolation="false"
+     stopOnFailure="false"
+     verbose="true"
+     xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
+
+    <testsuites>
+        <testsuite name="Tests">
+            <directory suffix="Test.php">./tests/</directory>
+        </testsuite>
+    </testsuites>
+    <coverage includeUncoveredFiles="false">
+        <include>
+            <directory suffix=".php">src/</directory>
+        </include>
+    </coverage>
+    <php>
+        <env name="APP_ENV" value="testing" />
+    </php>
+</phpunit>
diff --git a/src/LaravelValidateServiceProvider.php b/src/LaravelValidateServiceProvider.php
@@ -40,10 +40,8 @@ class LaravelValidateServiceProvider extends ServiceProvider
 
     /**
      * Register files.
-     *
-     * @return void
      */
-    public function register()
+    public function register(): void
     {
         if ($this->app->runningInConsole()) {
             $this->publishLangFiles();
@@ -68,10 +66,8 @@ private function publishLangFiles(): void
 
     /**
      * Publish config file.
-     *
-     * @return void
      */
-    private function publishConfigFile()
+    private function publishConfigFile(): void
     {
         $this->publishes([
             __DIR__.'/../config/laravel-validate.php' => config_path('laravel-validate.php'),

diff --git a/src/Rules/ValidBase64.php b/src/Rules/ValidBase64.php
@@ -8,22 +8,16 @@ class ValidBase64 implements Rule
 {
     /**
      * Check base64.
-     *
-     * @param  string  $attribute
-     * @param  mixed  $value
-     * @return bool
      */
-    public function passes($attribute, $value)
+    public function passes($attribute, $value): bool
     {
         return base64_encode(base64_decode($value, true)) === $value;
     }
 
     /**
      * Get the validation error message.
-     *
-     * @return string
      */
-    public function message()
+    public function message(): string
     {
         return __('validate.base64');
     }

diff --git a/src/Rules/ValidBitcoinAddress.php b/src/Rules/ValidBitcoinAddress.php
@@ -7,23 +7,17 @@
 class ValidBitcoinAddress implements Rule
 {
     /**
-     * Check bitcoin address.
-     *
-     * @param  string  $attribute
-     * @param  mixed  $value
-     * @return bool
+     * Check bitcoin address is valid.
      */
-    public function passes($attribute, $value)
+    public function passes($attribute, $value): bool
     {
         return preg_match('/^(?:bc1|[13])[a-zA-HJ-NP-Z0-9]{25,39}$/', $value);
     }
 
     /**
      * Get the validation error message.
-     *
-     * @return string
      */
-    public function message()
+    public function message(): string
     {
         return __('validate.bitcoin-address');
     }

diff --git a/src/Rules/ValidCamelCase.php b/src/Rules/ValidCamelCase.php
@@ -8,22 +8,16 @@ class ValidCamelCase implements Rule
 {
     /**
      * Check value is camel case.
-     *
-     * @param  string  $attribute
-     * @param  mixed  $value
-     * @return bool
      */
-    public function passes($attribute, $value)
+    public function passes($attribute, $value): bool
     {
         return preg_match('/^(?:\p{Lu}?\p{Ll}+)(?:\p{Lu}\p{Ll}+)*$/u', $value);
     }
 
     /**
      * Get the validation error message.
-     *
-     * @return string
      */
-    public function message()
+    public function message(): string
     {
         return __('validate.camel-case');
     }

diff --git a/src/Rules/ValidCapitalCharWithNumber.php b/src/Rules/ValidCapitalCharWithNumber.php
@@ -8,22 +8,16 @@ class ValidCapitalCharWithNumber implements Rule
 {
     /**
      * Check all words are capital & with hyphen & number.
-     *
-     * @param  string  $attribute
-     * @param  mixed  $value
-     * @return bool
      */
-    public function passes($attribute, $value)
+    public function passes($attribute, $value): bool
     {
         return preg_match('/[A-Z]{2,}-\d+/', $value);
     }
 
     /**
      * Get the validation error message.
-     *
-     * @return string
      */
-    public function message()
+    public function message(): string
     {
         return __('validate.capital-char-with-number');
     }

diff --git a/src/Rules/ValidCarNumber.php b/src/Rules/ValidCarNumber.php
@@ -8,22 +8,16 @@ class ValidCarNumber implements Rule
 {
     /**
      * Check car number is valid.
-     *
-     * @param  string  $attribute
-     * @param  mixed  $value
-     * @return bool
      */
-    public function passes($attribute, $value)
+    public function passes($attribute, $value): bool
     {
         return preg_match('/^[A-Z]{2}[0-9]{2}[A-Z]{2}[0-9]{4}$/', $value);
     }
 
     /**
      * Get the validation error message.
-     *
-     * @return string
      */
-    public function message()
+    public function message(): string
     {
         return __('validate.car-number');
     }

diff --git a/src/Rules/ValidCartNumberIran.php b/src/Rules/ValidCartNumberIran.php
@@ -8,12 +8,8 @@ class ValidCartNumberIran implements Rule
 {
     /**
      * Check cart number is valid.
-     *
-     * @param  string  $attribute
-     * @param  mixed  $value
-     * @return bool
      */
-    public function passes($attribute, $value)
+    public function passes($attribute, $value): bool
     {
         $cardToArr = str_split($value);
         $cardTotal = 0;
@@ -31,10 +27,8 @@ public function passes($attribute, $value)
 
     /**
      * Get the validation error message.
-     *
-     * @return string
      */
-    public function message()
+    public function message(): string
     {
         return __('validate.cart-number-iran');
     }

diff --git a/src/Rules/ValidCreditCard.php b/src/Rules/ValidCreditCard.php
@@ -8,12 +8,8 @@ class ValidCreditCard implements Rule
 {
     /**
      * Check if the credit card number is valid using the Luhn algorithm.
-     *
-     * @param  string  $attribute
-     * @param  mixed  $value
-     * @return bool
      */
-    public function passes($attribute, $value)
+    public function passes($attribute, $value): bool
     {
         $value = preg_replace('/\D/', '', $value);
 
@@ -37,10 +33,8 @@ public function passes($attribute, $value)
 
     /**
      * Get the validation error message.
-     *
-     * @return string
      */
-    public function message()
+    public function message(): string
     {
         return __('validate.credit-card');
     }

diff --git a/src/Rules/ValidDiscordUsername.php b/src/Rules/ValidDiscordUsername.php
@@ -8,22 +8,16 @@ class ValidDiscordUsername implements Rule
 {
     /**
      * Check discord username is valid.
-     *
-     * @param  string  $attribute
-     * @param  mixed  $value
-     * @return bool
      */
-    public function passes($attribute, $value)
+    public function passes($attribute, $value): bool
     {
         return preg_match('/^.{3,32}#[0-9]{4}$/', $value);
     }
 
     /**
      * Get the validation error message.
-     *
-     * @return string
      */
-    public function message()
+    public function message(): string
     {
         return __('validate.discord-username');
     }

diff --git a/src/Rules/ValidDomain.php b/src/Rules/ValidDomain.php
@@ -8,22 +8,16 @@ class ValidDomain implements Rule
 {
     /**
      * Check domain name is valid.
-     *
-     * @param  string  $attribute
-     * @param  mixed  $value
-     * @return bool
      */
-    public function passes($attribute, $value)
+    public function passes($attribute, $value): bool
     {
         return preg_match('/^(?:[-A-Za-z0-9]+\.)+[A-Za-z]{2,6}$/', $value);
     }
 
     /**
      * Get the validation error message.
-     *
-     * @return string
      */
-    public function message()
+    public function message(): string
     {
         return __('validate.domain');
     }

diff --git a/src/Rules/ValidDuplicate.php b/src/Rules/ValidDuplicate.php
@@ -8,12 +8,8 @@ class ValidDuplicate implements Rule
 {
     /**
      * Check duplicate value.
-     *
-     * @param  string  $attribute
-     * @param  mixed  $value
-     * @return bool
      */
-    public function passes($attribute, $value)
+    public function passes($attribute, $value): bool
     {
         $value = str_split($value);
 
@@ -22,10 +18,8 @@ public function passes($attribute, $value)
 
     /**
      * Get the validation error message.
-     *
-     * @return string
      */
-    public function message()
+    public function message(): string
     {
         return __('validate.duplicate');
     }

diff --git a/src/Rules/ValidDuplicateCharacter.php b/src/Rules/ValidDuplicateCharacter.php
@@ -8,12 +8,8 @@ class ValidDuplicateCharacter implements Rule
 {
     /**
      * Check duplicate characters, splitted by comma.
-     *
-     * @param  string  $attribute
-     * @param  mixed  $value
-     * @return bool
      */
-    public function passes($attribute, $value)
+    public function passes($attribute, $value): bool
     {
         $value = explode(',', $value);
 
@@ -22,10 +18,8 @@ public function passes($attribute, $value)
 
     /**
      * Get the validation error message.
-     *
-     * @return string
      */
-    public function message()
+    public function message(): string
     {
         return __('validate.duplicate_character');
     }