diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/field/formatter/TaxonomyFormatterBase.php b/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/field/formatter/TaxonomyFormatterBase.php index f507137..5df5c8c 100644 --- a/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/field/formatter/TaxonomyFormatterBase.php +++ b/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/field/formatter/TaxonomyFormatterBase.php @@ -36,7 +36,7 @@ public function prepareView(array $entities, $langcode, array &$items) { } } if ($tids) { - $terms = taxonomy_term_load_multiple($tids); + $terms = entity_load_multiple('taxonomy_term', $tids); // Iterate through the fieldable entities again to attach the loaded term // data. diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Tests/LoadMultipleTest.php b/core/modules/taxonomy/lib/Drupal/taxonomy/Tests/LoadMultipleTest.php deleted file mode 100644 index 501c26c..0000000 --- a/core/modules/taxonomy/lib/Drupal/taxonomy/Tests/LoadMultipleTest.php +++ /dev/null @@ -1,71 +0,0 @@ - 'Taxonomy term multiple loading', - 'description' => 'Test the loading of multiple taxonomy terms at once', - 'group' => 'Taxonomy', - ); - } - - function setUp() { - parent::setUp(); - $this->taxonomy_admin = $this->drupalCreateUser(array('administer taxonomy')); - $this->drupalLogin($this->taxonomy_admin); - } - - /** - * Create a vocabulary and some taxonomy terms, ensuring they're loaded - * correctly using taxonomy_term_load_multiple(). - */ - function testTaxonomyTermMultipleLoad() { - // Create a vocabulary. - $vocabulary = $this->createVocabulary(); - - // Create five terms in the vocabulary. - $i = 0; - while ($i < 5) { - $i++; - $this->createTerm($vocabulary); - } - // Load the terms from the vocabulary. - $terms = entity_load_multiple_by_properties('taxonomy_term', array('vid' => $vocabulary->id())); - $count = count($terms); - $this->assertEqual($count, 5, format_string('Correct number of terms were loaded. !count terms.', array('!count' => $count))); - - // Load the same terms again by tid. - $terms2 = taxonomy_term_load_multiple(array_keys($terms)); - $this->assertEqual($count, count($terms2), 'Five terms were loaded by tid.'); - $this->assertEqual($terms, $terms2, 'Both arrays contain the same terms.'); - - // Remove one term from the array, then delete it. - $deleted = array_shift($terms2); - $deleted->delete(); - $deleted_term = taxonomy_term_load($deleted->id()); - $this->assertFalse($deleted_term); - - // Load terms from the vocabulary by vid. - $terms3 = entity_load_multiple_by_properties('taxonomy_term', array('vid' => $vocabulary->id())); - $this->assertEqual(count($terms3), 4, 'Correct number of terms were loaded.'); - $this->assertFalse(isset($terms3[$deleted->id()])); - - // Create a single term and load it by name. - $term = $this->createTerm($vocabulary); - $loaded_terms = entity_load_multiple_by_properties('taxonomy_term', array('name' => $term->name->value)); - $this->assertEqual(count($loaded_terms), 1, 'One term was loaded.'); - $loaded_term = reset($loaded_terms); - $this->assertEqual($term->id(), $loaded_term->id(), 'Term loaded by name successfully.'); - } -} diff --git a/core/modules/taxonomy/taxonomy.api.php b/core/modules/taxonomy/taxonomy.api.php index 24fcc01..e49ac82 100644 --- a/core/modules/taxonomy/taxonomy.api.php +++ b/core/modules/taxonomy/taxonomy.api.php @@ -139,7 +139,7 @@ function hook_taxonomy_term_create(\Drupal\taxonomy\Plugin\Core\Entity\Term $ter * Act on taxonomy terms when loaded. * * Modules implementing this hook can act on the term objects returned by - * taxonomy_term_load_multiple(). + * entity_load_multiple(). * * For performance reasons, information to be added to term objects should be * loaded in a single query for all terms where possible. diff --git a/core/modules/taxonomy/taxonomy.module b/core/modules/taxonomy/taxonomy.module index c531daf..6fa5142 100644 --- a/core/modules/taxonomy/taxonomy.module +++ b/core/modules/taxonomy/taxonomy.module @@ -437,7 +437,7 @@ function taxonomy_term_view(Term $term, $view_mode = 'full', $langcode = NULL) { * Constructs a drupal_render() style array from an array of loaded terms. * * @param array $terms - * An array of taxonomy terms as returned by taxonomy_term_load_multiple(). + * An array of taxonomy terms as returned by entity_load_multiple(). * @param string $view_mode * View mode, e.g. 'full', 'teaser'... * @param string $langcode @@ -568,7 +568,7 @@ function taxonomy_term_load_parents($tid) { $query->orderBy('t.weight'); $query->orderBy('t.name'); $tids = $query->execute()->fetchCol(); - $parents[$tid] = taxonomy_term_load_multiple($tids); + $parents[$tid] = entity_load_multiple('taxonomy_term', $tids); } return isset($parents[$tid]) ? $parents[$tid] : array(); @@ -626,7 +626,7 @@ function taxonomy_term_load_children($tid, $vid = NULL) { $query->orderBy('t.weight'); $query->orderBy('t.name'); $tids = $query->execute()->fetchCol(); - $children[$tid] = taxonomy_term_load_multiple($tids); + $children[$tid] = entity_load_multiple('taxonomy_term', $tids); } return isset($children[$tid]) ? $children[$tid] : array(); @@ -687,7 +687,7 @@ function taxonomy_get_tree($vid, $parent = 0, $max_depth = NULL, $load_entities // Load full entities, if necessary. The entity controller statically // caches the results. if ($load_entities) { - $term_entities = taxonomy_term_load_multiple(array_keys($terms[$vid])); + $term_entities = entity_load_multiple('taxonomy_term', array_keys($terms[$vid])); } $max_depth = (!isset($max_depth)) ? count($children[$vid]) : $max_depth; @@ -780,27 +780,6 @@ function taxonomy_term_load_multiple_by_name($name, $vocabulary = NULL) { } /** - * Load multiple taxonomy terms based on certain conditions. - * - * This function should be used whenever you need to load more than one term - * from the database. Terms are loaded into memory and will not require - * database access if loaded again during the same page request. - * - * @see entity_load_multiple() - * @see Drupal\Core\Entity\Query\EntityQueryInterface - * - * @param array $tids - * (optional) An array of entity IDs. If omitted, all entities are loaded. - * - * @return array - * An array of taxonomy term entities, indexed by tid. When no results are - * found, an empty array is returned. - */ -function taxonomy_term_load_multiple(array $tids = NULL) { - return entity_load_multiple('taxonomy_term', $tids); -} - -/** * Loads multiple taxonomy vocabularies based on certain conditions. * * This function should be used whenever you need to load more than one @@ -947,14 +926,14 @@ function taxonomy_options_list($field, $instance, $entity) { */ function taxonomy_field_validate(EntityInterface $entity = NULL, $field, $instance, $langcode, $items, &$errors) { // Build an array of existing term IDs so they can be loaded with - // taxonomy_term_load_multiple(); + // entity_load_multiple(); foreach ($items as $delta => $item) { if (!empty($item['tid']) && $item['tid'] != 'autocreate') { $tids[] = $item['tid']; } } if (!empty($tids)) { - $terms = taxonomy_term_load_multiple($tids); + $terms = entity_load_multiple('taxonomy_term', $tids); // Check each existing item to ensure it can be found in the // allowed values for this field.