From f2b35e73225d8ec7487ef393dc610583fe2b1ece Mon Sep 17 00:00:00 2001
From: Jan Schneider <jan@horde.org>
Date: Tue, 30 Nov 2010 14:43:21 +0100
Subject: [PATCH] Consistently extend exception classes from
 Horde_Exception_Prior. CS, cleanup.

---
 beatnik/lib/Exception.php                                           | 5 ++++-
 chora/lib/Exception.php                                             | 2 +-
 framework/ActiveSync/lib/Horde/ActiveSync/Exception.php             | 3 ++-
 framework/Argv/lib/Horde/Argv/Exception.php                         | 5 +++--
 framework/Block/lib/Horde/Block/Exception.php                       | 5 +++--
 framework/Browser/lib/Horde/Browser/Exception.php                   | 2 +-
 framework/Cache/lib/Horde/Cache/Exception.php                       | 4 +++-
 framework/Controller/lib/Horde/Controller/Exception.php             | 2 +-
 framework/Db/lib/Horde/Db/Exception.php                             | 2 +-
 framework/Feed/lib/Horde/Feed/Exception.php                         | 3 ++-
 framework/Imap_Client/lib/Horde/Imap/Client/Exception.php           | 2 +-
 framework/Itip/lib/Horde/Itip/Exception.php                         | 2 +-
 framework/Kolab_Format/lib/Horde/Kolab/Format/Exception.php         | 2 +-
 framework/Kolab_Resource/lib/Horde/Kolab/Resource/Exception.php     | 2 +-
 framework/Kolab_Server/lib/Horde/Kolab/Server/Exception.php         | 2 +-
 framework/Kolab_Storage/lib/Horde/Kolab/Storage/Exception.php       | 6 +++---
 framework/Lock/lib/Horde/Lock/Exception.php                         | 4 +++-
 framework/Oauth/lib/Horde/Oauth/Exception.php                       | 2 +-
 framework/Pdf/lib/Horde/Pdf/Exception.php                           | 2 +-
 framework/Routes/lib/Horde/Routes/Exception.php                     | 5 +++--
 framework/Secret/lib/Horde/Secret/Exception.php                     | 2 +-
 framework/Service_Facebook/lib/Horde/Service/Facebook/Exception.php | 3 ++-
 framework/Service_Twitter/lib/Horde/Service/Twitter/Exception.php   | 3 ++-
 framework/Share/lib/Horde/Share/Exception.php                       | 2 +-
 framework/Token/lib/Horde/Token/Exception.php                       | 2 +-
 framework/Translation/lib/Horde/Translation/Exception.php           | 2 +-
 framework/VFS/lib/VFS/Exception.php                                 | 4 +++-
 gollem/lib/Exception.php                                            | 4 +++-
 hermes/lib/Exception.php                                            | 5 ++++-
 operator/lib/Exception.php                                          | 5 ++++-
 passwd/lib/Exception.php                                            | 5 ++++-
 pastie/lib/Exception.php                                            | 5 ++++-
 shout/lib/Exception.php                                             | 4 +++-
 timeobjects/lib/Exception.php                                       | 2 +-
 vilma/lib/Exception.php                                             | 5 ++++-
 whups/lib/Exception.php                                             | 5 ++++-
 36 files changed, 79 insertions(+), 41 deletions(-)

diff --git a/beatnik/lib/Exception.php b/beatnik/lib/Exception.php
index bf2efcd4d..844564b24 100644
--- a/beatnik/lib/Exception.php
+++ b/beatnik/lib/Exception.php
@@ -1 +1,4 @@
-<?php class Beatnik_Exception extends Horde_Exception {}
\ No newline at end of file
+<?php
+class Beatnik_Exception extends Horde_Exception_Prior
+{
+}
\ No newline at end of file
diff --git a/chora/lib/Exception.php b/chora/lib/Exception.php
index 53399c7cc..d61681597 100644
--- a/chora/lib/Exception.php
+++ b/chora/lib/Exception.php
@@ -8,6 +8,6 @@
  * @author  Chuck Hagenbuch <chuck@horde.org>
  * @package Chora
  */
-class Chora_Exception extends Horde_Exception
+class Chora_Exception extends Horde_Exception_Prior
 {
 }
diff --git a/framework/ActiveSync/lib/Horde/ActiveSync/Exception.php b/framework/ActiveSync/lib/Horde/ActiveSync/Exception.php
index e380d73b6..39237bc3c 100644
--- a/framework/ActiveSync/lib/Horde/ActiveSync/Exception.php
+++ b/framework/ActiveSync/lib/Horde/ActiveSync/Exception.php
@@ -1,3 +1,4 @@
 <?php
-class Horde_ActiveSync_Exception extends Exception {
+class Horde_ActiveSync_Exception extends Horde_Exception_Prior
+{
 }
\ No newline at end of file
diff --git a/framework/Argv/lib/Horde/Argv/Exception.php b/framework/Argv/lib/Horde/Argv/Exception.php
index 55222f3ae..aa8a421df 100644
--- a/framework/Argv/lib/Horde/Argv/Exception.php
+++ b/framework/Argv/lib/Horde/Argv/Exception.php
@@ -15,5 +15,6 @@
  * @category Horde
  * @package  Horde_Argv
  */
-class Horde_Argv_Exception extends Exception
-{}
+class Horde_Argv_Exception extends Horde_Exception_Prior
+{
+}
diff --git a/framework/Block/lib/Horde/Block/Exception.php b/framework/Block/lib/Horde/Block/Exception.php
index 22eecb1da..9cdb7b989 100644
--- a/framework/Block/lib/Horde/Block/Exception.php
+++ b/framework/Block/lib/Horde/Block/Exception.php
@@ -11,5 +11,6 @@
  * @category Horde
  * @package  Horde_Block
  */
-class Horde_Block_Exception extends Horde_Exception
-{}
+class Horde_Block_Exception extends Horde_Exception_Prior
+{
+}
diff --git a/framework/Browser/lib/Horde/Browser/Exception.php b/framework/Browser/lib/Horde/Browser/Exception.php
index 53b44886a..f8ae29a3d 100644
--- a/framework/Browser/lib/Horde/Browser/Exception.php
+++ b/framework/Browser/lib/Horde/Browser/Exception.php
@@ -11,6 +11,6 @@
  * @category Horde
  * @package  Browser
  */
-class Horde_Browser_Exception extends Horde_Exception
+class Horde_Browser_Exception extends Horde_Exception_Prior
 {
 }
diff --git a/framework/Cache/lib/Horde/Cache/Exception.php b/framework/Cache/lib/Horde/Cache/Exception.php
index 189a0d878..d4ecd12ee 100644
--- a/framework/Cache/lib/Horde/Cache/Exception.php
+++ b/framework/Cache/lib/Horde/Cache/Exception.php
@@ -11,4 +11,6 @@
  * @category Horde
  * @package  Cache
  */
-class Horde_Cache_Exception extends Horde_Exception_Prior {}
+class Horde_Cache_Exception extends Horde_Exception_Prior
+{
+}
diff --git a/framework/Controller/lib/Horde/Controller/Exception.php b/framework/Controller/lib/Horde/Controller/Exception.php
index 5214a4ce4..dfd7a9ce4 100644
--- a/framework/Controller/lib/Horde/Controller/Exception.php
+++ b/framework/Controller/lib/Horde/Controller/Exception.php
@@ -19,6 +19,6 @@
  * @category   Horde
  * @package    Horde_Controller
  */
-class Horde_Controller_Exception extends Exception
+class Horde_Controller_Exception extends Horde_Exception_Prior
 {
 }
diff --git a/framework/Db/lib/Horde/Db/Exception.php b/framework/Db/lib/Horde/Db/Exception.php
index 359b3c275..84f73f2bc 100644
--- a/framework/Db/lib/Horde/Db/Exception.php
+++ b/framework/Db/lib/Horde/Db/Exception.php
@@ -21,6 +21,6 @@
  * @category   Horde
  * @package    Horde_Db
  */
-class Horde_Db_Exception extends Exception
+class Horde_Db_Exception extends Horde_Exception_Prior
 {
 }
diff --git a/framework/Feed/lib/Horde/Feed/Exception.php b/framework/Feed/lib/Horde/Feed/Exception.php
index 2a816393b..9957d7a97 100644
--- a/framework/Feed/lib/Horde/Feed/Exception.php
+++ b/framework/Feed/lib/Horde/Feed/Exception.php
@@ -8,5 +8,6 @@
  * @category Horde
  * @package Horde_Feed
  */
-class Horde_Feed_Exception extends Horde_Exception_LastError {
+class Horde_Feed_Exception extends Horde_Exception_LastError
+{
 }
diff --git a/framework/Imap_Client/lib/Horde/Imap/Client/Exception.php b/framework/Imap_Client/lib/Horde/Imap/Client/Exception.php
index 6b7c355cf..74f4dd858 100644
--- a/framework/Imap_Client/lib/Horde/Imap/Client/Exception.php
+++ b/framework/Imap_Client/lib/Horde/Imap/Client/Exception.php
@@ -12,7 +12,7 @@
  * @license  http://www.fsf.org/copyleft/lgpl.html LGPL
  * @package  Imap_Client
  */
-class Horde_Imap_Client_Exception extends Exception
+class Horde_Imap_Client_Exception extends Horde_Exception_Prior
 {
     /* Error message codes. */
 
diff --git a/framework/Itip/lib/Horde/Itip/Exception.php b/framework/Itip/lib/Horde/Itip/Exception.php
index 3e656ae41..2f34c60c3 100644
--- a/framework/Itip/lib/Horde/Itip/Exception.php
+++ b/framework/Itip/lib/Horde/Itip/Exception.php
@@ -26,6 +26,6 @@
  * @license  http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html LGPL
  * @link     http://pear.horde.org/index.php?package=Itip
  */
-class Horde_Itip_Exception extends Exception
+class Horde_Itip_Exception extends Horde_Exception_Prior
 {
 }
diff --git a/framework/Kolab_Format/lib/Horde/Kolab/Format/Exception.php b/framework/Kolab_Format/lib/Horde/Kolab/Format/Exception.php
index a0856afb9..42876e6b6 100644
--- a/framework/Kolab_Format/lib/Horde/Kolab/Format/Exception.php
+++ b/framework/Kolab_Format/lib/Horde/Kolab/Format/Exception.php
@@ -25,6 +25,6 @@
  * @license  http://www.fsf.org/copyleft/lgpl.html LGPL
  * @link     http://pear.horde.org/index.php?package=Kolab_Format
  */
-class Horde_Kolab_Format_Exception extends Exception
+class Horde_Kolab_Format_Exception extends Horde_Exception_Prior
 {
 }
\ No newline at end of file
diff --git a/framework/Kolab_Resource/lib/Horde/Kolab/Resource/Exception.php b/framework/Kolab_Resource/lib/Horde/Kolab/Resource/Exception.php
index a90dfd26c..71116b9e0 100644
--- a/framework/Kolab_Resource/lib/Horde/Kolab/Resource/Exception.php
+++ b/framework/Kolab_Resource/lib/Horde/Kolab/Resource/Exception.php
@@ -25,7 +25,7 @@
  * @license  http://www.fsf.org/copyleft/lgpl.html LGPL
  * @link     http://pear.horde.org/index.php?package=Kolab_Resource
  */
-class Horde_Kolab_Resource_Exception extends Exception
+class Horde_Kolab_Resource_Exception extends Horde_Exception_Prior
 {
     /**
      * Constants to define the error type.
diff --git a/framework/Kolab_Server/lib/Horde/Kolab/Server/Exception.php b/framework/Kolab_Server/lib/Horde/Kolab/Server/Exception.php
index 79a7c88f6..a62402ae0 100644
--- a/framework/Kolab_Server/lib/Horde/Kolab/Server/Exception.php
+++ b/framework/Kolab_Server/lib/Horde/Kolab/Server/Exception.php
@@ -25,7 +25,7 @@
  * @license  http://www.fsf.org/copyleft/lgpl.html LGPL
  * @link     http://pear.horde.org/index.php?package=Kolab_Server
  */
-class Horde_Kolab_Server_Exception extends Horde_Exception
+class Horde_Kolab_Server_Exception extends Horde_Exception_Prior
 {
     /**
      * Constants to define the error type.
diff --git a/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Exception.php b/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Exception.php
index eab6dea8e..cfa64e979 100644
--- a/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Exception.php
+++ b/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Exception.php
@@ -25,7 +25,7 @@
  * @license  http://www.fsf.org/copyleft/lgpl.html LGPL
  * @link     http://pear.horde.org/index.php?package=Kolab_Storage
  */
-class Horde_Kolab_Storage_Exception extends Horde_Exception
+class Horde_Kolab_Storage_Exception extends Horde_Exception_Prior
 {
     /**
      * Constants to define the error type.
@@ -34,11 +34,11 @@ class Horde_Kolab_Storage_Exception extends Horde_Exception
     /**
      * The specified folder already exists.
      */
-    const FOLDER_EXISTS             = 10;
+    const FOLDER_EXISTS = 10;
 
     /**
      * The name of the folder has not been specified.
      */
-    const FOLDER_NAME_UNSET         = 50;
+    const FOLDER_NAME_UNSET = 50;
 
 }
diff --git a/framework/Lock/lib/Horde/Lock/Exception.php b/framework/Lock/lib/Horde/Lock/Exception.php
index 249c36e82..f1c34bf9e 100644
--- a/framework/Lock/lib/Horde/Lock/Exception.php
+++ b/framework/Lock/lib/Horde/Lock/Exception.php
@@ -11,4 +11,6 @@
  * @category Horde
  * @package  Lock
  */
-class Horde_Lock_Exception extends Horde_Exception_Prior {}
+class Horde_Lock_Exception extends Horde_Exception_Prior
+{
+}
diff --git a/framework/Oauth/lib/Horde/Oauth/Exception.php b/framework/Oauth/lib/Horde/Oauth/Exception.php
index 662ec75a1..50f457511 100644
--- a/framework/Oauth/lib/Horde/Oauth/Exception.php
+++ b/framework/Oauth/lib/Horde/Oauth/Exception.php
@@ -16,6 +16,6 @@
  * @category Horde
  * @package  Horde_Oauth
  */
-class Horde_Oauth_Exception extends Exception
+class Horde_Oauth_Exception extends Horde_Exception_Prior
 {
 }
diff --git a/framework/Pdf/lib/Horde/Pdf/Exception.php b/framework/Pdf/lib/Horde/Pdf/Exception.php
index 0b5f86a1c..597e10e0b 100644
--- a/framework/Pdf/lib/Horde/Pdf/Exception.php
+++ b/framework/Pdf/lib/Horde/Pdf/Exception.php
@@ -14,6 +14,6 @@
  * @category Horde
  * @package  Horde_Pdf
  */
-class Horde_Pdf_Exception extends Exception
+class Horde_Pdf_Exception extends Horde_Exception_Prior
 {
 }
diff --git a/framework/Routes/lib/Horde/Routes/Exception.php b/framework/Routes/lib/Horde/Routes/Exception.php
index e6f4a0df0..e38695062 100644
--- a/framework/Routes/lib/Horde/Routes/Exception.php
+++ b/framework/Routes/lib/Horde/Routes/Exception.php
@@ -18,5 +18,6 @@
  * 
  * @package Horde_Routes
  */
-class Horde_Routes_Exception extends Exception 
-{}
+class Horde_Routes_Exception extends Horde_Exception_Prior
+{
+}
diff --git a/framework/Secret/lib/Horde/Secret/Exception.php b/framework/Secret/lib/Horde/Secret/Exception.php
index 98aa8980a..acd034738 100644
--- a/framework/Secret/lib/Horde/Secret/Exception.php
+++ b/framework/Secret/lib/Horde/Secret/Exception.php
@@ -11,6 +11,6 @@
  * @category Horde
  * @package  Horde_Secret
  */
-class Horde_Secret_Exception extends Horde_Exception
+class Horde_Secret_Exception extends Horde_Exception_Prior
 {
 }
diff --git a/framework/Service_Facebook/lib/Horde/Service/Facebook/Exception.php b/framework/Service_Facebook/lib/Horde/Service/Facebook/Exception.php
index 85f9091bd..fb6c265ba 100644
--- a/framework/Service_Facebook/lib/Horde/Service/Facebook/Exception.php
+++ b/framework/Service_Facebook/lib/Horde/Service/Facebook/Exception.php
@@ -6,5 +6,6 @@
  * @category Horde
  * @package Horde_Service_Facebook
  */
-class Horde_Service_Facebook_Exception extends Exception {
+class Horde_Service_Facebook_Exception extends Horde_Exception_Prior
+{
 }
\ No newline at end of file
diff --git a/framework/Service_Twitter/lib/Horde/Service/Twitter/Exception.php b/framework/Service_Twitter/lib/Horde/Service/Twitter/Exception.php
index 17390dfa6..f0fab1507 100644
--- a/framework/Service_Twitter/lib/Horde/Service/Twitter/Exception.php
+++ b/framework/Service_Twitter/lib/Horde/Service/Twitter/Exception.php
@@ -8,5 +8,6 @@
  * @category Horde
  * @package Horde_Service_Twitter
  */
-class Horde_Service_Twitter_Exception extends Horde_Exception_Prior {
+class Horde_Service_Twitter_Exception extends Horde_Exception_Prior
+{
 }
diff --git a/framework/Share/lib/Horde/Share/Exception.php b/framework/Share/lib/Horde/Share/Exception.php
index 88d2525a1..ecef0548c 100644
--- a/framework/Share/lib/Horde/Share/Exception.php
+++ b/framework/Share/lib/Horde/Share/Exception.php
@@ -4,6 +4,6 @@
  *
  *
  */
-class Horde_Share_Exception extends Exception
+class Horde_Share_Exception extends Horde_Exception_Prior
 {
 }
\ No newline at end of file
diff --git a/framework/Token/lib/Horde/Token/Exception.php b/framework/Token/lib/Horde/Token/Exception.php
index f7bde4020..97cedc079 100644
--- a/framework/Token/lib/Horde/Token/Exception.php
+++ b/framework/Token/lib/Horde/Token/Exception.php
@@ -11,6 +11,6 @@
  * @category Horde
  * @package  Token
  */
-class Horde_Token_Exception extends Horde_Exception
+class Horde_Token_Exception extends Horde_Exception_Prior
 {
 }
diff --git a/framework/Translation/lib/Horde/Translation/Exception.php b/framework/Translation/lib/Horde/Translation/Exception.php
index 393a3e71b..c7088359b 100644
--- a/framework/Translation/lib/Horde/Translation/Exception.php
+++ b/framework/Translation/lib/Horde/Translation/Exception.php
@@ -10,6 +10,6 @@
  * @author  Jan Schneider <jan@horde.org>
  * @package Translation
  */
-class Horde_Translation_Exception extends Horde_Exception
+class Horde_Translation_Exception extends Horde_Exception_Prior
 {
 }
diff --git a/framework/VFS/lib/VFS/Exception.php b/framework/VFS/lib/VFS/Exception.php
index 62edcc942..3a58e7505 100644
--- a/framework/VFS/lib/VFS/Exception.php
+++ b/framework/VFS/lib/VFS/Exception.php
@@ -10,4 +10,6 @@
  * @author  Michael Slusarz <slusarz@horde.org>
  * @package VFS
  */
-class VFS_Exception extends Exception {}
+class VFS_Exception extends Horde_Exception_Prior
+{
+}
diff --git a/gollem/lib/Exception.php b/gollem/lib/Exception.php
index 9dfaca777..820ed5401 100644
--- a/gollem/lib/Exception.php
+++ b/gollem/lib/Exception.php
@@ -12,4 +12,6 @@
  * @license  http://www.fsf.org/copyleft/gpl.html GPL
  * @package  Gollem
  */
-class Gollem_Exception extends Horde_Exception_Prior {}
+class Gollem_Exception extends Horde_Exception_Prior
+{
+}
diff --git a/hermes/lib/Exception.php b/hermes/lib/Exception.php
index 814aa1548..81cf64810 100644
--- a/hermes/lib/Exception.php
+++ b/hermes/lib/Exception.php
@@ -1 +1,4 @@
-<?php class Hermes_Exception extends Horde_Exception {}
\ No newline at end of file
+<?php
+class Hermes_Exception extends Horde_Exception_Prior
+{
+}
diff --git a/operator/lib/Exception.php b/operator/lib/Exception.php
index 4d31fd8b7..74db64a7e 100644
--- a/operator/lib/Exception.php
+++ b/operator/lib/Exception.php
@@ -1 +1,4 @@
-<?php class Operator_Exception extends Horde_Exception {}
\ No newline at end of file
+<?php
+class Operator_Exception extends Horde_Exception_Prior
+{
+}
diff --git a/passwd/lib/Exception.php b/passwd/lib/Exception.php
index 56d2f50dc..10b71660e 100644
--- a/passwd/lib/Exception.php
+++ b/passwd/lib/Exception.php
@@ -1 +1,4 @@
-<?php class Passwd_Exception extends Horde_Exception {}
\ No newline at end of file
+<?php
+class Passwd_Exception extends Horde_Exception_Prior
+{
+}
diff --git a/pastie/lib/Exception.php b/pastie/lib/Exception.php
index ef4d84a40..58ef4c018 100644
--- a/pastie/lib/Exception.php
+++ b/pastie/lib/Exception.php
@@ -1 +1,4 @@
-<?php class Pastie_Exception extends Horde_Exception {}
+<?php
+class Pastie_Exception extends Horde_Exception_Prior
+{
+}
diff --git a/shout/lib/Exception.php b/shout/lib/Exception.php
index ca623f254..79139edb0 100644
--- a/shout/lib/Exception.php
+++ b/shout/lib/Exception.php
@@ -1,2 +1,4 @@
 <?php
-class Shout_Exception extends Horde_Exception_Prior {}
+class Shout_Exception extends Horde_Exception_Prior
+{
+}
diff --git a/timeobjects/lib/Exception.php b/timeobjects/lib/Exception.php
index 9aee528b8..629722da4 100644
--- a/timeobjects/lib/Exception.php
+++ b/timeobjects/lib/Exception.php
@@ -2,6 +2,6 @@
 /**
  *
  */
-class TimeObjects_Exception extends Exception
+class TimeObjects_Exception extends Horde_Exception_Prior
 {
 }
\ No newline at end of file
diff --git a/vilma/lib/Exception.php b/vilma/lib/Exception.php
index 800d8e3d4..9740fa660 100644
--- a/vilma/lib/Exception.php
+++ b/vilma/lib/Exception.php
@@ -1 +1,4 @@
-class Vilma_Exception extends Horde_Exception {}
\ No newline at end of file
+<?php
+class Vilma_Exception extends Horde_Exception_Prior
+{
+}
diff --git a/whups/lib/Exception.php b/whups/lib/Exception.php
index 1ba40c7be..357d7586c 100644
--- a/whups/lib/Exception.php
+++ b/whups/lib/Exception.php
@@ -1 +1,4 @@
-<?php class Whups_Exception extends Horde_Exception {}
+<?php
+class Whups_Exception extends Horde_Exception_Prior
+{
+}
-- 
2.11.0