Expand CustomBlockInterface with methods

Removed unnecessary methods and converted a lot of code to method calls and related cleanup.

Fixed the revision id test, I have no idea how that is passing right now, it is wrong.

   // This will create a new revision that is not "front facing".
     // Save this as a non-default revision.
     $loaded->setNewRevision();
-    $loaded->isDefaultRevision = FALSE;
+    $loaded->isDefaultRevision(FALSE);
     $loaded->block_body = $this->randomName(8);
     $loaded->save();

isDefaultRevision is a protected property that goes through __set() which adds it to $this->values. Not what you want...

Removed getInfo() in favor of label().

Ups.

Uh, oh, thanks for tracking that down!

Seems like a case for @plach to look into.

Ah, right. ->langcode is not translatable, so $entity->getTranslation('de')->langcode->value is still the old langcode.

I remember that we had to do this as well for the config/content entity issue.

That's... confusing. Can we do something about it?

Someone up for a quick re-roll and try the approach suggested in #20?

#24: drupal8.custom-block.module.2028035-24.patch queued for re-testing.

1. +++ b/core/modules/block/custom_block/lib/Drupal/custom_block/CustomBlockFormController.php
   @@ -27,11 +27,11 @@ class CustomBlockFormController extends ContentEntityFormController {
        // Set up default values, if required.
   -    $block_type = entity_load('custom_block_type', $block->type->value);
   -    // If this is a new custom block, fill in the default values.
   -    if (isset($block->id->value)) {
   -      $block->set('log', NULL);
   +    if (!$block->isNew()) {
   +      $block->setRevisionLog(NULL);
        }
   +
   +    $block_type = entity_load('custom_block_type', $block->bundle());
        // Always use the default revision setting.
   

   Looks like the $block_type assignment moved below the other change, making the diff bigger than it has to by. Try to move it back into the original order to keep the necessary changes as small as possible.

2. +++ b/core/modules/block/custom_block/lib/Drupal/custom_block/CustomBlockFormController.php
   @@ -49,27 +49,30 @@ public function form(array $form, array &$form_state) {
        // Basic block information.
        // These elements are just values so they are not even sent to the client.
   -    foreach (array('revision_id', 'id') as $key) {
   -      $form[$key] = array(
   -        '#type' => 'value',
   -        '#value' => $block->$key->value,
   -      );
   -    }
   +    $form['id'] = array(
   +      '#type' => 'value',
   +      '#value' => $block->id(),
   +    );
   +
   +    $form['revision_id'] = array(
   +      '#type' => 'value',
   +      '#value' => $block->getRevisionId(),
   +    );
   

   Now that I look at this again, why do we even need this stuff? Shouldn't be here IMHO.

   Try to remove those two form definitions and see what happens.

3. +++ b/core/modules/block/custom_block/lib/Drupal/custom_block/Entity/CustomBlock.php
   @@ -137,18 +77,13 @@ public function createDuplicate() {
    
   -  /**
   -   * {@inheritdoc}
   -   */
   -  public function getRevisionId() {
   -    return $this->revision_id->value;
   -  }
   
   @@ -309,4 +227,34 @@ public function getChangedTime() {
   +  /**
   +   * {@inheritdoc}
   +   */
   +  public function getRevisionId() {
   +    return $this->get('revision_id')->value;
   +  }
   

   It seems this is just moved to a different location. Just like the first example, try to move it to the original location to keep the patch size down and make it easier to review.

1. +++ b/core/modules/block/custom_block/lib/Drupal/custom_block/CustomBlockInterface.php
   @@ -16,6 +16,36 @@
   +   *
   +   * @param string info
   

   info needs to be $info, didn't notice that before.

2. +++ b/core/modules/block/custom_block/lib/Drupal/custom_block/CustomBlockInterface.php
   @@ -16,6 +16,36 @@
   +   * @return \Drupal\custom_block\CustomBlock
   +   *   The class instance that this method is called on.
   

   Should be CustomBlock*Interface*.