Merge branch 'master' into markup

Conflicts: library/Zend/Markup/Parser/Textile.php library/Zend/Markup/Renderer/AbstractRenderer.php library/Zend/Markup/Renderer/Html.php
zendframework · Oct 30, 2010 · 369dd16 · 369dd16
2 parents 96e1d5b + bbae534
commit 369dd16
Show file tree

Hide file tree

Showing 41 changed files with 155 additions and 188 deletions.
diff --git a/src/Exception.php b/src/Exception.php
@@ -16,7 +16,6 @@
  * @package    Zend_Log
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**
@@ -25,12 +24,10 @@
 namespace Zend\Log;
 
 /**
- * @uses       \Zend\Exception
  * @category   Zend
  * @package    Zend_Log
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
-class Exception extends \Zend\Exception
-{}
+interface Exception
+{}
diff --git a/src/Exception/InvalidArgumentException.php b/src/Exception/InvalidArgumentException.php
@@ -0,0 +1,7 @@
+<?php
+namespace Zend\Log\Exception;
+
+class InvalidArgumentException
+	extends \InvalidArgumentException
+	implements \Zend\Log\Exception
+{}
diff --git a/src/Exception/NotImplementedException.php b/src/Exception/NotImplementedException.php
@@ -0,0 +1,7 @@
+<?php
+namespace Zend\Log\Exception;
+
+class NotImplementedException
+	extends \InvalidArgumentException
+	implements \Zend\Log\Exception
+{}
diff --git a/src/Exception/RuntimeException.php b/src/Exception/RuntimeException.php
@@ -0,0 +1,7 @@
+<?php
+namespace Zend\Log\Exception;
+
+class RuntimeException
+	extends \RuntimeException
+	implements \Zend\Log\Exception
+{}
diff --git a/src/Factory.php b/src/Factory.php
@@ -16,7 +16,6 @@
  * @package    Zend_Log
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**
@@ -29,7 +28,6 @@
  * @package    Zend_Log
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 interface Factory
 {

diff --git a/src/Filter.php b/src/Filter.php
@@ -17,7 +17,6 @@
  * @subpackage Filter
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**
@@ -31,7 +30,6 @@
  * @subpackage Filter
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 interface Filter
 {

diff --git a/src/Filter/AbstractFilter.php b/src/Filter/AbstractFilter.php
@@ -17,7 +17,6 @@
  * @subpackage Writer
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**
@@ -28,15 +27,14 @@
     Zend\Log\Filter;
 
 /**
- * @uses       \Zend\Log\Exception
+ * @uses       \Zend\Log\Exception\InvalidArgumentException
  * @uses       \Zend\Log\Filter\FilterInterface
  * @uses       \Zend\Log\FactoryInterface
  * @category   Zend
  * @package    Zend_Log
  * @subpackage Writer
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 abstract class AbstractFilter implements Filter, Factory
 {
@@ -45,7 +43,7 @@ abstract class AbstractFilter implements Filter, Factory
      * 
      * @param  array|\Zend\Config\Config $config \Zend\Config\Config or Array
      * @return array
-     * @throws \Zend\Log\Exception
+     * @throws \Zend\Log\Exception\InvalidArgumentException
      */
     static protected function _parseConfig($config)
     {
@@ -54,7 +52,7 @@ static protected function _parseConfig($config)
         }
 
         if (!is_array($config)) {
-            throw new \Zend\Log\Exception('Configuration must be an array or instance of Zend\\Config\\Config');
+            throw new \Zend\Log\Exception\InvalidArgumentException('Configuration must be an array or instance of Zend\Config\Config');
         }
 
         return $config;

diff --git a/src/Filter/Message.php b/src/Filter/Message.php
@@ -17,7 +17,6 @@
  * @subpackage Filter
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**
@@ -26,14 +25,13 @@
 namespace Zend\Log\Filter;
 
 /**
- * @uses       \Zend\Log\Exception
+ * @uses       \Zend\Log\Exception\InvalidArgumentException
  * @uses       \Zend\Log\Filter\AbstractFilter
  * @category   Zend
  * @package    Zend_Log
  * @subpackage Filter
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 class Message extends AbstractFilter
 {
@@ -46,12 +44,12 @@ class Message extends AbstractFilter
      * Filter out any log messages not matching $regexp.
      *
      * @param  string  $regexp     Regular expression to test the log message
-     * @throws \Zend\Log\Exception
+     * @throws \Zend\Log\Exception\InvalidArgumentException
      */
     public function __construct($regexp)
     {
         if (@preg_match($regexp, '') === false) {
-            throw new \Zend\Log\Exception("Invalid regular expression '$regexp'");
+            throw new \Zend\Log\Exception\InvalidArgumentException("Invalid regular expression '$regexp'");
         }
         $this->_regexp = $regexp;
     }
@@ -61,7 +59,6 @@ public function __construct($regexp)
      * 
      * @param  array|\Zend\Config\Config $config
      * @return \Zend\Log\Filter\Message
-     * @throws \Zend\Log\Exception
      */
     static public function factory($config = array()) 
     {

diff --git a/src/Filter/Priority.php b/src/Filter/Priority.php
@@ -17,7 +17,6 @@
  * @subpackage Filter
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**
@@ -26,14 +25,13 @@
 namespace Zend\Log\Filter;
 
 /**
- * @uses       \Zend\Log\Exception
+ * @uses       \Zend\Log\Exception\InvalidArgumentException
  * @uses       \Zend\Log\Filter\AbstractFilter
  * @category   Zend
  * @package    Zend_Log
  * @subpackage Filter
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 class Priority extends AbstractFilter
 {
@@ -53,12 +51,12 @@ class Priority extends AbstractFilter
      *
      * @param  integer  $priority  Priority
      * @param  string   $operator  Comparison operator
-     * @throws \Zend\Log\Exception
+     * @throws \Zend\Log\Exception\InvalidArgumentException
      */
     public function __construct($priority, $operator = null)
     {
         if (! is_integer($priority)) {
-            throw new \Zend\Log\Exception('Priority must be an integer');
+            throw new \Zend\Log\Exception\InvalidArgumentException('Priority must be an integer');
         }
 
         $this->_priority = $priority;
@@ -70,7 +68,7 @@ public function __construct($priority, $operator = null)
      * 
      * @param  array|\Zend\Config\Config $config
      * @return \Zend\Log\Filter\Priority
-     * @throws \Zend\Log\Exception
+     * @throws \Zend\Log\Exception\InvalidArgumentException
      */
     static public function factory($config = array()) 
     {
@@ -86,7 +84,7 @@ static public function factory($config = array())
         }
 
         if (!is_numeric($config['priority'])) {
-        	throw new \Zend\Log\Exception('Priority must be an integer.');
+        	throw new \Zend\Log\Exception\InvalidArgumentException('Priority must be an integer.');
         }
 
         return new self(

diff --git a/src/Filter/SuppressFilter.php b/src/Filter/SuppressFilter.php
@@ -17,7 +17,6 @@
  * @subpackage Filter
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**
@@ -32,7 +31,6 @@
  * @subpackage Filter
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 class SuppressFilter extends AbstractFilter
 {
@@ -71,7 +69,6 @@ public function accept($event)
      * 
      * @param  array|\Zend\Config\Config $config
      * @return \Zend\Log\Filter\Suppress
-     * @throws \Zend\Log\Exception
      */
     static public function factory($config = array())
     {

diff --git a/src/Formatter.php b/src/Formatter.php
@@ -17,7 +17,6 @@
  * @subpackage Formatter
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**
@@ -31,7 +30,6 @@
  * @subpackage Formatter
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 interface Formatter
 {

diff --git a/src/Formatter/Firebug.php b/src/Formatter/Firebug.php
@@ -17,7 +17,6 @@
  * @subpackage Formatter
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**

diff --git a/src/Formatter/Simple.php b/src/Formatter/Simple.php
@@ -17,7 +17,6 @@
  * @subpackage Formatter
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**
@@ -27,14 +26,13 @@
 use \Zend\Log\Formatter;
 
 /**
- * @uses       \Zend\Log\Exception
+ * @uses       \Zend\Log\Exception\InvalidArgumentException
  * @uses       \Zend\Log\Formatter\FormatterInterface
  * @category   Zend
  * @package    Zend_Log
  * @subpackage Formatter
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 class Simple implements Formatter
 {
@@ -49,7 +47,7 @@ class Simple implements Formatter
      * Class constructor
      *
      * @param  null|string  $format  Format specifier for log messages
-     * @throws \Zend\Log\Exception
+     * @throws \Zend\Log\Exception\InvalidArgumentException
      */
     public function __construct($format = null)
     {
@@ -58,7 +56,7 @@ public function __construct($format = null)
         }
 
         if (! is_string($format)) {
-            throw new \Zend\Log\Exception('Format must be a string');
+            throw new \Zend\Log\Exception\InvalidArgumentException('Format must be a string');
         }
 
         $this->_format = $format;

diff --git a/src/Formatter/Xml.php b/src/Formatter/Xml.php
@@ -17,7 +17,6 @@
  * @subpackage Formatter
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**
@@ -36,7 +35,6 @@
  * @subpackage Formatter
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 class Xml implements Formatter
 {