Unnecessary @param tags & Missing variable names in block, block_content module

This all looks good, thanks!

One thing though:

+++ b/core/modules/block_content/src/Plugin/Block/BlockContentBlock.php
@@ -66,12 +66,13 @@ class BlockContentBlock extends BlockBase implements ContainerFactoryPluginInter
+   * @param \Drupal\Core\Routing\UrlGeneratorInterface $url_generator

If you are going to add a @param tag line, it also needs a documentation line below it.

Added Documentation line.

Patch #5 is correct. Patch #6 isn't -- the parameter is actually a class that generates URLs, not a generated URL and there is no given route anyway.

So, #5 is RTBC. Hiding #6 patch.

+++ b/core/modules/block_content/src/Plugin/Block/BlockContentBlock.php
@@ -66,12 +66,14 @@ class BlockContentBlock extends BlockBase implements ContainerFactoryPluginInter
+   * @param \Drupal\Core\Routing\UrlGeneratorInterface $url_generator
+   *   The url generator.

This class is also missing a protected property for $this->urlGenerator - let's add that here.

An interdiff would have been nice. ;)

Sorry, didn't notice this either in my previous reviews:

1. +++ b/core/modules/block_content/src/Plugin/Block/BlockContentBlock.php
   @@ -58,6 +58,13 @@ class BlockContentBlock extends BlockBase implements ContainerFactoryPluginInter
   +   * The url generator.
   

   url => URL

2. +++ b/core/modules/block_content/src/Plugin/Block/BlockContentBlock.php
   @@ -66,12 +73,14 @@ class BlockContentBlock extends BlockBase implements ContainerFactoryPluginInter
   +   *   The url generator.
   

   url => URL

Thanks!

Committed 3060a7c and pushed to 8.0.x. Thanks!

+++ b/core/modules/block_content/src/Plugin/Block/BlockContentBlock.php
@@ -58,6 +58,13 @@ class BlockContentBlock extends BlockBase implements ContainerFactoryPluginInter
   /**
+   * The URL generator.
+   *
+   * @var \Drupal\Core\Routing\UrlGeneratorInterface
+   */
+  protected $urlGenerator;

Technically this is an API change - but I think it is totally acceptable to protect this. Nothing should be publicly accessing this.