ben/status-board
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix naming convention for class methods

Browse Source
This commit is contained in:
Ben Roberts
2011-12-21 11:27:26 +00:00
parent 94fe97b1de
commit c7e11fd273
4 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
source/lib/StatusBoard/Incident.class.php
View File

@@ -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);

2
source/lib/StatusBoard/IncidentStatus.class.php
View File

@@ -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);
}

2
source/lib/StatusBoard/Service.class.php
View File

@@ -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;

8
source/lib/StatusBoard/Site.class.php
View File

@@ -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() {