From c7e11fd273f77253f3e582a4d3792f6ab7507123 Mon Sep 17 00:00:00 2001
From: Ben Roberts <ben@sihnon.net>
Date: Wed, 21 Dec 2011 11:27:26 +0000
Subject: [PATCH] Fix naming convention for class methods

---
 source/lib/StatusBoard/Incident.class.php       | 16 ++++++++--------
 source/lib/StatusBoard/IncidentStatus.class.php |  2 +-
 source/lib/StatusBoard/Service.class.php        |  2 +-
 source/lib/StatusBoard/Site.class.php           |  8 ++++----
 4 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/source/lib/StatusBoard/Incident.class.php b/source/lib/StatusBoard/Incident.class.php
index c3a3fbf..6165a02 100644
--- a/source/lib/StatusBoard/Incident.class.php
+++ b/source/lib/StatusBoard/Incident.class.php
@@ -15,17 +15,17 @@ class StatusBoard_Incident extends StatusBoard_DatabaseObject {
     protected $current_status = null;
     protected $statuses = null;
 
-    public static function open_for_site(StatusBoard_Site $site) {
-        return static::all_for('site', $site->id, 'incident_open');
+    public static function openForSite(StatusBoard_Site $site) {
+        return static::allFor('site', $site->id, 'incident_open');
     }
     
-    public static function open_for_site_during(StatusBoard_Site $site, $start, $end) {
+    public static function openForSiteDuring(StatusBoard_Site $site, $start, $end) {
         $params = array(
             array('name' => 'start', 'value' => $start, 'type' => PDO::PARAM_INT),
             array('name' => 'end',   'value' => $end,   'type' => PDO::PARAM_INT),
         );
         
-        return static::all_for('site', $site->id, 'incident_opentimes', '`start_time` < :end AND `ctime` > :start', $params);
+        return static::allFor('site', $site->id, 'incident_opentimes', '`start_time` < :end AND `ctime` > :start', $params);
     }
     
     public function currentStatus($ignore_cache = false) {
@@ -42,7 +42,7 @@ class StatusBoard_Incident extends StatusBoard_DatabaseObject {
         return $this->current_status;
     }
     
-    public function statusAtTime($time) {
+    public function statusAt($time) {
         $database = StatusBoard_Main::instance()->database();
         $row = $database->selectOne('SELECT `status` FROM `incidentstatus` WHERE `incident`=:incident AND ctime < :time ORDER BY ctime DESC LIMIT 1', array(
                 array('name' => 'incident', 'value' => $this->id, 'type' => PDO::PARAM_INT),
@@ -68,7 +68,7 @@ class StatusBoard_Incident extends StatusBoard_DatabaseObject {
         foreach ($incidents as $incident) {
             $incident_status = null;
             if ($time) {
-                $incident_status = $incident->statusAtTime($time);    
+                $incident_status = $incident->statusAt($time);    
             } else {
                 $incident_status = $incident->currentStatus();
             }
@@ -83,7 +83,7 @@ class StatusBoard_Incident extends StatusBoard_DatabaseObject {
     
     public function statusChanges($ignore_cache = false) {
         if ($this->statuses === null || $ignore_cache) {
-            $this->statuses = StatusBoard_IncidentStatus::all_for('incident', $this->id);
+            $this->statuses = StatusBoard_IncidentStatus::allFor('incident', $this->id);
         }
         
         return $this->statuses;
@@ -91,7 +91,7 @@ class StatusBoard_Incident extends StatusBoard_DatabaseObject {
     
     public function changeStatus($status, $description) {
         if ($this->statuses === null) {
-            $this->statuses = StatusBoard_IncidentStatus::all_for('incident', $this->id);
+            $this->statuses = StatusBoard_IncidentStatus::allFor('incident', $this->id);
         }
         
         $new_status = StatusBoard_IncidentStatus::newForIncident($this, $status, $description);
diff --git a/source/lib/StatusBoard/IncidentStatus.class.php b/source/lib/StatusBoard/IncidentStatus.class.php
index c9acc60..a95072c 100644
--- a/source/lib/StatusBoard/IncidentStatus.class.php
+++ b/source/lib/StatusBoard/IncidentStatus.class.php
@@ -10,7 +10,7 @@ class StatusBoard_IncidentStatus extends StatusBoard_DatabaseObject {
     protected $_db_description;
     protected $_db_ctime;
         
-    public function all_for_incident(StatusBoard_Incident $incident) {
+    public function allForIncident(StatusBoard_Incident $incident) {
         return static::all_for('incident', $incident->id);
     }
     
diff --git a/source/lib/StatusBoard/Service.class.php b/source/lib/StatusBoard/Service.class.php
index 5dc4cb9..24aec8e 100644
--- a/source/lib/StatusBoard/Service.class.php
+++ b/source/lib/StatusBoard/Service.class.php
@@ -26,7 +26,7 @@ class StatusBoard_Service extends StatusBoard_DatabaseObject {
        
     public function sites($ignore_cache = false) {
         if ($this->sites === null || $ignore_cache) {
-            $this->sites = StatusBoard_Site::all_for_service($this);
+            $this->sites = StatusBoard_Site::allForService($this);
         }
         
         return $this->sites;
diff --git a/source/lib/StatusBoard/Site.class.php b/source/lib/StatusBoard/Site.class.php
index e40328e..a4790fb 100644
--- a/source/lib/StatusBoard/Site.class.php
+++ b/source/lib/StatusBoard/Site.class.php
@@ -12,8 +12,8 @@ class StatusBoard_Site extends StatusBoard_DatabaseObject {
     protected $incidents = null;
     protected $incidents_open = null;
     
-    public static function all_for_service(StatusBoard_Service $service) {
-        return static::all_for('service', $service->id);
+    public static function allForService(StatusBoard_Service $service) {
+        return static::allFor('service', $service->id);
     } 
     
     public static function newSiteForService(StatusBoard_Service $service, $name, $description) {
@@ -29,14 +29,14 @@ class StatusBoard_Site extends StatusBoard_DatabaseObject {
     
     public function openIncidents($ignore_cache = false) {
         if ($this->incidents_open === null || $ignore_cache) {
-            $this->incidents_open = StatusBoard_Incident::open_for_site($this);
+            $this->incidents_open = StatusBoard_Incident::openForSite($this);
         }
         
         return $this->incidents_open;
     }
     
     public function openIncidentsDuring($start, $end) {
-        return StatusBoard_Incident::open_for_site_during($this, $start, $end);
+        return StatusBoard_Incident::openForSiteDuring($this, $start, $end);
     }
     
     public function status() {