Fixed
Project:
Drupal core
Version:
main
Component:
rest.module
Priority:
Normal
Category:
Task
Assigned:
Unassigned
Reporter:
Created:
25 Mar 2026 at 14:55 UTC
Updated:
6 Apr 2026 at 20:42 UTC
Jump to comment: Most recent
Another simple case where we can remove 186 entries from the baseline.
Add return types to BasicAuthResourceTestTrait and any child implementations.
Start within a Git clone of the project using the version control instructions.
Or, if you do not have SSH keys set up on git.drupalcode.org:
Comments
Comment #2
longwaveComment #4
smustgrave commentedLets do it! Pretty simple review
Think it would be nice to get these trait return types in before we bump phpstan btw, just to reduce size.
Comment #5
amateescu commentedNeeds a rebase after #3575324: Add return type documentation to ResourceTestBase.
Comment #7
sivaji_ganesh_jojodae commentedDone rebasing from UI.
Comment #8
smustgrave commentedSeems @longwave may have done the rebase that resolved the conflict if you’re saying the rebase worked through the UI.
Comment #9
godotislateOne question: The IS says, "Another simple case where we can remove 186 entries from the baseline," but there are no baseline changes here?
I'd expect to see something like this removed:
Comment #10
amateescu commentedIt was definitely there at some point, see https://git.drupalcode.org/project/drupal/-/merge_requests/15204/diffs?c..., but I think it was lost in of the rebases..
Comment #11
smustgrave commentedWouldn't phpstan be failing now?
Comment #12
godotislateYes, the PHPStan job should fail. It's strange.
Comment #13
godotislateBack to NW to look into the PHPStan thing.
Comment #14
oily commentedRe: #9 to #13, There seem to be 2x MR's authored by @longwave with the same ID but containing different commit ID's?
Looking at this:
https://git.drupalcode.org/project/drupal/-/merge_requests/15204/diffs?c...
It seems that the 1 change which is in fact 186 individual deletions from the phpstan baseline file in commit c3dd89662e88cac08f070df0e487ec14a4701837 resulted from the regeneration of the phpstan baseline file after the 2x commits a7652b7de19013534f601161fe3f87bb032e3e34 and 56105c88131259bace36bbfe142a77ab811479f4 were made in other files.
Normally the 'Changes' tab would reveal the 'changes' made to all 3x files, not just 2x files.
This is confusing to me, but could it be that this is how the Gitlab pipelines are configured (recently?) to handle commits that affect the phpstan baseline? Something like, MR commits add return types, the newly added return types trigger a phpstan baseline regeneration done by the pipeline and the pipeline creates a commit for the new phpstan-baseline.php? So manual deletions from the .phpstan-baseline.php file are no longer necessary? And it is no longer necessary to commit the .phpstan-baseline.php file?
Please pardon the groping around in ignorance, hoping to shed a sliver of light on something.
Comment #15
godotislateRebased again and PHPStan did not fail either. This really is strange.
Comment #16
oily commentedRe: #14
I take that back. There is only 1 MR.
Comment #17
oily commentedRe: #15, Not sure if this helps explain that, but commit c3dd89662e88cac08f070df0e487ec14a4701837 seems to be committed in the MR so the 186 removals from the .phpstan-baseline.php file are in the MR. I opened the Web IDE for the MR and searched for one of the 186 deletions. Not found. So is commit c3dd89662e88cac08f070df0e487ec14a4701837 present but hidden in the MR?
Comment #18
oily commentedIf you go here:
https://git.drupalcode.org/project/drupal/-/merge_requests/15204/diffs?c...
Then click on 'Show latest version' button. You then seem to be in the same MR but with only the 2 commits. You lose commit c3dd89662e88cac08f070df0e487ec14a4701837.
Comment #19
mstrelan commentedActually this is expected. The methods extend from ResourceTestBase where they have
@return voidsince #3575324: Add return type documentation to ResourceTestBaseProbably we don't need to proceed with this issue, or we can commit as is.
Comment #20
oily commentedComment #21
godotislate#19: Ah good catch, didn't realize that those lines in the baseline had already been removed.
Comment #24
godotislateSince #3575324: Add return type documentation to ResourceTestBase only went into main, this will only go into main.
Committed 9434496 and pushed to main. Thanks!