Use SPL or special-purpose exceptions.

horde · Apr 9, 2014 · 7fb0372 · 7fb0372
1 parent 28a4a42
commit 7fb0372
Show file tree

Hide file tree

Showing 12 changed files with 24 additions and 25 deletions.
diff --git a/kronolith/lib/Calendars/Default.php b/kronolith/lib/Calendars/Default.php
@@ -27,7 +27,7 @@ class Kronolith_Calendars_Default extends Kronolith_Calendars_Base
     public function __construct($shares, $user, $params)
     {
         if (!isset($params['identity'])) {
-            throw new Kronolith_Exception('This calendars handler needs an "identity" parameter!');
+            throw new BadMethodCallException('This calendars handler needs an "identity" parameter!');
         } else {
             $this->_identity = $params['identity'];
             unset($params['identity']);

diff --git a/kronolith/lib/Driver.php b/kronolith/lib/Driver.php
@@ -383,7 +383,7 @@ protected function _updateEvent(Kronolith_Event $event)
      */
     public function exists($uid, $calendar_id = null)
     {
-        throw new Kronolith_Exception('Not supported');
+        throw new BadMethodCallException('Not supported');
     }
 
     /**
@@ -419,7 +419,7 @@ public function move($eventId, $newCalendar)
      */
     protected function _move($eventId, $newCalendar)
     {
-        throw new Kronolith_Exception('Not supported');
+        throw new BadMethodCallException('Not supported');
     }
 
     /**
@@ -429,7 +429,7 @@ protected function _move($eventId, $newCalendar)
      */
     public function delete($calendar)
     {
-        throw new Kronolith_Exception('Not supported');
+        throw new BadMethodCallException('Not supported');
     }
 
     /**
@@ -545,7 +545,7 @@ protected function _handleNotifications(Kronolith_Event $event, $action)
      */
     public function filterEventsByCalendar($uids, $calendar)
     {
-        throw new Kronolith_Exception('Not supported');
+        throw new BadMethodCallException('Not supported');
     }
 
     /**
@@ -557,7 +557,7 @@ public function filterEventsByCalendar($uids, $calendar)
      */
     public function removeUserData($user)
     {
-        throw new Kronolith_Exception('Deprecated.');
+        throw new BadMethodCallException('Deprecated.');
     }
 
     /**

diff --git a/kronolith/lib/Driver/Kolab.php b/kronolith/lib/Driver/Kolab.php
@@ -188,8 +188,7 @@ public function exists($uid, $calendar_id = null)
     {
         // Log error if someone uses this function in an unsupported way
         if ($calendar_id != $this->calendar) {
-            Horde::log(sprintf("Kolab::exists called for calendar %s. Currently active is %s.", $calendar_id, $this->calendar), 'ERR');
-            throw new Kronolith_Exception(sprintf("Kolab::exists called for calendar %s. Currently active is %s.", $calendar_id, $this->calendar));
+            throw new BadMethodCallException(sprintf('Kolab::exists called for calendar %s. Currently active is %s.', $calendar_id, $this->calendar));
         }
 
         $this->synchronize();

diff --git a/kronolith/lib/Event.php b/kronolith/lib/Event.php
@@ -535,7 +535,7 @@ public function getShare()
         if ($GLOBALS['calendar_manager']->getEntry(Kronolith::ALL_CALENDARS, $this->calendar) !== false) {
             return $GLOBALS['calendar_manager']->getEntry(Kronolith::ALL_CALENDARS, $this->calendar)->share();
         }
-        throw new Kronolith_Exception('Share not found');
+        throw new LogicException('Share not found');
     }
 
     /**
@@ -568,7 +568,7 @@ public function hasPermission($permission, $user = null)
     public function save()
     {
         if (!$this->initialized) {
-            throw new Kronolith_Exception('Event not yet initialized');
+            throw new LogicException('Event not yet initialized');
         }
 
         /* Check for acceptance/denial of this event's resources. */

diff --git a/kronolith/lib/Factory/Driver.php b/kronolith/lib/Factory/Driver.php
@@ -103,7 +103,7 @@ public function create($driver, array $params = array())
             break;
 
         default:
-            throw new Kronolith_Exception('No calendar driver specified');
+            throw new InvalidArgumentException('No calendar driver specified');
             break;
         }
 

diff --git a/kronolith/lib/Resource/Base.php b/kronolith/lib/Resource/Base.php
@@ -51,7 +51,7 @@ public function __construct(array $params = array())
 
         // Names are required.
         if (empty($params['name'])) {
-            throw new Horde_Exception('Required \'name\' attribute missing from resource calendar');
+            throw new BadMethodCallException('Required \'name\' attribute missing from resource calendar');
         }
         $this->_params = array_merge(
             array('description' => '',
@@ -120,7 +120,7 @@ public function get($property)
             return ($this instanceof Kronolith_Resource_Single) ? 'Single' : 'Group';
         }
         if (!array_key_exists($property, $this->_params)) {
-            throw new Horde_Exception(sprintf('The property \'%s\' does not exist', $property));
+            throw new LogicException(sprintf('The property \'%s\' does not exist', $property));
         }
         return $this->_params[$property];
     }

diff --git a/kronolith/lib/Resource/Group.php b/kronolith/lib/Resource/Group.php
@@ -158,7 +158,7 @@ public function addEvent(Kronolith_Event $event)
         if (!empty($this->_selectedResource)) {
             $this->_selectedResource->addEvent($event);
         } else {
-            throw new Kronolith_Exception('Events should be added to the Single resource object, not directly to the Group object.');
+            throw new LogicException('Events should be added to the Single resource object, not directly to the Group object.');
         }
     }
 
@@ -171,7 +171,7 @@ public function addEvent(Kronolith_Event $event)
      */
     public function removeEvent(Kronolith_Event $event)
     {
-        throw new Kronolith_Exception('Unsupported');
+        throw new BadMethodCallException('Unsupported');
     }
 
     /**
@@ -181,7 +181,7 @@ public function removeEvent(Kronolith_Event $event)
      */
     public function getFreeBusy($startstamp = null, $endstamp = null, $asObject = false, $json = false)
     {
-        throw new Kronolith_Exception('Unsupported');
+        throw new BadMethodCallException('Unsupported');
     }
 
     /**
@@ -196,7 +196,7 @@ public function setId($id)
         if (empty($this->_id)) {
             $this->_id = $id;
         } else {
-            throw new Kronolith_Exception('Resource already exists. Cannot change the id.');
+            throw new LogicException('Resource already exists. Cannot change the id.');
         }
     }
 
@@ -210,4 +210,4 @@ public function getResponseType()
         return Kronolith_Resource::RESPONSETYPE_AUTO;
     }
 
-}
+}
diff --git a/kronolith/lib/Resource/Single.php b/kronolith/lib/Resource/Single.php
@@ -129,7 +129,7 @@ public function setId($id)
         if (empty($this->_id)) {
             $this->_id = $id;
         } else {
-            throw new Kronolith_Exception('Resource already exists. Cannot change the id.');
+            throw new LogicException('Resource already exists. Cannot change the id.');
         }
     }
 

diff --git a/kronolith/lib/View/DeleteEvent.php b/kronolith/lib/View/DeleteEvent.php
@@ -28,7 +28,7 @@ public function __get($property)
         case 'event':
             return $this->_event;
         default:
-            throw new Kronolith_Exception('Property does not exist.');
+            throw new LogicException('Property does not exist.');
         }
     }
 

diff --git a/kronolith/lib/View/EditEvent.php b/kronolith/lib/View/EditEvent.php
@@ -29,7 +29,7 @@ public function __get($property)
         case 'event':
             return $this->_event;
         default:
-            throw new Kronolith_Exception('Property does not exist.');
+            throw new LogicException('Property does not exist.');
         }
     }
 

diff --git a/kronolith/lib/View/Event.php b/kronolith/lib/View/Event.php
@@ -28,7 +28,7 @@ public function __get($property)
         case 'event':
             return $this->_event;
         default:
-            throw new Kronolith_Exception('Property does not exist.');
+            throw new LogicException('Property does not exist.');
         }
     }
 

diff --git a/kronolith/perms.php b/kronolith/perms.php
@@ -18,7 +18,7 @@
 
 // Exit if the user shouldn't be able to change share permissions.
 if (!empty($conf['share']['no_sharing'])) {
-    throw new Horde_Exception('Permission denied.');
+    throw new Horde_Exception_PermissionDenied();
 }
 
 $shares = $injector->getInstance('Horde_Core_Factory_Share')->create();
@@ -51,7 +51,7 @@
         (isset($share) &&
          !$registry->isAdmin() &&
          ($registry->getAuth() != $share->get('owner')))) {
-        throw new Horde_Exception('Permission denied.');
+        throw new Horde_Exception_PermissionDenied();
     }
     break;
 
@@ -71,7 +71,7 @@
     if (!$registry->getAuth() ||
         (!$registry->isAdmin() &&
          ($registry->getAuth() != $share->get('owner')))) {
-        throw new Horde_Exception('Permission denied.');
+        throw new Horde_Exception_PermissionDenied();
     }
 
     try {