diff --git a/core/includes/form.inc b/core/includes/form.inc
index 9d253351e2..d99dca282a 100644
--- a/core/includes/form.inc
+++ b/core/includes/form.inc
@@ -787,8 +787,8 @@ function batch_set($batch_definition) {
* is omitted and no redirect response was returned by the 'finished'
* callback. Any query arguments will be automatically persisted.
* @param \Drupal\Core\Url $url
- * (optional - should only be used for separate scripts like update.php)
- * URL of the batch processing page.
+ * (optional) URL of the batch processing page. Should only be used for
+ * separate scripts like update.php.
* @param $redirect_callback
* (optional) Specify a function to be called to redirect to the progressive
* processing page.
diff --git a/core/lib/Drupal/Core/Access/AccessResultForbidden.php b/core/lib/Drupal/Core/Access/AccessResultForbidden.php
index 2dc913761c..3edae61af3 100644
--- a/core/lib/Drupal/Core/Access/AccessResultForbidden.php
+++ b/core/lib/Drupal/Core/Access/AccessResultForbidden.php
@@ -18,7 +18,7 @@ class AccessResultForbidden extends AccessResult implements AccessResultReasonIn
* Constructs a new AccessResultForbidden instance.
*
* @param null|string $reason
- * (optional) a message to provide details about this access result
+ * (optional) A message to provide details about this access result.
*/
public function __construct($reason = NULL) {
$this->reason = $reason;
diff --git a/core/lib/Drupal/Core/Access/AccessResultNeutral.php b/core/lib/Drupal/Core/Access/AccessResultNeutral.php
index 2fb75eb501..5839eae7e1 100644
--- a/core/lib/Drupal/Core/Access/AccessResultNeutral.php
+++ b/core/lib/Drupal/Core/Access/AccessResultNeutral.php
@@ -18,7 +18,7 @@ class AccessResultNeutral extends AccessResult implements AccessResultReasonInte
* Constructs a new AccessResultNeutral instance.
*
* @param null|string $reason
- * (optional) a message to provide details about this access result
+ * (optional) A message to provide details about this access result
*/
public function __construct($reason = NULL) {
$this->reason = $reason;
diff --git a/core/lib/Drupal/Core/Menu/MenuParentFormSelectorInterface.php b/core/lib/Drupal/Core/Menu/MenuParentFormSelectorInterface.php
index a376069cb0..1e1ec5bb52 100644
--- a/core/lib/Drupal/Core/Menu/MenuParentFormSelectorInterface.php
+++ b/core/lib/Drupal/Core/Menu/MenuParentFormSelectorInterface.php
@@ -42,7 +42,7 @@ public function getParentSelectOptions($id = '', array $menus = NULL, CacheableM
* (optional) ID of a link plugin. This will exclude the link and its
* children from being selected.
* @param array $menus
- * (optional) array of menu names as keys and titles as values to limit
+ * (optional) Array of menu names as keys and titles as values to limit
* the values that may be selected. If NULL, all menus will be included.
*
* @return array
diff --git a/core/modules/options/tests/src/Functional/OptionsFieldUITest.php b/core/modules/options/tests/src/Functional/OptionsFieldUITest.php
index e29a1d0550..df696d61c0 100644
--- a/core/modules/options/tests/src/Functional/OptionsFieldUITest.php
+++ b/core/modules/options/tests/src/Functional/OptionsFieldUITest.php
@@ -259,7 +259,7 @@ public function testOptionsTrimmedValuesText() {
* Helper function to create list field of a given type.
*
* @param string $type
- * 'list_integer', 'list_float' or 'list_string'
+ * One of 'list_integer', 'list_float' or 'list_string'.
*/
protected function createOptionsField($type) {
// Create a field.
diff --git a/core/modules/serialization/tests/src/Unit/Normalizer/NormalizerBaseTest.php b/core/modules/serialization/tests/src/Unit/Normalizer/NormalizerBaseTest.php
index f5e8f0f7b5..63b9bf714d 100644
--- a/core/modules/serialization/tests/src/Unit/Normalizer/NormalizerBaseTest.php
+++ b/core/modules/serialization/tests/src/Unit/Normalizer/NormalizerBaseTest.php
@@ -26,7 +26,7 @@ class NormalizerBaseTest extends UnitTestCase {
* @param mixed $data
* The data passed to supportsNormalization.
* @param string $supported_interface_or_class
- * (optional) the supported interface or class to set on the normalizer.
+ * (optional) The supported interface or class to set on the normalizer.
*/
public function testSupportsNormalization($expected_return, $data, $supported_interface_or_class = NULL) {
$normalizer_base = $this->getMockForAbstractClass('Drupal\Tests\serialization\Unit\Normalizer\TestNormalizerBase');
diff --git a/core/modules/views/src/Views.php b/core/modules/views/src/Views.php
index 9962d38d57..014beaefe1 100644
--- a/core/modules/views/src/Views.php
+++ b/core/modules/views/src/Views.php
@@ -283,8 +283,8 @@ public static function getDisabledViews() {
* Filters the views on status. Can either be 'all' (default), 'enabled' or
* 'disabled'
* @param mixed $exclude_view
- * view or current display to exclude
- * either a
+ * View or current display to exclude.
+ * Either a:
* - views object (containing $exclude_view->storage->name and $exclude_view->current_display)
* - views name as string: e.g. my_view
* - views name and display id (separated by ':'): e.g. my_view:default
diff --git a/core/phpcs.xml.dist b/core/phpcs.xml.dist
index a593e62c7d..0e2ea13524 100644
--- a/core/phpcs.xml.dist
+++ b/core/phpcs.xml.dist
@@ -57,7 +57,6 @@
-
diff --git a/core/tests/Drupal/Tests/Core/Menu/LocalTaskIntegrationTestBase.php b/core/tests/Drupal/Tests/Core/Menu/LocalTaskIntegrationTestBase.php
index 8ac0bbf536..839f8ae083 100644
--- a/core/tests/Drupal/Tests/Core/Menu/LocalTaskIntegrationTestBase.php
+++ b/core/tests/Drupal/Tests/Core/Menu/LocalTaskIntegrationTestBase.php
@@ -128,7 +128,7 @@ protected function getLocalTaskManager($module_dirs, $route_name, $route_params)
* @param $expected_tasks
* A list of tasks groups by level expected at the given route
* @param array $route_params
- * (optional) a list of route parameters used to resolve tasks.
+ * (optional) A list of route parameters used to resolve tasks.
*/
protected function assertLocalTasks($route_name, $expected_tasks, $route_params = []) {