diff --git a/core/includes/install.core.inc b/core/includes/install.core.inc index cfc0497bbc..9335221596 100644 --- a/core/includes/install.core.inc +++ b/core/includes/install.core.inc @@ -1810,10 +1810,11 @@ function _install_module_batch($module, $module_name, &$context) { * @param string $server_pattern * Server access pattern (to replace language code, version number, etc. in). * - * @return array + * @return array|null * Requirements compliance array. If the translation was downloaded * successfully then an empty array is returned. Otherwise the requirements - * error with detailed information. + * error with detailed information. NULL if the file already exists for this + * language code. */ function install_check_translations($langcode, $server_pattern) { $requirements = []; diff --git a/core/lib/Drupal/Component/Datetime/DateTimePlus.php b/core/lib/Drupal/Component/Datetime/DateTimePlus.php index 4086d29d5d..3495314984 100644 --- a/core/lib/Drupal/Component/Datetime/DateTimePlus.php +++ b/core/lib/Drupal/Component/Datetime/DateTimePlus.php @@ -630,8 +630,9 @@ public static function datePad($value, $size = 2) { * - timezone: (optional) String timezone name. Defaults to the timezone * of the date object. * - * @return string - * The formatted value of the date. + * @return string|null + * The formatted value of the date or NULL if there were construction + * errors. */ public function format($format, $settings = []) { diff --git a/core/lib/Drupal/Core/Entity/EntityListBuilder.php b/core/lib/Drupal/Core/Entity/EntityListBuilder.php index c1654362d0..7191fae8d4 100644 --- a/core/lib/Drupal/Core/Entity/EntityListBuilder.php +++ b/core/lib/Drupal/Core/Entity/EntityListBuilder.php @@ -246,9 +246,6 @@ public function render() { /** * Gets the title of the page. - * - * @return string - * A string title of the page. */ protected function getTitle() { return; diff --git a/core/modules/dblog/src/Controller/DbLogController.php b/core/modules/dblog/src/Controller/DbLogController.php index 10e2af8c56..8dd636f621 100644 --- a/core/modules/dblog/src/Controller/DbLogController.php +++ b/core/modules/dblog/src/Controller/DbLogController.php @@ -298,8 +298,9 @@ public function eventDetails($event_id) { /** * Builds a query for database log administration filters based on session. * - * @return array - * An associative array with keys 'where' and 'args'. + * @return array|null + * An associative array with keys 'where' and 'args' or NULL if there were + * no filters set. */ protected function buildFilterQuery() { if (empty($_SESSION['dblog_overview_filter'])) { diff --git a/core/modules/forum/tests/src/Functional/ForumTest.php b/core/modules/forum/tests/src/Functional/ForumTest.php index 76823a757c..260f63a830 100644 --- a/core/modules/forum/tests/src/Functional/ForumTest.php +++ b/core/modules/forum/tests/src/Functional/ForumTest.php @@ -525,8 +525,8 @@ public function testForumWithNewPost() { * @param bool $container * TRUE if $forum is a container; FALSE otherwise. * - * @return object - * The created topic node. + * @return object|null + * The created topic node or NULL if the forum is a container. */ public function createForumTopic($forum, $container = FALSE) { // Generate a random subject/body. diff --git a/core/modules/simpletest/simpletest.module b/core/modules/simpletest/simpletest.module index 27d770a922..27034dc219 100644 --- a/core/modules/simpletest/simpletest.module +++ b/core/modules/simpletest/simpletest.module @@ -772,9 +772,10 @@ function simpletest_mail_alter(&$message) { * @param $phpunit_xml_file * Path to the PHPUnit XML file. * - * @return array[] + * @return array[]|null * The results as array of rows in a format that can be inserted into - * {simpletest}. + * {simpletest}. If the phpunit_xml_file does not have any contents then the + * function will return NULL. */ function simpletest_phpunit_xml_to_rows($test_id, $phpunit_xml_file) { $contents = @file_get_contents($phpunit_xml_file); diff --git a/core/modules/system/src/Tests/Module/ModuleTestBase.php b/core/modules/system/src/Tests/Module/ModuleTestBase.php index a0a4ed226a..cc5a7ef270 100644 --- a/core/modules/system/src/Tests/Module/ModuleTestBase.php +++ b/core/modules/system/src/Tests/Module/ModuleTestBase.php @@ -90,8 +90,10 @@ public function assertModuleTablesDoNotExist($module) { * @param string $module * The name of the module. * - * @return bool - * TRUE if configuration has been installed, FALSE otherwise. + * @return bool|null + * TRUE if configuration has been installed, FALSE otherwise. Returns NULL + * if the module configuration directory does not exist or does not contain + * any configuration files. */ public function assertModuleConfig($module) { $module_config_dir = drupal_get_path('module', $module) . '/' . InstallStorage::CONFIG_INSTALL_DIRECTORY; diff --git a/core/modules/system/tests/src/Functional/Module/ModuleTestBase.php b/core/modules/system/tests/src/Functional/Module/ModuleTestBase.php index 392f2875e6..abdbe03916 100644 --- a/core/modules/system/tests/src/Functional/Module/ModuleTestBase.php +++ b/core/modules/system/tests/src/Functional/Module/ModuleTestBase.php @@ -87,8 +87,10 @@ public function assertModuleTablesDoNotExist($module) { * @param string $module * The name of the module. * - * @return bool - * TRUE if configuration has been installed, FALSE otherwise. + * @return bool|null + * TRUE if configuration has been installed, FALSE otherwise. Returns NULL + * if the module configuration directory does not exist or does not contain + * any configuration files. */ public function assertModuleConfig($module) { $module_config_dir = drupal_get_path('module', $module) . '/' . InstallStorage::CONFIG_INSTALL_DIRECTORY; diff --git a/core/phpcs.xml.dist b/core/phpcs.xml.dist index 3945d340e5..b198b813d8 100644 --- a/core/phpcs.xml.dist +++ b/core/phpcs.xml.dist @@ -52,7 +52,6 @@ -