Commit edb693a5 authored by Bertrand Gauthier's avatar Bertrand Gauthier
Browse files

Merge branch 'release_4.1.3'

parents b9026941 884de011
Loading
Loading
Loading
Loading
Loading
+5 −0
Original line number Diff line number Diff line
Journal des modifications
=========================

4.1.3
-----
- [FIX] Balises <img> des logos/signatures dont la src est le contenu binaire : le format était systématiquement 
  'image/png' ce qui posait problème si l'image était d'un autre format.

4.1.2
-----
- [FIX] Plantage du formulaire de création d'un avis sur un rapport d'activité.
+56 −12
Original line number Diff line number Diff line
@@ -1811,16 +1811,16 @@
        },
        {
            "name": "guzzlehttp/guzzle",
            "version": "6.5.5",
            "version": "6.5.7",
            "source": {
                "type": "git",
                "url": "https://github.com/guzzle/guzzle.git",
                "reference": "9d4290de1cfd701f38099ef7e183b64b4b7b0c5e"
                "reference": "724562fa861e21a4071c652c8a159934e4f05592"
            },
            "dist": {
                "type": "zip",
                "url": "https://api.github.com/repos/guzzle/guzzle/zipball/9d4290de1cfd701f38099ef7e183b64b4b7b0c5e",
                "reference": "9d4290de1cfd701f38099ef7e183b64b4b7b0c5e",
                "url": "https://api.github.com/repos/guzzle/guzzle/zipball/724562fa861e21a4071c652c8a159934e4f05592",
                "reference": "724562fa861e21a4071c652c8a159934e4f05592",
                "shasum": ""
            },
            "require": {
@@ -1857,10 +1857,40 @@
                "MIT"
            ],
            "authors": [
                {
                    "name": "Graham Campbell",
                    "email": "hello@gjcampbell.co.uk",
                    "homepage": "https://github.com/GrahamCampbell"
                },
                {
                    "name": "Michael Dowling",
                    "email": "mtdowling@gmail.com",
                    "homepage": "https://github.com/mtdowling"
                },
                {
                    "name": "Jeremy Lindblom",
                    "email": "jeremeamia@gmail.com",
                    "homepage": "https://github.com/jeremeamia"
                },
                {
                    "name": "George Mponos",
                    "email": "gmponos@gmail.com",
                    "homepage": "https://github.com/gmponos"
                },
                {
                    "name": "Tobias Nyholm",
                    "email": "tobias.nyholm@gmail.com",
                    "homepage": "https://github.com/Nyholm"
                },
                {
                    "name": "Márk Sági-Kazár",
                    "email": "mark.sagikazar@gmail.com",
                    "homepage": "https://github.com/sagikazarmark"
                },
                {
                    "name": "Tobias Schultze",
                    "email": "webmaster@tubo-world.de",
                    "homepage": "https://github.com/Tobion"
                }
            ],
            "description": "Guzzle is a PHP HTTP client library",
@@ -1876,9 +1906,23 @@
            ],
            "support": {
                "issues": "https://github.com/guzzle/guzzle/issues",
                "source": "https://github.com/guzzle/guzzle/tree/6.5"
                "source": "https://github.com/guzzle/guzzle/tree/6.5.7"
            },
            "funding": [
                {
                    "url": "https://github.com/GrahamCampbell",
                    "type": "github"
                },
                {
                    "url": "https://github.com/Nyholm",
                    "type": "github"
                },
            "time": "2020-06-16T21:01:06+00:00"
                {
                    "url": "https://tidelift.com/funding/github/packagist/guzzlehttp/guzzle",
                    "type": "tidelift"
                }
            ],
            "time": "2022-06-09T21:36:50+00:00"
        },
        {
            "name": "guzzlehttp/promises",
@@ -1966,16 +2010,16 @@
        },
        {
            "name": "guzzlehttp/psr7",
            "version": "1.8.3",
            "version": "1.8.5",
            "source": {
                "type": "git",
                "url": "https://github.com/guzzle/psr7.git",
                "reference": "1afdd860a2566ed3c2b0b4a3de6e23434a79ec85"
                "reference": "337e3ad8e5716c15f9657bd214d16cc5e69df268"
            },
            "dist": {
                "type": "zip",
                "url": "https://api.github.com/repos/guzzle/psr7/zipball/1afdd860a2566ed3c2b0b4a3de6e23434a79ec85",
                "reference": "1afdd860a2566ed3c2b0b4a3de6e23434a79ec85",
                "url": "https://api.github.com/repos/guzzle/psr7/zipball/337e3ad8e5716c15f9657bd214d16cc5e69df268",
                "reference": "337e3ad8e5716c15f9657bd214d16cc5e69df268",
                "shasum": ""
            },
            "require": {
@@ -2056,7 +2100,7 @@
            ],
            "support": {
                "issues": "https://github.com/guzzle/psr7/issues",
                "source": "https://github.com/guzzle/psr7/tree/1.8.3"
                "source": "https://github.com/guzzle/psr7/tree/1.8.5"
            },
            "funding": [
                {
@@ -2072,7 +2116,7 @@
                    "type": "tidelift"
                }
            ],
            "time": "2021-10-05T13:56:00+00:00"
            "time": "2022-03-20T21:51:18+00:00"
        },
        {
            "name": "jasig/phpcas",
+18 −0
Original line number Diff line number Diff line
# Version 4.1.3

## 1. Sur le serveur d'application

- Placez-vous dans le répertoire de l'application puis lancez la commande suivante
  pour installer la nouvelle version :

```bash
git fetch --tags && git checkout --force 4.1.3 && bash ./install.sh
```

- Selon le moteur PHP que vous avez installé, rechargez le service, exemple :
    - php7.4-fpm         : `service php7.4-fpm reload`
    - apache2-mod-php7.4 : `service apache2 reload`

## 2. Dans la base de données

Nada.
+1 −1
Original line number Diff line number Diff line
@@ -446,7 +446,7 @@ class FichierTheseController extends AbstractController
        /** @var \Laminas\Http\Response $response */
        $response = $this->getResponse();

        return $this->fichierTheseService->createResponseForFileContent($response, $content);
        return $this->fichierTheseService->createResponseForFileContent($response, $content, "image/png");
    }

    /**
+5 −8
Original line number Diff line number Diff line
@@ -420,12 +420,10 @@ class FichierTheseService extends BaseService
     * @param string $inputFilePath
     * @return string Contenu binaire du fichier PNG généré
     * @throws LogicException Format de fichier incorrect
     *
     * @deprecated Appeler directement FileService::generateFirstPagePreview()
     */
    public function generateFirstPagePreview($inputFilePath)
    public function generateFirstPagePreview(string $inputFilePath): string
    {
        return $this->fileService->generateFirstPagePreview($inputFilePath);
        return $this->fileService->generateFirstPagePreviewPngImageFromPdf($inputFilePath);
    }

    /**
@@ -450,14 +448,13 @@ class FichierTheseService extends BaseService
    /**
     * @param Response $response
     * @param string $fileContent
     * @param string $mimeType Ex : "image/png"
     * @param int|null $cacheMaxAge En secondes, ex: 60*60*24 = 86400 s = 1 jour
     * @return Response
     *
     * @deprecated Appeler directement FileService::createResponseForFileContent()
     */
    public function createResponseForFileContent(Response $response, $fileContent, $cacheMaxAge = null)
    public function createResponseForFileContent(Response $response, string $fileContent, string $mimeType, ?int $cacheMaxAge = null): Response
    {
        return $this->fileService->createResponseForFileContent($response, $fileContent, $cacheMaxAge);
        return $this->fileService->createResponseForFileContent($response, $fileContent, $mimeType, $cacheMaxAge);
    }

    /**
Loading