Bläddra i källkod

ZF-12185: Zend_EventManager exceptions not valid PHP 5.2

git-svn-id: http://framework.zend.com/svn/framework/standard/trunk@24765 44c647ce-9c0f-0410-b52a-842ac1e357ba
adamlundrigan 13 år sedan
förälder
incheckning
d75f1cf422

+ 1 - 6
library/Zend/EventManager/Exception.php

@@ -19,11 +19,6 @@
  */
 
 /**
- * @namespace
- */
-namespace Zend\EventManager;
-
-/**
  * Base exception interface
  *
  * @category   Zend
@@ -31,6 +26,6 @@ namespace Zend\EventManager;
  * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
-interface Exception
+interface Zend_EventManager_Exception
 {
 }

+ 8 - 5
library/Zend/EventManager/Exception/InvalidArgumentException.php

@@ -19,11 +19,14 @@
  */
 
 /**
- * @namespace
+ * @see Zend_Exception
  */
-namespace Zend\EventManager\Exception;
+require_once 'Zend/Exception.php';
 
-use Zend\EventManager\Exception;
+/**
+ * @see Zend_EventManager_Exception
+ */
+require_once 'Zend/EventManager/Exception.php';
 
 /**
  * Invalid argument exception
@@ -33,7 +36,7 @@ use Zend\EventManager\Exception;
  * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
-class InvalidArgumentException 
-    extends \InvalidArgumentException implements Exception
+class Zend_EventManager_Exception_InvalidArgumentException
+    extends Zend_Exception implements Zend_EventManager_Exception
 {
 }

+ 10 - 0
tests/Zend/EventManager/EventManagerTest.php

@@ -551,6 +551,16 @@ class Zend_EventManager_EventManagerTest extends PHPUnit_Framework_TestCase
         }
     }
 
+    /**
+     * @group ZF-12185
+     * @expectedException Zend_EventManager_Exception_InvalidArgumentException
+     */
+    public function testInvalidArgumentExceptionCanBeThrown()
+    {
+        require_once "Zend/EventManager/Exception/InvalidArgumentException.php";
+        throw new Zend_EventManager_Exception_InvalidArgumentException();
+    }
+
     /*
      * Listeners used in tests
      */