Remove PEAR dependency in horde/Browser

diff --git a/framework/Browser/lib/Horde/Browser/Imode.php b/framework/Browser/lib/Horde/Browser/Imode.php
index 2aeabbf..69c67da 100644 (file)
--- a/framework/Browser/lib/Horde/Browser/Imode.php
+++ b/framework/Browser/lib/Horde/Browser/Imode.php
@@ -322,10 +322,11 @@ class Horde_Browser_Imode
      *   $ua = new Browser_imode($_SERVER['HTTP_USER_AGENT']);
      *
      * @param string $input  The user agent to match.
+     *
+     * @throws Horde_Browser_Exception
      */
     public function __construct($input)
     {
-        $_error = 0;
         $temp = explode('/', $input);
 
         $this->_user_agent = $input;
@@ -343,7 +344,7 @@ class Horde_Browser_Imode
         $this->_extra = $matches[3];
 
         if (!($this->_data[$this->_model])) {
-            $_error = PEAR::raiseError('Unknown User Agent');
+            throw new Horde_Browser_Exception('Unknown User Agent');
         }
     }
 

diff --git a/framework/Browser/package.xml b/framework/Browser/package.xml
index 2bf4b7e..41378e1 100644 (file)
--- a/framework/Browser/package.xml
+++ b/framework/Browser/package.xml
@@ -25,7 +25,8 @@ about the current user's browser and its capabilities.
   <api>beta</api>
  </stability>
  <license uri="http://www.gnu.org/copyleft/lesser.html">LGPL</license>
- <notes>* Remove Horde_Browser::escapeJSCode().
+ <notes>* Remove PEAR dependency.
+ * Remove Horde_Browser::escapeJSCode().
  * Add Horde_Browser_Exception::.
  * Initial Horde 4 package.</notes>
  <contents>
@@ -50,16 +51,14 @@ about the current user&apos;s browser and its capabilities.
     <min>1.5.0</min>
    </pearinstaller>
    <package>
-    <name>Util</name>
+    <name>Exception</name>
     <channel>pear.horde.org</channel>
    </package>
-  </required>
-  <optional>
    <package>
-    <name>PEAR</name>
-    <channel>pear.php.net</channel>
+    <name>Util</name>
+    <channel>pear.horde.org</channel>
    </package>
-  </optional>
+  </required>
  </dependencies>
  <phprelease>
   <filelist>