Merge branch 'master' into PHRAS-3484

Dockerfile

@@ -13,9 +13,12 @@ RUN echo "deb http://deb.debian.org/debian stretch main non-free" > /etc/apt/sou
         apt-transport-https \
         ca-certificates \
         gnupg2 \
+    && sed -i 's/mozilla\/DST_Root_CA_X3.crt/!mozilla\/DST_Root_CA_X3.crt/g' /etc/ca-certificates.conf \
+    && update-ca-certificates --fresh \
     && apt-get update \
     && apt-get install -y --no-install-recommends \
         zlib1g-dev \
+        automake \
         git \
         ghostscript \
         gpac \
@@ -33,6 +36,7 @@ RUN echo "deb http://deb.debian.org/debian stretch main non-free" > /etc/apt/sou
         libssl-dev \
         libxslt-dev \
         libzmq3-dev \
+        libtool \
         locales \
         gettext \
         mcrypt \
@@ -46,6 +50,12 @@ RUN echo "deb http://deb.debian.org/debian stretch main non-free" > /etc/apt/sou
         libreoffice-math \
         libreoffice-writer \                                                                 
         libreoffice-pdfimport \
+        # heic
+        libde265-dev \
+        libopenjp2-7-dev \
+        librsvg2-dev \
+        libwebp-dev \
+        # End heic
         # FFmpeg
         yasm \
         libvorbis-dev \
@@ -73,6 +83,20 @@ RUN echo "deb http://deb.debian.org/debian stretch main non-free" > /etc/apt/sou
         nano \
     && update-locale "LANG=fr_FR.UTF-8 UTF-8" \
     && dpkg-reconfigure --frontend noninteractive locales \
+    && mkdir /tmp/libheif \
+    && git clone https://github.com/strukturag/libheif.git /tmp/libheif \
+    && cd /tmp/libheif \
+    && ./autogen.sh \
+    && ./configure \
+    && make \
+    && make install \
+    && mkdir /tmp/ImageMagick \
+    && curl https://download.imagemagick.org/ImageMagick/download/ImageMagick.tar.gz| tar zx -C /tmp/ImageMagick --strip-components 1 \
+    && cd /tmp/ImageMagick \
+    && ./configure \
+    && make \
+    && make install \
+    && ldconfig \
     && docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ \
     && docker-php-ext-install -j$(nproc) gd \
     && docker-php-ext-configure ldap --with-libdir=lib/x86_64-linux-gnu/ \

composer.lock

@@ -131,16 +131,16 @@
         },
         {
             "name": "alchemy/embed-bundle",
-            "version": "2.0.12",
+            "version": "2.0.13",
             "source": {
                 "type": "git",
                 "url": "https://github.com/alchemy-fr/embed-bundle.git",
-                "reference": "06e3c1c9c2fdf4cbc3c98db7ea1880517ea74dbf"
+                "reference": "e7c53ac4f0bfedba2cbd4431040cd615703a4c23"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/alchemy-fr/embed-bundle/zipball/06e3c1c9c2fdf4cbc3c98db7ea1880517ea74dbf",
-                "reference": "06e3c1c9c2fdf4cbc3c98db7ea1880517ea74dbf",
+                "url": "https://api.github.com/repos/alchemy-fr/embed-bundle/zipball/e7c53ac4f0bfedba2cbd4431040cd615703a4c23",
+                "reference": "e7c53ac4f0bfedba2cbd4431040cd615703a4c23",
                 "shasum": ""
             },
             "require-dev": {
@@ -178,10 +178,10 @@
             ],
             "description": "Embed resources bundle",
             "support": {
-                "source": "https://github.com/alchemy-fr/embed-bundle/tree/2.0.12",
+                "source": "https://github.com/alchemy-fr/embed-bundle/tree/2.0.13",
                 "issues": "https://github.com/alchemy-fr/embed-bundle/issues"
             },
-            "time": "2021-09-20T09:48:10+00:00"
+            "time": "2021-10-01T13:22:39+00:00"
         },
         {
             "name": "alchemy/geonames-api-consumer",
@@ -275,16 +275,16 @@
         },
         {
             "name": "alchemy/mediavorus",
-            "version": "0.4.10",
+            "version": "0.4.11",
             "source": {
                 "type": "git",
                 "url": "https://github.com/alchemy-fr/MediaVorus.git",
-                "reference": "3e235eb1efb528aea2973c946f4bf47630b98985"
+                "reference": "0108a4b93d258dff00d154d1c05ddb296a34d621"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/alchemy-fr/MediaVorus/zipball/3e235eb1efb528aea2973c946f4bf47630b98985",
-                "reference": "3e235eb1efb528aea2973c946f4bf47630b98985",
+                "url": "https://api.github.com/repos/alchemy-fr/MediaVorus/zipball/0108a4b93d258dff00d154d1c05ddb296a34d621",
+                "reference": "0108a4b93d258dff00d154d1c05ddb296a34d621",
                 "shasum": ""
             },
             "require": {
@@ -334,7 +334,10 @@
             "keywords": [
                 "metadata"
             ],
-            "time": "2020-02-18T13:37:45+00:00"
+            "support": {
+                "source": "https://github.com/alchemy-fr/MediaVorus/tree/0.4.11"
+            },
+            "time": "2021-09-29T12:09:06+00:00"
         },
         {
             "name": "alchemy/oauth2php",

lib/Alchemy/Phrasea/Border/MimeGuesserConfiguration.php

@@ -13,6 +13,7 @@ namespace Alchemy\Phrasea\Border;
 
 use Alchemy\Phrasea\Core\Configuration\PropertyAccess;
 use MediaVorus\Utils\AudioMimeTypeGuesser;
+use MediaVorus\Utils\ImageMimeTypeGuesser;
 use MediaVorus\Utils\PostScriptMimeTypeGuesser;
 use MediaVorus\Utils\RawImageMimeTypeGuesser;
 use MediaVorus\Utils\VideoMimeTypeGuesser;
@@ -39,6 +40,7 @@ class MimeGuesserConfiguration
         $guesser->register(new PostScriptMimeTypeGuesser());
         $guesser->register(new AudioMimeTypeGuesser());
         $guesser->register(new VideoMimeTypeGuesser());
+        $guesser->register(new ImageMimeTypeGuesser());
 
         $guesser->register(new CustomExtensionGuesser($this->conf->get(['border-manager', 'extension-mapping'], [])));
     }