Merge pull request #874 from UN-OCHA/develop

v2.15.0

.github/workflows/run-tests.yml

@@ -48,7 +48,7 @@ jobs:
         uses: cafuego/command-output@main
         with:
           run: |
-            php --version && composer --version
+            docker --version && php --version && composer --version
 
       - name: Composer Validate
         id: validate
@@ -153,6 +153,22 @@ jobs:
           threshold_metric: "lines"
           comment_footer: false
 
+      - name: DB Logs
+        id: dblog
+        if: failure()
+        uses: cafuego/command-output@main
+        with:
+          run: |
+            docker compose -f tests/docker-compose.yml exec -T drupal drush watchdog:show
+
+      - name: PHP Logs
+        id: phplog
+        if: failure()
+        uses: cafuego/command-output@main
+        with:
+          run: |
+            docker compose -f tests/docker-compose.yml exec -T drupal grep -i fatal /var/log/php/error.log
+
       - name: Find Comment
         uses: peter-evans/find-comment@v3
         if: ${{ !env.ACT }}
@@ -185,6 +201,9 @@ jobs:
             <details><summary>Drupal Logs</summary>
             <code>${{ steps.dblog.outputs.stdout }}</code>
             </details>
+            <details><summary>PHP Logs</summary>
+            <code>${{ steps.phplog.outputs.stdout }}</code>
+            </details>
 
             *Pusher: @${{ github.actor }}, Action: `${{ github.event_name }}`, Workflow: `${{ github.workflow }}`*
           edit-mode: replace

PATCHES/imageapi_optimize_webp--3424324-property-check.patch

@@ -0,0 +1,12 @@
+diff --git a/src/Controller/ImageStyleDownloadController.php b/src/Controller/ImageStyleDownloadController.php
+--- a/src/Controller/ImageStyleDownloadController.php	(revision c1afae65e07b47ff8abb909fdf35303b36493806)
++++ b/src/Controller/ImageStyleDownloadController.php	(date 1709116553784)
+@@ -40,7 +40,7 @@
+     }
+     $path_info = pathinfo($target);
+     // If .webp file, look for image to derive from.
+-    if ($path_info['extension'] == 'webp') {
++    if (isset($path_info['extension']) && $path_info['extension'] === 'webp') {
+       $image_uri = $scheme . '://' . $target;
+       // Continue processing if source found, else throw NotFoundHttpException.
+       if ($source_uri = $this->lookupSourceImage($image_uri)) {

PATCHES/imageapi_optimize_webp--3453941-drupal-10-3-compatibility.patch

@@ -0,0 +1,31 @@
+diff --git a/src/Controller/ImageStyleDownloadController.php b/src/Controller/ImageStyleDownloadController.php
+index c8c9d67..9c33d76 100644
+--- a/src/Controller/ImageStyleDownloadController.php
++++ b/src/Controller/ImageStyleDownloadController.php
+@@ -33,7 +33,7 @@ class ImageStyleDownloadController extends CoreImageStyleDownloadController {
+   /**
+    * {@inheritdoc}
+    */
+-  public function deliver(Request $request, $scheme, ImageStyleInterface $image_style) {
++  public function deliver(Request $request, $scheme, ImageStyleInterface $image_style, string $required_derivative_scheme) {
+     $target = $request->query->get('file');
+     if (!$target) {
+       throw new NotFoundHttpException();
+@@ -46,7 +46,7 @@ class ImageStyleDownloadController extends CoreImageStyleDownloadController {
+       if ($source_uri = $this->lookupSourceImage($image_uri)) {
+         // Replace webp image with source image and call parent:deliver().
+         $request->query->set('file', str_replace($scheme . '://', '', $source_uri));
+-        $source_response = parent::deliver($request, $scheme, $image_style);
++        $source_response = parent::deliver($request, $scheme, $image_style, $required_derivative_scheme);
+         $derivative_uri = $image_style->buildUri($image_uri);
+         // If parent:deliver() returns BinaryFileResponse, we'll replace
+         // the BinaryFileResponse with one containing the .webp image
+@@ -71,7 +71,7 @@ class ImageStyleDownloadController extends CoreImageStyleDownloadController {
+       throw new NotFoundHttpException();
+     }
+     else {
+-      return parent::deliver($request, $scheme, $image_style);
++      return parent::deliver($request, $scheme, $image_style, $required_derivative_scheme);
+     }
+   }
+