[meta] Fix strict type errors in kernel tests

Created on 31 October 2023, 7 months ago
Updated 29 February 2024, 3 months ago

Problem/Motivation

This is a child issue of 📌 Add declare(strict_types=1) to all tests Needs work . After adding enabling strict types to all tests there were around 3000 errors. Fixing them all in one issue will lead to an enormous merge request that's difficult to review, as per the issue scope guidelines .

Steps to reproduce

Add to phpcs.xml.dist:

  <rule ref="SlevomatCodingStandard.TypeHints.DeclareStrictTypes">
    <properties>
      <property name="spacesCountAroundEqualsSign" value="0" />
    </properties>
    <include-pattern>*/tests/src/Kernel/*</include-pattern>
    <include-pattern>./tests/Drupal/KernelTests/*</include-pattern>
  </rule>

Run phpcbf:

composer phpcbf

Run the test suite:

./vendor/bin/phpunit -c core/phpunit.xml.dist --bootstrap=core/tests/bootstrap.php --testsuite=kernel

Proposed resolution

Remaining tasks

  1. 📌 Fix strict type errors: Convert FormattableMarkup to strings (simple replacement) in core/tests/Drupal/KernelTests/* Active
  2. 📌 Fix strict type errors: Convert FormattableMarkup to strings (simple replacement) in core/modules/*/tests/src/Kernel/* Active
  3. 📌 Fix strict type errors: Convert FormattableMarkup to strings (complex replacement) in core Kernel tests Active
  4. 📌 Fix strict type errors in kernel tests: Add (string) casts where needed Active
  5. 📌 Fix strict type errors in kernel tests: Do not quote integers Active
  6. 📌 Fix strict type errors in CommentFieldAccessTest Active
  7. 📌 Fix strict type errors in AssertContentTrait Needs work
  8. 📌 Fix strict type errors: miscellaneous fixes in core Kernel tests Postponed
  9. 📌 Fix AssertContentTrait to stop recommending FormattableMarkup Active

User interface changes

API changes

Data model changes

Release notes snippet

🌱 Plan
Status

Active

Version

11.0 🔥

Component
PHPUnit 

Last updated about 8 hours ago

Created by

🇦🇺Australia mstrelan

Live updates comments and jobs are added and updated live.
Sign in to follow issues

Merge Requests

Comments & Activities

  • Issue created by @mstrelan
  • @mstrelan opened merge request.
  • Pipeline finished with Failed
    7 months ago
    Total: 599s
    #41917
  • Pipeline finished with Failed
    7 months ago
    Total: 557s
    #42416
  • Pipeline finished with Failed
    7 months ago
    #42439
  • Pipeline finished with Failed
    7 months ago
    Total: 170s
    #42455
  • Pipeline finished with Failed
    7 months ago
    #42456
  • Pipeline finished with Failed
    7 months ago
    Total: 1070s
    #42475
  • Pipeline finished with Failed
    7 months ago
    Total: 572s
    #42483
  • Pipeline finished with Failed
    7 months ago
    Total: 161s
    #42498
  • Pipeline finished with Failed
    7 months ago
    Total: 733s
    #42507
  • Pipeline finished with Failed
    7 months ago
    Total: 634s
    #43030
  • Pipeline finished with Failed
    7 months ago
    Total: 161s
    #43059
  • Pipeline finished with Success
    7 months ago
    #43064
  • Status changed to Needs review 7 months ago
  • 🇦🇺Australia mstrelan

    Updated IS to mention the reason for two merge requests. This is ready for review.

  • Pipeline finished with Success
    7 months ago
    Total: 922s
    #43068
  • Status changed to Needs work 7 months ago
  • 🇺🇸United States smustgrave

    Think it needs a rebase, showing 1000+ file changes and says to be unmergable

  • Status changed to Needs review 7 months ago
  • 🇦🇺Australia mstrelan

    Let's just review MR !5215 for now. There are indeed over 1000 files changed in the other one.

  • Pipeline finished with Success
    7 months ago
    Total: 704s
    #44627
  • Pipeline finished with Success
    7 months ago
    Total: 3186s
    #44626
  • Status changed to Needs work 7 months ago
  • 🇺🇸United States dww

    Opened 6 MR threads, 3 of which are trivial suggestions, 1 FYI that can be ignored, and 2 places we probably need to continue the sprintf() conversion. Everything else looks great! 😅

    Thanks
    -Derek

  • Status changed to Needs review 7 months ago
  • 🇦🇺Australia mstrelan

    Thanks for the review, have fixed up those issues.

  • Pipeline finished with Success
    7 months ago
    Total: 799s
    #44673
  • Status changed to Needs work 7 months ago
  • 🇺🇸United States dww

    🏓 😂

  • 🇺🇸United States dww

    FYI, after checking out the MR branch locally, here's some grep output of remaining instances of FormattableMarkup in any Kernel test code. Some of these are legit. Some might want to be fixed as part of this issue?

    egrep -ir FormattableMarkup tests/Drupal/KernelTests > core-tests-kerneltests-formattable-markup.txt
    egrep -ir FormattableMarkup core/modules/*/tests/src/Kernel > core-module-kernel-formattable-markup.txt
    

    p.s. Crediting @mstrelan for the work, and myself for reviews.

  • Status changed to Needs review 7 months ago
  • 🇦🇺Australia mstrelan

    Fixed issues in #11. I don't think we should do #12 here, the scope is large enough already, unless you feel strongly about any of them.

  • Pipeline finished with Success
    7 months ago
    Total: 559s
    #44720
  • Status changed to RTBC 7 months ago
  • 🇺🇸United States smustgrave

    Seems threads have been resolved.

    Will agree with #13 about expanding the scope so follow up? If not please move back to NW.

  • Status changed to Needs review 7 months ago
  • 🇦🇺Australia mstrelan

    I've removed most of the sprintf calls in favour of string interpolation. In cases where the placeholders use expressions I've mostly stuck with sprintf, and in cases where interpolation leads to awkward escaping of slashes or quotes I've replaced with concatenation.

  • Pipeline finished with Success
    7 months ago
    Total: 662s
    #49713
  • Status changed to Needs work 7 months ago
  • 🇺🇸United States dww

    cc969fb3 looks much better, thanks!

    However, I found a few nits and one assertion where you changed the values being compared and lost test coverage, so back to NW.

    Sadly, I ran out of steam at core/tests/Drupal/KernelTests/Core/Entity/ContentEntityCloneTest.php. But I think we're really close, now!

    Thanks again,
    -Derek

  • 🇺🇸United States dww

    p.s. Sorry, forgot to explicitly say: absolutely in favor of not expanding the scope any more than necessary in here! 😅 This is already almost too big to read. #12 can be fodder for followups, for sure, we don't need to do that here.

  • Status changed to Needs review 7 months ago
  • Pipeline finished with Success
    7 months ago
    Total: 894s
    #50061
  • 🇺🇸United States smustgrave

    Oh wow the MR has gotten much larger then a day ago haha

  • Status changed to RTBC 7 months ago
  • 🇺🇸United States dww

    Thanks for all the work in here, @mstrelan! It's entirely possible I've missed something, but I've probably spent over 3 hours trying to carefully review this monster. 😅 I spot nothing else to complain about. The only open threads are:

    1. A placeholder for where I reviewed that's now obsolete (but which I can't resolve myself).
    2. A question about if/how we should open follow-ups to fix yucky assertion messages that we noticed while working on this.

    Neither need to be "solved" before this is committed. Testbot is still happy. GitLab claims it needs a rebase, but I just checked and the latest 5215.diff is applying cleanly to a freshly pulled 11.x core checkout (at commit 54862ffc).

    Moving to RTBC to get this in front of the committers.

    Thanks again!
    -Derek

  • Status changed to Needs work 7 months ago
  • 🇺🇸United States xjm

    Nice work on this so far.

    I got partway through and started thinking that maybe that comment test should get its own separate issue. Then I looked at the diffstat:
    109 files, +630, −683

    That's a 1313 LOC change set -- way too large. In general, we should not exceed a total of 400 added and removed lines in order to make our reviews effective, unless the issue is a purely scannable 1:1 replacement that doesn't require thinking about the context. (See Derek's comments above that demonstrate the impact of having an MR that's too large.)

    We should split this up into a few smaller scopes of similar change types. It should be straightforward, if a little fiddly, with git add -p, checking out specific files from the bulk branch, or other similar gitifying. So, I'm converting this to a meta.

    1. I think one or more sub-issues could focus on only the FormattableMarkup, which should mostly be converted straight to double-quoted strings for readabillity (mostly not sprintf()). So one or more issues where we're just stripping the FormattableMarkup.
    2. There should be additional issues for tests that are doing complicated ugly things inside FormattableMarkup calls (like the comment tests). The comment test might merit its own dedicated issue to refactor and simplify the test.
    3. Another issue could handle places where defining new local variables improves the readability while FormattableMarkup is removed.
    4. Another issue could handle the addition of string casts.
    5. Another could be dedicated to removing quotes from ints.
    6. Etc. Try splitting it into a few MRs grouped by the type of change that fits, and then check their sizes against the guidelines. We want to target about 100-200 lines changes (for a total of 200-400 added and removed) per MR.
  • Status changed to Needs review 7 months ago
  • 🇺🇸United States dww

    Yes, splitting this is the only way to get it done. 😅 I checked with @mstrelan and agreed I'd help by opening the newly scoped issues, and he'd continue with the git shenanigans for now. I tried to match the proposal in #21 pretty closely:

    1. 📌 Fix strict type errors: Convert FormattableMarkup to strings (simple replacement) in core/tests/Drupal/KernelTests/* Active
    2. 📌 Fix strict type errors: Convert FormattableMarkup to strings (simple replacement) in core/modules/*/tests/src/Kernel/* Active
    3. 📌 Fix strict type errors: Convert FormattableMarkup to strings (complex replacement) in core Kernel tests Active
    4. 📌 Fix strict type errors in kernel tests: Add (string) casts where needed Active
    5. 📌 Fix strict type errors in kernel tests: Do not quote integers Active

    I'm hoping that by the time we handle all the "easy" conversions in 2 separate issues, that the "everything else" MR won't be that bad. 🙏 If we have to split up #3402294 even further, so be it. 😬

    I put this in the remaining tasks, too. Moving to review to make sure the plan sounds okay before we proceed too much further.

    Thanks!
    -Derek

  • 🇺🇸United States dww

    Adding 📌 Fix strict type errors in CommentFieldAccessTest Active since yeah, that 1 test is nearly 150 lines of diff...

  • Status changed to Active 6 months ago
  • 🇺🇸United States dww
  • 🇦🇺Australia mstrelan

    Opened a mega MR of all related issues to see what's left to fix.

  • Pipeline finished with Failed
    3 months ago
    Total: 586s
    #106581
  • Pipeline finished with Success
    3 months ago
    Total: 603s
    #106610
  • Pipeline finished with Success
    3 months ago
    Total: 526s
    #106631
  • Pipeline finished with Failed
    3 months ago
    Total: 595s
    #110029
  • Pipeline finished with Canceled
    about 2 months ago
    Total: 326s
    #141626
  • Pipeline finished with Failed
    about 2 months ago
    #141633
  • Pipeline finished with Success
    about 2 months ago
    Total: 997s
    #141669
Production build 0.69.0 2024