Sub-Issue of #1976158: Rename entity storage/list/form/render "controllers" to handlers.

Rename Drupal\content_translation\ContentTranslationController (not the other one in the Controller namespace!) to ContentTranslationHandler.

Then to do the same for all subclasses of this for Node, Term and so on.

This class is referenced in the entity annotations, so make sure to do a text search for the class name so that you find those references as well.

CommentFileSizeAuthor
#16 2227973-16.content_translation.controller_rename.patch27.63 KBberdir
#11 interdiff.txt1.92 KBpfrenssen
#11 2227973-11.content_translation.controller_rename.patch27.63 KBpfrenssen
#9 interdiff.txt11.3 KBpfrenssen
#9 2227973-9.content_translation.controller_rename.patch27.84 KBpfrenssen
#5 2227973-5.content_translation.controller_rename.patch27.12 KBpfrenssen
#3 2227973-3.content_translation.controller_rename.patch74.91 KBpfrenssen

Comments

berdir’s picture

berdir
Primary language German
Location Switzerland
commented
Parent issue: » #1976158: Rename entity storage/list/form/render "controllers" to handlers
pfrenssen’s picture

pfrenssen
Location Sofia
commented
Assigned: Unassigned » pfrenssen
pfrenssen’s picture

pfrenssen
Location Sofia
commented
Assigned: pfrenssen » Unassigned
Status: Active » Needs review
StatusFileSize
new 2227973-3.content_translation.controller_rename.patch74.91 KB

Renamed the classes. I grepped the codebase and it looks like all instances are covered, but I might have missed something. Let's see what the bot thinks of it.

berdir’s picture

berdir
Primary language German
Location Switzerland
commented
Status: Needs review » Needs work

Looks like the patch didn't pick up the renames, make sure to use -M or see https://drupal.org/documentation/git/configure about renames.

pfrenssen’s picture

pfrenssen
Location Sofia
commented
StatusFileSize
new 2227973-5.content_translation.controller_rename.patch27.12 KB

Didn't know about that option, this is much easier to review! Only CommentTranslationHandler was not picked up, the file is so small that it probably exceeded a threshold for LoC changed to still be recognized as a rename.

pfrenssen’s picture

pfrenssen
Location Sofia
commented
Status: Needs work » Needs review
berdir’s picture

berdir
Primary language German
Location Switzerland
commented
Status: Needs review » Needs work 
  1. +++ b/core/modules/block/custom_block/lib/Drupal/custom_block/CustomBlockTranslationHandler.php
@@ -33,7 +33,7 @@ public function entityFormAlter(array &$form, array &$form_state, EntityInterfac
   /**
-   * Overrides ContentTranslationController::entityFormTitle().
+   * Overrides ContentTranslationHandler::entityFormTitle().

    When touching those, let's convert to {@inheritdoc}. 

  2. +++ b/core/modules/content_translation/lib/Drupal/content_translation/ContentTranslationHandler.php
@@ -2,7 +2,7 @@
  * @file
- * Definition of Drupal\content_translation\ContentTranslationController.
+ * Definition of Drupal\content_translation\ContentTranslationHandler.

    Same here, fix those by using Contains \Drupal... instead (note leading backslash)

pfrenssen’s picture

pfrenssen
Location Sofia
commented
Assigned: Unassigned » pfrenssen

I'll take care of it.

pfrenssen’s picture

pfrenssen
Location Sofia
commented
Status: Needs work » Needs review
StatusFileSize
new 2227973-9.content_translation.controller_rename.patch27.84 KB
new interdiff.txt11.3 KB
berdir’s picture

berdir
Primary language German
Location Switzerland
commented 
+++ b/core/modules/content_translation/lib/Drupal/content_translation/ContentTranslationHandler.php
@@ -42,7 +42,7 @@ public function __construct(EntityTypeInterface $entity_type) {
 
   /**
-   * Implements ContentTranslationControllerInterface::retranslate().
+   * Implements ContentTranslationHandlerInterface::retranslate().
    */
   public function retranslate(EntityInterface $entity, $langcode = NULL) {

Still a few left in this file. Just the Implements, the Form validation/submission references are fine.

pfrenssen’s picture

pfrenssen
Location Sofia
commented
StatusFileSize
new 2227973-11.content_translation.controller_rename.patch27.63 KB
new interdiff.txt1.92 KB

Fixed those too.

plach’s picture

plach
he/him
Primary language Italian
Location Venezia
commented
Status: Needs review » Reviewed & tested by the community

I completely agree with this rename (it matches how this stuff is called in D7 :) and the patch looks good!

Status: Reviewed & tested by the community » Needs work

The last submitted patch, 11: 2227973-11.content_translation.controller_rename.patch, failed testing.

berdir’s picture

berdir
Primary language German
Location Switzerland
commented
Status: Needs work » Reviewed & tested by the community

git rebase took care of the re-roll, so back to RTBC.

alexpott’s picture

alexpott
he/they
Primary language English
Location 🇪🇺🌍
commented
Status: Reviewed & tested by the community » Needs work
Issue tags: +Needs reroll

2227973-11.content_translation.controller_rename.patch no longer applies.

error: patch failed: core/modules/content_translation/lib/Drupal/content_translation/ContentTranslationController.php:12
error: core/modules/content_translation/lib/Drupal/content_translation/ContentTranslationController.php: patch does not apply
berdir’s picture

berdir
Primary language German
Location Switzerland
commented
Status: Needs work » Reviewed & tested by the community
Issue tags: -Needs reroll
StatusFileSize
new 2227973-16.content_translation.controller_rename.patch27.63 KB

Yeah, I failed to upload the re-roll it seems. Automatically done with git rebase, so back to RTBC.

alexpott’s picture

alexpott
he/they
Primary language English
Location 🇪🇺🌍
commented
Status: Reviewed & tested by the community » Fixed

Committed 3b3ba27 and pushed to 8.x. Thanks!

  • Commit 3b3ba27 on 8.x by alexpott: 
    Issue #2227973 by pfrenssen, Berdir: Rename ContentTranslationController...
alexpott’s picture

alexpott
he/they
Primary language English
Location 🇪🇺🌍
commented
Status: Reviewed & tested by the community » Fixed

Status: Fixed » Closed (fixed)

Automatically closed - issue fixed for 2 weeks with no activity.