Problem/Motivation

After updating Drupal 10.2.7 to 10.3.0 get a PHP Fatal error:

PHP Fatal error: Declaration of Drupal\wpf\Controller\ImageStyleDownloadController::deliver(Symfony\Component\HttpFoundation\Request $request, $scheme, Drupal\image\ImageStyleInterface $image_style) must be compatible with Drupal\image\Controller\ImageStyleDownloadController::deliver(Symfony\Component\HttpFoundation\Request $request, $scheme, Drupal\image\ImageStyleInterface $image_style, string $required_derivative_scheme) in /var/www/html/www/modules/contrib/wpf/src/Controller/ImageStyleDownloadController.php on line 86

Steps to reproduce

After update just run: drush updb or drush cr

Proposed resolution

Make a small patch (0002-wpf.patch)

CommentFileSizeAuthor
#8 0004-wpf.patch2.21 KBdavedg629
#3 0002-wpf.patch1.14 KBsutry
#2 0001-wpf.patch1.14 KBsutry
0001-wpf.patch986 bytessutry

Issue fork wpf-3456349

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:

    1 hidden branch
  • 1.0.x Comparechanges, plain diff MR !3
About issue forks

Comments

Sutry created an issue. See original summary.

sutry’s picture

sutry commented
StatusFileSize
new 0001-wpf.patch1.14 KB
sutry’s picture

sutry commented
Issue summary: View changes
StatusFileSize
new 0002-wpf.patch1.14 KB
sutry’s picture

sutry commented

The issue is described here: https://www.drupal.org/node/3346038
and there: https://www.drupal.org/project/drupal/releases/10.3.0#update-info

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

realityloop’s picture

realityloop commented
Status: Active » Needs review

An additional change was required https://git.drupalcode.org/issue/wpf-3456349/-/commit/1b9246944a7436fafb...

douggreen opened merge request !3

davedg629’s picture

davedg629 commented
StatusFileSize
new 0004-wpf.patch2.21 KB

For the patch in #6, is there any reason the parent::deliver() code on line 90 was updated to include $required_derivative_scheme but the same parent::deliver() code on line 102 was not updated?

I assume it needs to be updated in both places. I've attached a patch that includes both updates and it's working for me.

ikeigenwijs’s picture

ikeigenwijs commented

#8 works for us

dj1999’s picture

dj1999 commented
Status: Needs review » Fixed
dj1999’s picture

dj1999 commented
Status: Fixed » Closed (fixed)

Commited here.

dj1999 closed merge request !3