diff --git a/core/modules/update/tests/src/Unit/ModuleVersionParserTest.php b/core/modules/update/tests/src/Unit/ModuleVersionParserTest.php index e019a2c443..f38950443d 100644 --- a/core/modules/update/tests/src/Unit/ModuleVersionParserTest.php +++ b/core/modules/update/tests/src/Unit/ModuleVersionParserTest.php @@ -78,7 +78,7 @@ public function testCreateFromSupportBranch($version, $excepted_version_info) { } /** - * Dataprovider for expected version information. + * Data provider for expected version information. * * @return array * Arrays of version information. diff --git a/core/modules/update/tests/src/Unit/UpdateFetcherTest.php b/core/modules/update/tests/src/Unit/UpdateFetcherTest.php index 4fa27ab759..9ac53a3491 100644 --- a/core/modules/update/tests/src/Unit/UpdateFetcherTest.php +++ b/core/modules/update/tests/src/Unit/UpdateFetcherTest.php @@ -67,20 +67,20 @@ public function providerTestUpdateBuildFetchUrl() { $project['info']['project status url'] = 'http://www.example.com'; $project['includes'] = ['module1' => 'Module 1', 'module2' => 'Module 2']; $site_key = ''; - $expected = 'http://www.example.com/' . $project['name'] . '/current'; + $expected = "http://www.example.com/{$project['name']}/current"; $data[] = [$project, $site_key, $expected]; // For disabled projects it shouldn't add the site key either. $site_key = 'site_key'; $project['project_type'] = 'disabled'; - $expected = 'http://www.example.com/' . $project['name'] . '/current'; + $expected = "http://www.example.com/{$project['name']}/current"; $data[] = [$project, $site_key, $expected]; // For enabled projects, test adding the site key. $project['project_type'] = ''; - $expected = 'http://www.example.com/' . $project['name'] . '/current'; + $expected = "http://www.example.com/{$project['name']}/current"; $expected .= '?site_key=site_key'; $expected .= '&list=' . rawurlencode('module1,module2'); @@ -88,7 +88,7 @@ public function providerTestUpdateBuildFetchUrl() { // Test when the URL contains a question mark. $project['info']['project status url'] = 'http://www.example.com/?project='; - $expected = 'http://www.example.com/?project=/' . $project['name'] . '/current'; + $expected = "http://www.example.com/?project=/{$project['name']}/current"; $expected .= '&site_key=site_key'; $expected .= '&list=' . rawurlencode('module1,module2'); diff --git a/core/modules/update/update.compare.inc b/core/modules/update/update.compare.inc index 2819fbfb14..e27c259182 100644 --- a/core/modules/update/update.compare.inc +++ b/core/modules/update/update.compare.inc @@ -126,11 +126,10 @@ function update_calculate_project_data($available) { * series to consider. The project defines the currently supported development * branches, so the first step is to make sure the development branch of the * current version is still supported. If so, then the major version of the - * current version is used. If the current - * version is not in supported branch, the project maintainer's recommended - * branch is used to determine the major version to use. There's also a check to - * make sure that this function never recommends an earlier release than the - * currently installed major version. + * current version is used. If the current version is not in a supported branch, + * the next supported branch is used to determine the major version to use. + * There's also a check to make sure that this function never recommends an + * earlier release than the currently installed major version. * * Given a target major version, the available releases are scanned looking for * the specific release to recommend (avoiding beta releases and development