Move DateUtils.php into Traits directory

rakit · Nov 24, 2018 · 9e1f8e6 · 9e1f8e6
1 parent cedc217
commit 9e1f8e6
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/src/Rules/After.php b/src/Rules/After.php
@@ -7,7 +7,7 @@
 class After extends Rule
 {
 
-    use DateUtils;
+    use Traits\DateUtilsTrait;
 
     /** @var string */
     protected $message = "The :attribute must be a date after :time.";

diff --git a/src/Rules/Before.php b/src/Rules/Before.php
@@ -6,7 +6,7 @@
 
 class Before extends Rule
 {
-    use DateUtils;
+    use Traits\DateUtilsTrait;
 
     /** @var string */
     protected $message = "The :attribute must be a date before :time.";

diff --git a/src/Rules/DateUtils.php → src/Rules/Traits/DateUtilsTrait.php b/src/Rules/DateUtils.php → src/Rules/Traits/DateUtilsTrait.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Rakit\Validation\Rules;
+namespace Rakit\Validation\Rules\Traits;
 
 use Exception;
 
-trait DateUtils
+trait DateUtilsTrait
 {
 
     /**
@@ -26,9 +26,8 @@ protected function isValidDate(string $date): bool
      */
     protected function throwException(string $value)
     {
-        return new Exception(
-            "Expected a valid date, got '{$value}' instead. 2016-12-08, 2016-12-02 14:58, tomorrow are considered valid dates"
-        );
+        // phpcs:ignore
+        return new Exception("Expected a valid date, got '{$value}' instead. 2016-12-08, 2016-12-02 14:58, tomorrow are considered valid dates");
     }
 
     /**

diff --git a/src/Validation.php b/src/Validation.php
@@ -483,7 +483,8 @@ protected function resolveRules($rules): array
                 $validator = call_user_func_array($validatorFactory, ['callback', $rule]);
             } else {
                 $ruleName = is_object($rule) ? get_class($rule) : gettype($rule);
-                throw new \Exception("Rule must be a string, closure or Rakit\Validation\Rule instance. ".$ruleName." given");
+                $message = "Rule must be a string, Closure or '".Rule::class."' instance. ".$ruleName." given";
+                throw new \Exception();
             }
 
             $resolvedRules[] = $validator;