Unverified Commit 3c5abe40 authored by Alex Pott's avatar Alex Pott
Browse files

Issue #3116103 by longwave: Remove remaining deprecated code from Entity system

parent 0b870817

core/lib/Drupal/Core/Entity/EntityDefinitionUpdateManager.php

+0 −7
Original line number Diff line number Diff line
@@ -127,13 +127,6 @@ public function getChangeSummary() { 
    return $summary;

  }



  /**

   * {@inheritdoc}

   */

  public function applyUpdates() {

    trigger_error('EntityDefinitionUpdateManagerInterface::applyUpdates() is deprecated in 8.7.0 and will be removed before Drupal 9.0.0. Use \Drupal\Core\Entity\EntityDefinitionUpdateManagerInterface::getChangeList() and execute each entity type and field storage update manually instead. See https://www.drupal.org/node/3034742.', E_USER_DEPRECATED);

  }



  /**

   * {@inheritdoc}

   */

core/lib/Drupal/Core/Entity/Sql/SqlContentEntityStorage.php

+1 −4
Original line number Diff line number Diff line
@@ -695,10 +695,7 @@ protected function buildQuery($ids, $revision_ids = FALSE) { 
    $query->addTag($this->entityTypeId . '_load_multiple');



    if ($revision_ids) {

      if (!is_array($revision_ids)) {

        @trigger_error('Passing a single revision ID to "\Drupal\Core\Entity\Sql\SqlContentEntityStorage::buildQuery()" is deprecated in Drupal 8.5.x and will be removed before Drupal 9.0.0. An array of revision IDs should be given instead. See https://www.drupal.org/node/2924915.', E_USER_DEPRECATED);

      }

      $query->join($this->revisionTable, 'revision', "revision.{$this->idKey} = base.{$this->idKey} AND revision.{$this->revisionKey} IN (:revisionIds[])", [':revisionIds[]' => (array) $revision_ids]);

      $query->join($this->revisionTable, 'revision', "revision.{$this->idKey} = base.{$this->idKey} AND revision.{$this->revisionKey} IN (:revisionIds[])", [':revisionIds[]' => $revision_ids]);

    }

    elseif ($this->revisionTable) {

      $query->join($this->revisionTable, 'revision', "revision.{$this->revisionKey} = base.{$this->revisionKey}");

core/lib/Drupal/Core/Extension/module.api.php

+0 −3
Original line number Diff line number Diff line
@@ -583,9 +583,6 @@ function hook_install_tasks_alter(&$tasks, $install_state) { 
 *   \Drupal::entityDefinitionUpdateManager()::getFieldStorageDefinition(). When

 *   adding a new definition always replicate it in the update function body as

 *   you would do with a schema definition.

 * - Never call \Drupal::entityDefinitionUpdateManager()::applyUpdates() in an

 *   update function, as it will apply updates for any module not only yours,

 *   which will lead to unpredictable results.

 * - Be careful about API functions and especially CRUD operations that you use

 *   in your update function. If they invoke hooks or use services, they may

 *   not behave as expected, and it may actually not be appropriate to use the