Skip to content
Snippets Groups Projects

Add EOL and warning dates for 10.5 and 10.6.

Closed Jess requested to merge issue/drupal-3378393:3378393-eol-dates-10.4 into 10.4.x
3 unresolved threads

Closes #3378393

Merge request reports

Loading
Loading

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
  • quietone added 13 commits

    added 13 commits

    Compare with previous version

  • quietone added 2 commits

    added 2 commits

    • cf1b7dde - put warning date in range
    • c25e2e16 - there is coverage on the end date

    Compare with previous version

  • quietone added 404 commits

    added 404 commits

    Compare with previous version

  • 221 221 }
    222 222
    223 223 $comparable_request_date = $date_formatter->format($time->getRequestTime(), 'custom', $date_format);
    224 if ($this->securityCoverageInfo['security_coverage_end_date'] <= $comparable_request_date) {
    224 if ($this->securityCoverageInfo['security_coverage_end_date'] < $comparable_request_date) {
    • It's not immediately clear why the logic is changing here (now using < instead of <=). Seems a bit out of scope to change this to start warning "Coverage has ended" on the last day we say you have coverage...

      I figured out why this was changed, and I think it's due to an error in the fixture changes. I'll start another thread there to be easier to follow...

    • quietone changed this line in version 10 of the diff

      changed this line in version 10 of the diff

    • Please register or sign in to reply
  • 175 '10.5.0, supported, 6 months warn' => [
    176 'installed_version' => '10.5.0',
    177 'fixture' => 'sec.10.6.0',
    178 178 'requirements_section_heading' => 'Warnings found',
    179 'message' => "Covered until 2023-Jun-21 $update_soon_message $release_coverage_message",
    180 'mock_date' => '2022-12-14',
    179 'message' => "Covered until 2026-Jun-17 $update_soon_message $release_coverage_message",
    180 'mock_date' => '2025-12-10',
    181 181 ],
    182 182 ];
    183 183 // Ensure that the message does not change, including on the last day of
    184 184 // security coverage.
    185 $test_cases['9.4.0, supported, last day warn'] = $test_cases['9.4.0, supported, 6 months warn'];
    186 $test_cases['9.4.0, supported, last day warn']['mock_date'] = '2023-06-20';
    185 $test_cases['10.5.0, supported, last day warn'] = $test_cases['10.5.0, supported, 6 months warn'];
    186 $test_cases['10.5.0, supported, last day warn']['mock_date'] = '2026-06-17';
    • Comment on lines -186 to +186

      Currently in 10.4.x branch, we have:

      const SECURITY_COVERAGE_END_DATE_9_4 = '2023-06-21';

      So the mock here used 2023-06-20 for testing the "last day".

      The new const is:

      const SECURITY_COVERAGE_END_DATE_10_5 = '2026-06-17';

      so we should be using 2026-06-16 here. Then we wouldn't have to change the logic above.

      Suggested change
      182 $test_cases['10.5.0, supported, last day warn'] = $test_cases['10.5.0, supported, 6 months warn'];
      183 $test_cases['10.5.0, supported, last day warn']['mock_date'] = '2026-06-17';
      182 $test_cases['10.5.0, supported, last day warn']['mock_date'] = '2026-06-16';
    • xjm set these date and I agree that the end date should stay consistently as the Wednesday of the week.

    • quietone changed this line in version 10 of the diff

      changed this line in version 10 of the diff

    • Please register or sign in to reply
  • Derek Wright
  • 208 $test_cases['10.6.0, supported, 6 months warn'] = [
    209 'installed_version' => '10.6.0',
    210 'fixture' => 'sec.10.6.0',
    211 211 'requirements_section_heading' => 'Warnings found',
    212 'message' => "Covered until 2023-Nov $update_soon_message $release_coverage_message",
    213 'mock_date' => '2023-05-15',
    212 'message' => "Covered until 2026-Dec-09 $update_soon_message $release_coverage_message",
    213 'mock_date' => '2026-06-17',
    214 214 ];
    215 215
    216 216 // Ensure that the message does not change, including on the last day of
    217 217 // security coverage.
    218 $test_cases['9.5.0, supported, last day warn'] = $test_cases['9.5.0, supported, 6 months warn'];
    219 $test_cases['9.5.0, supported, last day warn']['mock_date'] = '2023-10-31';
    218 $test_cases['10.6.0, supported, last day warn'] = $test_cases['10.6.0, supported, 6 months warn'];
    219 $test_cases['10.6.0, supported, last day warn']['mock_date'] = '2026-12-09';
    • Per above, I think this should be:

      Suggested change
      216 $test_cases['10.6.0, supported, last day warn']['mock_date'] = '2026-12-09';
      216 $test_cases['10.6.0, supported, last day warn']['mock_date'] = '2026-12-08';
    • Since the comment claims that this is to test the last day of security coverage, I changed the date to the last day of security coverage. And that makes sense to me, we want to make sure we are showing the last day warning on the actual last day.

    • quietone changed this line in version 10 of the diff

      changed this line in version 10 of the diff

    • Please register or sign in to reply
  • quietone added 1 commit

    added 1 commit

    Compare with previous version

  • quietone added 35 commits

    added 35 commits

    Compare with previous version

  • quietone added 10 commits

    added 10 commits

    Compare with previous version

  • quietone added 1 commit

    added 1 commit

    Compare with previous version

  • closed

  • Please register or sign in to reply
    Loading