If the site is on an insecure version of an old minor and there is a secure version of that old minor available, the update status report should link that release
Closes #2990476
Merge request reports
Activity
added 544 commits
-
6fa6d503...820d76b2 - 543 commits from branch
project:11.x - 8a51cf2d - Convert patch #55
-
6fa6d503...820d76b2 - 543 commits from branch
added 381 commits
-
8a51cf2d...f8a34d34 - 380 commits from branch
project:11.x - 199fd619 - Convert patch #55
-
8a51cf2d...f8a34d34 - 380 commits from branch
110 110 * The type of update message expected. 111 111 * @param string $update_element_css_locator 112 112 * The CSS locator for the page element that contains the security updates. 113 * @param string $recommended_security_release 114 * The recommended security release. 113 115 */ 114 protected function assertSecurityUpdates($project_path_part, array $expected_security_releases, $expected_update_message_type, $update_element_css_locator) { 116 protected function assertSecurityUpdates($project_path_part, array $expected_security_releases, $expected_update_message_type, $update_element_css_locator, string $recommended_security_release) { -
I'm probably missing something, but I've looked through the test-only changes in this MR 3 times and I don't see why we've added this final parameter and updated all the providers, since it doesn't look like we do anything with this string.
assertSecurityUpdates()).
165 175 'expected_security_releases' => ['1.2'], 166 176 'expected_update_message_type' => static::UPDATE_AVAILABLE, 167 177 'fixture' => 'sec.8.1.2', 178 'recommended_security_release' => '', - Comment on lines 171 to +178
573 580 $project_data['reason'] = t('Invalid info'); 574 581 } 575 582 } 583 584 /** 585 * Updates recommended if there is a later security release in ihe same minor. 586 * 587 * @param $project_data 588 * An array containing information about a specific project. 589 * @param $release_module_version 590 * The current release extension object. - Comment on lines +589 to +590
"extension object"? So we assume this is a
Drupal\update\ProjectRelease? We should say so. Also see above that these are for themes, too, so we don't wantmodule_in the name... changed this line in version 5 of the diff
573 580 $project_data['reason'] = t('Invalid info'); 574 581 } 575 582 } 583 584 /** 585 * Updates recommended if there is a later security release in ihe same minor. 586 * 587 * @param $project_data 588 * An array containing information about a specific project. 589 * @param $release_module_version 590 * The current release extension object. 591 */ 592 function update_recommended(&$project_data, $release_module_version): void { -
As new code, can we add the types?
Also, see above about the name of this parameter. I'm not exactly sure what it should be called, but maybe
$installed_versionis short and sweet? The rest of the function will need to be updated to match... changed this line in version 4 of the diff
358 358 $recommended_version_without_extra = ''; 359 359 $recommended_release = NULL; 360 360 $release_is_supported = FALSE; 361 $release_module_version = NULL; -
All this plumbing works on both modules and themes, so I doubt this is the right name for this variable. Everywhere else we call these "project releases". So probably something like this would be better:
$project_release_version = NULL;That said, I'm not totally understanding the point of this variable (yet) and the entire code base is dealing with "project release versions" of all sorts.
$project_installed_release_version = NULL;Maybe? Or even just this?
This function is per-project already, so we don't really have to keep saying so.
changed this line in version 5 of the diff
This was PHPStorm was complaining about $release_module_version not being set. Since the new method no longer uses that variable this line has been removed.
Also, the variable '$release_module_version' was added to core in 2020, in #3074993. A name change would be something for another issue.
370 371 } 371 372 372 373 try { 373 374 $release_module_version = ExtensionVersion::createFromVersionString($release->getVersion()); added 124 commits
-
199fd619...20a080c2 - 122 commits from branch
project:11.x - a77c8596 - Convert patch #55
- eac663ec - add types, renaming
-
199fd619...20a080c2 - 122 commits from branch
added 40 commits
Toggle commit listadded 363 commits
Toggle commit list
