Problem/Motivation

This is a public followup from Drupal and third-party security updates that were released today. (See., e.g., 11.3.10.)

The release branches have been updated to the latest, secure versions of Twig and Symfony, but not main or 11.x yet. We can save time and do these updates in public now that everything's disclosed.

Proposed resolution

Update SF and Composer packages, including increasing constraints as in 11.3.x

Remaining tasks

MRs needed.

Release notes snippet

None needed (they will already have been informed on 11.3.10, and no 11.4 or 12.0 milestones are available yet).

Issue fork drupal-3591179

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

xjm created an issue. See original summary.

xjm opened merge request !15830

xjm’s picture

xjm
she/her
Primary language English
commented
Status: Active » Needs review

xjm opened merge request !15831

xjm’s picture

xjm
she/her
Primary language English
commented

Looks like 11.x needs the same PHPStan fixes for PHP 8.5 as were committed to 11.3. The branch is pushed now so I'll try to port that over. Edit: But it's not the same files, hm. Edit 2: May need to regenerate the baseline?

xjm’s picture

xjm
she/her
Primary language English
commented
Status: Needs review » Needs work

Hrm. I tried regenerating the baseline on this MR's 11.x branch and it resulted in a massive increase in baseline, rather than the decrease I was expecting. Possibly because I was using PHP 8.5?

The errors in the PHPstan job on the branch are:

Line   core/modules/mysql/src/Driver/Database/mysql/Connection.php       
 ------ ------------------------------------------------------------------ 
  74     No error with identifier class.notFound is reported on line 74.   
         🪪  ignore.unmatchedIdentifier (non-ignorable)                    
  128    No error with identifier class.notFound is reported on line 128.  
         🪪  ignore.unmatchedIdentifier (non-ignorable)                    
  133    No error with identifier class.notFound is reported on line 133.  
         🪪  ignore.unmatchedIdentifier (non-ignorable)                    
  139    No error with identifier class.notFound is reported on line 139.  
         🪪  ignore.unmatchedIdentifier (non-ignorable)                    
  150    No error with identifier class.notFound is reported on line 150.  
         🪪  ignore.unmatchedIdentifier (non-ignorable)                    
 ------ ------------------------------------------------------------------ 
 ------ ----------------------------------------------------------------- 
  Line   core/modules/mysql/tests/src/Kernel/mysql/MysqlDriverTest.php    
 ------ ----------------------------------------------------------------- 
  28     No error with identifier class.notFound is reported on line 28.  
         🪪  ignore.unmatchedIdentifier (non-ignorable)                   
 ------ ----------------------------------------------------------------- 
 ------ ----------------------------------------------------------------- 
  Line   core/modules/mysql/tests/src/Unit/ConnectionTest.php             
 ------ ----------------------------------------------------------------- 
  36     No error with identifier class.notFound is reported on line 36.  
         🪪  ignore.unmatchedIdentifier (non-ignorable)                   
 ------ ----------------------------------------------------------------- 
 ------ ------------------------------------------------------------------ 
  Line   core/modules/pgsql/src/Driver/Database/pgsql/Connection.php       
 ------ ------------------------------------------------------------------ 
  103    No error with identifier class.notFound is reported on line 103.  
         🪪  ignore.unmatchedIdentifier (non-ignorable)                    
  192    No error with identifier class.notFound is reported on line 192.  
         🪪  ignore.unmatchedIdentifier (non-ignorable)                    
 ------ ------------------------------------------------------------------ 
 ------ --------------------------------------------------------------------- 
  Line   core/modules/sqlite/src/Driver/Database/sqlite/Connection.php        
 ------ --------------------------------------------------------------------- 
  113    No error with identifier new.noConstructor is reported on line 113.  
         🪪  ignore.unmatchedIdentifier (non-ignorable)                       
 ------ --------------------------------------------------------------------- 
 [ERROR] Found 10 errors
xjm’s picture

xjm
she/her
Primary language English
commented
Status: Needs work » Needs review

Did some manual diff editing to dig the relevant changes out of 11.3.10 (I think).

alexpott’s picture

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

The two branches look great and match the updates for the 11.3.10 release.

  • catch committed 29100c2f on 11.x 
    task: #3591179 Update main and 11.x to latest Twig and Symfony versions...

  • catch committed dc3c97a4 on main 
    task: #3591179 Update main and 11.x to latest Twig and Symfony versions...

catch closed merge request !15830

catch closed merge request !15831

catch’s picture

catch
he/him
Primary language English
commented
Version: main » 11.x-dev
Status: Reviewed & tested by the community » Fixed

Committed/pushed the respective MRs to main and 11.x, thanks!

Now that this issue is closed, review the contribution record.

As a contributor, attribute any organization that helped you, or if you volunteered your own time.

Maintainers, credit people who helped resolve this issue.

Status: Fixed » Closed (fixed)

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