From 732366d9d246a790cbc342f21ce792011ea0ffa0 Mon Sep 17 00:00:00 2001 From: Michael M Slusarz Date: Mon, 19 Jul 2010 16:26:32 -0600 Subject: [PATCH] Add Horde_Text_Filter_Exception:: --- framework/Text_Filter/lib/Horde/Text/Filter.php | 6 +++--- .../Text_Filter/lib/Horde/Text/Filter/Exception.php | 17 +++++++++++++++++ framework/Text_Filter/package.xml | 8 +++++++- 3 files changed, 27 insertions(+), 4 deletions(-) create mode 100644 framework/Text_Filter/lib/Horde/Text/Filter/Exception.php diff --git a/framework/Text_Filter/lib/Horde/Text/Filter.php b/framework/Text_Filter/lib/Horde/Text/Filter.php index 9ec6f044b..e0f7cba70 100644 --- a/framework/Text_Filter/lib/Horde/Text/Filter.php +++ b/framework/Text_Filter/lib/Horde/Text/Filter.php @@ -24,7 +24,7 @@ class Horde_Text_Filter * parameters a subclass might need. * * @return Horde_Text_Filter_Base The newly created concrete instance. - * @throws Horde_Exception + * @throws Horde_Text_Filter_Exception */ static public function factory($driver, $params = array()) { @@ -40,7 +40,7 @@ class Horde_Text_Filter return new $class($params); } - throw new Horde_Exception(__CLASS__ . ': Class definition of ' . $driver . ' not found.'); + throw new Horde_Text_Filter_Exception(__CLASS__ . ': Class definition of ' . $driver . ' not found.'); } /** @@ -61,7 +61,7 @@ class Horde_Text_Filter foreach ($filters as $num => $filter) { try { $filterOb = self::factory($filter, isset($params[$num]) ? $params[$num] : array()); - } catch (Horde_Exception $e) { + } catch (Horde_Text_Filter_Exception $e) { return $e->getMessage(); } $patterns = $filterOb->getPatterns(); diff --git a/framework/Text_Filter/lib/Horde/Text/Filter/Exception.php b/framework/Text_Filter/lib/Horde/Text/Filter/Exception.php new file mode 100644 index 000000000..fce82adaf --- /dev/null +++ b/framework/Text_Filter/lib/Horde/Text/Filter/Exception.php @@ -0,0 +1,17 @@ + + * @category Horde + * @license http://www.fsf.org/copyleft/lgpl.html LGPL + * @package Text_Filter + */ +class Horde_Text_Filter_Exception extends Horde_Exception_Prior +{ +} diff --git a/framework/Text_Filter/package.xml b/framework/Text_Filter/package.xml index 89584c7c5..e4585d398 100644 --- a/framework/Text_Filter/package.xml +++ b/framework/Text_Filter/package.xml @@ -37,7 +37,8 @@ http://pear.php.net/dtd/package-2.0.xsd"> beta LGPL - * Remove Horde/Core dependency in the Emoticons driver. + * Add Horde_Text_Filter_Exception::. + * Remove Horde/Core dependency in the Emoticons driver. * Html2text converter now uses XML parser to generate output. * Add ability to define filters to use with preg_replace_callback(). * Add 'noprefetch' parameter to XSS filter (Ticket #8836). @@ -62,6 +63,7 @@ http://pear.php.net/dtd/package-2.0.xsd"> + @@ -204,6 +206,10 @@ http://pear.php.net/dtd/package-2.0.xsd"> pear.horde.org + Exception + pear.horde.org + + Util pear.horde.org -- 2.11.0