Commit d47cd984 authored by catch's avatar catch
Browse files

Issue #3244802 by andypost, Spokje, catch, dww: Remove BC layers in entity system

parent 637ccc1a
Loading
Loading
Loading
Loading
−7
Changes for core/core.services.yml: 0 added lines, 7 removed lines.
Original line number Diff line number Diff line
@@ -1163,13 +1163,6 @@ services:
    class: Drupal\Core\Entity\EntityAccessCheck
    tags:
      - { name: access_check, applies_to: _entity_access }
  access_check.entity_bundles:
    # Deprecated in drupal:9.2.0 and is removed from drupal:10.0.0. Specify the
    # list of bundles in the entity parameter, under "bundle" key as a sequence,
    # instead. See https://www.drupal.org/node/3155569.
    class: Drupal\Core\Entity\EntityBundleAccessCheck
    tags:
      - { name: access_check, applies_to: _entity_bundles }
  access_check.entity_create:
    class: Drupal\Core\Entity\EntityCreateAccessCheck
    arguments: ['@entity_type.manager']
−58

File deleted.

−34
Changes for core/lib/Drupal/Core/Entity/EntityStorageBase.php: 0 added lines, 34 removed lines.
Original line number Diff line number Diff line
@@ -115,40 +115,6 @@ public function getEntityClass(?string $bundle = NULL): string {
    return $this->baseEntityClass;
  }

  /**
   * Warns subclasses not to directly access the deprecated entityClass property.
   *
   * @param string $name
   *   The name of the property to get.
   *
   * @todo Remove this in Drupal 10.
   * @see https://www.drupal.org/project/drupal/issues/3244802
   */
  public function __get($name) {
    if ($name === 'entityClass') {
      @trigger_error('Accessing the entityClass property directly is deprecated in drupal:9.3.0. Use ::getEntityClass() instead. See https://www.drupal.org/node/3191609', E_USER_DEPRECATED);
      return $this->getEntityClass();
    }
  }

  /**
   * Warns subclasses not to directly set the deprecated entityClass property.
   *
   * @param string $name
   *   The name of the property to set.
   * @param mixed $value
   *   The value to use.
   *
   * @todo Remove this in Drupal 10.
   * @see https://www.drupal.org/project/drupal/issues/3244802
   */
  public function __set(string $name, $value): void {
    if ($name === 'entityClass') {
      @trigger_error('Setting the entityClass property directly is deprecated in drupal:9.3.0 and has no effect in drupal:10.0.0. See https://www.drupal.org/node/3191609', E_USER_DEPRECATED);
      $this->baseEntityClass = $value;
    }
  }

  /**
   * {@inheritdoc}
   */
−8
Changes for core/lib/Drupal/Core/Entity/EntityType.php: 0 added lines, 8 removed lines.
Original line number Diff line number Diff line
@@ -431,14 +431,6 @@ public function entityClassImplements($interface) {
    return is_subclass_of($this->getClass(), $interface);
  }

  /**
   * {@inheritdoc}
   */
  public function isSubclassOf($class) {
    @trigger_error(__METHOD__ . '() is deprecated in drupal:8.3.0 and is removed from drupal:10.0.0. Use Drupal\Core\Entity\EntityTypeInterface::entityClassImplements() instead. See https://www.drupal.org/node/2842808', E_USER_DEPRECATED);
    return $this->entityClassImplements($class);
  }

  /**
   * {@inheritdoc}
   */
−17
Changes for core/lib/Drupal/Core/Entity/EntityTypeInterface.php: 0 added lines, 17 removed lines.
Original line number Diff line number Diff line
@@ -360,23 +360,6 @@ public function setAccessClass($class);
   */
  public function entityClassImplements($interface);

  /**
   * Indicates if the entity type is a subclass of the given class or interface.
   *
   * @param string $class
   *   The class or interface to check.
   *
   * @return bool
   *   TRUE if the entity type is a subclass of the class or interface.
   *
   * @deprecated in drupal:8.3.0 and is removed from drupal:10.0.0.
   *   Use Drupal\Core\Entity\EntityTypeInterface::entityClassImplements()
   *   instead.
   *
   * @see https://www.drupal.org/node/2842808
   */
  public function isSubclassOf($class);

  /**
   * Sets the handlers for a given type.
   *
Loading