Problem/Motivation

In the parent issue, we are facing issues with upgrading PHPStan to version 1.7.x.

Proposed resolution

Mark phpstan/phpstan >=1.7 as a confict in composer.json here, and remove the conflict once the parent is solved.

Remaining tasks

User interface changes

API changes

Data model changes

Release notes snippet

Issue fork drupal-3285061

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

Comments

mondrake created an issue. See original summary.

mondrake opened merge request !2365

mondrake’s picture

mondrake
Location 🇮🇹
commented
Priority: Normal » Critical
Status: Active » Needs review

Critical, because it unblocks 'updated deps' testbot runs.

mallezie’s picture

mallezie
Primary language Dutch
Location Loenhout
commented
Status: Needs review » Needs work

Test fail. Probably something in the dependencies file, where the update does not go through. Or might need a composer lock update after this change.

alexpott’s picture

alexpott
he/they
Primary language English
Location 🇪🇺🌍
commented

I don’t think we should be using conflict here - we should just adjust the dependency in the root composer file - no?

mondrake’s picture

mondrake
Location 🇮🇹
commented

Like that?

mondrake’s picture

mondrake
Location 🇮🇹
commented
Status: Needs work » Needs review
alexpott’s picture

alexpott
he/they
Primary language English
Location 🇪🇺🌍
commented
Status: Needs review » Reviewed & tested by the community

yep looks great

mondrake’s picture

mondrake
Location 🇮🇹
commented
Title: Mark phpstan/phpstan >=1.7 as a confict in composer.json » Prevent installation of phpstan/phpstan >=1.7
Status: Reviewed & tested by the community » Needs work

I think the test will fail, did not update the lock file

mondrake’s picture

mondrake
Location 🇮🇹
commented
Assigned: Unassigned » mondrake

On this.

mondrake’s picture

mondrake
Location 🇮🇹
commented
Assigned: mondrake » Unassigned
Status: Needs work » Reviewed & tested by the community

The updated deps bot test failure is legitimate I think, due to a string change in a dependency, it should not be fixed here.

Setting back to RTBC as I only run COMPOSER_ROOT_VERSION=10.0.x-dev composer update --lock on the previous change.

mallezie’s picture

mallezie
Primary language Dutch
Location Loenhout
commented

Looks good to me.

alexpott’s picture

alexpott
he/they
Primary language English
Location 🇪🇺🌍
commented
Status: Reviewed & tested by the community » Fixed

Committed 42be883 and pushed to 10.0.x. Thanks!

  • alexpott committed 42be883 on 10.0.x 
    Issue #3285061 by mondrake, mallezie, alexpott: Prevent installation of...

Status: Fixed » Closed (fixed)

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

mondrake closed merge request !2365