diff --git a/core/includes/common.inc b/core/includes/common.inc index feceb5b..037c5b0 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 06a806b..aaa8408 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 1938ed6..bf85929 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 f5cba32..92ed706 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 a0bdc69..9a6e8bb 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 50692b2..bf2b335 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 136ec54..b634d51 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 8933310..8f2bffd 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 220fe7a..c52211d 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 984ff17..b0b10a5 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 d2a0072..06db8ec 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 4d12322..5ec490c 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 d16b48d..3a1d868 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 2f35a57..faa0d02 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 effbe63..f475117 100644 --- a/core/lib/Drupal/Core/Datetime/Element/Datelist.php +++ b/core/lib/Drupal/Core/Datetime/Element/Datelist.php @@ -352,7 +352,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 e7468ea..071bcc3 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 dda03df..dafa674 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 cdee878..c7848e2 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 5840a83..28ebcce 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 f0a3f86..08323dd 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 71a0568..e2181cf 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 bf51f8e..4ee308b 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 7b66d50..9420e8d 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 4df6468..5379eda 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 3cbbd5a..266ef64 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 28819dc..6d469e2 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 d564dd5..6d68c1e 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 74ea34c..7ea8bb4 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 ee275f7..a977c16 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 d95e6fa..2592f54 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 65acde5..fd3cfc1 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 1adbc51..b441e28 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 a8c89f8..920afeb 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 425fc1b..1852026 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 8682399..f25140f 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 6b24eab..70172e9 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 faa511b..12483a4 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 3aa8e68..67ad20f 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 6248b32..cd8bea8 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 961958b..2d8f4cb 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 f2b913f..8ff3235 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 bbb37bf..d1f3c95 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 cd9a973..98357c6 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 6f63134..e05fa21 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 9b22e35..56dcb9f 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 dccf586..ace42e6 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 b65ed41..e5149f6 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 93a02d8..abd717e 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 118b08a..8b98ec3 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 f17f102..a4ac605 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 2d3ecd8..38819e1 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 4ea8ddc..550e229 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 9c88d96..cc3b20a 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 a6f72a7..0633ac8 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 ccb3c61..cfbb17f 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 8e4482f..88f4069 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 01db0a7..349f694 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 baf803b..ea69e14 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 df98bfd..ce93c0e 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 1366dce..12adb4a 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 db6832f..09accee 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 1cc52f3..dd7c24c 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 1d01b92..28f13b3 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 ad15706..d1115a9 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 52926e3..4b0b44e 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 975c31f..93c1b06 100644 --- a/core/phpcs.xml.dist +++ b/core/phpcs.xml.dist @@ -19,17 +19,20 @@ - + ContentAfterOpen, SpacingBeforeShort, TagValueIndent, ShortStartSpace, + SpacingAfter --> - - + + + diff --git a/core/tests/Drupal/KernelTests/Component/Utility/SafeMarkupKernelTest.php b/core/tests/Drupal/KernelTests/Component/Utility/SafeMarkupKernelTest.php index c2b4b4a..cd42ad1 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 33fa30a..ce78ac3 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 40c2a58..c47d514 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));