Merge branch 'master' of git://github.com/zendframework/zf2

zendframework · Jun 26, 2011 · e1d7b9a · e1d7b9a
11 parents b23edec + d0c5d5b + ebf227a + 78cdefd + 033ab4d + 5013d43 + c0d814f + 1845030 + a714cd1 + f1de588 + 90636d5
commit e1d7b9a
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/src/Backend/StaticBackend.php b/src/Backend/StaticBackend.php
@@ -389,7 +389,7 @@ public function clean($mode = Cache\Cache::CLEANING_MODE_ALL, $tags = array())
             case Cache\Cache::CLEANING_MODE_MATCHING_TAG:
             case Cache\Cache::CLEANING_MODE_MATCHING_ANY_TAG:
                 if (empty($tags)) {
-                    throw new end\Exception('Cannot use tag matching modes as no tags were defined');
+                    throw new \InvalidArgumentException('Cannot use tag matching modes as no tags were defined');
                 }
                 if ($this->_tagged === null && $tagged = $this->getInnerCache()->load(self::INNER_CACHE_NAME)) {
                     $this->_tagged = $tagged;
@@ -429,7 +429,7 @@ public function clean($mode = Cache\Cache::CLEANING_MODE_ALL, $tags = array())
                 break;
             case Cache\Cache::CLEANING_MODE_NOT_MATCHING_TAG:
                 if (empty($tags)) {
-                    throw new \Zend\Exception('Cannot use tag matching modes as no tags were defined');
+                    throw new \InvalidArgumentException('Cannot use tag matching modes as no tags were defined');
                 }
                 if ($this->_tagged === null) {
                     $tagged = $this->getInnerCache()->load(self::INNER_CACHE_NAME);

diff --git a/src/Exception.php b/src/Exception.php
@@ -24,9 +24,10 @@
 namespace Zend\Cache;
 
 /**
- * @uses       \Zend\Exception
+ * @uses       \Exception
+ * @category   Zend
  * @package    Zend_Cache
  * @copyright  Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
-class Exception extends \Zend\Exception {}
+class Exception extends \Exception {}
diff --git a/src/Frontend/Page.php b/src/Frontend/Page.php
@@ -282,7 +282,7 @@ public function start($id = false, $doNotDie = false)
             if ($doNotDie) {
                 return true;
             }
-            die();
+            exit();
         }
         ob_start(array($this, '_flush'));
         ob_implicit_flush(false);