Skip to content
Snippets Groups Projects
Commit ee65ea49 authored by József Dudás's avatar József Dudás
Browse files

Issue #3456349 by Sutry, realityloop, davedg629: Error after upgrading Drupal 10.2.7 to 10.3.0

parent 87216382
Branches
Tags 1.2.0
No related merge requests found
......@@ -83,11 +83,11 @@ class ImageStyleDownloadController extends CoreImageStyleDownloadController {
/**
* Builds the response.
*/
public function deliver(Request $request, $scheme, ImageStyleInterface $image_style) {
public function deliver(Request $request, $scheme, ImageStyleInterface $image_style, string $required_derivative_scheme) {
// Interesting just the defined in JPEG_PATTERN extensions.
if (!preg_match(ImageFactoryInterface::JPG_PATTERN, $request->getPathInfo())) {
// Don't match with extensions go to system image style delivery method.
return parent::deliver($request, $scheme, $image_style);
return parent::deliver($request, $scheme, $image_style, $required_derivative_scheme);
}
// Prepare image uri.
......@@ -99,7 +99,7 @@ class ImageStyleDownloadController extends CoreImageStyleDownloadController {
$derivative_uri = $image_style->buildUri($image_uri);
if (!preg_match('/.webp$/', $derivative_uri)) {
// The image style is not converted to webp format go to system deliver.
return parent::deliver($request, $scheme, $image_style);
return parent::deliver($request, $scheme, $image_style, $required_derivative_scheme);
}
$headers = [];
......
......@@ -16,7 +16,10 @@ class RouteSubscriber extends RouteSubscriberBase {
protected function alterRoutes(RouteCollection $collection): void {
foreach (['image.style_public', 'image.style_private'] as $route_id) {
if ($route = $collection->get($route_id)) {
$route->setDefault('_controller', 'Drupal\wpf\Controller\ImageStyleDownloadController::deliver');
$route->setDefault(
'_controller', 'Drupal\wpf\Controller\ImageStyleDownloadController::deliver',
'required_derivative_scheme', 'public'
);
}
}
}
......
......@@ -2,7 +2,7 @@ name: Webp fallback image
type: module
description: Prepare fallback image for webp using responsive image.
package: Image
core_version_requirement: ^8 || ^9 || ^10
core_version_requirement: ^10.3
dependencies:
- drupal:file
- drupal:responsive_image
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment