Merge pull request #6027 from bolt/fix/not-just-strings

Allow aliased thumbnails for image 'arrays'.

src/Twig/Handler/ImageHandler.php

@@ -238,7 +238,7 @@ private function getThumbnail($fileName = null, $width = null, $height = null, $
     }
 
     /**
-     * Get the thumbnail relative URI.
+     * Get the thumbnail relative URI, using width, height and action.
      *
      * @param Thumbnail $thumb
      *
@@ -261,12 +261,25 @@ private function getThumbnailUri(Thumbnail $thumb)
         );
     }
 
+    /**
+     * Get the thumbnail relative URI, using an alias.
+     *
+     * @param mixed  $filename
+     * @param string $alias
+     *
+     * @return mixed
+     */
     private function getAliasedUri($filename, $alias)
     {
         if (!$this->isAlias($alias)) {
             return false;
         }
 
+        // If we're passing in an image as array, instead of a single filename.
+        if (is_array($filename) && isset($filename['file'])) {
+            $filename = $filename['file'];
+        }
+
         return $this->app['url_generator']->generate(
             'thumb_alias',
             [