diff --git a/core/lib/Drupal/Component/Datetime/DateTimePlus.php b/core/lib/Drupal/Component/Datetime/DateTimePlus.php
index b636262ef2..4086d29d5d 100644
--- a/core/lib/Drupal/Component/Datetime/DateTimePlus.php
+++ b/core/lib/Drupal/Component/Datetime/DateTimePlus.php
@@ -321,9 +321,9 @@ public function __call($method, $args) {
    * Returns the difference between two DateTimePlus objects.
    *
    * @param \Drupal\Component\Datetime\DateTimePlus|\DateTime $datetime2
-   *    The date to compare to.
+   *   The date to compare to.
    * @param bool $absolute
-   *    Should the interval be forced to be positive?
+   *   Should the interval be forced to be positive?
    *
    * @return \DateInterval
    *   A DateInterval object representing the difference between the two dates.
diff --git a/core/lib/Drupal/Component/Diff/MappedDiff.php b/core/lib/Drupal/Component/Diff/MappedDiff.php
index 32b38995d7..466e8f09a6 100644
--- a/core/lib/Drupal/Component/Diff/MappedDiff.php
+++ b/core/lib/Drupal/Component/Diff/MappedDiff.php
@@ -29,7 +29,7 @@ class MappedDiff extends Diff {
    *   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.
+   *   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/lib/Drupal/Component/PhpStorage/PhpStorageInterface.php b/core/lib/Drupal/Component/PhpStorage/PhpStorageInterface.php
index 735341d6b1..fb9194c98a 100644
--- a/core/lib/Drupal/Component/PhpStorage/PhpStorageInterface.php
+++ b/core/lib/Drupal/Component/PhpStorage/PhpStorageInterface.php
@@ -44,7 +44,7 @@ public function load($name);
    * @param string $name
    *   The virtual file name. Can be a relative path.
    * @param string $code
-   *    The PHP code to be saved.
+   *   The PHP code to be saved.
    *
    * @return bool
    *   TRUE if the save succeeded, FALSE if it failed.
diff --git a/core/lib/Drupal/Core/Cache/Cache.php b/core/lib/Drupal/Core/Cache/Cache.php
index f02a4e7cd7..9257aab3f6 100644
--- a/core/lib/Drupal/Core/Cache/Cache.php
+++ b/core/lib/Drupal/Core/Cache/Cache.php
@@ -20,9 +20,9 @@ class Cache {
    * Merges arrays of cache contexts and removes duplicates.
    *
    * @param array $a
-   *    Cache contexts array to merge.
+   *   Cache contexts array to merge.
    * @param array $b
-   *    Cache contexts array to merge.
+   *   Cache contexts array to merge.
    *
    * @return string[]
    *   The merged array of cache contexts.
@@ -46,9 +46,9 @@ public static function mergeContexts(array $a = [], array $b = []) {
    * they're constituted from.
    *
    * @param array $a
-   *    Cache tags array to merge.
+   *   Cache tags array to merge.
    * @param array $b
-   *    Cache tags array to merge.
+   *   Cache tags array to merge.
    *
    * @return string[]
    *   The merged array of cache tags.
@@ -67,9 +67,9 @@ public static function mergeTags(array $a = [], array $b = []) {
    * Ensures infinite max-age (Cache::PERMANENT) is taken into account.
    *
    * @param int $a
-   *    Max age value to merge.
+   *   Max age value to merge.
    * @param int $b
-   *    Max age value to merge.
+   *   Max age value to merge.
    *
    * @return int
    *   The minimum max-age value.
diff --git a/core/lib/Drupal/Core/Cron.php b/core/lib/Drupal/Core/Cron.php
index a544ca8db0..d0a9b688df 100644
--- a/core/lib/Drupal/Core/Cron.php
+++ b/core/lib/Drupal/Core/Cron.php
@@ -81,7 +81,7 @@ class Cron implements CronInterface {
    * @param \Drupal\Core\State\StateInterface $state
    *   The state service.
    * @param \Drupal\Core\Session\AccountSwitcherInterface $account_switcher
-   *    The account switching service.
+   *   The account switching service.
    * @param \Psr\Log\LoggerInterface $logger
    *   A logger instance.
    * @param \Drupal\Core\Queue\QueueWorkerManagerInterface $queue_manager
diff --git a/core/lib/Drupal/Core/Database/Driver/pgsql/Schema.php b/core/lib/Drupal/Core/Database/Driver/pgsql/Schema.php
index 4586d01058..fcf9d0084d 100644
--- a/core/lib/Drupal/Core/Database/Driver/pgsql/Schema.php
+++ b/core/lib/Drupal/Core/Database/Driver/pgsql/Schema.php
@@ -297,9 +297,9 @@ protected function createTableSql($name, $table) {
    * function it has to be processed by _db_process_field().
    *
    * @param $name
-   *    Name of the field.
+   *   Name of the field.
    * @param $spec
-   *    The field specification, as per the schema data structure format.
+   *   The field specification, as per the schema data structure format.
    */
   protected function createFieldSql($name, $spec) {
     // The PostgreSQL server converts names into lowercase, unless quoted.
diff --git a/core/lib/Drupal/Core/Database/Driver/sqlite/Schema.php b/core/lib/Drupal/Core/Database/Driver/sqlite/Schema.php
index 90c4848350..4399ddde94 100644
--- a/core/lib/Drupal/Core/Database/Driver/sqlite/Schema.php
+++ b/core/lib/Drupal/Core/Database/Driver/sqlite/Schema.php
@@ -149,9 +149,9 @@ protected function processField($field) {
    * to be processed by db_processField().
    *
    * @param $name
-   *    Name of the field.
+   *   Name of the field.
    * @param $spec
-   *    The field specification, as per the schema data structure format.
+   *   The field specification, as per the schema data structure format.
    */
   protected function createFieldSql($name, $spec) {
     if (!empty($spec['auto_increment'])) {
diff --git a/core/lib/Drupal/Core/EventSubscriber/PsrResponseSubscriber.php b/core/lib/Drupal/Core/EventSubscriber/PsrResponseSubscriber.php
index 8948258400..ed7312f087 100644
--- a/core/lib/Drupal/Core/EventSubscriber/PsrResponseSubscriber.php
+++ b/core/lib/Drupal/Core/EventSubscriber/PsrResponseSubscriber.php
@@ -25,7 +25,7 @@ class PsrResponseSubscriber implements EventSubscriberInterface {
    * Constructs a new PathRootsSubscriber instance.
    *
    * @param \Symfony\Bridge\PsrHttpMessage\HttpFoundationFactoryInterface $http_foundation_factory
-   *    The httpFoundation factory.
+   *   The httpFoundation factory.
    */
   public function __construct(HttpFoundationFactoryInterface $http_foundation_factory) {
     $this->httpFoundationFactory = $http_foundation_factory;
diff --git a/core/lib/Drupal/Core/Field/Plugin/Field/FieldFormatter/EntityReferenceFormatterBase.php b/core/lib/Drupal/Core/Field/Plugin/Field/FieldFormatter/EntityReferenceFormatterBase.php
index aa8f82934a..0ca145a165 100644
--- a/core/lib/Drupal/Core/Field/Plugin/Field/FieldFormatter/EntityReferenceFormatterBase.php
+++ b/core/lib/Drupal/Core/Field/Plugin/Field/FieldFormatter/EntityReferenceFormatterBase.php
@@ -158,7 +158,7 @@ public function prepareView(array $entities_items) {
    * Returns whether the entity referenced by an item needs to be loaded.
    *
    * @param \Drupal\Core\Field\Plugin\Field\FieldType\EntityReferenceItem $item
-   *    The item to check.
+   *   The item to check.
    *
    * @return bool
    *   TRUE if the entity needs to be loaded.
@@ -175,7 +175,7 @@ protected function needsEntityLoad(EntityReferenceItem $item) {
    * granting access.
    *
    * @param \Drupal\Core\Entity\EntityInterface $entity
-   *    The entity to check.
+   *   The entity to check.
    *
    * @return \Drupal\Core\Access\AccessResult
    *   A cacheable access result.
diff --git a/core/lib/Drupal/Core/Language/LanguageManager.php b/core/lib/Drupal/Core/Language/LanguageManager.php
index 7f3ddc816b..f4804caf42 100644
--- a/core/lib/Drupal/Core/Language/LanguageManager.php
+++ b/core/lib/Drupal/Core/Language/LanguageManager.php
@@ -376,7 +376,7 @@ public function getConfigOverrideLanguage() {
    * The locked languages are removed by default.
    *
    * @param \Drupal\Core\Language\LanguageInterface[] $languages
-   *    Array with languages to be filtered.
+   *   Array with languages to be filtered.
    * @param int $flags
    *   (optional) Specifies the state of the languages that have to be returned.
    *   It can be: LanguageInterface::STATE_CONFIGURABLE,
diff --git a/core/lib/Drupal/Core/Utility/Token.php b/core/lib/Drupal/Core/Utility/Token.php
index 1512b39bff..a250d5892b 100644
--- a/core/lib/Drupal/Core/Utility/Token.php
+++ b/core/lib/Drupal/Core/Utility/Token.php
@@ -283,8 +283,8 @@ public function scan($text) {
    *     modules require special formatting of token text, for example URL
    *     encoding or truncation to a specific length.
    * @param \Drupal\Core\Render\BubbleableMetadata $bubbleable_metadata
-   *    The bubbleable metadata. This is passed to the token replacement
-   *    implementations so that they can attach their metadata.
+   *   The bubbleable metadata. This is passed to the token replacement
+   *   implementations so that they can attach their metadata.
    *
    * @return array
    *   An associative array of replacement values, keyed by the original 'raw'
diff --git a/core/modules/aggregator/src/Controller/AggregatorController.php b/core/modules/aggregator/src/Controller/AggregatorController.php
index 021e4d10a2..0090ca3107 100644
--- a/core/modules/aggregator/src/Controller/AggregatorController.php
+++ b/core/modules/aggregator/src/Controller/AggregatorController.php
@@ -25,7 +25,7 @@ class AggregatorController extends ControllerBase {
    * Constructs a \Drupal\aggregator\Controller\AggregatorController object.
    *
    * @param \Drupal\Core\Datetime\DateFormatterInterface $date_formatter
-   *    The date formatter service.
+   *   The date formatter service.
    */
   public function __construct(DateFormatterInterface $date_formatter) {
     $this->dateFormatter = $date_formatter;
diff --git a/core/modules/contextual/src/ContextualController.php b/core/modules/contextual/src/ContextualController.php
index 0451a10e21..59a2ba0f95 100644
--- a/core/modules/contextual/src/ContextualController.php
+++ b/core/modules/contextual/src/ContextualController.php
@@ -24,7 +24,7 @@ class ContextualController implements ContainerInjectionInterface {
    * Constructors a new ContextualController
    *
    * @param \Drupal\Core\Render\RendererInterface $renderer
-   *    The renderer.
+   *   The renderer.
    */
   public function __construct(RendererInterface $renderer) {
     $this->renderer = $renderer;
diff --git a/core/modules/language/src/LanguageNegotiator.php b/core/modules/language/src/LanguageNegotiator.php
index db558992a4..a236a48d62 100644
--- a/core/modules/language/src/LanguageNegotiator.php
+++ b/core/modules/language/src/LanguageNegotiator.php
@@ -74,7 +74,7 @@ class LanguageNegotiator implements LanguageNegotiatorInterface {
    * Constructs a new LanguageNegotiator object.
    *
    * @param \Drupal\language\ConfigurableLanguageManagerInterface $language_manager
-   *    The language manager.
+   *   The language manager.
    * @param \Drupal\Component\Plugin\PluginManagerInterface $negotiator_manager
    *   The language negotiation methods plugin manager
    * @param \Drupal\Core\Config\ConfigFactoryInterface $config_factory
diff --git a/core/modules/node/src/NodeGrantDatabaseStorageInterface.php b/core/modules/node/src/NodeGrantDatabaseStorageInterface.php
index 235fbc06be..329d9a1049 100644
--- a/core/modules/node/src/NodeGrantDatabaseStorageInterface.php
+++ b/core/modules/node/src/NodeGrantDatabaseStorageInterface.php
@@ -31,11 +31,11 @@ public function checkAll(AccountInterface $account);
    * @param array $tables
    *   A list of tables that need to be part of the alter.
    * @param string $op
-   *    The operation to be performed on the node. Possible values are:
-   *    - "view"
-   *    - "update"
-   *    - "delete"
-   *    - "create"
+   *   The operation to be performed on the node. Possible values are:
+   *   - "view"
+   *   - "update"
+   *   - "delete"
+   *   - "create"
    * @param \Drupal\Core\Session\AccountInterface $account
    *   A user object representing the user for whom the operation is to be
    *   performed.
diff --git a/core/modules/views/src/Plugin/views/HandlerBase.php b/core/modules/views/src/Plugin/views/HandlerBase.php
index e582d783f9..9bc489f61f 100644
--- a/core/modules/views/src/Plugin/views/HandlerBase.php
+++ b/core/modules/views/src/Plugin/views/HandlerBase.php
@@ -214,13 +214,13 @@ public function sanitizeValue($value, $type = NULL) {
    * Transform a string by a certain method.
    *
    * @param $string
-   *    The input you want to transform.
+   *   The input you want to transform.
    * @param $option
-   *    How do you want to transform it, possible values:
-   *      - upper: Uppercase the string.
-   *      - lower: lowercase the string.
-   *      - ucfirst: Make the first char uppercase.
-   *      - ucwords: Make each word in the string uppercase.
+   *   How do you want to transform it, possible values:
+   *   - upper: Uppercase the string.
+   *   - lower: lowercase the string.
+   *   - ucfirst: Make the first char uppercase.
+   *   - ucwords: Make each word in the string uppercase.
    *
    * @return string
    *   The transformed string.
diff --git a/core/modules/views/src/Plugin/views/field/EntityOperations.php b/core/modules/views/src/Plugin/views/field/EntityOperations.php
index 4ca28f6d92..6f0882979a 100644
--- a/core/modules/views/src/Plugin/views/field/EntityOperations.php
+++ b/core/modules/views/src/Plugin/views/field/EntityOperations.php
@@ -46,7 +46,7 @@ class EntityOperations extends FieldPluginBase {
    * @param array $plugin_definition
    *   The plugin implementation definition.
    * @param \Drupal\Core\Entity\EntityManagerInterface $entity_manager
-   *    The entity manager.
+   *   The entity manager.
    * @param \Drupal\Core\Language\LanguageManagerInterface $language_manager
    *   The language manager.
    */
diff --git a/core/modules/views/src/Plugin/views/field/RenderedEntity.php b/core/modules/views/src/Plugin/views/field/RenderedEntity.php
index 3d0f8c72f2..8676386577 100644
--- a/core/modules/views/src/Plugin/views/field/RenderedEntity.php
+++ b/core/modules/views/src/Plugin/views/field/RenderedEntity.php
@@ -46,7 +46,7 @@ class RenderedEntity extends FieldPluginBase implements CacheableDependencyInter
    * @param array $plugin_definition
    *   The plugin implementation definition.
    * @param \Drupal\Core\Entity\EntityManagerInterface $entity_manager
-   *    The entity manager.
+   *   The entity manager.
    * @param \Drupal\Core\Language\LanguageManagerInterface $language_manager
    *   The language manager.
    */
diff --git a/core/modules/views/src/Plugin/views/style/StylePluginBase.php b/core/modules/views/src/Plugin/views/style/StylePluginBase.php
index d71db329e6..0971b2e49a 100644
--- a/core/modules/views/src/Plugin/views/style/StylePluginBase.php
+++ b/core/modules/views/src/Plugin/views/style/StylePluginBase.php
@@ -385,7 +385,7 @@ public function validateOptionsForm(&$form, FormStateInterface $form_state) {
    * @param \Drupal\Core\Form\FormStateInterface $form_state
    *   The current state of the form.
    * @param string $type
-   *    The display type, either block or page.
+   *   The display type, either block or page.
    */
   public function wizardForm(&$form, FormStateInterface $form_state, $type) {
   }
@@ -788,7 +788,7 @@ public function getField($index, $field) {
    * @param $index
    *   The index count of the row.
    * @param $field
-   *    The id of the field.
+   *   The id of the field.
    */
   public function getFieldValue($index, $field) {
     $this->view->row_index = $index;
diff --git a/core/modules/views/src/ViewExecutable.php b/core/modules/views/src/ViewExecutable.php
index f13c0e752d..7ca902906c 100644
--- a/core/modules/views/src/ViewExecutable.php
+++ b/core/modules/views/src/ViewExecutable.php
@@ -1338,8 +1338,8 @@ public function build($display_id = NULL) {
    * @todo Some filter needs this function, even it is internal.
    *
    * @param string $key
-   *    The type of handlers (filter etc.) which should be iterated over to
-   *    build the relationship and query information.
+   *   The type of handlers (filter etc.) which should be iterated over to build
+   *   the relationship and query information.
    */
   public function _build($key) {
     $handlers = &$this->$key;
diff --git a/core/modules/views/views.api.php b/core/modules/views/views.api.php
index c21b9c54e8..e6af1982f7 100644
--- a/core/modules/views/views.api.php
+++ b/core/modules/views/views.api.php
@@ -544,11 +544,11 @@ function hook_field_views_data(\Drupal\field\FieldStorageConfigInterface $field_
  * default data that views_field_default_views_data() supplies for the
  * field storage.
  *
- *  @param array $data
- *    The views data for the field storage. This has the same format as the
- *    return value of hook_views_data().
- *  @param \Drupal\field\FieldStorageConfigInterface $field_storage
- *    The field storage config entity.
+ * @param array $data
+ *   The views data for the field storage. This has the same format as the
+ *   return value of hook_views_data().
+ * @param \Drupal\field\FieldStorageConfigInterface $field_storage
+ *   The field storage config entity.
  *
  * @see views_views_data()
  * @see hook_field_views_data()
diff --git a/core/phpcs.xml.dist b/core/phpcs.xml.dist
index 870763eab9..3945d340e5 100644
--- a/core/phpcs.xml.dist
+++ b/core/phpcs.xml.dist
@@ -60,7 +60,6 @@
     <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.ParamMissingDefinition"/>
     <exclude name="Drupal.Commenting.FunctionComment.TypeHintMissing"/>
   </rule>
diff --git a/core/tests/Drupal/Tests/Component/Utility/UrlHelperTest.php b/core/tests/Drupal/Tests/Component/Utility/UrlHelperTest.php
index faff21bb32..84cac4c16b 100644
--- a/core/tests/Drupal/Tests/Component/Utility/UrlHelperTest.php
+++ b/core/tests/Drupal/Tests/Component/Utility/UrlHelperTest.php
@@ -391,11 +391,11 @@ public static function providerTestIsExternal() {
    * @covers ::filterBadProtocol
    *
    * @param string $uri
-   *    Protocol URI.
+   *   Protocol URI.
    * @param string $expected
-   *    Expected escaped value.
+   *   Expected escaped value.
    * @param array $protocols
-   *    Protocols to allow.
+   *   Protocols to allow.
    */
   public function testFilterBadProtocol($uri, $expected, $protocols) {
     UrlHelper::setAllowedProtocols($protocols);
@@ -430,11 +430,11 @@ public static function providerTestFilterBadProtocol() {
    * @covers ::stripDangerousProtocols
    *
    * @param string $uri
-   *    Protocol URI.
+   *   Protocol URI.
    * @param string $expected
-   *    Expected escaped value.
+   *   Expected escaped value.
    * @param array $protocols
-   *    Protocols to allow.
+   *   Protocols to allow.
    */
   public function testStripDangerousProtocols($uri, $expected, $protocols) {
     UrlHelper::setAllowedProtocols($protocols);
diff --git a/core/tests/Drupal/Tests/Core/EventSubscriber/PsrResponseSubscriberTest.php b/core/tests/Drupal/Tests/Core/EventSubscriber/PsrResponseSubscriberTest.php
index 3e1cca689e..f5855be837 100644
--- a/core/tests/Drupal/Tests/Core/EventSubscriber/PsrResponseSubscriberTest.php
+++ b/core/tests/Drupal/Tests/Core/EventSubscriber/PsrResponseSubscriberTest.php
@@ -77,7 +77,7 @@ public function testDoesNotConvertControllerResult() {
    * Sets up an alias event that return $controllerResult.
    *
    * @param mixed $controller_result
-   *    The return Object.
+   *   The return Object.
    *
    * @return \Symfony\Component\HttpKernel\Event\GetResponseForControllerResultEvent|\PHPUnit_Framework_MockObject_MockObject
    *   A mock object to test.
diff --git a/core/themes/engines/twig/twig.engine b/core/themes/engines/twig/twig.engine
index 791f9083b8..177e01a511 100644
--- a/core/themes/engines/twig/twig.engine
+++ b/core/themes/engines/twig/twig.engine
@@ -128,7 +128,7 @@ function twig_render_template($template_file, array $variables) {
  *
  * @param array|object $element
  *   The parent renderable array to exclude the child items.
- * @param string[] $args, ...
+ * @param string[] ...
  *   The string keys of $element to prevent printing.
  *
  * @return array