.../field/lib/Drupal/field/Tests/FieldAttachOtherTest.php | 8 ++++---- .../field/lib/Drupal/field/Tests/FieldAttachTestBase.php | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/core/modules/field/lib/Drupal/field/Tests/FieldAttachOtherTest.php b/core/modules/field/lib/Drupal/field/Tests/FieldAttachOtherTest.php index d61c2ad..f971099 100644 --- a/core/modules/field/lib/Drupal/field/Tests/FieldAttachOtherTest.php +++ b/core/modules/field/lib/Drupal/field/Tests/FieldAttachOtherTest.php @@ -25,7 +25,7 @@ public static function getInfo() { * Test field_attach_view() and field_attach_prepare_view(). */ function testFieldAttachView() { - $this->createFieldInstance('_2'); + $this->createFieldWithInstance('_2'); $entity_type = 'test_entity'; $entity_init = field_test_create_entity(); @@ -328,7 +328,7 @@ function testFieldAttachCache() { * hook_field_validate. */ function testFieldAttachValidate() { - $this->createFieldInstance('_2'); + $this->createFieldWithInstance('_2'); $entity_type = 'test_entity'; $entity = field_test_create_entity(0, 0, $this->instance['bundle']); @@ -420,7 +420,7 @@ function testFieldAttachValidate() { * widgets show up. */ function testFieldAttachForm() { - $this->createFieldInstance('_2'); + $this->createFieldWithInstance('_2'); $entity_type = 'test_entity'; $entity = field_test_create_entity(0, 0, $this->instance['bundle']); @@ -460,7 +460,7 @@ function testFieldAttachForm() { * Test field_attach_submit(). */ function testFieldAttachSubmit() { - $this->createFieldInstance('_2'); + $this->createFieldWithInstance('_2'); $entity_type = 'test_entity'; $entity_init = field_test_create_entity(0, 0, $this->instance['bundle']); diff --git a/core/modules/field/lib/Drupal/field/Tests/FieldAttachTestBase.php b/core/modules/field/lib/Drupal/field/Tests/FieldAttachTestBase.php index 59a81bf..9d15ba2 100644 --- a/core/modules/field/lib/Drupal/field/Tests/FieldAttachTestBase.php +++ b/core/modules/field/lib/Drupal/field/Tests/FieldAttachTestBase.php @@ -19,17 +19,17 @@ function setUp() { parent::setUp(); - $this->createFieldInstance(); + $this->createFieldWithInstance(); } /** - * Create a field instance. + * Create a field and an instance of it. * * @param string $suffix * (optional) A string that should only contain characters that are valid in * PHP variable names as well. */ - function createFieldInstance($suffix = '') { + function createFieldWithInstance($suffix = '') { $field_name = 'field_name' . $suffix; $field = 'field' . $suffix; $field_id = 'field_id' . $suffix;