From 1a1ccd71bca044fc15747a8ffc997330c222182c Mon Sep 17 00:00:00 2001 From: "Michael J. Rubinsky" Date: Tue, 13 Apr 2010 11:15:24 -0400 Subject: [PATCH] cs - fix camelcase method names from z-push legacy code --- .../lib/Horde/ActiveSync/Connector/Importer.php | 4 +- .../lib/Horde/ActiveSync/Driver/Base.php | 12 +++--- .../lib/Horde/ActiveSync/Driver/Horde.php | 48 +++++++++++----------- .../lib/Horde/ActiveSync/Request/Sync.php | 2 +- .../ActiveSync/lib/Horde/ActiveSync/State/File.php | 6 +-- .../lib/Horde/ActiveSync/State/History.php | 4 +- framework/ActiveSync/lib/Horde/ActiveSync/Sync.php | 6 +-- .../test/Horde/ActiveSync/FileStateTest.php | 2 +- 8 files changed, 42 insertions(+), 42 deletions(-) diff --git a/framework/ActiveSync/lib/Horde/ActiveSync/Connector/Importer.php b/framework/ActiveSync/lib/Horde/ActiveSync/Connector/Importer.php index f84d2fe81..94a71424e 100644 --- a/framework/ActiveSync/lib/Horde/ActiveSync/Connector/Importer.php +++ b/framework/ActiveSync/lib/Horde/ActiveSync/Connector/Importer.php @@ -121,7 +121,7 @@ class Horde_ActiveSync_Connector_Importer } /* Tell the backend about the change */ - $stat = $this->_backend->ChangeMessage($this->_folderId, $id, $message); + $stat = $this->_backend->changeMessage($this->_folderId, $id, $message); if (!is_array($stat)) { return $stat; } @@ -286,7 +286,7 @@ class Horde_ActiveSync_Connector_Importer */ protected function _isConflict($type, $folderid, $id) { - $stat = $this->_backend->StatMessage($folderid, $id); + $stat = $this->_backend->statMessage($folderid, $id); if (!$stat) { /* Message is gone, if type is change, this is a conflict */ if ($type == 'change') { diff --git a/framework/ActiveSync/lib/Horde/ActiveSync/Driver/Base.php b/framework/ActiveSync/lib/Horde/ActiveSync/Driver/Base.php index 3476ad373..475443569 100644 --- a/framework/ActiveSync/lib/Horde/ActiveSync/Driver/Base.php +++ b/framework/ActiveSync/lib/Horde/ActiveSync/Driver/Base.php @@ -199,7 +199,7 @@ abstract class Horde_ActiveSync_Driver_Base * * @return array A list of messages */ - abstract public function GetMessageList($folderId, $cutOffDate); + abstract public function getMessageList($folderId, $cutOffDate); /** * Get a list of server changes that occured during the specified time @@ -222,7 +222,7 @@ abstract class Horde_ActiveSync_Driver_Base * * @return hash with 'id', 'mod', and 'flags' members */ - abstract public function StatMessage($folderId, $id); + abstract public function statMessage($folderId, $id); /** * @@ -233,7 +233,7 @@ abstract class Horde_ActiveSync_Driver_Base * * @return Horde_ActiveSync_Message_Base The message data */ - abstract public function GetMessage($folderid, $id, $truncsize, $mimesupport = 0); + abstract public function getMessage($folderid, $id, $truncsize, $mimesupport = 0); /** * Delete a message @@ -254,7 +254,7 @@ abstract class Horde_ActiveSync_Driver_Base * * @return a stat array of the new message */ - abstract public function ChangeMessage($folderid, $id, $message); + abstract public function changeMessage($folderid, $id, $message); /** * Any code needed to authenticate to backend as the actual user. @@ -404,7 +404,7 @@ abstract class Horde_ActiveSync_Driver_Base public function Fetch($folderid, $id, $mimesupport = 0) { // Forces entire message (up to 1Mb) - return $this->GetMessage($folderid, $id, 1024 * 1024, $mimesupport); + return $this->getMessage($folderid, $id, 1024 * 1024, $mimesupport); } /** @@ -432,7 +432,7 @@ abstract class Horde_ActiveSync_Driver_Base /** * @return unknown_type */ - public function GetWasteBasket() + public function getWasteBasket() { return false; } diff --git a/framework/ActiveSync/lib/Horde/ActiveSync/Driver/Horde.php b/framework/ActiveSync/lib/Horde/ActiveSync/Driver/Horde.php index 0fa707522..4c82528fd 100644 --- a/framework/ActiveSync/lib/Horde/ActiveSync/Driver/Horde.php +++ b/framework/ActiveSync/lib/Horde/ActiveSync/Driver/Horde.php @@ -109,11 +109,11 @@ class Horde_ActiveSync_Driver_Horde extends Horde_ActiveSync_Driver_Base /** * @TODO * - * @see framework/ActiveSync/lib/Horde/ActiveSync/Driver/Horde_ActiveSync_Driver_Base#GetWasteBasket() + * @see framework/ActiveSync/lib/Horde/ActiveSync/Driver/Horde_ActiveSync_Driver_Base#getWasteBasket() */ - public function GetWasteBasket() + public function getWasteBasket() { - $this->_logger->debug('Horde::GetWasteBasket()'); + $this->_logger->debug('Horde::getWasteBasket()'); return false; } @@ -131,15 +131,15 @@ class Horde_ActiveSync_Driver_Horde extends Horde_ActiveSync_Driver_Base $folders = array(); if (array_search('calendar', $supported)){ - $folders[] = $this->StatFolder(self::APPOINTMENTS_FOLDER); + $folders[] = $this->statFolder(self::APPOINTMENTS_FOLDER); } if (array_search('contacts', $supported)){ - $folders[] = $this->StatFolder(self::CONTACTS_FOLDER); + $folders[] = $this->statFolder(self::CONTACTS_FOLDER); } if (array_search('tasks', $supported)){ - $folders[] = $this->StatFolder(self::TASKS_FOLDER); + $folders[] = $this->statFolder(self::TASKS_FOLDER); } return $folders; @@ -185,9 +185,9 @@ class Horde_ActiveSync_Driver_Horde extends Horde_ActiveSync_Driver_Base * * @return a stat hash */ - public function StatFolder($id) + public function statFolder($id) { - $this->_logger->debug('Horde::StatFolder(' . $id . ')'); + $this->_logger->debug('Horde::statFolder(' . $id . ')'); $folder = array(); $folder['id'] = $id; @@ -200,11 +200,11 @@ class Horde_ActiveSync_Driver_Horde extends Horde_ActiveSync_Driver_Base /** * Get the message list of specified folder * - * @see framework/ActiveSync/lib/Horde/ActiveSync/Driver/Horde_ActiveSync_Driver_Base#GetMessageList($folderId, $cutOffDate) + * @see framework/ActiveSync/lib/Horde/ActiveSync/Driver/Horde_ActiveSync_Driver_Base#getMessageList($folderId, $cutOffDate) */ - public function GetMessageList($folderid, $cutoffdate) + public function getMessageList($folderid, $cutoffdate) { - $this->_logger->debug('Horde::GetMessageList(' . $folderid . ', ' . $cutoffdate . ')'); + $this->_logger->debug('Horde::getMessageList(' . $folderid . ', ' . $cutoffdate . ')'); $messages = array(); switch ($folderid) { @@ -215,7 +215,7 @@ class Horde_ActiveSync_Driver_Horde extends Horde_ActiveSync_Driver_Base try { $events = $this->_connector->calendar_listEvents($startstamp, $endstamp, null); } catch (Horde_Exception $e) { - $this->_logger->err($e->GetMessage()); + $this->_logger->err($e->getMessage()); return array(); } foreach ($events as $day) { @@ -229,7 +229,7 @@ class Horde_ActiveSync_Driver_Horde extends Horde_ActiveSync_Driver_Base try { $contacts = $this->_connector->contacts_list(); } catch (Horde_Exception $e) { - $this->_logger->err($e->GetMessage()); + $this->_logger->err($e->getMessage()); return array(); } @@ -279,11 +279,11 @@ class Horde_ActiveSync_Driver_Horde extends Horde_ActiveSync_Driver_Base /** * Get a message from the backend * - * @see framework/ActiveSync/lib/Horde/ActiveSync/Driver/Horde_ActiveSync_Driver_Base#GetMessage($folderid, $id, $truncsize, $mimesupport) + * @see framework/ActiveSync/lib/Horde/ActiveSync/Driver/Horde_ActiveSync_Driver_Base#getMessage($folderid, $id, $truncsize, $mimesupport) */ - public function GetMessage($folderid, $id, $truncsize, $mimesupport = 0) + public function getMessage($folderid, $id, $truncsize, $mimesupport = 0) { - $this->_logger->debug('Horde::GetMessage(' . $folderid . ', ' . $id . ')'); + $this->_logger->debug('Horde::getMessage(' . $folderid . ', ' . $id . ')'); $message = false; switch ($folderid) { @@ -291,7 +291,7 @@ class Horde_ActiveSync_Driver_Horde extends Horde_ActiveSync_Driver_Base try { return $this->_connector->calendar_export($id); } catch (Horde_Exception $e) { - $this->_logger->err($e->GetMessage()); + $this->_logger->err($e->getMessage()); return false; } break; @@ -300,7 +300,7 @@ class Horde_ActiveSync_Driver_Horde extends Horde_ActiveSync_Driver_Base try { return $this->_connector->contacts_export($id); } catch (Horde_Exception $e) { - $this->_logger->err($e->GetMessage()); + $this->_logger->err($e->getMessage()); return false; } @@ -310,7 +310,7 @@ class Horde_ActiveSync_Driver_Horde extends Horde_ActiveSync_Driver_Base try { return $this->_connector->tasks_export($id); } catch (Horde_Exception $e) { - $this->_logger->err($e->GetMessage()); + $this->_logger->err($e->getMessage()); return false; } break; @@ -322,9 +322,9 @@ class Horde_ActiveSync_Driver_Horde extends Horde_ActiveSync_Driver_Base /** * Get message stat data * - * @see framework/ActiveSync/lib/Horde/ActiveSync/Driver/Horde_ActiveSync_Driver_Base#StatMessage($folderId, $id) + * @see framework/ActiveSync/lib/Horde/ActiveSync/Driver/Horde_ActiveSync_Driver_Base#statMessage($folderId, $id) */ - public function StatMessage($folderid, $id) + public function statMessage($folderid, $id) { return $this->_smartStatMessage($folderid, $id, true); } @@ -380,11 +380,11 @@ class Horde_ActiveSync_Driver_Horde extends Horde_ActiveSync_Driver_Base * @param string $id * @param Horde_ActiveSync_Message_Base $message * - * @see framework/ActiveSync/lib/Horde/ActiveSync/Driver/Horde_ActiveSync_Driver_Base#ChangeMessage($folderid, $id, $message) + * @see framework/ActiveSync/lib/Horde/ActiveSync/Driver/Horde_ActiveSync_Driver_Base#changeMessage($folderid, $id, $message) */ - public function ChangeMessage($folderid, $id, $message) + public function changeMessage($folderid, $id, $message) { - $this->_logger->debug('Horde::ChangeMessage(' . $folderid . ', ' . $id . ')'); + $this->_logger->debug('Horde::changeMessage(' . $folderid . ', ' . $id . ')'); $stat = false; switch ($folderid) { diff --git a/framework/ActiveSync/lib/Horde/ActiveSync/Request/Sync.php b/framework/ActiveSync/lib/Horde/ActiveSync/Request/Sync.php index 1db597909..85723791f 100644 --- a/framework/ActiveSync/lib/Horde/ActiveSync/Request/Sync.php +++ b/framework/ActiveSync/lib/Horde/ActiveSync/Request/Sync.php @@ -301,7 +301,7 @@ class Horde_ActiveSync_Request_Sync extends Horde_ActiveSync_Request_Base break; case Horde_ActiveSync::SYNC_REMOVE: if (isset($collection['deletesasmoves'])) { - $folderid = $this->_driver->GetWasteBasket(); + $folderid = $this->_driver->getWasteBasket(); if ($folderid) { $importer->ImportMessageMove($serverid, $folderid); diff --git a/framework/ActiveSync/lib/Horde/ActiveSync/State/File.php b/framework/ActiveSync/lib/Horde/ActiveSync/State/File.php index 03dded5ec..5dca9d0e2 100644 --- a/framework/ActiveSync/lib/Horde/ActiveSync/State/File.php +++ b/framework/ActiveSync/lib/Horde/ActiveSync/State/File.php @@ -443,8 +443,8 @@ class Horde_ActiveSync_State_File extends Horde_ActiveSync_State_Base foreach ($changes as $change) { switch ($change['type']) { case 'change': - $stat = $this->_backend->StatMessage($this->_collection['id'], $change['id']); - if (!$message = $this->_backend->GetMessage($this->_collection['id'], $change['id'], 0)) { + $stat = $this->_backend->statMessage($this->_collection['id'], $change['id']); + if (!$message = $this->_backend->getMessage($this->_collection['id'], $change['id'], 0)) { continue; //throw new Horde_ActiveSync_Exception('Message not found'); } @@ -590,7 +590,7 @@ class Horde_ActiveSync_State_File extends Horde_ActiveSync_State_Base $this->_changes = $this->_backend->AlterPingChanges($folderId, $syncState); } else { /* Get our lists - syncstate (old) and msglist (new) */ - $msglist = $this->_backend->GetMessageList($this->_collection['id'], $cutoffdate); + $msglist = $this->_backend->getMessageList($this->_collection['id'], $cutoffdate); if ($msglist === false) { return false; } diff --git a/framework/ActiveSync/lib/Horde/ActiveSync/State/History.php b/framework/ActiveSync/lib/Horde/ActiveSync/State/History.php index f115743fb..41e9cde0c 100644 --- a/framework/ActiveSync/lib/Horde/ActiveSync/State/History.php +++ b/framework/ActiveSync/lib/Horde/ActiveSync/State/History.php @@ -348,8 +348,8 @@ class Horde_ActiveSync_State_History extends Horde_ActiveSync_State_Base foreach ($changes as $change) { switch ($change['type']) { case 'change': - $stat = $this->_backend->StatMessage($this->_collection['id'], $change['id']); - if (!$message = $this->_backend->GetMessage($this->_collection['id'], $change['id'], 0)) { + $stat = $this->_backend->statMessage($this->_collection['id'], $change['id']); + if (!$message = $this->_backend->getMessage($this->_collection['id'], $change['id'], 0)) { throw new Horde_ActiveSync_Exception('Message not found'); } if ($stat && $message) { diff --git a/framework/ActiveSync/lib/Horde/ActiveSync/Sync.php b/framework/ActiveSync/lib/Horde/ActiveSync/Sync.php index ea8972282..77521629c 100644 --- a/framework/ActiveSync/lib/Horde/ActiveSync/Sync.php +++ b/framework/ActiveSync/lib/Horde/ActiveSync/Sync.php @@ -145,7 +145,7 @@ class Horde_ActiveSync_Sync switch($change['type']) { case 'change': $folder = $this->_backend->getFolder($change['id']); - $stat = $this->_backend->StatFolder($change['id']); + $stat = $this->_backend->statFolder($change['id']); if (!$folder) { return; } @@ -181,8 +181,8 @@ class Horde_ActiveSync_Sync // Note: because 'parseMessage' and 'statMessage' are two seperate // calls, we have a chance that the message has changed between both // calls. This may cause our algorithm to 'double see' changes. - $stat = $this->_backend->StatMessage($this->_folderId, $change['id']); - if (!$message = $this->_backend->GetMessage($this->_folderId, $change['id'], $truncsize)) { + $stat = $this->_backend->statMessage($this->_folderId, $change['id']); + if (!$message = $this->_backend->getMessage($this->_folderId, $change['id'], $truncsize)) { return false; } diff --git a/framework/ActiveSync/test/Horde/ActiveSync/FileStateTest.php b/framework/ActiveSync/test/Horde/ActiveSync/FileStateTest.php index 898a97546..562258751 100644 --- a/framework/ActiveSync/test/Horde/ActiveSync/FileStateTest.php +++ b/framework/ActiveSync/test/Horde/ActiveSync/FileStateTest.php @@ -84,7 +84,7 @@ class Horde_ActiveSync_FileStateTest extends Horde_Test_Case /* Import the state into the state object */ foreach($changes as $change) { // We know it's always a 'change' since the above test passed - $stat = $driver->StatMessage('Contacts', $change['id'], 0); + $stat = $driver->statMessage('Contacts', $change['id'], 0); $state->updateState('change', $stat, 0); } -- 2.11.0