From 892ba6630da5a2b71dce838e24158780a654e81c Mon Sep 17 00:00:00 2001 From: Marco Villegas Date: Wed, 5 Jan 2011 00:32:49 -0500 Subject: [PATCH] task #723958: Remove ArrayAccess dependency everywhere. --- includes/VersioncontrolRepository.php | 14 -------------- includes/controllers.inc | 16 +--------------- ...VersioncontrolRepositoryManagementTestCase.test | 2 +- ...ersioncontrolRepositoryUnitTestingTestCase.test | 2 +- versioncontrol.admin.inc | 12 ++++++------ versioncontrol.module | 2 +- 6 files changed, 10 insertions(+), 38 deletions(-) diff --git includes/VersioncontrolRepository.php includes/VersioncontrolRepository.php index bcdac51..ff28b2d 100644 --- includes/VersioncontrolRepository.php +++ includes/VersioncontrolRepository.php @@ -447,20 +447,6 @@ abstract class VersioncontrolRepository implements VersioncontrolEntityInterface return $this->pluginInstances['committer_mapper']; } - - //ArrayAccess interface implementation FIXME soooooooo deprecated - public function offsetExists($offset) { - return isset($this->$offset); - } - public function offsetGet($offset) { - return $this->$offset; - } - public function offsetSet($offset, $value) { - $this->$offset = $value; - } - public function offsetUnset($offset) { - unset($this->$offset); - } } /** diff --git includes/controllers.inc includes/controllers.inc index e2fe06a..ed7d000 100644 --- includes/controllers.inc +++ includes/controllers.inc @@ -511,7 +511,7 @@ class VersioncontrolItemController extends VersioncontrolEntityController { protected $idKey = 'item_revision_id'; } -interface VersioncontrolEntityInterface extends ArrayAccess { +interface VersioncontrolEntityInterface { public function build($args = array()); public function save($options = array()); @@ -659,18 +659,4 @@ abstract class VersioncontrolEntity implements VersioncontrolEntityInterface { */ protected function backendDelete($options) {} - //ArrayAccess interface implementation FIXME soooooooo deprecated - public function offsetExists($offset) { - return isset($this->$offset); - } - public function offsetGet($offset) { - return $this->$offset; - } - public function offsetSet($offset, $value) { - $this->$offset = $value; - } - public function offsetUnset($offset) { - unset($this->$offset); - } - } diff --git tests/VersioncontrolRepositoryManagementTestCase.test tests/VersioncontrolRepositoryManagementTestCase.test index e420272..4b38948 100644 --- tests/VersioncontrolRepositoryManagementTestCase.test +++ tests/VersioncontrolRepositoryManagementTestCase.test @@ -87,7 +87,7 @@ class VersioncontrolRepositoryManagementTestCase extends VersioncontrolTestCase $found_repositories = $this->testBackend->loadEntities('repo', array(), array('name' => array($edit['repo_name']))); if ($is_repo_edited = (count($found_repositories) == 1)) { $edited_repo = array_shift($found_repositories); - $is_repo_edited = $edited_repo['root'] == $edit['root']; + $is_repo_edited = $edited_repo->root == $edit['root']; } $this->assertTrue($is_repo_edited, t('Repository updated in database.')); } diff --git tests/VersioncontrolRepositoryUnitTestingTestCase.test tests/VersioncontrolRepositoryUnitTestingTestCase.test index 23470ae..aea7fc9 100644 --- tests/VersioncontrolRepositoryUnitTestingTestCase.test +++ tests/VersioncontrolRepositoryUnitTestingTestCase.test @@ -88,7 +88,7 @@ class VersioncontrolRepositoryUnitTestingTestCase extends VersioncontrolTestCase 'updated' => time(), //TODO $repo->update_method 'locked' => TRUE, - 'plugins' => array('auth_handler' => 'account') + $repo['plugins'], + 'plugins' => array('auth_handler' => 'account') + $repo->plugins, ); $repo->name = $data['name']; diff --git versioncontrol.admin.inc versioncontrol.admin.inc index fb5e7ca..dbfdb8a 100644 --- versioncontrol.admin.inc +++ versioncontrol.admin.inc @@ -281,8 +281,8 @@ function versioncontrol_admin_repository_edit(&$form_state, $repository, $vcs = if ($repository_exists) { $form['#repository'] = $repository; } - $form['#vcs'] = $repository_exists ? $repository['vcs'] : $vcs; - $form['#original_name'] = $repository_exists ? $repository['name'] : 0; + $form['#vcs'] = $repository_exists ? $repository->vcs : $vcs; + $form['#original_name'] = $repository_exists ? $repository->name : 0; $form['repository_information'] = array( '#type' => 'fieldset', @@ -295,7 +295,7 @@ function versioncontrol_admin_repository_edit(&$form_state, $repository, $vcs = '#type' => 'textfield', '#title' => t('Repository name'), '#description' => t('A label for the repository that will be used in all user visible messages.'), - '#default_value' => $repository_exists ? $repository['name'] : '', + '#default_value' => $repository_exists ? $repository->name : '', '#required' => TRUE, '#weight' => 0, '#size' => 40, @@ -305,7 +305,7 @@ function versioncontrol_admin_repository_edit(&$form_state, $repository, $vcs = '#type' => 'textfield', '#title' => t('Repository root'), '#description' => t('The location of the repository\'s root directory.'), - '#default_value' => $repository_exists ? $repository['root'] : '', + '#default_value' => $repository_exists ? $repository->root : '', '#weight' => 5, '#size' => 60, '#maxlength' => 255, @@ -461,7 +461,7 @@ function versioncontrol_admin_repository_delete_confirm(&$form_state, $repositor $form['#repo_id'] = $repository->repo_id; $form = confirm_form($form, - t('Are you sure you want to delete %name?', array('%name' => $repository['name'])), + t('Are you sure you want to delete %name?', array('%name' => $repository->name)), !empty($_GET['destination']) ? $_GET['destination'] : 'admin/content/versioncontrol-repositories', t('Mind that by deleting the repository, all associated data such as commits and account associations will be deleted as well.'), t('Delete'), t('Cancel') @@ -476,7 +476,7 @@ function versioncontrol_admin_repository_delete_confirm_submit($form, &$form_sta $repository = versioncontrol_repository_load($form['#repo_id']); $repository->delete(); drupal_set_message(t('The %repository repository has been deleted.', array( - '%repository' => $repository['name'], + '%repository' => $repository->name, ))); $form_state['redirect'] = 'admin/content/versioncontrol-repositories'; } diff --git versioncontrol.module versioncontrol.module index 37f1443..182b8fe 100644 --- versioncontrol.module +++ versioncontrol.module @@ -725,7 +725,7 @@ function theme_versioncontrol_account_username($uid, $username, $repository, $op if (!empty($options['include_repository_name'])) { $username = t('!user @ !repository', array( '!user' => $username, - '!repository' => $repository['name'], + '!repository' => $repository->name, )); } if ($format == 'html' && module_exists('commitlog')) { -- 1.7.2.3