diff --git a/core/modules/contextual/contextual.api.php b/core/modules/contextual/contextual.api.php
index 2122d2c..428c514 100644
--- a/core/modules/contextual/contextual.api.php
+++ b/core/modules/contextual/contextual.api.php
@@ -23,8 +23,7 @@
  * @param array $items
  *   An associative array containing the original contextual link items, as
  *   generated by
- *   \Drupal\Core\Menu\ContextualLinkManagerInterface
- *    ::getContextualLinksArrayByGroup(),
+ *   \Drupal\Core\Menu\ContextualLinkManagerInterface::getContextualLinksArrayByGroup(),
  *   which were used to build $element['#links'].
  *
  * @see hook_contextual_links_alter()
diff --git a/core/modules/contextual/src/Plugin/views/field/ContextualLinks.php b/core/modules/contextual/src/Plugin/views/field/ContextualLinks.php
index 351302e..7267430 100644
--- a/core/modules/contextual/src/Plugin/views/field/ContextualLinks.php
+++ b/core/modules/contextual/src/Plugin/views/field/ContextualLinks.php
@@ -90,6 +90,9 @@ public function preRender(&$values) {
    * @param \Drupal\views\ResultRow $values
    *   The values retrieved from a single row of a view's query result.
    *
+   * @return string
+   *   The rendered HTML.
+   *
    * @see contextual_preprocess()
    * @see contextual_contextual_links_view_alter()
    */
diff --git a/core/modules/contextual/src/Tests/ContextualDynamicContextTest.php b/core/modules/contextual/src/Tests/ContextualDynamicContextTest.php
index 64111fd..1c9a8fb 100644
--- a/core/modules/contextual/src/Tests/ContextualDynamicContextTest.php
+++ b/core/modules/contextual/src/Tests/ContextualDynamicContextTest.php
@@ -120,6 +120,8 @@ public function testDifferentPermissions() {
    *
    * @param string $id
    *   A contextual link id.
+   *
+   * @return bool
    */
   protected function assertContextualLinkPlaceHolder($id) {
     $this->assertRaw('<div' . new Attribute(array('data-contextual-id' => $id)) . '></div>', format_string('Contextual link placeholder with id @id exists.', array('@id' => $id)));
diff --git a/core/modules/contextual/src/Tests/ContextualUnitTest.php b/core/modules/contextual/src/Tests/ContextualUnitTest.php
index 3d3fc62..66f446e 100644
--- a/core/modules/contextual/src/Tests/ContextualUnitTest.php
+++ b/core/modules/contextual/src/Tests/ContextualUnitTest.php
@@ -27,7 +27,7 @@ class ContextualUnitTest extends KernelTestBase {
   /**
    * Provides testcases for testContextualLinksToId() and.
    */
-  public function runContextualLinksIdTestcases() {
+  protected function runContextualLinksIdTestcases() {
     // Test branch conditions:
     // - one group.
     // - one dynamic path argument.