diff --git a/core/modules/block/lib/Drupal/block/BlockFormController.php b/core/modules/block/lib/Drupal/block/BlockFormController.php
index e90c5c5..3da6f93 100644
--- a/core/modules/block/lib/Drupal/block/BlockFormController.php
+++ b/core/modules/block/lib/Drupal/block/BlockFormController.php
@@ -290,7 +290,9 @@ public function validate(array $form, array &$form_state) {
     $form_state['values']['visibility']['role']['roles'] = array_filter($form_state['values']['visibility']['role']['roles']);
     // The Block Entity form puts all block plugin form elements in the
     // settings form element, so just pass that to the block for validation.
-    $settings = array('values' => &$form_state['values']['settings']);
+    $settings = array('values' =>
+      &$form_state['values']['settings'],
+    );
     // Call the plugin validate handler.
     $this->entity->getPlugin()->validateConfigurationForm($form, $settings);
   }
@@ -325,7 +327,9 @@ public function submit(array $form, array &$form_state) {
       'route_parameters' => array(
         'theme' => $form_state['values']['theme'],
       ),
-      'options' => array('query' => array('block-placement' => drupal_html_class($this->entity->id()))),
+      'options' => array('query' =>
+        array('block-placement' => drupal_html_class($this->entity->id())),
+      ),
     );
   }
 
diff --git a/core/modules/block/lib/Drupal/block/BlockPluginBag.php b/core/modules/block/lib/Drupal/block/BlockPluginBag.php
index 3c327b4..5693281 100644
--- a/core/modules/block/lib/Drupal/block/BlockPluginBag.php
+++ b/core/modules/block/lib/Drupal/block/BlockPluginBag.php
@@ -44,6 +44,8 @@ public function __construct(PluginManagerInterface $manager, $instance_id, array
 
   /**
    * {@inheritdoc}
+   *
+   * @return \Drupal\block\BlockPluginInterface
    */
   public function &get($instance_id) {
     return parent::get($instance_id);
diff --git a/core/modules/block/lib/Drupal/block/BlockPluginInterface.php b/core/modules/block/lib/Drupal/block/BlockPluginInterface.php
index dea63e7..568ffed 100644
--- a/core/modules/block/lib/Drupal/block/BlockPluginInterface.php
+++ b/core/modules/block/lib/Drupal/block/BlockPluginInterface.php
@@ -60,7 +60,7 @@ public function build();
    * @todo This doesn't belong here. Move this into a new base class in
    *   http://drupal.org/node/1764380.
    * @todo This does not set a value in \Drupal::config(), so the name is
-   * confusing.
+   *   confusing.
    *
    * @see \Drupal\Component\Plugin\PluginBase::$configuration
    */
diff --git a/core/modules/block/tests/Drupal/block/Tests/BlockConfigEntityUnitTest.php b/core/modules/block/tests/Drupal/block/Tests/BlockConfigEntityUnitTest.php
index d6fb278..1f264a0 100644
--- a/core/modules/block/tests/Drupal/block/Tests/BlockConfigEntityUnitTest.php
+++ b/core/modules/block/tests/Drupal/block/Tests/BlockConfigEntityUnitTest.php
@@ -22,16 +22,14 @@ class BlockConfigEntityUnitTest extends UnitTestCase {
   /**
    * The entity type used for testing.
    *
-   * @var \Drupal\Core\Entity\EntityTypeInterface
-   *   \PHPUnit_Framework_MockObject_MockObject
+   * @var \Drupal\Core\Entity\EntityTypeInterface|\PHPUnit_Framework_MockObject_MockObject
    */
   protected $entityType;
 
   /**
    * The entity manager used for testing.
    *
-   * @var \Drupal\Core\Entity\EntityManagerInterface
-   *   \PHPUnit_Framework_MockObject_MockObject
+   * @var \Drupal\Core\Entity\EntityManagerInterface|\PHPUnit_Framework_MockObject_MockObject
    */
   protected $entityManager;
 
@@ -45,8 +43,7 @@ class BlockConfigEntityUnitTest extends UnitTestCase {
   /**
    * The UUID generator used for testing.
    *
-   * @var \Drupal\Component\Uuid\UuidInterface
-   *   \PHPUnit_Framework_MockObject_MockObject
+   * @var \Drupal\Component\Uuid\UuidInterface|\PHPUnit_Framework_MockObject_MockObject
    */
   protected $uuid;
 
diff --git a/core/modules/block/tests/Drupal/block/Tests/Plugin/views/display/BlockTest.php b/core/modules/block/tests/Drupal/block/Tests/Plugin/views/display/BlockTest.php
index 2d13035..a02e17f 100644
--- a/core/modules/block/tests/Drupal/block/Tests/Plugin/views/display/BlockTest.php
+++ b/core/modules/block/tests/Drupal/block/Tests/Plugin/views/display/BlockTest.php
@@ -19,24 +19,21 @@ class BlockTest extends UnitTestCase {
   /**
    * The view executable.
    *
-   * @var \Drupal\views\ViewExecutable
-   *   \PHPUnit_Framework_MockObject_MockObject
+   * @var \Drupal\views\ViewExecutable|\PHPUnit_Framework_MockObject_MockObject
    */
   protected $executable;
 
   /**
    * The views block plugin.
    *
-   * @var \Drupal\views\Plugin\Block\ViewsBlock
-   *   \PHPUnit_Framework_MockObject_MockObject
+   * @var \Drupal\views\Plugin\Block\ViewsBlock|\PHPUnit_Framework_MockObject_MockObject
    */
   protected $blockPlugin;
 
   /**
    * The tested block display plugin.
    *
-   * @var \Drupal\block\Plugin\views\display\Block
-   *   \PHPUnit_Framework_MockObject_MockObject
+   * @var \Drupal\block\Plugin\views\display\Block|\PHPUnit_Framework_MockObject_MockObject
    */
   protected $blockDisplay;