Merge branch 'navigation-renamed-interfaces' of https://github.com/pr…

…olic/zf2 into feature/zen27-navigation
zendframework · May 4, 2012 · 9d3ce53 · 9d3ce53
commit 9d3ce53
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 17 deletions.
diff --git a/src/Exception/BadMethodCallException.php b/src/Exception/BadMethodCallException.php
@@ -21,8 +21,6 @@
 
 namespace Zend\Navigation\Exception;
 
-use Zend\Navigation\Exception;
-
 /**
  * Navigation bad method call exception
  *
@@ -32,5 +30,7 @@
  * @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 BadMethodCallException extends \BadMethodCallException implements Exception
+class BadMethodCallException
+    extends \BadMethodCallException
+    implements ExceptionInterface
 {}
diff --git a/src/Exception/DomainException.php b/src/Exception/DomainException.php
@@ -21,8 +21,6 @@
 
 namespace Zend\Navigation\Exception;
 
-use Zend\Navigation\Exception;
-
 /**
  * Navigation domain exception
  *
@@ -32,5 +30,7 @@
  * @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 DomainException extends \DomainException implements Exception
+class DomainException
+    extends \DomainException
+    implements ExceptionInterface
 {}
diff --git a/src/Exception.php → src/Exception/ExceptionInterface.php b/src/Exception.php → src/Exception/ExceptionInterface.php
@@ -18,7 +18,7 @@
  * @license    http://framework.zend.com/license/new-bsd New BSD License
  */
 
-namespace Zend\Navigation;
+namespace Zend\Navigation\Exception;
 
 /**
  * Navigation exception
@@ -28,7 +28,7 @@
  * @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 ExceptionInterface
 {
 
 }
diff --git a/src/Exception/InvalidArgumentException.php b/src/Exception/InvalidArgumentException.php
@@ -21,8 +21,6 @@
 
 namespace Zend\Navigation\Exception;
 
-use Zend\Navigation\Exception;
-
 /**
  * Navigation invalid argument exception
  *
@@ -32,5 +30,7 @@
  * @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 InvalidArgumentException
+    extends \InvalidArgumentException
+    implements ExceptionInterface
 {}
diff --git a/src/Exception/OutOfBoundsException.php b/src/Exception/OutOfBoundsException.php
@@ -21,8 +21,6 @@
 
 namespace Zend\Navigation\Exception;
 
-use Zend\Navigation\Exception;
-
 /**
  * Navigation out of bounds exception
  *
@@ -32,5 +30,7 @@
  * @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 OutOfBoundsException extends \OutOfBoundsException implements Exception
+class OutOfBoundsException
+    extends \OutOfBoundsException
+    implements ExceptionInterface
 {}
diff --git a/src/Page/AbstractPage.php b/src/Page/AbstractPage.php
@@ -22,7 +22,7 @@
 namespace Zend\Navigation\Page;
 
 use Traversable,
-    Zend\Acl\Resource as AclResource,
+    Zend\Acl\Resource\ResourceInterface as AclResource,
     Zend\Navigation\Container,
     Zend\Navigation\Exception,
     Zend\Stdlib\ArrayUtils;

diff --git a/test/ContainerTest.php b/test/ContainerTest.php
@@ -122,7 +122,7 @@ public function testConstructorShouldThrowExceptionOnInvalidArgument()
             $this->fail('An invalid argument was given to the constructor, ' .
                         'but a Zend\Navigation\Exception\InvalidArgumentException was ' .
                         'not thrown');
-        } catch (Navigation\Exception $e) {
+        } catch (Navigation\Exception\ExceptionInterface $e) {
             $this->assertContains('Invalid argument: $pages', $e->getMessage());
         }
     }

diff --git a/test/Page/PageTest.php b/test/Page/PageTest.php
@@ -196,7 +196,7 @@ public function testSetAndGetFragmentIdentifier()
             try {
                 $page->setFragment($invalid);
                 $this->fail('An invalid value was set, but a ' .
-                            'Zend_Navigation_Exception was not thrown');
+                            'Zend\Navigation\Exception\InvalidArgumentException was not thrown');
             } catch (Navigation\Exception\InvalidArgumentException $e) {
                 $this->assertContains(
                     'Invalid argument: $fragment', $e->getMessage()