zendframework#6598 - using caught IntlException instances as previo…

…us exceptions
froschdesign · Jan 3, 2015 · b2e9d8d · b2e9d8d
1 parent 6704893
commit b2e9d8d
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/library/Zend/I18n/Validator/DateTime.php b/library/Zend/I18n/Validator/DateTime.php
@@ -271,8 +271,8 @@ public function isValid($value)
             if (intl_is_failure($formatter->getErrorCode())) {
                 throw new ValidatorException\InvalidArgumentException($formatter->getErrorMessage());
             }
-        } catch (IntlException $e) {
-            throw new ValidatorException\InvalidArgumentException($e->getMessage());
+        } catch (IntlException $intlException) {
+            throw new ValidatorException\InvalidArgumentException($e->getMessage(), 0, $intlException);
         }
 
 
@@ -283,7 +283,7 @@ public function isValid($value)
                 $this->error(self::INVALID_DATETIME);
                 return false;
             }
-        } catch (IntlException $e) {
+        } 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
@@ -127,8 +127,8 @@ public function isValid($value)
             if (intl_is_failure($formatter->getErrorCode())) {
                 throw new Exception\InvalidArgumentException($formatter->getErrorMessage());
             }
-        } catch (IntlException $e) {
-            throw new Exception\InvalidArgumentException($e->getMessage());
+        } 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
@@ -114,8 +114,8 @@ public function isValid($value)
             if (intl_is_failure($format->getErrorCode())) {
                 throw new Exception\InvalidArgumentException("Invalid locale string given");
             }
-        } catch (IntlException $e) {
-            throw new Exception\InvalidArgumentException("Invalid locale string given");
+        } catch (IntlException $intlException) {
+            throw new Exception\InvalidArgumentException("Invalid locale string given", 0, $intlException);
         }
 
         try {
@@ -124,7 +124,7 @@ public function isValid($value)
                 $this->error(self::NOT_INT);
                 return false;
             }
-        } catch (IntlException $e) {
+        } catch (IntlException $intlException) {
             $this->error(self::NOT_INT);
             return false;
         }