#707724 by chx: Rename confusing arguments in field/entity APIs.

5 files changed, 63 insertions, 63 deletions

diff --git a/modules/field/tests/field.test b/modules/field/tests/field.test
index 2109748f3..c65a9b8e6 100644
--- a/modules/field/tests/field.test
+++ b/modules/field/tests/field.test
@@ -2731,26 +2731,26 @@ class FieldTranslationsTestCase extends FieldTestCase {
     // Prepare the field translations.
     field_test_entity_info_translatable('test_entity', TRUE);
     $eid = $evid = 1;
-    $obj_type = 'test_entity';
-    $object = field_test_create_stub_entity($eid, $evid, $this->instance['bundle']);
+    $entity_type = 'test_entity';
+    $entity = field_test_create_stub_entity($eid, $evid, $this->instance['bundle']);
     $field_translations = array();
-    $available_languages = field_multilingual_available_languages($obj_type, $this->field);
+    $available_languages = field_multilingual_available_languages($entity_type, $this->field);
     $this->assertTrue(count($available_languages) > 1, t('Field is translatable.'));
     foreach ($available_languages as $langcode) {
       $field_translations[$langcode] = $this->_generateTestFieldValues($this->field['cardinality']);
     }
 
     // Save and reload the field translations.
-    $object->{$this->field_name} = $field_translations;
-    field_attach_insert($obj_type, $object);
-    unset($object->{$this->field_name});
-    field_attach_load($obj_type, array($eid => $object));
+    $entity->{$this->field_name} = $field_translations;
+    field_attach_insert($entity_type, $entity);
+    unset($entity->{$this->field_name});
+    field_attach_load($entity_type, array($eid => $entity));
 
     // Check if the correct values were saved/loaded.
     foreach ($field_translations as $langcode => $items) {
       $result = TRUE;
       foreach ($items as $delta => $item) {
-        $result = $result && $item['value'] == $object->{$this->field_name}[$langcode][$delta]['value'];
+        $result = $result && $item['value'] == $entity->{$this->field_name}[$langcode][$delta]['value'];
       }
       $this->assertTrue($result, t('%language translation correctly handled.', array('%language' => $langcode)));
     }
@@ -2779,20 +2779,20 @@ class FieldBulkDeleteTestCase extends FieldTestCase {
    * same fieldable type which contains the data for the field name
    * (if given).
    *
-   * @param $obj_type
-   *   The entity type of $objects.
-   * @param $objects
-   *   An array of objects of type $obj_type.
+   * @param $entity_type
+   *   The entity type of $entities.
+   * @param $entities
+   *   An array of objects of type $entity_type.
    * @param $field_name
    *   Optional; a field name whose data should be copied from
-   *   $objects into the returned stub objects.
+   *   $entities into the returned stub objects.
    * @return
-   *   An array of stub objects corresponding to $objects.
+   *   An array of stub objects corresponding to $entities.
    */
-  function _generateStubObjects($obj_type, $objects, $field_name = NULL) {
+  function _generateStubObjects($entity_type, $entities, $field_name = NULL) {
     $stubs = array();
-    foreach ($objects as $obj) {
-      $stub = entity_create_stub_entity($obj_type, entity_extract_ids($obj_type, $obj));
+    foreach ($entities as $obj) {
+      $stub = entity_create_stub_entity($entity_type, entity_extract_ids($entity_type, $obj));
       if (isset($field_name)) {
         $stub->{$field_name} = $obj->{$field_name};
       }
diff --git a/modules/field/tests/field_test.entity.inc b/modules/field/tests/field_test.entity.inc
index 0a15bccb6..71810eb86 100644
--- a/modules/field/tests/field_test.entity.inc
+++ b/modules/field/tests/field_test.entity.inc
@@ -54,12 +54,12 @@ function field_test_entity_info() {
  */
 function field_test_entity_info_alter(&$entity_info) {
   // Enable/disable field_test as a translation handler.
-  foreach (field_test_entity_info_translatable() as $obj_type => $translatable) {
-    $entity_info[$obj_type]['translation']['field_test'] = $translatable;
+  foreach (field_test_entity_info_translatable() as $entity_type => $translatable) {
+    $entity_info[$entity_type]['translation']['field_test'] = $translatable;
   }
   // Disable locale as a translation handler.
-  foreach ($entity_info as $obj_type => $info) {
-    $entity_info[$obj_type]['translation']['locale'] = FALSE;
+  foreach ($entity_info as $entity_type => $info) {
+    $entity_info[$entity_type]['translation']['locale'] = FALSE;
   }
 }
 
diff --git a/modules/field/tests/field_test.field.inc b/modules/field/tests/field_test.field.inc
index 8793e22d2..1213d4d4d 100644
--- a/modules/field/tests/field_test.field.inc
+++ b/modules/field/tests/field_test.field.inc
@@ -59,7 +59,7 @@ function field_test_field_update_forbid($field, $prior_field, $has_data) {
 /**
  * Implements hook_field_load().
  */
-function field_test_field_load($obj_type, $objects, $field, $instances, $langcode, &$items, $age) {
+function field_test_field_load($entity_type, $entities, $field, $instances, $langcode, &$items, $age) {
   foreach ($items as $id => $item) {
     // To keep the test non-intrusive, only act for instances with the
     // test_hook_field_load setting explicitly set to TRUE.
@@ -80,7 +80,7 @@ function field_test_field_load($obj_type, $objects, $field, $instances, $langcod
  * Possible error codes:
  * - 'field_test_invalid': The value is invalid.
  */
-function field_test_field_validate($obj_type, $object, $field, $instance, $langcode, $items, &$errors) {
+function field_test_field_validate($entity_type, $entity, $field, $instance, $langcode, $items, &$errors) {
   foreach ($items as $delta => $item) {
     if ($item['value'] == -1) {
       $errors[$field['field_name']][$langcode][$delta][] = array(
@@ -261,7 +261,7 @@ function field_test_field_formatter_info() {
 /**
  * Implements hook_field_formatter_prepare_view().
  */
-function field_test_field_formatter_prepare_view($obj_type, $objects, $field, $instances, $langcode, &$items, $displays) {
+function field_test_field_formatter_prepare_view($entity_type, $entities, $field, $instances, $langcode, &$items, $displays) {
   foreach ($items as $id => $item) {
     // To keep the test non-intrusive, only act on the
     // 'field_test_needs_additional_data' formatter.
@@ -279,7 +279,7 @@ function field_test_field_formatter_prepare_view($obj_type, $objects, $field, $i
 /**
  * Implements hook_field_formatter_view().
  */
-function field_test_field_formatter_view($object_type, $object, $field, $instance, $langcode, $items, $display) {
+function field_test_field_formatter_view($entity_type, $entity, $field, $instance, $langcode, $items, $display) {
   $element = array();
   $settings = $display['settings'];
 
@@ -311,14 +311,14 @@ function field_test_field_formatter_view($object_type, $object, $field, $instanc
 /**
  * Sample 'default value' callback.
  */
-function field_test_default_value($obj_type, $object, $field, $instance) {
+function field_test_default_value($entity_type, $entity, $field, $instance) {
   return array(array('value' => 99));
 }
 
 /**
  * Implements hook_field_access().
  */
-function field_test_field_access($op, $field, $obj_type, $object, $account) {
+function field_test_field_access($op, $field, $entity_type, $entity, $account) {
   if ($field['field_name'] == "field_no_{$op}_access") {
     return FALSE;
   }
diff --git a/modules/field/tests/field_test.module b/modules/field/tests/field_test.module
index 5c8689c2c..7d0b8366d 100644
--- a/modules/field/tests/field_test.module
+++ b/modules/field/tests/field_test.module
@@ -68,8 +68,8 @@ function field_test_menu() {
  *
  * This simulates a field operation callback to be invoked by _field_invoke().
  */
-function field_test_field_test_op($obj_type, $object, $field, $instance, $langcode, &$items) {
-  return array($langcode => md5(serialize(array($obj_type, $object, $field['field_name'], $langcode, $items))));
+function field_test_field_test_op($entity_type, $entity, $field, $instance, $langcode, &$items) {
+  return array($langcode => md5(serialize(array($entity_type, $entity, $field['field_name'], $langcode, $items))));
 }
 
 /**
@@ -78,10 +78,10 @@ function field_test_field_test_op($obj_type, $object, $field, $instance, $langco
  * This simulates a multiple field operation callback to be invoked by
  * _field_invoke_multiple().
  */
-function field_test_field_test_op_multiple($obj_type, $objects, $field, $instances, $langcode, &$items) {
+function field_test_field_test_op_multiple($entity_type, $entities, $field, $instances, $langcode, &$items) {
   $result = array();
-  foreach ($objects as $id => $object) {
-    $result[$id] = array($langcode => md5(serialize(array($obj_type, $object, $field['field_name'], $langcode, $items[$id]))));
+  foreach ($entities as $id => $entity) {
+    $result[$id] = array($langcode => md5(serialize(array($entity_type, $entity, $field['field_name'], $langcode, $items[$id]))));
   }
   return $result;
 }
@@ -89,7 +89,7 @@ function field_test_field_test_op_multiple($obj_type, $objects, $field, $instanc
 /**
  * Implements hook_field_languages().
  */
-function field_test_field_languages($obj_type, $field, &$languages) {
+function field_test_field_languages($entity_type, $field, &$languages) {
   if ($field['settings']['test_hook_in']) {
     // Add an unavailable language.
     $languages[] = 'xx';
@@ -101,10 +101,10 @@ function field_test_field_languages($obj_type, $field, &$languages) {
 /**
  * Helper function to enable entity translations.
  */
-function field_test_entity_info_translatable($obj_type = NULL, $translatable = NULL) {
+function field_test_entity_info_translatable($entity_type = NULL, $translatable = NULL) {
   $stored_value = &drupal_static(__FUNCTION__, array());
-  if (isset($obj_type)) {
-    $stored_value[$obj_type] = $translatable;
+  if (isset($entity_type)) {
+    $stored_value[$entity_type] = $translatable;
     entity_info_cache_clear();
   }
   return $stored_value;
@@ -175,7 +175,7 @@ function field_test_field_create_field($field) {
 /**
  * Memorize calls to hook_field_insert().
  */
-function field_test_field_insert($obj_type, $object, $field, $instance, $items) {
+function field_test_field_insert($entity_type, $entity, $field, $instance, $items) {
   $args = func_get_args();
   field_test_memorize(__FUNCTION__, $args);
 }
@@ -183,7 +183,7 @@ function field_test_field_insert($obj_type, $object, $field, $instance, $items)
 /**
  * Memorize calls to hook_field_update().
  */
-function field_test_field_update($obj_type, $object, $field, $instance, $items) {
+function field_test_field_update($entity_type, $entity, $field, $instance, $items) {
   $args = func_get_args();
   field_test_memorize(__FUNCTION__, $args);
 }
@@ -191,7 +191,7 @@ function field_test_field_update($obj_type, $object, $field, $instance, $items)
 /**
  * Memorize calls to hook_field_delete().
  */
-function field_test_field_delete($obj_type, $object, $field, $instance, $items) {
+function field_test_field_delete($entity_type, $entity, $field, $instance, $items) {
   $args = func_get_args();
   field_test_memorize(__FUNCTION__, $args);
 }
diff --git a/modules/field/tests/field_test.storage.inc b/modules/field/tests/field_test.storage.inc
index e85c832cf..1008009d0 100644
--- a/modules/field/tests/field_test.storage.inc
+++ b/modules/field/tests/field_test.storage.inc
@@ -81,7 +81,7 @@ function _field_test_storage_data($data = NULL) {
 /**
  * Implements hook_field_storage_load().
  */
-function field_test_field_storage_load($obj_type, $objects, $age, $fields, $options) {
+function field_test_field_storage_load($entity_type, $entities, $age, $fields, $options) {
   $data = _field_test_storage_data();
 
   $load_current = $age == FIELD_LOAD_CURRENT;
@@ -93,9 +93,9 @@ function field_test_field_storage_load($obj_type, $objects, $age, $fields, $opti
     $sub_table = $load_current ? 'current' : 'revisions';
     $delta_count = array();
     foreach ($field_data[$sub_table] as $row) {
-      if ($row->type == $obj_type && (!$row->deleted || $options['deleted'])) {
+      if ($row->type == $entity_type && (!$row->deleted || $options['deleted'])) {
         if (($load_current && in_array($row->entity_id, $ids)) || (!$load_current && in_array($row->revision_id, $ids))) {
-          if (in_array($row->language, field_multilingual_available_languages($obj_type, $field))) {
+          if (in_array($row->language, field_multilingual_available_languages($entity_type, $field))) {
             if (!isset($delta_count[$row->entity_id][$row->language])) {
               $delta_count[$row->entity_id][$row->language] = 0;
             }
@@ -104,7 +104,7 @@ function field_test_field_storage_load($obj_type, $objects, $age, $fields, $opti
               foreach ($field['columns'] as $column => $attributes) {
                 $item[$column] = $row->{$column};
               }
-              $objects[$row->entity_id]->{$field_name}[$row->language][] = $item;
+              $entities[$row->entity_id]->{$field_name}[$row->language][] = $item;
               $delta_count[$row->entity_id][$row->language]++;
             }
           }
@@ -117,33 +117,33 @@ function field_test_field_storage_load($obj_type, $objects, $age, $fields, $opti
 /**
  * Implements hook_field_storage_write().
  */
-function field_test_field_storage_write($obj_type, $object, $op, $fields) {
+function field_test_field_storage_write($entity_type, $entity, $op, $fields) {
   $data = _field_test_storage_data();
 
-  list($id, $vid, $bundle) = entity_extract_ids($obj_type, $object);
+  list($id, $vid, $bundle) = entity_extract_ids($entity_type, $entity);
 
   foreach ($fields as $field_id) {
     $field = field_info_field_by_id($field_id);
     $field_name = $field['field_name'];
     $field_data = &$data[$field_id];
 
-    $all_languages = field_multilingual_available_languages($obj_type, $field);
-    $field_languages = array_intersect($all_languages, array_keys((array) $object->$field_name));
+    $all_languages = field_multilingual_available_languages($entity_type, $field);
+    $field_languages = array_intersect($all_languages, array_keys((array) $entity->$field_name));
 
     // Delete and insert, rather than update, in case a value was added.
     if ($op == FIELD_STORAGE_UPDATE) {
-      // Delete languages present in the incoming $object->$field_name.
-      // Delete all languages if $object->$field_name is empty.
-      $languages = !empty($object->$field_name) ? $field_languages : $all_languages;
+      // Delete languages present in the incoming $entity->$field_name.
+      // Delete all languages if $entity->$field_name is empty.
+      $languages = !empty($entity->$field_name) ? $field_languages : $all_languages;
       if ($languages) {
         foreach ($field_data['current'] as $key => $row) {
-          if ($row->type == $obj_type && $row->entity_id == $id && in_array($row->language, $languages)) {
+          if ($row->type == $entity_type && $row->entity_id == $id && in_array($row->language, $languages)) {
             unset($field_data['current'][$key]);
           }
         }
         if (isset($vid)) {
           foreach ($field_data['revisions'] as $key => $row) {
-            if ($row->type == $obj_type && $row->revision_id == $vid) {
+            if ($row->type == $entity_type && $row->revision_id == $vid) {
               unset($field_data['revisions'][$key]);
             }
           }
@@ -152,12 +152,12 @@ function field_test_field_storage_write($obj_type, $object, $op, $fields) {
     }
 
     foreach ($field_languages as $langcode) {
-      $items = (array) $object->{$field_name}[$langcode];
+      $items = (array) $entity->{$field_name}[$langcode];
       $delta_count = 0;
       foreach ($items as $delta => $item) {
         $row = (object) array(
           'field_id' => $field_id,
-          'type' => $obj_type,
+          'type' => $entity_type,
           'entity_id' => $id,
           'revision_id' => $vid,
           'bundle' => $bundle,
@@ -187,15 +187,15 @@ function field_test_field_storage_write($obj_type, $object, $op, $fields) {
 /**
  * Implements hook_field_storage_delete().
  */
-function field_test_field_storage_delete($obj_type, $object, $fields) {
-  list($id, $vid, $bundle) = entity_extract_ids($obj_type, $object);
+function field_test_field_storage_delete($entity_type, $entity, $fields) {
+  list($id, $vid, $bundle) = entity_extract_ids($entity_type, $entity);
 
   // Note: reusing field_test_storage_purge(), like field_sql_storage.module
   // does, is highly inefficient in our case...
   foreach (field_info_instances($bundle) as $instance) {
     if (isset($fields[$instance['field_id']])) {
       $field = field_info_field_by_id($instance['field_id']);
-      field_test_field_storage_purge($obj_type, $object, $field, $instance);
+      field_test_field_storage_purge($entity_type, $entity, $field, $instance);
     }
   }
 }
@@ -203,15 +203,15 @@ function field_test_field_storage_delete($obj_type, $object, $fields) {
 /**
  * Implements hook_field_storage_purge().
  */
-function field_test_field_storage_purge($obj_type, $object, $field, $instance) {
+function field_test_field_storage_purge($entity_type, $entity, $field, $instance) {
   $data = _field_test_storage_data();
 
-  list($id, $vid, $bundle) = entity_extract_ids($obj_type, $object);
+  list($id, $vid, $bundle) = entity_extract_ids($entity_type, $entity);
 
   $field_data = &$data[$field['id']];
   foreach (array('current', 'revisions') as $sub_table) {
     foreach ($field_data[$sub_table] as $key => $row) {
-      if ($row->type == $obj_type && $row->entity_id == $id) {
+      if ($row->type == $entity_type && $row->entity_id == $id) {
         unset($field_data[$sub_table][$key]);
       }
     }
@@ -223,15 +223,15 @@ function field_test_field_storage_purge($obj_type, $object, $field, $instance) {
 /**
  * Implements hook_field_storage_delete_revision().
  */
-function field_test_field_storage_delete_revision($obj_type, $object, $fields) {
+function field_test_field_storage_delete_revision($entity_type, $entity, $fields) {
   $data = _field_test_storage_data();
 
-  list($id, $vid, $bundle) = entity_extract_ids($obj_type, $object);
+  list($id, $vid, $bundle) = entity_extract_ids($entity_type, $entity);
   foreach ($fields as $field_id) {
     $field_data = &$data[$field_id];
     foreach (array('current', 'revisions') as $sub_table) {
       foreach ($field_data[$sub_table] as $key => $row) {
-        if ($row->type == $obj_type && $row->entity_id == $id && $row->revision_id == $vid) {
+        if ($row->type == $entity_type && $row->entity_id == $id && $row->revision_id == $vid) {
           unset($field_data[$sub_table][$key]);
         }
       }