Catch Throwable in timezone validation (#16344)

laravel · Nov 10, 2016 · c2e4b5c · c2e4b5c
1 parent 10a3fe3
commit c2e4b5c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/src/Illuminate/Validation/Validator.php b/src/Illuminate/Validation/Validator.php
@@ -6,6 +6,7 @@
 use DateTime;
 use Countable;
 use Exception;
+use Throwable;
 use DateTimeZone;
 use RuntimeException;
 use DateTimeInterface;
@@ -1976,6 +1977,8 @@ protected function validateTimezone($attribute, $value)
             new DateTimeZone($value);
         } catch (Exception $e) {
             return false;
+        } catch (Throwable $e) {
+            return false;
         }
 
         return true;

diff --git a/tests/Validation/ValidationValidatorTest.php b/tests/Validation/ValidationValidatorTest.php
@@ -2063,6 +2063,9 @@ public function testValidateTimezone()
 
         $v = new Validator($trans, ['foo' => 'GMT'], ['foo' => 'Timezone']);
         $this->assertTrue($v->passes());
+
+        $v = new Validator($trans, ['foo' => ['this_is_not_a_timezone']], ['foo' => 'Timezone']);
+        $this->assertFalse($v->passes());
     }
 
     public function testValidateRegex()