From 1d7b860554ed15e1381b5857616652a1955ba948 Mon Sep 17 00:00:00 2001
From: Alex Pott <alex.a.pott@googlemail.com>
Date: Thu, 5 May 2016 12:32:19 +0100
Subject: [PATCH] Issue #2716685 by Mile23: Part 2: Fix several errors in the
'Drupal.Commenting.DocComment' coding standard
(cherry picked from commit 70f58860c8603b3418b58b73f8d5a3b78dd270e8)
---
core/includes/common.inc | 1 -
core/includes/form.inc | 2 --
core/includes/install.core.inc | 2 +-
.../Diff/Engine/HWLDFWordAccumulator.php | 3 +-
core/lib/Drupal/Component/Diff/MappedDiff.php | 3 --
.../Exception/InvalidDecoratedMethod.php | 1 -
.../Plugin/Factory/DefaultFactory.php | 1 -
core/lib/Drupal/Component/Utility/Xss.php | 1 -
core/lib/Drupal/Core/Ajax/RemoveCommand.php | 1 -
.../Drupal/Core/Cache/CacheableMetadata.php | 1 -
.../Cache/Context/CacheContextsManager.php | 1 -
.../Core/Cache/MemoryCounterBackend.php | 2 --
.../Core/Controller/ControllerResolver.php | 1 -
.../Drupal/Core/Datetime/DrupalDateTime.php | 1 -
.../Drupal/Core/Datetime/Element/Datelist.php | 1 -
.../KeyValueStore/Query/QueryFactory.php | 1 -
.../Entity/Query/QueryAggregateInterface.php | 2 --
.../Core/Extension/ExtensionDiscovery.php | 1 -
.../Drupal/Core/Extension/ThemeHandler.php | 2 +-
core/lib/Drupal/Core/Form/FormState.php | 28 +++++++++----------
core/lib/Drupal/Core/Menu/MenuTreeStorage.php | 1 -
.../Core/Menu/MenuTreeStorageInterface.php | 1 -
.../AdminPathConfigEntityConverter.php | 1 -
core/lib/Drupal/Core/Path/AliasStorage.php | 1 -
core/lib/Drupal/Core/Routing/UrlGenerator.php | 2 +-
.../Core/StackMiddleware/KernelPreHandle.php | 1 -
.../Core/Utility/UnroutedUrlAssembler.php | 2 +-
.../modules/block_test/block_test.module | 2 +-
.../src/Plugin/Condition/BaloneySpam.php | 1 -
core/modules/book/src/BookManager.php | 1 -
.../modules/book/src/BookManagerInterface.php | 1 -
.../book/src/BookOutlineStorageInterface.php | 1 -
.../book/src/Controller/BookController.php | 1 -
.../ContentTranslationManagerInterface.php | 1 -
core/modules/datetime/datetime.module | 1 -
.../src/Tests/Views/FilterDateTimeTest.php | 2 +-
.../dblog/src/Controller/DbLogController.php | 1 -
.../tests/src/Kernel/EntityDisplayTest.php | 2 +-
.../file/src/FileUsage/FileUsageInterface.php | 1 -
.../file/tests/src/Kernel/ValidatorTest.php | 9 +++---
.../Normalizer/ContentEntityNormalizer.php | 1 -
.../src/Plugin/Condition/Language.php | 1 -
.../menu_link_content.module | 1 -
.../Plugin/Deriver/MenuLinkContentDeriver.php | 1 -
core/modules/migrate/src/Plugin/Migration.php | 2 +-
.../node/src/Plugin/Condition/NodeType.php | 1 -
.../Plugin/views/argument_default/Node.php | 1 -
core/modules/node/src/Tests/NodeTitleTest.php | 2 +-
.../Kernel/Migrate/d7/MigrateNodeTypeTest.php | 1 +
core/modules/options/options.api.php | 1 -
.../ChainEntityResolverTest.php | 1 -
.../src/Tests/Render/AjaxPageStateTest.php | 2 --
.../Tests/System/MainContentFallbackTest.php | 2 +-
.../modules/common_test/common_test.module | 1 -
.../condition_test/src/FormController.php | 1 -
.../src/Tests/ToolbarAdminMenuTest.php | 2 +-
core/modules/update/update.module | 1 -
.../user/src/Plugin/Condition/UserRole.php | 1 -
.../Plugin/migrate/process/ConvertTokens.php | 1 -
core/modules/user/user.module | 1 -
core/modules/views/src/ManyToOneHelper.php | 1 -
.../views/src/Plugin/views/PluginBase.php | 1 -
.../views/display/DisplayPluginInterface.php | 1 -
.../views/field/FieldHandlerInterface.php | 4 ---
.../src/Controller/ViewsUIController.php | 1 -
core/phpcs.xml.dist | 11 +++++---
.../Utility/SafeMarkupKernelTest.php | 1 -
.../Core/PathProcessor/PathProcessorTest.php | 2 +-
.../Drupal/Tests/Core/Utility/ErrorTest.php | 1 -
69 files changed, 40 insertions(+), 97 deletions(-)
diff --git a/core/includes/common.inc b/core/includes/common.inc
index feceb5bbe6be..037c5b0f4487 100644
--- a/core/includes/common.inc
+++ b/core/includes/common.inc
@@ -220,7 +220,6 @@ function valid_email_address($mail) {
* UrlHelper::filterBadProtocol() is functionality equivalent to check_url()
* apart from the fact it is protected from double escaping bugs. Note that
* this method no longer marks its output as safe.
- *
*/
function check_url($uri) {
return Html::escape(UrlHelper::stripDangerousProtocols($uri));
diff --git a/core/includes/form.inc b/core/includes/form.inc
index 06a806be9e62..aaa8408e4e62 100644
--- a/core/includes/form.inc
+++ b/core/includes/form.inc
@@ -313,7 +313,6 @@ function template_preprocess_checkboxes(&$variables) {
* An associative array containing:
* - element: An associative array containing the properties and children of
* the details element. Properties used: #children.
- *
*/
function template_preprocess_vertical_tabs(&$variables) {
$element = $variables['element'];
@@ -372,7 +371,6 @@ function template_preprocess_form(&$variables) {
* - element: An associative array containing the properties of the element.
* Properties used: #title, #value, #description, #rows, #cols,
* #placeholder, #required, #attributes, #resizable
- *
*/
function template_preprocess_textarea(&$variables) {
$element = $variables['element'];
diff --git a/core/includes/install.core.inc b/core/includes/install.core.inc
index 865685078e6d..8dd191cb1e55 100644
--- a/core/includes/install.core.inc
+++ b/core/includes/install.core.inc
@@ -1372,7 +1372,7 @@ function install_retrieve_file($uri, $destination) {
}
/**
- * Checks if the localization server can be contacted.
+ * Checks if the localization server can be contacted.
*
* @param string $uri
* The URI to contact.
diff --git a/core/lib/Drupal/Component/Diff/Engine/HWLDFWordAccumulator.php b/core/lib/Drupal/Component/Diff/Engine/HWLDFWordAccumulator.php
index f5cba327f8a0..92ed7067ba67 100644
--- a/core/lib/Drupal/Component/Diff/Engine/HWLDFWordAccumulator.php
+++ b/core/lib/Drupal/Component/Diff/Engine/HWLDFWordAccumulator.php
@@ -5,8 +5,7 @@
use Drupal\Component\Utility\Unicode;
/**
- * Additions by Axel Boldt follow, partly taken from diff.php, phpwiki-1.3.3
- *
+ * Additions by Axel Boldt follow, partly taken from diff.php, phpwiki-1.3.3
*/
/**
diff --git a/core/lib/Drupal/Component/Diff/MappedDiff.php b/core/lib/Drupal/Component/Diff/MappedDiff.php
index a0bdc69b904f..9a6e8bbfcdc3 100644
--- a/core/lib/Drupal/Component/Diff/MappedDiff.php
+++ b/core/lib/Drupal/Component/Diff/MappedDiff.php
@@ -21,15 +21,12 @@ class MappedDiff extends Diff {
*
* @param $from_lines array 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.
*/
diff --git a/core/lib/Drupal/Component/Plugin/Exception/InvalidDecoratedMethod.php b/core/lib/Drupal/Component/Plugin/Exception/InvalidDecoratedMethod.php
index 50692b2d8d1f..bf2b335fd3cb 100644
--- a/core/lib/Drupal/Component/Plugin/Exception/InvalidDecoratedMethod.php
+++ b/core/lib/Drupal/Component/Plugin/Exception/InvalidDecoratedMethod.php
@@ -7,6 +7,5 @@
/**
* Exception thrown when a decorator's _call() method is triggered, but the
* decorated object does not contain the requested method.
- *
*/
class InvalidDecoratedMethod extends BadMethodCallException implements ExceptionInterface { }
diff --git a/core/lib/Drupal/Component/Plugin/Factory/DefaultFactory.php b/core/lib/Drupal/Component/Plugin/Factory/DefaultFactory.php
index 136ec5444cb2..b634d51dd9fd 100644
--- a/core/lib/Drupal/Component/Plugin/Factory/DefaultFactory.php
+++ b/core/lib/Drupal/Component/Plugin/Factory/DefaultFactory.php
@@ -71,7 +71,6 @@ public function createInstance($plugin_id, array $configuration = array()) {
* @throws \Drupal\Component\Plugin\Exception\PluginException
* Thrown when there is no class specified, the class doesn't exist, or
* the class does not implement the specified required interface.
- *
*/
public static function getPluginClass($plugin_id, $plugin_definition = NULL, $required_interface = NULL) {
$missing_class_message = sprintf('The plugin (%s) did not specify an instance class.', $plugin_id);
diff --git a/core/lib/Drupal/Component/Utility/Xss.php b/core/lib/Drupal/Component/Utility/Xss.php
index 8933310d3d0a..8f2bffd94e4b 100644
--- a/core/lib/Drupal/Component/Utility/Xss.php
+++ b/core/lib/Drupal/Component/Utility/Xss.php
@@ -116,7 +116,6 @@ public static function filter($string, array $html_tags = NULL) {
* @ingroup sanitization
*
* @see \Drupal\Component\Utility\Xss::getAdminTagList()
- *
*/
public static function filterAdmin($string) {
return static::filter($string, static::$adminTags);
diff --git a/core/lib/Drupal/Core/Ajax/RemoveCommand.php b/core/lib/Drupal/Core/Ajax/RemoveCommand.php
index 220fe7a2d898..c52211d80a48 100644
--- a/core/lib/Drupal/Core/Ajax/RemoveCommand.php
+++ b/core/lib/Drupal/Core/Ajax/RemoveCommand.php
@@ -29,7 +29,6 @@ class RemoveCommand implements CommandInterface {
* Constructs a RemoveCommand object.
*
* @param string $selector
- *
*/
public function __construct($selector) {
$this->selector = $selector;
diff --git a/core/lib/Drupal/Core/Cache/CacheableMetadata.php b/core/lib/Drupal/Core/Cache/CacheableMetadata.php
index 984ff17799d9..b0b10a5a6347 100644
--- a/core/lib/Drupal/Core/Cache/CacheableMetadata.php
+++ b/core/lib/Drupal/Core/Cache/CacheableMetadata.php
@@ -6,7 +6,6 @@
* Defines a generic class for passing cacheability metadata.
*
* @ingroup cache
- *
*/
class CacheableMetadata implements RefinableCacheableDependencyInterface {
diff --git a/core/lib/Drupal/Core/Cache/Context/CacheContextsManager.php b/core/lib/Drupal/Core/Cache/Context/CacheContextsManager.php
index 57b79b612685..0e89fb9d43b8 100644
--- a/core/lib/Drupal/Core/Cache/Context/CacheContextsManager.php
+++ b/core/lib/Drupal/Core/Cache/Context/CacheContextsManager.php
@@ -98,7 +98,6 @@ public function getLabels($include_calculated_cache_contexts = FALSE) {
* @return \Drupal\Core\Cache\Context\ContextCacheKeys
* The ContextCacheKeys object containing the converted cache keys and
* cacheability metadata.
- *
*/
public function convertTokensToKeys(array $context_tokens) {
assert('$this->assertValidTokens($context_tokens)');
diff --git a/core/lib/Drupal/Core/Cache/MemoryCounterBackend.php b/core/lib/Drupal/Core/Cache/MemoryCounterBackend.php
index 4d12322dd9aa..5ec490c5969f 100644
--- a/core/lib/Drupal/Core/Cache/MemoryCounterBackend.php
+++ b/core/lib/Drupal/Core/Cache/MemoryCounterBackend.php
@@ -9,7 +9,6 @@
* many times a cache entry was set or requested.
*
* @todo On the longrun this backend should be replaced by phpunit mock objects.
- *
*/
class MemoryCounterBackend extends MemoryBackend {
@@ -49,7 +48,6 @@ public function delete($cid) {
*
* @param string $function
* The called function.
- *
* @param string $cid
* The cache ID of the cache entry to increase the counter.
*/
diff --git a/core/lib/Drupal/Core/Controller/ControllerResolver.php b/core/lib/Drupal/Core/Controller/ControllerResolver.php
index d16b48da3e94..3a1d8684acb9 100644
--- a/core/lib/Drupal/Core/Controller/ControllerResolver.php
+++ b/core/lib/Drupal/Core/Controller/ControllerResolver.php
@@ -46,7 +46,6 @@ class ControllerResolver extends BaseControllerResolver implements ControllerRes
*
* @param \Symfony\Bridge\PsrHttpMessage\HttpMessageFactoryInterface $http_message_factory
* The PSR-7 converter.
- *
* @param \Drupal\Core\DependencyInjection\ClassResolverInterface $class_resolver
* The class resolver.
*/
diff --git a/core/lib/Drupal/Core/Datetime/DrupalDateTime.php b/core/lib/Drupal/Core/Datetime/DrupalDateTime.php
index 2f35a57a33b0..faa0d022330f 100644
--- a/core/lib/Drupal/Core/Datetime/DrupalDateTime.php
+++ b/core/lib/Drupal/Core/Datetime/DrupalDateTime.php
@@ -24,7 +24,6 @@ class DrupalDateTime extends DateTimePlus {
/**
* Format string translation cache.
- *
*/
protected $formatTranslationCache;
diff --git a/core/lib/Drupal/Core/Datetime/Element/Datelist.php b/core/lib/Drupal/Core/Datetime/Element/Datelist.php
index 705001a19f30..76f61bb040a5 100644
--- a/core/lib/Drupal/Core/Datetime/Element/Datelist.php
+++ b/core/lib/Drupal/Core/Datetime/Element/Datelist.php
@@ -357,7 +357,6 @@ protected static function checkEmptyInputs($input, $parts) {
* Rounds minutes and seconds to nearest requested value.
*
* @param $date
- *
* @param $increment
*
* @return
diff --git a/core/lib/Drupal/Core/Entity/KeyValueStore/Query/QueryFactory.php b/core/lib/Drupal/Core/Entity/KeyValueStore/Query/QueryFactory.php
index e7468ea25492..071bcc315942 100644
--- a/core/lib/Drupal/Core/Entity/KeyValueStore/Query/QueryFactory.php
+++ b/core/lib/Drupal/Core/Entity/KeyValueStore/Query/QueryFactory.php
@@ -28,7 +28,6 @@ class QueryFactory implements QueryFactoryInterface {
/**
* Constructs a QueryFactory object.
- *
*/
public function __construct(KeyValueFactoryInterface $key_value_factory) {
$this->keyValueFactory = $key_value_factory;
diff --git a/core/lib/Drupal/Core/Entity/Query/QueryAggregateInterface.php b/core/lib/Drupal/Core/Entity/Query/QueryAggregateInterface.php
index dda03df64beb..dafa6748d014 100644
--- a/core/lib/Drupal/Core/Entity/Query/QueryAggregateInterface.php
+++ b/core/lib/Drupal/Core/Entity/Query/QueryAggregateInterface.php
@@ -48,7 +48,6 @@ public function groupBy($field);
* The aggregation function, for example COUNT or MIN.
* @param mixed $value
* The actual value of the field.
- *
* @param $operator
* Possible values:
* - '=', '<>', '>', '>=', '<', '<=', 'STARTS_WITH', 'CONTAINS',
@@ -58,7 +57,6 @@ public function groupBy($field);
* literals of the same type as the column.
* - 'BETWEEN': This operator expects $value to be an array of two literals
* of the same type as the column.
- *
* @param string $langcode
* (optional) The language code.
*
diff --git a/core/lib/Drupal/Core/Extension/ExtensionDiscovery.php b/core/lib/Drupal/Core/Extension/ExtensionDiscovery.php
index cdee87867b52..c7848e2aac7b 100644
--- a/core/lib/Drupal/Core/Extension/ExtensionDiscovery.php
+++ b/core/lib/Drupal/Core/Extension/ExtensionDiscovery.php
@@ -16,7 +16,6 @@
* $settings['extension_discovery_scan_tests'] = TRUE;
* @encode
* to your settings.php.
- *
*/
class ExtensionDiscovery {
diff --git a/core/lib/Drupal/Core/Extension/ThemeHandler.php b/core/lib/Drupal/Core/Extension/ThemeHandler.php
index 5840a83bd424..28ebcce01966 100644
--- a/core/lib/Drupal/Core/Extension/ThemeHandler.php
+++ b/core/lib/Drupal/Core/Extension/ThemeHandler.php
@@ -54,7 +54,7 @@ class ThemeHandler implements ThemeHandlerInterface {
protected $state;
/**
- * The config installer to install configuration.
+ * The config installer to install configuration.
*
* @var \Drupal\Core\Config\ConfigInstallerInterface
*/
diff --git a/core/lib/Drupal/Core/Form/FormState.php b/core/lib/Drupal/Core/Form/FormState.php
index f0a3f860db43..08323dd59d43 100644
--- a/core/lib/Drupal/Core/Form/FormState.php
+++ b/core/lib/Drupal/Core/Form/FormState.php
@@ -348,20 +348,20 @@ class FormState implements FormStateInterface {
protected $groups = array();
/**
- * This is not a special key, and no specific support is provided for it in
- * the Form API. By tradition it was the location where application-specific
- * data was stored for communication between the submit, validation, and form
- * builder functions, especially in a multi-step-style form. Form
- * implementations may use any key(s) within $form_state (other than the keys
- * listed here and other reserved ones used by Form API internals) for this
- * kind of storage. The recommended way to ensure that the chosen key doesn't
- * conflict with ones used by the Form API or other modules is to use the
- * module name as the key name or a prefix for the key name. For example, the
- * entity form classes use $this->entity in entity forms, or
- * $form_state->getFormObject()->getEntity() outside the controller, to store
- * information about the entity being edited, and this information stays
- * available across successive clicks of the "Preview" button (if available)
- * as well as when the "Save" button is finally clicked.
+ * This is not a special key, and no specific support is provided for it in
+ * the Form API. By tradition it was the location where application-specific
+ * data was stored for communication between the submit, validation, and form
+ * builder functions, especially in a multi-step-style form. Form
+ * implementations may use any key(s) within $form_state (other than the keys
+ * listed here and other reserved ones used by Form API internals) for this
+ * kind of storage. The recommended way to ensure that the chosen key doesn't
+ * conflict with ones used by the Form API or other modules is to use the
+ * module name as the key name or a prefix for the key name. For example, the
+ * entity form classes use $this->entity in entity forms, or
+ * $form_state->getFormObject()->getEntity() outside the controller, to store
+ * information about the entity being edited, and this information stays
+ * available across successive clicks of the "Preview" button (if available)
+ * as well as when the "Save" button is finally clicked.
*
* @var array
*/
diff --git a/core/lib/Drupal/Core/Menu/MenuTreeStorage.php b/core/lib/Drupal/Core/Menu/MenuTreeStorage.php
index 71a05680b610..e2181cf1c76f 100644
--- a/core/lib/Drupal/Core/Menu/MenuTreeStorage.php
+++ b/core/lib/Drupal/Core/Menu/MenuTreeStorage.php
@@ -1097,7 +1097,6 @@ protected function doBuildTreeData(array $links, array $parents = array(), $dept
* is an associative array of information about the menu link, containing
* the fields from the $this->table. This array must be ordered
* depth-first. MenuTreeStorage::loadTreeData() includes a sample query.
- *
* @param array $parents
* An array of the menu link ID values that are in the path from the current
* page to the root of the menu tree.
diff --git a/core/lib/Drupal/Core/Menu/MenuTreeStorageInterface.php b/core/lib/Drupal/Core/Menu/MenuTreeStorageInterface.php
index bf51f8efad6f..4ee308b96cb0 100644
--- a/core/lib/Drupal/Core/Menu/MenuTreeStorageInterface.php
+++ b/core/lib/Drupal/Core/Menu/MenuTreeStorageInterface.php
@@ -32,7 +32,6 @@ public function resetDefinitions();
*
* @param array $definitions
* The new menu link definitions.
- *
*/
public function rebuild(array $definitions);
diff --git a/core/lib/Drupal/Core/ParamConverter/AdminPathConfigEntityConverter.php b/core/lib/Drupal/Core/ParamConverter/AdminPathConfigEntityConverter.php
index 7b66d50ad113..9420e8dbbdfa 100644
--- a/core/lib/Drupal/Core/ParamConverter/AdminPathConfigEntityConverter.php
+++ b/core/lib/Drupal/Core/ParamConverter/AdminPathConfigEntityConverter.php
@@ -47,7 +47,6 @@ class AdminPathConfigEntityConverter extends EntityConverter {
* The config factory.
* @param \Drupal\Core\Routing\AdminContext $admin_context
* The route admin context service.
- *
*/
public function __construct(EntityManagerInterface $entity_manager, ConfigFactoryInterface $config_factory, AdminContext $admin_context) {
parent::__construct($entity_manager);
diff --git a/core/lib/Drupal/Core/Path/AliasStorage.php b/core/lib/Drupal/Core/Path/AliasStorage.php
index 4df646803e40..5379edad1d9d 100644
--- a/core/lib/Drupal/Core/Path/AliasStorage.php
+++ b/core/lib/Drupal/Core/Path/AliasStorage.php
@@ -42,7 +42,6 @@ class AliasStorage implements AliasStorageInterface {
*
* @param \Drupal\Core\Database\Connection $connection
* A database connection for reading and writing path aliases.
- *
* @param \Drupal\Core\Extension\ModuleHandlerInterface $module_handler
* The module handler.
*/
diff --git a/core/lib/Drupal/Core/Routing/UrlGenerator.php b/core/lib/Drupal/Core/Routing/UrlGenerator.php
index e7b7aa96c0b2..6d8db00f11b0 100644
--- a/core/lib/Drupal/Core/Routing/UrlGenerator.php
+++ b/core/lib/Drupal/Core/Routing/UrlGenerator.php
@@ -63,7 +63,7 @@ class UrlGenerator implements UrlGeneratorInterface {
];
/**
- * Constructs a new generator object.
+ * Constructs a new generator object.
*
* @param \Drupal\Core\Routing\RouteProviderInterface $provider
* The route provider to be searched for routes.
diff --git a/core/lib/Drupal/Core/StackMiddleware/KernelPreHandle.php b/core/lib/Drupal/Core/StackMiddleware/KernelPreHandle.php
index 28819dc3d8f7..6d469e2507e9 100644
--- a/core/lib/Drupal/Core/StackMiddleware/KernelPreHandle.php
+++ b/core/lib/Drupal/Core/StackMiddleware/KernelPreHandle.php
@@ -30,7 +30,6 @@ class KernelPreHandle implements HttpKernelInterface {
*
* @param \Symfony\Component\HttpKernel\HttpKernelInterface $http_kernel
* The wrapped HTTP kernel.
- *
* @param \Drupal\Core\DrupalKernelInterface $drupal_kernel
* The main Drupal kernel.
*/
diff --git a/core/lib/Drupal/Core/Utility/UnroutedUrlAssembler.php b/core/lib/Drupal/Core/Utility/UnroutedUrlAssembler.php
index d564dd5d947b..6d68c1e4bc20 100644
--- a/core/lib/Drupal/Core/Utility/UnroutedUrlAssembler.php
+++ b/core/lib/Drupal/Core/Utility/UnroutedUrlAssembler.php
@@ -29,7 +29,7 @@ class UnroutedUrlAssembler implements UnroutedUrlAssemblerInterface {
protected $pathProcessor;
/**
- * Constructs a new unroutedUrlAssembler object.
+ * Constructs a new unroutedUrlAssembler object.
*
* @param \Symfony\Component\HttpFoundation\RequestStack $request_stack
* A request stack object.
diff --git a/core/modules/block/tests/modules/block_test/block_test.module b/core/modules/block/tests/modules/block_test/block_test.module
index 74ea34c3e616..7ea8bb4d6f8e 100644
--- a/core/modules/block/tests/modules/block_test/block_test.module
+++ b/core/modules/block/tests/modules/block_test/block_test.module
@@ -2,7 +2,7 @@
/**
* @file
- * Provide test blocks.
+ * Provide test blocks.
*/
use Drupal\Core\Block\BlockPluginInterface;
diff --git a/core/modules/block/tests/modules/block_test/src/Plugin/Condition/BaloneySpam.php b/core/modules/block/tests/modules/block_test/src/Plugin/Condition/BaloneySpam.php
index ee275f7eac49..a977c166e214 100644
--- a/core/modules/block/tests/modules/block_test/src/Plugin/Condition/BaloneySpam.php
+++ b/core/modules/block/tests/modules/block_test/src/Plugin/Condition/BaloneySpam.php
@@ -11,7 +11,6 @@
* id = "baloney_spam",
* label = @Translation("Baloney spam"),
* )
- *
*/
class BaloneySpam extends ConditionPluginBase {
diff --git a/core/modules/book/src/BookManager.php b/core/modules/book/src/BookManager.php
index d95e6fa6811b..2592f54310ac 100644
--- a/core/modules/book/src/BookManager.php
+++ b/core/modules/book/src/BookManager.php
@@ -1045,7 +1045,6 @@ protected function buildBookOutlineData(array $links, array $parents = array(),
*
* @return array
* Book tree.
- *
*/
protected function buildBookOutlineRecursive(&$links, $parents, $depth) {
$tree = array();
diff --git a/core/modules/book/src/BookManagerInterface.php b/core/modules/book/src/BookManagerInterface.php
index 65acde5b6d9b..fd3cfc1077f7 100644
--- a/core/modules/book/src/BookManagerInterface.php
+++ b/core/modules/book/src/BookManagerInterface.php
@@ -81,7 +81,6 @@ public function loadBookLink($nid, $translate = TRUE);
*
* @param int[] $nids
* An array of nids to load.
- *
* @param bool $translate
* If TRUE, set access, title, and other elements.
*
diff --git a/core/modules/book/src/BookOutlineStorageInterface.php b/core/modules/book/src/BookOutlineStorageInterface.php
index 1adbc5157db4..b441e286a24d 100644
--- a/core/modules/book/src/BookOutlineStorageInterface.php
+++ b/core/modules/book/src/BookOutlineStorageInterface.php
@@ -49,7 +49,6 @@ public function loadMultiple($nids, $access = TRUE);
*
* @param array $book_link
* The book link.
- *
* @param int $max_depth
* The maximum supported depth of the book tree.
*
diff --git a/core/modules/book/src/Controller/BookController.php b/core/modules/book/src/Controller/BookController.php
index a8c89f899dfb..920afeb2b1fc 100644
--- a/core/modules/book/src/Controller/BookController.php
+++ b/core/modules/book/src/Controller/BookController.php
@@ -71,7 +71,6 @@ public static function create(ContainerInterface $container) {
*
* @return array
* A render array representing the administrative page content.
- *
*/
public function adminOverview() {
$rows = array();
diff --git a/core/modules/content_translation/src/ContentTranslationManagerInterface.php b/core/modules/content_translation/src/ContentTranslationManagerInterface.php
index 425fc1b67bce..1852026126cd 100644
--- a/core/modules/content_translation/src/ContentTranslationManagerInterface.php
+++ b/core/modules/content_translation/src/ContentTranslationManagerInterface.php
@@ -74,7 +74,6 @@ public function setEnabled($entity_type_id, $bundle, $value);
* @returns bool
* TRUE if the specified bundle is translatable. If no bundle is provided
* returns TRUE if at least one of the entity bundles is translatable.
- *
*/
public function isEnabled($entity_type_id, $bundle = NULL);
diff --git a/core/modules/datetime/datetime.module b/core/modules/datetime/datetime.module
index 8682399def9c..f25140f0b061 100644
--- a/core/modules/datetime/datetime.module
+++ b/core/modules/datetime/datetime.module
@@ -50,7 +50,6 @@ function datetime_help($route_name, RouteMatchInterface $route_match) {
* same value for in both the local timezone and UTC.
*
* @param $date
- *
*/
function datetime_date_default_time($date) {
$date->setTime(12, 0, 0);
diff --git a/core/modules/datetime/src/Tests/Views/FilterDateTimeTest.php b/core/modules/datetime/src/Tests/Views/FilterDateTimeTest.php
index 6b24eab19bfd..70172e987346 100644
--- a/core/modules/datetime/src/Tests/Views/FilterDateTimeTest.php
+++ b/core/modules/datetime/src/Tests/Views/FilterDateTimeTest.php
@@ -100,7 +100,7 @@ protected function _testOffset() {
}
/**
- * Test between operations.
+ * Test between operations.
*/
protected function _testBetween() {
$view = Views::getView('test_filter_datetime');
diff --git a/core/modules/dblog/src/Controller/DbLogController.php b/core/modules/dblog/src/Controller/DbLogController.php
index faa511bcf7a3..12483a4b7481 100644
--- a/core/modules/dblog/src/Controller/DbLogController.php
+++ b/core/modules/dblog/src/Controller/DbLogController.php
@@ -234,7 +234,6 @@ public function overview() {
* @return array
* If the ID is located in the Database Logging table, a build array in the
* format expected by drupal_render();
- *
*/
public function eventDetails($event_id) {
$build = array();
diff --git a/core/modules/field_ui/tests/src/Kernel/EntityDisplayTest.php b/core/modules/field_ui/tests/src/Kernel/EntityDisplayTest.php
index 3aa8e686eb6a..67ad20fca0df 100644
--- a/core/modules/field_ui/tests/src/Kernel/EntityDisplayTest.php
+++ b/core/modules/field_ui/tests/src/Kernel/EntityDisplayTest.php
@@ -113,7 +113,7 @@ public function testEntityDisplayCRUD() {
}
/**
- * Test sorting of components by name on basic CRUD operations
+ * Test sorting of components by name on basic CRUD operations
*/
public function testEntityDisplayCRUDSort() {
$display = EntityViewDisplay::create(array(
diff --git a/core/modules/file/src/FileUsage/FileUsageInterface.php b/core/modules/file/src/FileUsage/FileUsageInterface.php
index 6248b32d6231..cd8bea851090 100644
--- a/core/modules/file/src/FileUsage/FileUsageInterface.php
+++ b/core/modules/file/src/FileUsage/FileUsageInterface.php
@@ -64,7 +64,6 @@ public function delete(FileInterface $file, $module, $type = NULL, $id = NULL, $
* A nested array with usage data. The first level is keyed by module name,
* the second by object type and the third by the object id. The value of
* the third level contains the usage count.
- *
*/
public function listUsage(FileInterface $file);
}
diff --git a/core/modules/file/tests/src/Kernel/ValidatorTest.php b/core/modules/file/tests/src/Kernel/ValidatorTest.php
index 961958bd91d2..2d8f4cb7f885 100644
--- a/core/modules/file/tests/src/Kernel/ValidatorTest.php
+++ b/core/modules/file/tests/src/Kernel/ValidatorTest.php
@@ -51,7 +51,7 @@ function testFileValidateExtensions() {
}
/**
- * This ensures a specific file is actually an image.
+ * This ensures a specific file is actually an image.
*/
function testFileValidateIsImage() {
$this->assertTrue(file_exists($this->image->getFileUri()), 'The image being tested exists.', 'File');
@@ -64,8 +64,9 @@ function testFileValidateIsImage() {
}
/**
- * This ensures the resolution of a specific file is within bounds.
- * The image will be resized if it's too large.
+ * This ensures the resolution of a specific file is within bounds.
+ *
+ * The image will be resized if it's too large.
*/
function testFileValidateImageResolution() {
// Non-images.
@@ -113,7 +114,7 @@ function testFileValidateImageResolution() {
}
/**
- * This will ensure the filename length is valid.
+ * This will ensure the filename length is valid.
*/
function testFileValidateNameLength() {
// Create a new file entity.
diff --git a/core/modules/hal/src/Normalizer/ContentEntityNormalizer.php b/core/modules/hal/src/Normalizer/ContentEntityNormalizer.php
index f2b913fb7067..8ff3235fab52 100644
--- a/core/modules/hal/src/Normalizer/ContentEntityNormalizer.php
+++ b/core/modules/hal/src/Normalizer/ContentEntityNormalizer.php
@@ -215,7 +215,6 @@ protected function getEntityUri(EntityInterface $entity) {
*
* @return array
* The typed data IDs.
- *
*/
protected function getTypedDataIds($types, $context = array()) {
// The 'type' can potentially contain an array of type objects. By default,
diff --git a/core/modules/language/src/Plugin/Condition/Language.php b/core/modules/language/src/Plugin/Condition/Language.php
index bbb37bf23208..d1f3c95cec46 100644
--- a/core/modules/language/src/Plugin/Condition/Language.php
+++ b/core/modules/language/src/Plugin/Condition/Language.php
@@ -19,7 +19,6 @@
* "language" = @ContextDefinition("language", label = @Translation("Language"))
* }
* )
- *
*/
class Language extends ConditionPluginBase implements ContainerFactoryPluginInterface {
diff --git a/core/modules/menu_link_content/menu_link_content.module b/core/modules/menu_link_content/menu_link_content.module
index cd9a97300f72..98357c6cd501 100644
--- a/core/modules/menu_link_content/menu_link_content.module
+++ b/core/modules/menu_link_content/menu_link_content.module
@@ -49,7 +49,6 @@ function menu_link_content_path_insert($path) {
*
* @param string $path
* The path alias.
- *
*/
function _menu_link_content_update_path_alias($path) {
/** @var \Drupal\Core\Menu\MenuLinkManagerInterface $menu_link_manager */
diff --git a/core/modules/menu_link_content/src/Plugin/Deriver/MenuLinkContentDeriver.php b/core/modules/menu_link_content/src/Plugin/Deriver/MenuLinkContentDeriver.php
index 6f631345cf5a..e05fa2158fd5 100644
--- a/core/modules/menu_link_content/src/Plugin/Deriver/MenuLinkContentDeriver.php
+++ b/core/modules/menu_link_content/src/Plugin/Deriver/MenuLinkContentDeriver.php
@@ -43,7 +43,6 @@ class MenuLinkContentDeriver extends DeriverBase implements ContainerDeriverInte
*
* @param \Drupal\Core\Entity\Query\QueryFactory $query_factory
* The query factory.
- *
* @param \Drupal\Core\Entity\EntityManagerInterface $entity_manager
* The entity manager.
* @param \Drupal\Core\Menu\MenuLinkManagerInterface $menu_link_manager
diff --git a/core/modules/migrate/src/Plugin/Migration.php b/core/modules/migrate/src/Plugin/Migration.php
index 9b22e359faeb..56dcb9f51586 100644
--- a/core/modules/migrate/src/Plugin/Migration.php
+++ b/core/modules/migrate/src/Plugin/Migration.php
@@ -217,7 +217,7 @@ class Migration extends PluginBase implements MigrationInterface, RequirementsIn
protected $migrationPluginManager;
/**
- * The source plugin manager.
+ * The source plugin manager.
*
* @var \Drupal\migrate\Plugin\MigratePluginManager
*/
diff --git a/core/modules/node/src/Plugin/Condition/NodeType.php b/core/modules/node/src/Plugin/Condition/NodeType.php
index dccf5862e105..ace42e6208ee 100644
--- a/core/modules/node/src/Plugin/Condition/NodeType.php
+++ b/core/modules/node/src/Plugin/Condition/NodeType.php
@@ -18,7 +18,6 @@
* "node" = @ContextDefinition("entity:node", label = @Translation("Node"))
* }
* )
- *
*/
class NodeType extends ConditionPluginBase implements ContainerFactoryPluginInterface {
diff --git a/core/modules/node/src/Plugin/views/argument_default/Node.php b/core/modules/node/src/Plugin/views/argument_default/Node.php
index b65ed4128239..e5149f652f84 100644
--- a/core/modules/node/src/Plugin/views/argument_default/Node.php
+++ b/core/modules/node/src/Plugin/views/argument_default/Node.php
@@ -35,7 +35,6 @@ class Node 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/node/src/Tests/NodeTitleTest.php b/core/modules/node/src/Tests/NodeTitleTest.php
index ea533004e18d..ba898ee0d803 100644
--- a/core/modules/node/src/Tests/NodeTitleTest.php
+++ b/core/modules/node/src/Tests/NodeTitleTest.php
@@ -41,7 +41,7 @@ protected function setUp() {
}
/**
- * Creates one node and tests if the node title has the correct value.
+ * Creates one node and tests if the node title has the correct value.
*/
function testNodeTitle() {
// Create "Basic page" content with title.
diff --git a/core/modules/node/tests/src/Kernel/Migrate/d7/MigrateNodeTypeTest.php b/core/modules/node/tests/src/Kernel/Migrate/d7/MigrateNodeTypeTest.php
index 118b08a4ef1b..8b98ec3048c4 100644
--- a/core/modules/node/tests/src/Kernel/Migrate/d7/MigrateNodeTypeTest.php
+++ b/core/modules/node/tests/src/Kernel/Migrate/d7/MigrateNodeTypeTest.php
@@ -35,6 +35,7 @@ protected function setUp() {
* Tests a single node type.
*
* @dataProvider testNodeTypeDataProvider
+ *
* @param string $id
* The node type ID.
* @param string $label
diff --git a/core/modules/options/options.api.php b/core/modules/options/options.api.php
index f17f102ce340..a4ac605d4c95 100644
--- a/core/modules/options/options.api.php
+++ b/core/modules/options/options.api.php
@@ -18,7 +18,6 @@
* \Drupal\Core\TypedData\OptionsProviderInterface::getSettableOptions(). An
* empty option (_none) might have been added, depending on the field
* properties.
- *
* @param array $context
* An associative array containing:
* - field_definition: The field definition
diff --git a/core/modules/serialization/tests/src/Unit/EntityResolver/ChainEntityResolverTest.php b/core/modules/serialization/tests/src/Unit/EntityResolver/ChainEntityResolverTest.php
index 2d3ecd8d3c9d..38819e11e54e 100644
--- a/core/modules/serialization/tests/src/Unit/EntityResolver/ChainEntityResolverTest.php
+++ b/core/modules/serialization/tests/src/Unit/EntityResolver/ChainEntityResolverTest.php
@@ -127,7 +127,6 @@ public function testResolverWithResolvedToZero() {
*
* @param null|int $return
* Whether the mocked resolve method should return TRUE or FALSE.
- *
* @param bool $called
* Whether or not the resolve method is expected to be called.
*
diff --git a/core/modules/system/src/Tests/Render/AjaxPageStateTest.php b/core/modules/system/src/Tests/Render/AjaxPageStateTest.php
index 4ea8ddcb18bf..550e229fec87 100644
--- a/core/modules/system/src/Tests/Render/AjaxPageStateTest.php
+++ b/core/modules/system/src/Tests/Render/AjaxPageStateTest.php
@@ -53,7 +53,6 @@ public function testLibrariesAvailable() {
* When called with ajax_page_state[libraries]=core/html5shiv the library
* should be excluded as it is already loaded. This should not affect other
* libraries so test if drupalSettings is still available.
- *
*/
public function testHtml5ShivIsNotLoaded() {
$this->drupalGet('node',
@@ -82,7 +81,6 @@ public function testHtml5ShivIsNotLoaded() {
*
* ajax_page_state[libraries] should be able to support multiple libraries
* comma separated.
- *
*/
public function testMultipleLibrariesAreNotLoaded() {
$this->drupalGet('node',
diff --git a/core/modules/system/src/Tests/System/MainContentFallbackTest.php b/core/modules/system/src/Tests/System/MainContentFallbackTest.php
index 9c88d96b9d7c..cc3b20a2e1f4 100644
--- a/core/modules/system/src/Tests/System/MainContentFallbackTest.php
+++ b/core/modules/system/src/Tests/System/MainContentFallbackTest.php
@@ -5,7 +5,7 @@
use Drupal\simpletest\WebTestBase;
/**
- * Test SimplePageVariant main content rendering fallback page display variant.
+ * Test SimplePageVariant main content rendering fallback page display variant.
*
* @group system
*/
diff --git a/core/modules/system/tests/modules/common_test/common_test.module b/core/modules/system/tests/modules/common_test/common_test.module
index a6f72a798797..0633ac889da4 100644
--- a/core/modules/system/tests/modules/common_test/common_test.module
+++ b/core/modules/system/tests/modules/common_test/common_test.module
@@ -210,7 +210,6 @@ function common_test_library_info_alter(&$libraries, $module) {
* cron going.
*
* @see common_test_cron_helper()
- *
*/
function common_test_cron() {
throw new Exception(t('Uncaught exception'));
diff --git a/core/modules/system/tests/modules/condition_test/src/FormController.php b/core/modules/system/tests/modules/condition_test/src/FormController.php
index ccb3c61ef7da..cfbb17f5ee0c 100644
--- a/core/modules/system/tests/modules/condition_test/src/FormController.php
+++ b/core/modules/system/tests/modules/condition_test/src/FormController.php
@@ -48,7 +48,6 @@ public function buildForm(array $form, FormStateInterface $form_state) {
/**
* Implements \Drupal\Core\Form\FormInterface::validateForm().
- *
*/
public function validateForm(array &$form, FormStateInterface $form_state) {
$this->condition->validateConfigurationForm($form, $form_state);
diff --git a/core/modules/toolbar/src/Tests/ToolbarAdminMenuTest.php b/core/modules/toolbar/src/Tests/ToolbarAdminMenuTest.php
index 4a6b46ac1635..56b9d69a1983 100644
--- a/core/modules/toolbar/src/Tests/ToolbarAdminMenuTest.php
+++ b/core/modules/toolbar/src/Tests/ToolbarAdminMenuTest.php
@@ -337,7 +337,7 @@ function testSubtreesJsonRequest() {
}
/**
- * Test that subtrees hashes vary by the language of the page.
+ * Test that subtrees hashes vary by the language of the page.
*/
function testLanguageSwitching() {
// Create a new language with the langcode 'xx'.
diff --git a/core/modules/update/update.module b/core/modules/update/update.module
index 01db0a79cb6a..349f6944516a 100644
--- a/core/modules/update/update.module
+++ b/core/modules/update/update.module
@@ -375,7 +375,6 @@ function update_get_available($refresh = FALSE) {
* project.
*
* @see \Drupal\update\UpdateFetcher::createFetchTask()
- *
*/
function update_create_fetch_task($project) {
\Drupal::service('update.processor')->createFetchTask($project);
diff --git a/core/modules/user/src/Plugin/Condition/UserRole.php b/core/modules/user/src/Plugin/Condition/UserRole.php
index baf803bc1dba..ea69e143216b 100644
--- a/core/modules/user/src/Plugin/Condition/UserRole.php
+++ b/core/modules/user/src/Plugin/Condition/UserRole.php
@@ -15,7 +15,6 @@
* "user" = @ContextDefinition("entity:user", label = @Translation("User"))
* }
* )
- *
*/
class UserRole extends ConditionPluginBase {
diff --git a/core/modules/user/src/Plugin/migrate/process/ConvertTokens.php b/core/modules/user/src/Plugin/migrate/process/ConvertTokens.php
index df98bfdc7c5d..ce93c0e794a7 100644
--- a/core/modules/user/src/Plugin/migrate/process/ConvertTokens.php
+++ b/core/modules/user/src/Plugin/migrate/process/ConvertTokens.php
@@ -19,7 +19,6 @@ class ConvertTokens extends ProcessPluginBase {
/**
* {@inheritdoc}
- *
*/
public function transform($value, MigrateExecutableInterface $migrate_executable, Row $row, $destination_property) {
$tokens = array(
diff --git a/core/modules/user/user.module b/core/modules/user/user.module
index 1366dce77caf..12adb4a2b1a3 100644
--- a/core/modules/user/user.module
+++ b/core/modules/user/user.module
@@ -261,7 +261,6 @@ function user_load_by_name($name) {
* @return string|null
* A translated violation message if the name is invalid or NULL if the name
* is valid.
- *
*/
function user_validate_name($name) {
$definition = BaseFieldDefinition::create('string')
diff --git a/core/modules/views/src/ManyToOneHelper.php b/core/modules/views/src/ManyToOneHelper.php
index db6832f33316..09accee5a605 100644
--- a/core/modules/views/src/ManyToOneHelper.php
+++ b/core/modules/views/src/ManyToOneHelper.php
@@ -17,7 +17,6 @@
* definition terms:
* - numeric: If true, treat this field as numeric, using %d instead of %s in
* queries.
- *
*/
class ManyToOneHelper {
diff --git a/core/modules/views/src/Plugin/views/PluginBase.php b/core/modules/views/src/Plugin/views/PluginBase.php
index 323a985ff7d6..c876f6db62e1 100644
--- a/core/modules/views/src/Plugin/views/PluginBase.php
+++ b/core/modules/views/src/Plugin/views/PluginBase.php
@@ -196,7 +196,6 @@ public function filterByDefinedOptions(array &$storage) {
*
* @param array $storage
* The stored options.
- *
* @param array $options
* The defined options.
*/
diff --git a/core/modules/views/src/Plugin/views/display/DisplayPluginInterface.php b/core/modules/views/src/Plugin/views/display/DisplayPluginInterface.php
index 1d01b923cae7..28f13b3a2499 100644
--- a/core/modules/views/src/Plugin/views/display/DisplayPluginInterface.php
+++ b/core/modules/views/src/Plugin/views/display/DisplayPluginInterface.php
@@ -545,7 +545,6 @@ public function remove();
*
* @return bool
* Returns whether the identifier is unique on all handlers.
- *
*/
public function isIdentifierUnique($id, $identifier);
diff --git a/core/modules/views/src/Plugin/views/field/FieldHandlerInterface.php b/core/modules/views/src/Plugin/views/field/FieldHandlerInterface.php
index ad15706e2f4c..d1115a94a671 100644
--- a/core/modules/views/src/Plugin/views/field/FieldHandlerInterface.php
+++ b/core/modules/views/src/Plugin/views/field/FieldHandlerInterface.php
@@ -132,7 +132,6 @@ public function getEntity(ResultRow $values);
* An object containing all retrieved values.
* @param string $field
* Optional name of the field where the value is stored.
- *
*/
public function getValue(ResultRow $values, $field = NULL);
@@ -153,7 +152,6 @@ public function useStringGroupBy();
*
* @param \Drupal\views\ResultRow[] $values
* An array of all ResultRow objects returned from the query.
- *
*/
public function preRender(&$values);
@@ -167,7 +165,6 @@ public function preRender(&$values);
* The rendered output. If the output is safe it will be wrapped in an
* object that implements MarkupInterface. If it is empty or unsafe it
* will be a string.
- *
*/
public function render(ResultRow $values);
@@ -204,7 +201,6 @@ public function postRender(ResultRow $row, $output);
* The advanced rendered output. If the output is safe it will be wrapped in
* an object that implements MarkupInterface. If it is empty or unsafe
* it will be a string.
- *
*/
public function advancedRender(ResultRow $values);
diff --git a/core/modules/views_ui/src/Controller/ViewsUIController.php b/core/modules/views_ui/src/Controller/ViewsUIController.php
index 52926e35bace..4b0b44e44435 100644
--- a/core/modules/views_ui/src/Controller/ViewsUIController.php
+++ b/core/modules/views_ui/src/Controller/ViewsUIController.php
@@ -153,7 +153,6 @@ public function reportPlugins() {
* @return \Drupal\Core\Ajax\AjaxResponse|\Symfony\Component\HttpFoundation\RedirectResponse
* Either returns a rebuilt listing page as an AJAX response, or redirects
* back to the listing page.
- *
*/
public function ajaxOperation(ViewEntityInterface $view, $op, Request $request) {
// Perform the operation.
diff --git a/core/phpcs.xml.dist b/core/phpcs.xml.dist
index 491a5f0551a1..09a6a315352e 100644
--- a/core/phpcs.xml.dist
+++ b/core/phpcs.xml.dist
@@ -19,17 +19,20 @@
<rule ref="Drupal.CSS.ColourDefinition"/>
<rule ref="Drupal.Commenting.DocComment">
<!-- Sniff for these errors: SpacingAfterTagGroup, WrongEnd, SpacingBetween,
- ContentAfterOpen, SpacingBeforeShort, TagValueIndent -->
- <exclude name="Drupal.Commenting.DocComment.ShortStartSpace"/>
+ ContentAfterOpen, SpacingBeforeShort, TagValueIndent, ShortStartSpace,
+ SpacingAfter -->
<exclude name="Drupal.Commenting.DocComment.LongNotCapital"/>
- <exclude name="Drupal.Commenting.DocComment.ParamGroup"/>
- <exclude name="Drupal.Commenting.DocComment.SpacingAfter"/>
+ <!-- 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.ShortFullStop"/>
+ <!-- TagsNotGrouped and ParamGroup have false-positives.
+ @see https://www.drupal.org/node/2060925 -->
<exclude name="Drupal.Commenting.DocComment.TagsNotGrouped"/>
+ <exclude name="Drupal.Commenting.DocComment.ParamGroup"/>
<exclude name="Drupal.Commenting.DocComment.ShortSingleLine"/>
<exclude name="Drupal.Commenting.DocComment.TagGroupSpacing"/>
<exclude name="Drupal.Commenting.DocComment.MissingShort"/>
diff --git a/core/tests/Drupal/KernelTests/Component/Utility/SafeMarkupKernelTest.php b/core/tests/Drupal/KernelTests/Component/Utility/SafeMarkupKernelTest.php
index c2b4b4a4559d..cd42ad1b7bdf 100644
--- a/core/tests/Drupal/KernelTests/Component/Utility/SafeMarkupKernelTest.php
+++ b/core/tests/Drupal/KernelTests/Component/Utility/SafeMarkupKernelTest.php
@@ -32,7 +32,6 @@ protected function setUp() {
*
* @param string $uri
* The URI of the resource.
- *
* @param array $options
* The options to pass to Url::fromUri().
*
diff --git a/core/tests/Drupal/Tests/Core/PathProcessor/PathProcessorTest.php b/core/tests/Drupal/Tests/Core/PathProcessor/PathProcessorTest.php
index 33fa30a15c71..ce78ac328cd2 100644
--- a/core/tests/Drupal/Tests/Core/PathProcessor/PathProcessorTest.php
+++ b/core/tests/Drupal/Tests/Core/PathProcessor/PathProcessorTest.php
@@ -29,7 +29,7 @@ class PathProcessorTest extends UnitTestCase {
protected $languages;
/**
- * The language manager stub used to construct a PathProcessorLanguage object.
+ * The language manager stub used to construct a PathProcessorLanguage object.
*
* @var \Drupal\language\ConfigurableLanguageManagerInterface|\PHPUnit_Framework_MockObject_MockBuilder
*/
diff --git a/core/tests/Drupal/Tests/Core/Utility/ErrorTest.php b/core/tests/Drupal/Tests/Core/Utility/ErrorTest.php
index 40c2a58878f8..c47d5144c808 100644
--- a/core/tests/Drupal/Tests/Core/Utility/ErrorTest.php
+++ b/core/tests/Drupal/Tests/Core/Utility/ErrorTest.php
@@ -20,7 +20,6 @@ class ErrorTest extends UnitTestCase {
* The expected return array.
*
* @dataProvider providerTestGetLastCaller
- *
*/
public function testGetLastCaller($backtrace, $expected) {
$this->assertSame($expected, Error::getLastCaller($backtrace));
--
GitLab