Support for Drupal 7 is ending on 5 January 2025—it’s time to migrate to Drupal 10! Learn about the many benefits of Drupal 10 and find migration tools in our resource center.
Problem/Motivation
Several of our dependencies are out of date, bump them to their latest patch/minor releases.
Moreover sirbrillig/phpcs-variable-analysis | v2.11.3 | v2.11.4
is required for PHP 8.2 compatibility
Steps to reproduce
Use composer outdated
Proposed resolution
COMPOSER_ROOT_VERSION=10.0.x-dev composer upgrade -W
~/.composer/vendor/bin/composer-lock-diff --no-links
+------------------------------------+---------+--------+
| Production Changes | From | To |
+------------------------------------+---------+--------+
| doctrine/annotations | 1.13.2 | 1.13.3 |
| symfony/console | v6.1.2 | v6.1.3 |
| symfony/dependency-injection | v6.1.2 | v6.1.3 |
| symfony/deprecation-contracts | v3.1.0 | v3.1.1 |
| symfony/error-handler | v6.1.0 | v6.1.3 |
| symfony/event-dispatcher-contracts | v3.1.0 | v3.1.1 |
| symfony/http-kernel | v6.1.2 | v6.1.3 |
| symfony/mime | v6.1.1 | v6.1.3 |
| symfony/process | v6.1.0 | v6.1.3 |
| symfony/routing | v6.1.1 | v6.1.3 |
| symfony/serializer | v6.1.2 | v6.1.3 |
| symfony/service-contracts | v3.1.0 | v3.1.1 |
| symfony/string | v6.1.2 | v6.1.3 |
| symfony/translation-contracts | v3.1.0 | v3.1.1 |
| symfony/validator | v6.1.1 | v6.1.3 |
| symfony/var-dumper | v6.1.0 | v6.1.3 |
| symfony/yaml | v6.1.2 | v6.1.3 |
| twig/twig | v3.3.10 | v3.4.1 |
+------------------------------------+---------+--------+
+------------------------------------+---------+---------+
| Dev Changes | From | To |
+------------------------------------+---------+---------+
| composer/ca-bundle | 1.3.1 | 1.3.3 |
| composer/spdx-licenses | 1.5.6 | 1.5.7 |
| nikic/php-parser | v4.13.2 | v4.14.0 |
| phpstan/phpdoc-parser | 1.5.1 | 1.6.4 |
| phpunit/phpunit | 9.5.20 | 9.5.21 |
| sirbrillig/phpcs-variable-analysis | v2.11.3 | v2.11.4 |
| slevomat/coding-standard | 7.2.0 | 7.2.1 |
| squizlabs/php_codesniffer | 3.6.2 | 3.7.1 |
| symfony/browser-kit | v6.1.0 | v6.1.3 |
| symfony/css-selector | v6.1.0 | v6.1.3 |
| symfony/dom-crawler | v6.1.0 | v6.1.3 |
| symfony/filesystem | v6.1.0 | v6.1.3 |
| symfony/finder | v6.1.0 | v6.1.3 |
| symfony/lock | v6.1.1 | v6.1.3 |
| symfony/phpunit-bridge | v6.1.2 | v6.1.3 |
+------------------------------------+---------+---------+
Remaining tasks
review/commit
User interface changes
no
API changes
no
Data model changes
no
Release notes snippet
Comment | File | Size | Author |
---|---|---|---|
#44 | interdiff-44.txt | 11.28 KB | xjm |
#44 | composer-3295520-44-9.5.x.patch | 66.94 KB | xjm |
#43 | interdiff-43.txt | 10.15 KB | xjm |
#43 | composer-3295520-43-9.5.x.patch | 56.68 KB | xjm |
#41 | composer-3295520-41-9.5.x.patch | 46.93 KB | xjm |
Comments
Comment #2
longwaveComment #3
longwaveComment #4
xjmLet's hold off on this pending another upstream release.
Comment #5
andypostComment #6
andypost@xjm should the linked issues wait for release or not?
Comment #7
andypostAlso phpstan 1.8.2 is out, see #3298199: Upgrade phpstan/phpstan to 1.8.2 for support of PHP 8.2 #[\AllowDynamicProperties] attribute
Comment #8
sharayurajput CreditAttribution: sharayurajput at QED42 for Drupal India Association commentedWill review this
Comment #9
sharayurajput CreditAttribution: sharayurajput at QED42 for Drupal India Association commentedAs mentioned in comment #2 dependencies are updated appropriately LGTM
so moving to RTBC
Comment #10
longwave@xjm asked to postpone this until the end of the month, so moving back to postponed for now.
Comment #11
andypostOne more required release is ready https://github.com/sirbrillig/phpcs-variable-analysis/releases/tag/v2.11.4
Comment #12
xjmOK the upstream thing I was waiting on has changed schedule, so we can resume work on this. Sorry for the delay!
Comment #13
andypostpackage #11 and 2 separate issues
- #3299213: Require mikey179/vfsstream ^1.6.11 to allow tests running on PHP 8.2
- #3298396: Upgrade composer requirement to 2.3.6 to prevent warnings on PHP 8.2
Comment #14
andypostComment #15
xjmLooks like we'll need separate 10.1.x and 10.0.x versions (this will almost always be the case because of the hash).
Comment #16
andypostPatch for 10.1.x
Comment #17
andypostRe-purposed #3299213: Require mikey179/vfsstream ^1.6.11 to allow tests running on PHP 8.2 as there's stable release https://github.com/bovigo/vfsStream/releases/tag/v1.6.11
Comment #19
andypostUnrelated failure
Comment #20
andypostRe-roll patch after #3298396: Upgrade composer requirement to 2.3.6 to prevent warnings on PHP 8.2
Comment #21
JatinGupta40 CreditAttribution: JatinGupta40 at QED42 for Drupal India Association commentedI will try reviewing it.
Comment #22
andypostSomehow CI or container is broken
@JatinGupta40 The way to generate patch is
COMPOSER_ROOT_VERSION=10.0.x-dev composer upgrade -W
Comment #23
andypostre-queued
Comment #24
andypostAdded to IS that
sirbrillig/phpcs-variable-analysis | v2.11.3 | v2.11.4
required for PHP 8.2 compatibilityComment #25
andypostadded new SF releases, will have collision with #3300773: Fix failed test on `symfony/http-foundation` 4.4.44/6.1.3 and later
Comment #26
andypostComment #29
JatinGupta40 CreditAttribution: JatinGupta40 at QED42 for Drupal India Association commented@andypost Thanks for providing the patch and the suggestion to check the patch. Will get back quickly.
Thanks
Comment #30
andypostI just RTBCed #3300773-24: Fix failed test on `symfony/http-foundation` 4.4.44/6.1.3 and later
Comment #31
andypostReroll after commited #3300773: Fix failed test on `symfony/http-foundation` 4.4.44/6.1.3 and later
Comment #32
JatinGupta40 CreditAttribution: JatinGupta40 at QED42 for Drupal India Association commented@andypost Can you please add interdiff also.
Comment #33
andypost@ JatinGupta40 https://www.drupal.org/node/3295520/revisions/view/12735915/12736245 d-org provides interdiff - it's just re-roll
Comment #34
andypostProbably it makes sense to split out the upgrade of
sirbrillig/phpcs-variable-analysis
to separate issueComment #35
xjm@JatinGupta40, interdiffs donʻt really make sense with patches generated using automated tools like
composer update
; only if youʻre changing some human-maintained code in them.These look good to me. We could have a a followup for #34 to increase its constraint if appropriate.
Comment #36
andypostNo reason for follow-up as constraint should work https://git.drupalcode.org/project/coder/-/blob/8.3.x/composer.json#L20
Comment #37
longwaveRTBC+1, there is nothing left outstanding:
Comment #40
xjmCommitted to 10.1.x and 10.0.x, thanks! We should also do this for 9.5.x.
Comment #41
xjmTaking care not to update Guzzle to Guzzle 7:
Attached does:
(This doesn't work on the stable channel; the instructions above need to be used instead in that case.)
Comment #42
xjmForgot the dev deps.
Comment #43
xjmAttached updates the dev deps that have patch version updates.
A flat
composer udpate
gets a bunch more but there are a few major updates therein.Comment #44
xjmAh, PHPUnit was the problem there. It needs to be:
Comment #45
xjmComment #46
longwave#44 looks good for Drupal 9.5. The only outstanding minor update is Composer, where we can't go to 2.3 because it requires Symfony 5:
Comment #47
longwaveComment #48
alexpottCommitted e648289 and pushed to 9.5.x. Thanks!