Change $entity_type to $entity_type_id and $entity_info to $entity_type/$entity_types

#2005716: Promote EntityType to a domain object went in.

Well, I guess that's what we get for renames like this :)

Only renamed $entity_info/$info and $entity-type just when it was in the way. No idea how to identify $entity_type's that are ID's, also not sure if we need to.

One part I didn't touch, and that's hook_entity_info() and the _alter(), not sure what to do about that' Just rename $entity_info and worry about the hook in a different issue?

Doing the hook rename over there would be OK with me.

Missed to update route defaults/arguments, this should fix most of those tests, didn't check if all are due to this.

Fixing more routing stuff...

I didn't do any regex-ing, that was all PhpStorm rename refactoring, weird. it did something similar to some other arguments.

I tried that form manually and it worked, so I didn't look closer, I guess I just tested the ajax part that still worked?

1. +++ b/core/lib/Drupal/Core/Entity/ContentEntityBase.php
   @@ -716,8 +716,8 @@ public function addTranslation($langcode, array $values = array()) {
   -    $info = $this->getEntityType();
   
   +++ b/core/lib/Drupal/Core/Config/Entity/Query/Query.php
   @@ -85,8 +85,8 @@ public function condition($property, $value = NULL, $operator = NULL, $langcode
   -    $entity_info = $this->entityManager->getDefinition($this->getEntityType());
   

   Let's fill a follow up to change the entity query class to also use something like getEntityTypeId.

2. +++ b/core/modules/block/lib/Drupal/block/BlockAccessController.php
   @@ -31,22 +31,22 @@ class BlockAccessController extends EntityAccessController implements EntityCont
       *   The entity info for the entity type.
   ...
   +   * @param \Drupal\Core\Entity\EntityTypeInterface $entity_type
   ...
   -   * @param \Drupal\Core\Entity\EntityTypeInterface $entity_info
   

   it is a bit sad that we should probably better update the documentation in another follow up. this patch is big enough already.

3. +++ b/core/modules/content_translation/lib/Drupal/content_translation/ContentTranslationController.php
   @@ -32,12 +32,12 @@ class ContentTranslationController implements ContentTranslationControllerInterf
   +  public function __construct($entity_type) {
   

   Another follow up: typehint all those instances.

4. +++ b/core/modules/edit/lib/Drupal/edit/Form/EditFieldForm.php
   @@ -80,19 +80,19 @@ public function getFormId() {
   +    if ($entityId instanceof EntityChangedInterface) {
   ...
   -    if ($entity instanceof EntityChangedInterface) {
   ...
   +  public function buildForm(array $form, array &$form_state, EntityInterface $entityId = NULL, $field_name = NULL) {
   ...
   +      $this->init($form_state, $entityId, $field_name);
   ...
   -      $this->init($form_state, $entity, $field_name);
   

   My head thought for a while that entityId is an interface, luckily it won't and my head did not exploded.

Thanks for the review!

1. #2191651: Rename Drupal\Core\Entity\Query\QueryInterface::getEntityType() to getEntityTypeId()
2. Fixed all "entity info" that made sense in this context, left a few related to entity_info_cache_clear() and hook_entity_info(), will clean that up in the issue mentioned above.
3. #2191655: Type hint $entity_type everywhere it is an instance of EntityTypeInterface.
4. Yeah, PhpStorm doesn't like our buildForm() trick with additional optional arguments. If you try to rename a variable there, it attempts to match that *somehow* in all buildForm() implemetnations we have. For example, I tried to rename that back using PhpStorm and it removed _$id from $action_id, $ban_id, $entity_type_id, $test_id and so on, $resulting in $ban_, $action_, o.0

Together with #1981858: Rename hook_entity_info/alter() to hook_entity_type_build/alter(), which I will address next, this should allow us to remove "entity_info" completely :)

Re-roll.

Awesome

14: rename-entity-info-2165155-14.patch queued for re-testing.

14: rename-entity-info-2165155-14.patch queued for re-testing.

Committed 6c2ed3f and pushed to 8.x. Thanks!