Return default error message from message()

Author: arifszn

src/Rules/Ascii.php

@@ -24,7 +24,7 @@ class Ascii implements Rule
      */
     public function __construct(string $errorMessage = null)
     {
-        $this->errorMessage = $errorMessage ? $errorMessage : trans('advancedValidation::validation.ascii');
+        $this->errorMessage = $errorMessage;
     }
 
     /**
@@ -46,6 +46,6 @@ public function passes($attribute, $value)
      */
     public function message()
     {
-        return $this->errorMessage;
+        return $this->errorMessage ? $this->errorMessage : trans('advancedValidation::validation.ascii');
     }
 }

src/Rules/BIC.php

@@ -25,7 +25,7 @@ class BIC implements Rule
      */
     public function __construct(string $errorMessage = null)
     {
-        $this->errorMessage = $errorMessage ? $errorMessage : trans('advancedValidation::validation.bic');
+        $this->errorMessage = $errorMessage;
     }
 
     /**
@@ -48,6 +48,6 @@ public function passes($attribute, $value)
      */
     public function message()
     {
-        return $this->errorMessage;
+        return $this->errorMessage ? $this->errorMessage : trans('advancedValidation::validation.bic');
     }
 }

src/Rules/Base64Image.php

@@ -26,7 +26,7 @@ class Base64Image implements Rule
      */
     public function __construct(string $errorMessage = null)
     {
-        $this->errorMessage = $errorMessage ? $errorMessage : trans('advancedValidation::validation.base64_image');
+        $this->errorMessage = $errorMessage;
     }
 
     /**
@@ -65,6 +65,6 @@ public function passes($attribute, $value)
      */
     public function message()
     {
-        return $this->errorMessage;
+        return $this->errorMessage ? $this->errorMessage : trans('advancedValidation::validation.base64_image');
     }
 }

src/Rules/Base64String.php

@@ -24,7 +24,7 @@ class Base64String implements Rule
      */
     public function __construct(string $errorMessage = null)
     {
-        $this->errorMessage = $errorMessage ? $errorMessage : trans('advancedValidation::validation.base64_string');
+        $this->errorMessage = $errorMessage;
     }
 
     /**
@@ -46,6 +46,6 @@ public function passes($attribute, $value)
      */
     public function message()
     {
-        return $this->errorMessage;
+        return $this->errorMessage ? $this->errorMessage : trans('advancedValidation::validation.base64_string');
     }
 }

src/Rules/BtcAddress.php

@@ -24,7 +24,7 @@ class BtcAddress implements Rule
      */
     public function __construct(string $errorMessage = null)
     {
-        $this->errorMessage = $errorMessage ? $errorMessage : trans('advancedValidation::validation.btc_address');
+        $this->errorMessage = $errorMessage;
     }
 
     /**
@@ -53,6 +53,6 @@ public function passes($attribute, $value)
      */
     public function message()
     {
-        return $this->errorMessage;
+        return $this->errorMessage ? $this->errorMessage : trans('advancedValidation::validation.btc_address');
     }
 }

src/Rules/CreditCard.php

@@ -24,7 +24,7 @@ class CreditCard implements Rule
      */
     public function __construct(string $errorMessage = null)
     {
-        $this->errorMessage = $errorMessage ? $errorMessage : trans('advancedValidation::validation.credit_card');
+        $this->errorMessage = $errorMessage;
     }
 
     /**
@@ -76,6 +76,6 @@ public function passes($attribute, $value)
      */
     public function message()
     {
-        return $this->errorMessage;
+        return $this->errorMessage ? $this->errorMessage : trans('advancedValidation::validation.credit_card');
     }
 }

src/Rules/DataURI.php

@@ -24,7 +24,7 @@ class DataURI implements Rule
      */
     public function __construct(string $errorMessage = null)
     {
-        $this->errorMessage = $errorMessage ? $errorMessage : trans('advancedValidation::validation.data_uri');
+        $this->errorMessage = $errorMessage;
     }
 
     /**
@@ -87,6 +87,6 @@ public function passes($attribute, $value)
      */
     public function message()
     {
-        return $this->errorMessage;
+        return $this->errorMessage ? $this->errorMessage : trans('advancedValidation::validation.data_uri');
     }
 }

src/Rules/ImageURL.php

@@ -26,7 +26,7 @@ class ImageURL implements Rule
      */
     public function __construct(string $errorMessage = null)
     {
-        $this->errorMessage = $errorMessage ? $errorMessage : trans('advancedValidation::validation.image_url');
+        $this->errorMessage = $errorMessage;
     }
 
     /**
@@ -60,6 +60,6 @@ public function passes($attribute, $value)
      */
     public function message()
     {
-        return $this->errorMessage;
+        return $this->errorMessage ? $this->errorMessage : trans('advancedValidation::validation.image_url');
     }
 }

src/Rules/Phone.php

@@ -24,7 +24,7 @@ class Phone implements Rule
      */
     public function __construct(string $errorMessage = null)
     {
-        $this->errorMessage = $errorMessage ? $errorMessage : trans('advancedValidation::validation.phone');
+        $this->errorMessage = $errorMessage;
     }
 
     /**
@@ -46,6 +46,6 @@ public function passes($attribute, $value)
      */
     public function message()
     {
-        return $this->errorMessage;
+        return $this->errorMessage ? $this->errorMessage : trans('advancedValidation::validation.phone');
     }
 }

src/Rules/WithoutSpaces.php

@@ -24,7 +24,7 @@ class WithoutSpaces implements Rule
      */
     public function __construct(string $errorMessage = null)
     {
-        $this->errorMessage = $errorMessage ? $errorMessage : trans('advancedValidation::validation.without_spaces');
+        $this->errorMessage = $errorMessage;
     }
 
     /**
@@ -46,6 +46,6 @@ public function passes($attribute, $value)
      */
     public function message()
     {
-        return $this->errorMessage;
+        return $this->errorMessage ? $this->errorMessage : trans('advancedValidation::validation.without_spaces');
     }
 }