Optimized nested conditions

laravel · Jan 22, 2016 · 965309a · 965309a
1 parent 9a0fd77
commit 965309a
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/src/Illuminate/Validation/Validator.php b/src/Illuminate/Validation/Validator.php
@@ -551,7 +551,11 @@ protected function validateFailonfirst()
      */
     protected function shouldBreakOnFail($attribute)
     {
-        return $this->hasRule($attribute, ['Failonfirst']) && $this->messages->has($attribute);
+        if (! $this->hasRule($attribute, ['Failonfirst'])) {
+            return false;
+        }
+
+        return $this->messages->has($attribute);
     }
 
     /**