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

CommentFileSizeAuthor
#44 interdiff-44.txt11.28 KBxjm
#44 composer-3295520-44-9.5.x.patch66.94 KBxjm
#43 interdiff-43.txt10.15 KBxjm
#43 composer-3295520-43-9.5.x.patch56.68 KBxjm
#41 composer-3295520-41-9.5.x.patch46.93 KBxjm
#31 3295520-31-10.1.patch55.93 KBandypost
#31 3295520-31-10.0.patch55.93 KBandypost
#25 3295520-25-10.1.patch57.52 KBandypost
#25 3295520-25-10.0.patch57.52 KBandypost
#20 3295520-20-10.1.patch26.24 KBandypost
#20 3295520-20-10.0.patch26.24 KBandypost
#17 3295520-17-10.0.patch29.94 KBandypost
#17 3295520-17-10.1.patch29.94 KBandypost
#16 3295520-16-10.1.x.patch29.32 KBandypost
#14 3295520-14.patch28.53 KBandypost
#2 3295520-2.patch28.08 KBlongwave
Support from Acquia helps fund testing for Drupal Acquia logo

Comments

longwave created an issue. See original summary.

longwave’s picture

Status: Active » Needs review
FileSize
28.08 KB
+------------------------------------+---------+--------+
| Production Changes                 | From    | To     |
+------------------------------------+---------+--------+
| doctrine/annotations               | 1.13.2  | 1.13.3 |
| egulias/email-validator            | 3.1.2   | 3.2.1  |
| symfony/deprecation-contracts      | v3.1.0  | v3.1.1 |
| symfony/event-dispatcher-contracts | v3.1.0  | v3.1.1 |
| symfony/service-contracts          | v3.1.0  | v3.1.1 |
| symfony/translation-contracts      | v3.1.0  | v3.1.1 |
| twig/twig                          | v3.3.10 | v3.4.1 |
+------------------------------------+---------+--------+

+---------------------------+---------+---------+
| Dev Changes               | From    | To      |
+---------------------------+---------+---------+
| composer/ca-bundle        | 1.3.1   | 1.3.2   |
| composer/composer         | 2.3.5   | 2.3.9   |
| 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  |
| slevomat/coding-standard  | 7.2.0   | 7.2.1   |
| squizlabs/php_codesniffer | 3.6.2   | 3.7.1   |
+---------------------------+---------+---------+
longwave’s picture

Issue tags: +10.0.0 release notes
xjm’s picture

Status: Needs review » Postponed

Let's hold off on this pending another upstream release.

andypost’s picture

@xjm should the linked issues wait for release or not?

andypost’s picture

sharayurajput’s picture

Assigned: Unassigned » sharayurajput

Will review this

sharayurajput’s picture

Assigned: sharayurajput » Unassigned
Status: Needs review » Reviewed & tested by the community

As mentioned in comment #2 dependencies are updated appropriately LGTM
so moving to RTBC

longwave’s picture

Status: Reviewed & tested by the community » Postponed

@xjm asked to postpone this until the end of the month, so moving back to postponed for now.

andypost’s picture

xjm’s picture

Status: Postponed » Needs work

OK the upstream thing I was waiting on has changed schedule, so we can resume work on this. Sorry for the delay!

andypost’s picture

Status: Needs work » Needs review
FileSize
28.53 KB
$ ~/.composer/vendor/bin/composer-lock-diff --no-links
+------------------------------------+---------+--------+
| Production Changes                 | From    | To     |
+------------------------------------+---------+--------+
| doctrine/annotations               | 1.13.2  | 1.13.3 |
| symfony/deprecation-contracts      | v3.1.0  | v3.1.1 |
| symfony/event-dispatcher-contracts | v3.1.0  | v3.1.1 |
| symfony/service-contracts          | v3.1.0  | v3.1.1 |
| symfony/translation-contracts      | v3.1.0  | v3.1.1 |
| twig/twig                          | v3.3.10 | v3.4.1 |
+------------------------------------+---------+--------+

+------------------------------------+---------+---------+
| Dev Changes                        | From    | To      |
+------------------------------------+---------+---------+
| composer/ca-bundle                 | 1.3.1   | 1.3.3   |
| composer/composer                  | 2.3.5   | 2.3.10  |
| 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   |
+------------------------------------+---------+---------+
xjm’s picture

Looks like we'll need separate 10.1.x and 10.0.x versions (this will almost always be the case because of the hash).

andypost’s picture

Status: Needs review » Needs work

The last submitted patch, 17: 3295520-17-10.0.patch, failed testing. View results

andypost’s picture

Status: Needs work » Needs review

Unrelated failure

1) Drupal\Tests\ckeditor\FunctionalJavascript\CKEditorIntegrationTest::testOffCanvasStyles
Behat\Mink\Exception\ElementNotFoundException: Element matching css ".cke_top" not found.
JatinGupta40’s picture

Assigned: Unassigned » JatinGupta40

I will try reviewing it.

andypost’s picture

Somehow CI or container is broken

16:11:41 /bin/bash: sudo: command not found
16:11:41 chmod -R 777 /var/lib/mysql
16:11:45 
16:11:45 In Process.php line 1335:
16:11:45                                                                                
16:11:45   The process "sudo -u www-data git clone -b 10.0.x  https://git.drupalcode.o  
16:11:45   rg/project/drupal.git '/var/lib/drupalci/workspace/jenkins-drupal_patches-1  
16:11:45   40370/source'" exceeded the timeout of 300 seconds.                          
16:11:45                                                                                
16:11:45 
16:11:45 run [<definition>]

@JatinGupta40 The way to generate patch is COMPOSER_ROOT_VERSION=10.0.x-dev composer upgrade -W

andypost’s picture

re-queued

andypost’s picture

Issue summary: View changes
Issue tags: +PHP 8.2

Added to IS that sirbrillig/phpcs-variable-analysis | v2.11.3 | v2.11.4 required for PHP 8.2 compatibility

andypost’s picture

Issue summary: View changes

The last submitted patch, 25: 3295520-25-10.0.patch, failed testing. View results

Status: Needs review » Needs work

The last submitted patch, 25: 3295520-25-10.1.patch, failed testing. View results

JatinGupta40’s picture

@andypost Thanks for providing the patch and the suggestion to check the patch. Will get back quickly.
Thanks

andypost’s picture

andypost’s picture

JatinGupta40’s picture

Assigned: JatinGupta40 » Unassigned

@andypost Can you please add interdiff also.

andypost’s picture

@ JatinGupta40 https://www.drupal.org/node/3295520/revisions/view/12735915/12736245 d-org provides interdiff - it's just re-roll

andypost’s picture

Probably it makes sense to split out the upgrade of sirbrillig/phpcs-variable-analysis to separate issue

xjm’s picture

Status: Needs review » Reviewed & tested by the community

@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.

andypost’s picture

No reason for follow-up as constraint should work https://git.drupalcode.org/project/coder/-/blob/8.3.x/composer.json#L20

longwave’s picture

RTBC+1, there is nothing left outstanding:

$ composer outdated
...
slevomat/coding-standard 7.2.1 8.3.0 Slevomat Coding Standard for PHP_CodeSniffer complements Consistence Coding Standard by providing sniffs with additional checks.

$ composer why-not slevomat/coding-standard 8
drupal/coder 8.3.15 requires slevomat/coding-standard (^7.0) 

  • xjm committed f72ebaa on 10.1.x
    Issue #3295520 by andypost, longwave: Update dependencies for Drupal 10....

  • xjm committed f0ab77d on 10.0.x
    Issue #3295520 by andypost, longwave: Update dependencies for Drupal 10....
xjm’s picture

Version: 10.0.x-dev » 9.5.x-dev
Status: Reviewed & tested by the community » Needs review

Committed to 10.1.x and 10.0.x, thanks! We should also do this for 9.5.x.

xjm’s picture

Taking care not to update Guzzle to Guzzle 7:

Attached does:

composer self-update --snapshot
composer update drupal/core --with=guzzlehttp/guzzle:^6 -W

(This doesn't work on the stable channel; the instructions above need to be used instead in that case.)

xjm’s picture

Status: Needs review » Needs work

Forgot the dev deps.

xjm’s picture

Status: Needs work » Needs review
FileSize
56.68 KB
10.15 KB

Attached 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.

xjm’s picture

Ah, PHPUnit was the problem there. It needs to be:

composer update --with=guzzlehttp/guzzle:^6 --with=phpunit/phpunit:^8 -W
xjm’s picture

Title: Update dependencies for Drupal 10.0 » Update dependencies for Drupal 10.0 and 9.5
longwave’s picture

Status: Needs review » Reviewed & tested by the community

#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:

$ composer outdated -m
...
composer/composer        2.2.17  2.3.10  Composer helps you declare, manage and install dependencies of PHP projects. It ensures you have the right stack everywhere.

$ composer why-not composer/composer 2.3
composer/composer 2.3.0     requires                   symfony/console (^5.4.1 || ^6.0)           
drupal/drupal     9.5.x-dev does not require           symfony/console (but v4.4.44 is installed) 
composer/composer 2.3.0     requires                   symfony/filesystem (^5.4 || ^6.0)          
drupal/drupal     9.5.x-dev requires (for development) symfony/filesystem (^4.4)                  
composer/composer 2.3.0     requires                   symfony/finder (^5.4 || ^6.0)              
drupal/drupal     9.5.x-dev requires (for development) symfony/finder (^4.4)                      
composer/composer 2.3.0     requires                   symfony/process (^5.4 || ^6.0)             
drupal/drupal     9.5.x-dev does not require           symfony/process (but v4.4.44 is installed) 
composer/composer 2.3.0     requires                   composer/pcre (^2 || ^3)                   
drupal/drupal     9.5.x-dev does not require           composer/pcre (but 1.0.1 is installed)   
longwave’s picture

Issue tags: +9.5.0 release notes
alexpott’s picture

Status: Reviewed & tested by the community » Fixed

Committed e648289 and pushed to 9.5.x. Thanks!

  • alexpott committed e648289 on 9.5.x
    Issue #3295520 by andypost, xjm, longwave: Update dependencies for...

Status: Fixed » Closed (fixed)

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