From 93084ba962bdba722674cf9b7f7c52463149f728 Mon Sep 17 00:00:00 2001
From: Alex Pott <alex.a.pott@googlemail.com>
Date: Fri, 9 Apr 2021 00:20:05 +0100
Subject: [PATCH] Issue #3123058 by longwave, jungle, xjm, daffie: Fix
'Drupal.Commenting.DocComment.ParamGroup' coding standard
---
core/modules/field/src/EntityDisplayRebuilder.php | 1 -
core/modules/statistics/src/StatisticsStorageInterface.php | 1 -
.../tests/src/Functional/Form/LanguageSelectElementTest.php | 1 -
core/modules/user/src/Plugin/views/argument_default/User.php | 1 -
core/modules/user/user.module | 1 -
core/modules/views/src/Plugin/views/field/FieldPluginBase.php | 3 ---
core/phpcs.xml.dist | 3 +--
.../Core/Entity/EntityDecoupledTranslationRevisionsTest.php | 1 -
8 files changed, 1 insertion(+), 11 deletions(-)
diff --git a/core/modules/field/src/EntityDisplayRebuilder.php b/core/modules/field/src/EntityDisplayRebuilder.php
index 74c39737441d..4e618f657be0 100644
--- a/core/modules/field/src/EntityDisplayRebuilder.php
+++ b/core/modules/field/src/EntityDisplayRebuilder.php
@@ -70,7 +70,6 @@ public static function create(ContainerInterface $container) {
*
* @param string $entity_type_id
* The entity type machine name.
- *
* @param string $bundle
* The bundle we need to rebuild.
*/
diff --git a/core/modules/statistics/src/StatisticsStorageInterface.php b/core/modules/statistics/src/StatisticsStorageInterface.php
index 9109929ff144..b5da88a9f329 100644
--- a/core/modules/statistics/src/StatisticsStorageInterface.php
+++ b/core/modules/statistics/src/StatisticsStorageInterface.php
@@ -54,7 +54,6 @@ public function fetchView($id);
* - 'totalcount' The total number of views.
* - 'daycount' The number of views today.
* - 'timestamp' The unix timestamp of the last view.
- *
* @param int $limit
* The number of entity IDs to return.
*
diff --git a/core/modules/system/tests/src/Functional/Form/LanguageSelectElementTest.php b/core/modules/system/tests/src/Functional/Form/LanguageSelectElementTest.php
index f52f8bf87dcf..9d65a2273778 100644
--- a/core/modules/system/tests/src/Functional/Form/LanguageSelectElementTest.php
+++ b/core/modules/system/tests/src/Functional/Form/LanguageSelectElementTest.php
@@ -101,7 +101,6 @@ public function testHiddenLanguageSelectElement() {
*
* @param string $id
* The id of the language select element to check.
- *
* @param array $options
* An array with options to compare with.
*/
diff --git a/core/modules/user/src/Plugin/views/argument_default/User.php b/core/modules/user/src/Plugin/views/argument_default/User.php
index 448f79c55df3..3a4aa06c3c00 100644
--- a/core/modules/user/src/Plugin/views/argument_default/User.php
+++ b/core/modules/user/src/Plugin/views/argument_default/User.php
@@ -37,7 +37,6 @@ class User extends ArgumentDefaultPluginBase implements CacheableDependencyInter
* The plugin_id for the plugin instance.
* @param mixed $plugin_definition
* The plugin implementation definition.
- *
* @param \Drupal\Core\Routing\RouteMatchInterface $route_match
* The route match.
*/
diff --git a/core/modules/user/user.module b/core/modules/user/user.module
index 54c311ceb776..ef7bd083d14f 100644
--- a/core/modules/user/user.module
+++ b/core/modules/user/user.module
@@ -1026,7 +1026,6 @@ function user_role_revoke_permissions($rid, array $permissions = []) {
* - 'status_blocked': Account blocked.
* - 'cancel_confirm': Account cancellation request.
* - 'status_canceled': Account canceled.
- *
* @param \Drupal\Core\Session\AccountInterface $account
* The user object of the account being notified. Must contain at
* least the fields 'uid', 'name', and 'mail'.
diff --git a/core/modules/views/src/Plugin/views/field/FieldPluginBase.php b/core/modules/views/src/Plugin/views/field/FieldPluginBase.php
index cbd700faf260..a8a31f4f17f4 100644
--- a/core/modules/views/src/Plugin/views/field/FieldPluginBase.php
+++ b/core/modules/views/src/Plugin/views/field/FieldPluginBase.php
@@ -1365,7 +1365,6 @@ protected function renderAltered($alter, $tokens) {
* - word_boundary: Trim only on a word boundary.
* - ellipsis: Show an ellipsis (…) at the end of the trimmed string.
* - html: Make sure that the html is correct.
- *
* @param string $value
* The string which should be trimmed.
*
@@ -1681,7 +1680,6 @@ protected function getFieldTokenPlaceholder() {
*
* @param $array
* An array of values.
- *
* @param $parent_keys
* An array of parent keys. This will represent the array depth.
*
@@ -1793,7 +1791,6 @@ public function adminLabel($short = FALSE) {
* - word_boundary: Trim only on a word boundary.
* - ellipsis: Show an ellipsis (…) at the end of the trimmed string.
* - html: Make sure that the html is correct.
- *
* @param string $value
* The string which should be trimmed.
*
diff --git a/core/phpcs.xml.dist b/core/phpcs.xml.dist
index c8d861ea746e..124c13fdbe67 100644
--- a/core/phpcs.xml.dist
+++ b/core/phpcs.xml.dist
@@ -49,14 +49,13 @@
<!-- Sniff for these errors: SpacingAfterTagGroup, WrongEnd, SpacingBetween,
ContentAfterOpen, SpacingBeforeShort, TagValueIndent, ShortStartSpace,
SpacingAfter, LongNotCapital, ShortFullStop, TagGroupSpacing, Empty,
- TagsNotGrouped -->
+ TagsNotGrouped, ParamGroup -->
<!-- ParamNotFirst still not decided for PHPUnit-based tests.
@see https://www.drupal.org/node/2253915 -->
<exclude name="Drupal.Commenting.DocComment.ParamNotFirst"/>
<exclude name="Drupal.Commenting.DocComment.SpacingBeforeTags"/>
<exclude name="Drupal.Commenting.DocComment.LongFullStop"/>
<exclude name="Drupal.Commenting.DocComment.ShortNotCapital"/>
- <exclude name="Drupal.Commenting.DocComment.ParamGroup"/>
<exclude name="Drupal.Commenting.DocComment.ShortSingleLine"/>
<exclude name="Drupal.Commenting.DocComment.MissingShort"/>
</rule>
diff --git a/core/tests/Drupal/KernelTests/Core/Entity/EntityDecoupledTranslationRevisionsTest.php b/core/tests/Drupal/KernelTests/Core/Entity/EntityDecoupledTranslationRevisionsTest.php
index f2be89d3fd03..57e5f5f09b5f 100644
--- a/core/tests/Drupal/KernelTests/Core/Entity/EntityDecoupledTranslationRevisionsTest.php
+++ b/core/tests/Drupal/KernelTests/Core/Entity/EntityDecoupledTranslationRevisionsTest.php
@@ -255,7 +255,6 @@ public function dataTestUntranslatableFields() {
* @param array[] $sequence
* An array with arrays of arguments for the ::doSaveNewRevision() method as
* values. Every child array corresponds to a method invocation.
- *
* @param bool $default_translation_affected
* Whether untranslatable field changes affect all revisions or only the
* default revision.
--
GitLab