Merge branch 'hotfix/zendframework#6598-catch-intl-exceptions'

Close zendframework#6598 Close zendframework#6312
froschdesign · Jan 3, 2015 · 19b8cba · 19b8cba
2 parents 38782ac + b2e9d8d
commit 19b8cba
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 12 deletions.
diff --git a/library/Zend/I18n/Validator/DateTime.php b/library/Zend/I18n/Validator/DateTime.php
@@ -12,6 +12,7 @@
 use Locale;
 use IntlDateFormatter;
 use Traversable;
+use IntlException;
 use Zend\I18n\Exception as I18nException;
 use Zend\Validator\AbstractValidator;
 use Zend\Validator\Exception as ValidatorException;
@@ -263,15 +264,26 @@ public function isValid($value)
         }
 
         $this->setValue($value);
-        $formatter = $this->getIntlDateFormatter();
 
-        if (intl_is_failure($formatter->getErrorCode())) {
-            throw new ValidatorException\InvalidArgumentException($formatter->getErrorMessage());
+        try {
+            $formatter = $this->getIntlDateFormatter();
+
+            if (intl_is_failure($formatter->getErrorCode())) {
+                throw new ValidatorException\InvalidArgumentException($formatter->getErrorMessage());
+            }
+        } catch (IntlException $intlException) {
+            throw new ValidatorException\InvalidArgumentException($e->getMessage(), 0, $intlException);
         }
 
-        $timestamp = $formatter->parse($value);
 
-        if (intl_is_failure($formatter->getErrorCode()) || $timestamp === false) {
+        try {
+            $timestamp = $formatter->parse($value);
+
+            if (intl_is_failure($formatter->getErrorCode()) || $timestamp === false) {
+                $this->error(self::INVALID_DATETIME);
+                return false;
+            }
+        } catch (IntlException $intlException) {
             $this->error(self::INVALID_DATETIME);
             return false;
         }

diff --git a/library/Zend/I18n/Validator/Float.php b/library/Zend/I18n/Validator/Float.php
@@ -12,6 +12,7 @@
 use Locale;
 use NumberFormatter;
 use Traversable;
+use IntlException;
 use Zend\I18n\Exception as I18nException;
 use Zend\Stdlib\ArrayUtils;
 use Zend\Stdlib\StringUtils;
@@ -122,8 +123,12 @@ public function isValid($value)
         // Need to check if this is scientific formatted string. If not, switch to decimal.
         $formatter = new NumberFormatter($this->getLocale(), NumberFormatter::SCIENTIFIC);
 
-        if (intl_is_failure($formatter->getErrorCode())) {
-            throw new Exception\InvalidArgumentException($formatter->getErrorMessage());
+        try {
+            if (intl_is_failure($formatter->getErrorCode())) {
+                throw new Exception\InvalidArgumentException($formatter->getErrorMessage());
+            }
+        } catch (IntlException $intlException) {
+            throw new Exception\InvalidArgumentException($e->getMessage(), 0, $intlException);
         }
 
         if (StringUtils::hasPcreUnicodeSupport()) {

diff --git a/library/Zend/I18n/Validator/Int.php b/library/Zend/I18n/Validator/Int.php
@@ -12,11 +12,13 @@
 use Locale;
 use NumberFormatter;
 use Traversable;
+use IntlException;
 use Zend\I18n\Exception as I18nException;
 use Zend\Stdlib\ArrayUtils;
 use Zend\Validator\AbstractValidator;
 use Zend\Validator\Exception;
 
+
 class Int extends AbstractValidator
 {
     const INVALID = 'intInvalid';
@@ -107,13 +109,22 @@ public function isValid($value)
         $this->setValue($value);
 
         $locale = $this->getLocale();
-        $format = new NumberFormatter($locale, NumberFormatter::DECIMAL);
-        if (intl_is_failure($format->getErrorCode())) {
-            throw new Exception\InvalidArgumentException("Invalid locale string given");
+        try {
+            $format = new NumberFormatter($locale, NumberFormatter::DECIMAL);
+            if (intl_is_failure($format->getErrorCode())) {
+                throw new Exception\InvalidArgumentException("Invalid locale string given");
+            }
+        } catch (IntlException $intlException) {
+            throw new Exception\InvalidArgumentException("Invalid locale string given", 0, $intlException);
         }
 
-        $parsedInt = $format->parse($value, NumberFormatter::TYPE_INT64);
-        if (intl_is_failure($format->getErrorCode())) {
+        try {
+            $parsedInt = $format->parse($value, NumberFormatter::TYPE_INT64);
+            if (intl_is_failure($format->getErrorCode())) {
+                $this->error(self::NOT_INT);
+                return false;
+            }
+        } catch (IntlException $intlException) {
             $this->error(self::NOT_INT);
             return false;
         }