diff --git a/core/modules/contextual/contextual.api.php b/core/modules/contextual/contextual.api.php
index e8f33ee..8eba601 100644
--- a/core/modules/contextual/contextual.api.php
+++ b/core/modules/contextual/contextual.api.php
@@ -18,9 +18,9 @@
  * is passed in by reference. Further links may be added or existing links can
  * be altered.
  *
- * @param $element
+ * @param array $element
  *   A renderable array representing the contextual links.
- * @param $items
+ * @param array $items
  *   An associative array containing the original contextual link items, as
  *   generated by menu_contextual_links(), which were used to build
  *   $element['#links'].
diff --git a/core/modules/contextual/contextual.module b/core/modules/contextual/contextual.module
index 37b3a21..ff032a9 100644
--- a/core/modules/contextual/contextual.module
+++ b/core/modules/contextual/contextual.module
@@ -121,15 +121,19 @@ function contextual_preprocess(&$variables, $hook) {
 /**
  * Pre-render callback: Builds a renderable array for contextual links.
  *
- * @param $element
+ * @param array $element
  *   A renderable array containing a #contextual_links property, which is a
  *   keyed array. Each key is the name of the implementing module, and each
  *   value is an array that forms the function arguments for
  *   menu_contextual_links(). For example:
  *   @code
  *     array('#contextual_links' => array(
- *       'block' => array('admin/structure/block/manage', array('system', 'navigation')),
- *       'menu' => array('admin/structure/menu/manage', array('navigation')),
+ *       'block' => array(
+ *         'admin/structure/block/manage', array('system', 'navigation')
+ *        ),
+ *        'menu' => array(
+ *          'admin/structure/menu/manage', array('navigation')
+ *        ),
  *     ))
  *   @endcode
  *
@@ -171,4 +175,3 @@ function contextual_pre_render_links($element) {
 
   return $element;
 }
-
diff --git a/core/modules/contextual/contextual.theme-rtl.css b/core/modules/contextual/contextual.theme-rtl.css
index f558ffa..2ae8746 100644
--- a/core/modules/contextual/contextual.theme-rtl.css
+++ b/core/modules/contextual/contextual.theme-rtl.css
@@ -14,6 +14,6 @@
 }
 
 .contextual-region .contextual .contextual-links a {
- text-align: right;
- padding: 0.4em 0.6em 0.4em 0.8em;
+  padding: 0.4em 0.6em 0.4em 0.8em;
+  text-align: right;
 }
diff --git a/core/modules/contextual/lib/Drupal/contextual/Tests/ContextualDynamicContextTest.php b/core/modules/contextual/lib/Drupal/contextual/Tests/ContextualDynamicContextTest.php
index da786a2..76dc9d8 100644
--- a/core/modules/contextual/lib/Drupal/contextual/Tests/ContextualDynamicContextTest.php
+++ b/core/modules/contextual/lib/Drupal/contextual/Tests/ContextualDynamicContextTest.php
@@ -29,7 +29,7 @@ class ContextualDynamicContextTest extends WebTestBase {
     );
   }
 
-  function setUp() {
+  public function setUp() {
     parent::setUp();
     $this->drupalCreateContentType(array('type' => 'page', 'name' => 'Basic page'));
     $this->drupalCreateContentType(array('type' => 'article', 'name' => 'Article'));
@@ -40,7 +40,7 @@ class ContextualDynamicContextTest extends WebTestBase {
   /**
    * Tests contextual links on node lists with different permissions.
    */
-  function testNodeLinks() {
+  protected function testNodeLinks() {
     // Create three nodes in the following order:
     // - An article, which should be user-editable.
     // - A page, which should not be user-editable.