Merge branch 'feature/di' of github.com:ralphschindler/zf2 into featu…

…re/rackspace
zendframework · May 31, 2011 · 77efb4b · 77efb4b
9 parents ffbd904 + 633cda5 + 5b7f14c + 5a4a15d + f06099b + 860f855 + b812661 + f9abe33 + 61559f2
commit 77efb4b
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 3 deletions.
diff --git a/src/CreditCard.php b/src/CreditCard.php
@@ -304,7 +304,7 @@ public function isValid($value)
                     $this->_error(self::SERVICE, $value);
                     return false;
                 }
-            } catch (\Zend\Exception $e) {
+            } catch (\Exception $e) {
                 $this->_error(self::SERVICEFAILURE, $value);
                 return false;
             }

diff --git a/src/Exception.php b/src/Exception.php
@@ -24,7 +24,6 @@
 namespace Zend\Validator;
 
 /**
- * @uses       \Zend\Exception
  * @category   Zend
  * @package    Zend_Validate
  * @copyright  Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)

diff --git a/test/EmailAddressTest.php b/test/EmailAddressTest.php
@@ -471,7 +471,7 @@ public function testInstanceWithOldOptions()
             $this->assertEquals(Hostname::ALLOW_ALL, $options['allow']);
             $this->assertTrue($options['mx']);
             set_error_handler($handler);
-        } catch (\Zend\Exception $e) {
+        } catch (\Zend\Validator\Exception\InvalidArgumentException $e) {
             $this->markTestSkipped('MX not available on this system');
         }
     }