diff --git a/composer.lock b/composer.lock
index 482cd43aa2c053f3a64346cf5ad11a187b2a5e8a..81ca12d579dba9d9c0b2231b9928385028a39634 100644
--- a/composer.lock
+++ b/composer.lock
@@ -3043,28 +3043,28 @@
         },
         {
             "name": "drupal/coder",
-            "version": "8.2.10",
+            "version": "8.2.11",
             "source": {
                 "type": "git",
                 "url": "https://github.com/klausi/coder.git",
-                "reference": "c835ff5c1733676fe0d3f3b861e814d570baaa6f"
+                "reference": "564a361274d8234d36385766f063ca89c4184479"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/klausi/coder/zipball/c835ff5c1733676fe0d3f3b861e814d570baaa6f",
-                "reference": "c835ff5c1733676fe0d3f3b861e814d570baaa6f",
+                "url": "https://api.github.com/repos/klausi/coder/zipball/564a361274d8234d36385766f063ca89c4184479",
+                "reference": "564a361274d8234d36385766f063ca89c4184479",
                 "shasum": ""
             },
             "require": {
                 "ext-mbstring": "*",
                 "php": ">=5.4.0",
-                "squizlabs/php_codesniffer": ">=2.7.0 <3.0",
+                "squizlabs/php_codesniffer": ">=2.8.1 <3.0",
                 "symfony/yaml": ">=2.0.0"
             },
             "require-dev": {
-                "phpunit/phpunit": ">=3.7"
+                "phpunit/phpunit": ">=3.7 <6"
             },
-            "type": "library",
+            "type": "phpcodesniffer-standard",
             "notification-url": "https://packagist.org/downloads/",
             "license": [
                 "GPL-2.0+"
@@ -3076,7 +3076,7 @@
                 "phpcs",
                 "standards"
             ],
-            "time": "2016-12-09T21:57:53+00:00"
+            "time": "2017-03-02T08:57:31+00:00"
         },
         {
             "name": "fabpot/goutte",
diff --git a/core/composer.json b/core/composer.json
index b1dd8cfa4747e51deada1f9f608a65d7bdffa039..503704cb7d2a324d11b9bec0318d07313ff5c0f7 100644
--- a/core/composer.json
+++ b/core/composer.json
@@ -38,7 +38,7 @@
     "require-dev": {
         "behat/mink": "1.7.x-dev",
         "behat/mink-goutte-driver": "~1.2",
-        "drupal/coder": "8.2.10",
+        "drupal/coder": "8.2.11",
         "jcalderonzumba/gastonjs": "~1.0.2",
         "jcalderonzumba/mink-phantomjs-driver": "~0.3.1",
         "mikey179/vfsStream": "~1.2",
diff --git a/core/modules/page_cache/tests/modules/page_cache_form_test.install b/core/modules/page_cache/tests/modules/page_cache_form_test.install
index 72e3d70b4a2f2cebb2f882cfba7e08214c781962..07f68ce48f1ccb79ebe21a3c667cf77ff74f4880 100644
--- a/core/modules/page_cache/tests/modules/page_cache_form_test.install
+++ b/core/modules/page_cache/tests/modules/page_cache_form_test.install
@@ -5,6 +5,9 @@
  * Install hooks for page_cache_form_test.
  */
 
+/**
+ * Implements hook_install().
+ */
 function page_cache_form_test_install() {
   // Set an explicit module weight, to ensure that the form alter hook is
   // always called after page_cache_form_alter().
diff --git a/core/phpcs.xml.dist b/core/phpcs.xml.dist
index e4e42bea220c196ce13ec25a5f5c066a87f8776d..bcfa4a347a86069436f257e5e4685ed9702a1246 100644
--- a/core/phpcs.xml.dist
+++ b/core/phpcs.xml.dist
@@ -55,9 +55,13 @@
     <exclude name="Drupal.Commenting.FunctionComment.MissingReturnComment"/>
     <exclude name="Drupal.Commenting.FunctionComment.MissingReturnType"/>
     <exclude name="Drupal.Commenting.FunctionComment.ParamCommentFullStop"/>
+    <exclude name="Drupal.Commenting.FunctionComment.ParamCommentIndentation"/>
+    <exclude name="Drupal.Commenting.FunctionComment.ParamCommentNewLine"/>
     <exclude name="Drupal.Commenting.FunctionComment.ParamCommentNotCapital"/>
+    <exclude name="Drupal.Commenting.FunctionComment.ParamMissingDefinition"/>
     <exclude name="Drupal.Commenting.FunctionComment.ParamNameNoMatch"/>
     <exclude name="Drupal.Commenting.FunctionComment.ParamTypeSpaces"/>
+    <exclude name="Drupal.Commenting.FunctionComment.ReturnCommentIndentation"/>
     <exclude name="Drupal.Commenting.FunctionComment.ReturnTypeSpaces"/>
     <exclude name="Drupal.Commenting.FunctionComment.TypeHintMissing"/>
   </rule>
diff --git a/core/tests/Drupal/Tests/Core/Extension/modules/module_handler_test/hook_include.inc b/core/tests/Drupal/Tests/Core/Extension/modules/module_handler_test/hook_include.inc
index 00c781d5a259e0fd5807d04410572bb8240be346..da3a9c249fcd185a8c10ea82f8bf8da571bd962c 100644
--- a/core/tests/Drupal/Tests/Core/Extension/modules/module_handler_test/hook_include.inc
+++ b/core/tests/Drupal/Tests/Core/Extension/modules/module_handler_test/hook_include.inc
@@ -5,4 +5,7 @@
  * Include file for test module.
  */
 
+/**
+ * Test hook.
+ */
 function module_handler_test_hook_include() {}
diff --git a/core/tests/Drupal/Tests/Core/Extension/modules/module_handler_test_added/module_handler_test_added.hook.inc b/core/tests/Drupal/Tests/Core/Extension/modules/module_handler_test_added/module_handler_test_added.hook.inc
index 718791b3ce654a7d4e2fee81e3945f7ffab79286..88e00574b49854f840ca4ac7e777df78e8b4820e 100644
--- a/core/tests/Drupal/Tests/Core/Extension/modules/module_handler_test_added/module_handler_test_added.hook.inc
+++ b/core/tests/Drupal/Tests/Core/Extension/modules/module_handler_test_added/module_handler_test_added.hook.inc
@@ -5,4 +5,9 @@
  * Include file for test module.
  */
 
-function module_handler_test_added_hook($arg) { return $arg; }
+/**
+ * Test function.
+ */
+function module_handler_test_added_hook($arg) {
+  return $arg;
+}
diff --git a/core/tests/Drupal/Tests/Core/Extension/modules/module_handler_test_added/module_handler_test_added.module b/core/tests/Drupal/Tests/Core/Extension/modules/module_handler_test_added/module_handler_test_added.module
index 0a46c33017813e16c67780c6525b667173ad15f8..09e54197eeca8c449498036a3c414abb0b839f06 100644
--- a/core/tests/Drupal/Tests/Core/Extension/modules/module_handler_test_added/module_handler_test_added.module
+++ b/core/tests/Drupal/Tests/Core/Extension/modules/module_handler_test_added/module_handler_test_added.module
@@ -5,4 +5,9 @@
  * Test module.
  */
 
-function module_handler_test_added_helper($arg) { return $arg; }
+/**
+ * Test function.
+ */
+function module_handler_test_added_helper($arg) {
+  return $arg;
+}
diff --git a/core/tests/Drupal/Tests/Core/Extension/modules/module_handler_test_all2/module_handler_test_all2.module b/core/tests/Drupal/Tests/Core/Extension/modules/module_handler_test_all2/module_handler_test_all2.module
index 9275ce366c51e452acf75df28cb055fffd5028fd..6915a52a8d846f68bea5177a4547fcc7e9d3cf54 100644
--- a/core/tests/Drupal/Tests/Core/Extension/modules/module_handler_test_all2/module_handler_test_all2.module
+++ b/core/tests/Drupal/Tests/Core/Extension/modules/module_handler_test_all2/module_handler_test_all2.module
@@ -5,4 +5,9 @@
  * Test module.
  */
 
-function module_handler_test_all2_hook($arg) { return $arg; }
+/**
+ * Test function.
+ */
+function module_handler_test_all2_hook($arg) {
+  return $arg;
+}