Problem/Motivation

We have currenlty baselined PHPStan #method.*should return .* but return statement is missing# errors.

Proposed resolution

In this issue, fix the error in test classes and test modules, and cleanup the baseline.

Remaining tasks

User interface changes

no

API changes

no

Data model changes

no

Release notes snippet

CommentFileSizeAuthor
#14 3283794-14-9.3.x.patch63.47 KBlongwave
#13 3283794-13-9.4.x.patch64.53 KBlongwave

Issue fork drupal-3283794

Command icon Show commands

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:

About issue forks
Support from Acquia helps fund testing for Drupal Acquia logo

Comments

mondrake created an issue. See original summary.

mondrake opened merge request !2351

mondrake’s picture

mondrake
Location 🇮🇹
CreditAttribution: mondrake as a volunteer commented
Assigned: mondrake » Unassigned
Issue summary: View changes
Status: Active » Needs review
daffie’s picture

daffie CreditAttribution: daffie commented
Status: Needs review » Reviewed & tested by the community

All the changes look good to me.
The return type changes are only in tests.
The phpstan-baseline.neon is significantly smaller!
For me it is RTBC.

mondrake’s picture

mondrake
Location 🇮🇹
CreditAttribution: mondrake as a volunteer commented

rebased

mondrake’s picture

mondrake
Location 🇮🇹
CreditAttribution: mondrake as a volunteer commented
Issue tags: +Needs reroll

Needs reroll

mondrake’s picture

mondrake
Location 🇮🇹
CreditAttribution: mondrake as a volunteer commented
Status: Reviewed & tested by the community » Needs work

longwave made their first commit to this issue’s fork.

longwave’s picture

longwave
he/him
Primary language English
Location UK
CreditAttribution: longwave at Full Fat Things commented
Status: Needs work » Needs review
Issue tags: -Needs reroll
mondrake’s picture

mondrake
Location 🇮🇹
CreditAttribution: mondrake as a volunteer commented
Status: Needs review » Reviewed & tested by the community

back to rtbc

alexpott’s picture

alexpott
he/they
Primary language English
Location 🇪🇺🌍
CreditAttribution: alexpott at Acro Commerce, Thunder commented
Version: 10.0.x-dev » 9.4.x-dev
Status: Reviewed & tested by the community » Patch (to be ported)

Committed 386d79e and pushed to 10.0.x. Thanks!

We should backport the test changes to make backports of bugfixes simpler.

  • alexpott committed 386d79e on 10.0.x 
    Issue #3283794 by mondrake, longwave: Fix 'should return {type} but...
longwave’s picture

longwave
he/him
Primary language English
Location UK
CreditAttribution: longwave at Full Fat Things commented
Status: Patch (to be ported) » Needs review
FileSize
3283794-13-9.4.x.patch64.53 KB
longwave’s picture

longwave
he/him
Primary language English
Location UK
CreditAttribution: longwave at Full Fat Things commented
FileSize
3283794-14-9.3.x.patch63.47 KB

This patch is smaller because UserRegistrationRestTest does not exist in 9.3.x.

mondrake’s picture

mondrake
Location 🇮🇹
CreditAttribution: mondrake as a volunteer commented
Status: Needs review » Reviewed & tested by the community

Thanks.

mondrake closed merge request !2351

alexpott’s picture

alexpott
he/they
Primary language English
Location 🇪🇺🌍
CreditAttribution: alexpott at Acro Commerce, Thunder commented

Thanks @longwave. Will commit this to 9.5.x / 9.4.x once 9.4.0 is out. Currently in a freeze. 9.3.x is in security issue only mode so this won't go there.

alexpott’s picture

alexpott
he/they
Primary language English
Location 🇪🇺🌍
CreditAttribution: alexpott at Acro Commerce, Thunder commented
Status: Reviewed & tested by the community » Fixed

Committed and pushed 9b485ec74d to 9.5.x and a9dae8af9e to 9.4.x. Thanks!

Backported to 9.4.x as this is test only.

  • alexpott committed 9b485ec on 9.5.x 
    Issue #3283794 by mondrake, longwave: Fix 'should return {type} but...

  • alexpott committed a9dae8a on 9.4.x 
    Issue #3283794 by mondrake, longwave: Fix 'should return {type} but...

Status: Fixed » Closed (fixed)

Automatically closed - issue fixed for 2 weeks with no activity.