diff --git a/core/lib/Drupal/Component/Diff/Diff.php b/core/lib/Drupal/Component/Diff/Diff.php
index c70c417a8c48a3f6135ce8c1ffb71c6a1b7d4afd..8135b1582563d793c8780307a879291901251676 100644
--- a/core/lib/Drupal/Component/Diff/Diff.php
+++ b/core/lib/Drupal/Component/Diff/Diff.php
@@ -27,9 +27,11 @@ class Diff {
* Constructor.
* Computes diff between sequences of strings.
*
- * @param $from_lines array An array of strings.
- * (Typically these are lines from a file.)
- * @param $to_lines array An array of strings.
+ * @param array $from_lines
+ * An array of strings.
+ * (Typically these are lines from a file.)
+ * @param array $to_lines
+ * An array of strings.
*/
public function __construct($from_lines, $to_lines) {
$eng = new DiffEngine();
diff --git a/core/lib/Drupal/Component/Diff/MappedDiff.php b/core/lib/Drupal/Component/Diff/MappedDiff.php
index d49cc0df6227d6924b0112ec3923ceec81eddefa..32b38995d762239333a333ea5d929aeb6b0ec843 100644
--- a/core/lib/Drupal/Component/Diff/MappedDiff.php
+++ b/core/lib/Drupal/Component/Diff/MappedDiff.php
@@ -19,16 +19,17 @@ class MappedDiff extends Diff {
* case-insensitive diffs, or diffs which ignore
* changes in white-space.
*
- * @param $from_lines array An array of strings.
+ * @param array $from_lines
+ * An array of strings.
* (Typically these are lines from a file.)
- * @param $to_lines array An array of strings.
- * @param $mapped_from_lines array This array should
- * have the same size number of elements as $from_lines.
- * The elements in $mapped_from_lines and
- * $mapped_to_lines are what is actually compared
- * when computing the diff.
- * @param $mapped_to_lines array This array should
- * have the same number of elements as $to_lines.
+ * @param array $to_lines
+ * An array of strings.
+ * @param array $mapped_from_lines
+ * This array should have the same size number of elements as $from_lines.
+ * The elements in $mapped_from_lines and $mapped_to_lines are what is
+ * actually compared when computing the diff.
+ * @param array $mapped_to_lines
+ * This array should have the same number of elements as $to_lines.
*/
public function __construct($from_lines, $to_lines, $mapped_from_lines, $mapped_to_lines) {
diff --git a/core/modules/system/src/Tests/Session/SessionTest.php b/core/modules/system/src/Tests/Session/SessionTest.php
index fcadd42b91ea2cb6cc595997698d09183b730715..1be9561b36f75f3d5ad3d167871ee51b677a1a40 100644
--- a/core/modules/system/src/Tests/Session/SessionTest.php
+++ b/core/modules/system/src/Tests/Session/SessionTest.php
@@ -282,7 +282,8 @@ public function testEmptySessionID() {
/**
* Reset the cookie file so that it refers to the specified user.
*
- * @param $uid User id to set as the active session.
+ * @param $uid
+ * User id to set as the active session.
*/
public function sessionReset($uid = 0) {
// Close the internal browser.
diff --git a/core/phpcs.xml.dist b/core/phpcs.xml.dist
index 3ec3e1df1dee988231bf62d29d33083cf4f6a665..45dbe153e58bced260556c06f949f95789fcefe3 100644
--- a/core/phpcs.xml.dist
+++ b/core/phpcs.xml.dist
@@ -56,7 +56,6 @@
-