Merge branch 'release/v1.3'

CHANGELOG.md

@@ -2,6 +2,13 @@
 
 ## [UNRELEASED]
 
+## [1.3.0] - 2018-12-12
+### Changement
+- [TECH] Mise à jour Symfony 3.4 à 4.2.1, #129
+### Fix
+- [BILAN] Le graphique de l'indice de maturité est maintenant bien ordonné, #128
+- [GLOBAL] Les générations WORD acceptent maintenant les caractères spéciaux, #127
+
 ## [1.2.2] - 2018-11-16
 ### Fix
 - [GLOBAL] Le code postal commencant par 0 ne fonctionnait pas pour les adresses du registre, #119

composer.json

 {
-    "name" : "soluris/gestion-rgpd",
+    "name" : "soluris/madis",
     "type": "project",
     "license": "proprietary",
     "authors" : [
         {
             "name" : "Donovan Bourlard",
-            "email" : "donovan.bourlard@outlook.fr"
+            "email" : "donovan@awkan.fr"
         }
     ],
     "require": {
@@ -17,18 +17,18 @@
         "ramsey/uuid": "^3.7",
         "ramsey/uuid-doctrine": "^1.4",
         "rollerworks/password-strength-bundle": "^2.0",
-        "sensiolabs/security-checker": "^4.1",
         "stof/doctrine-extensions-bundle": "^1.3",
-        "symfony/asset": "^3.4",
-        "symfony/dotenv": "^3.4",
-        "symfony/expression-language": "^3.4",
-        "symfony/form": "^3.4",
+        "symfony/asset": "^4.2",
+        "symfony/dotenv": "^4.2",
+        "symfony/expression-language": "^4.2",
+        "symfony/flex": "^1.1",
+        "symfony/form": "^4.2",
         "symfony/orm-pack": "^1.0",
-        "symfony/security-bundle": "^3.4",
-        "symfony/skeleton": "^3.4",
+        "symfony/security-bundle": "^4.2",
+        "symfony/skeleton": "^4.2",
         "symfony/swiftmailer-bundle": "^3.2",
-        "symfony/twig-bundle": "^3.4",
-        "symfony/validator": "^3.4",
+        "symfony/twig-bundle": "^4.2",
+        "symfony/validator": "^4.2",
         "symfony/webpack-encore-pack": "^1.0",
         "twig/extensions": "^1.5"
     },
@@ -38,6 +38,7 @@
         "friendsofphp/php-cs-fixer": "^2.11",
         "hautelook/alice-bundle": "^2.0",
         "phpunit/phpunit": "^7.1",
+        "sensiolabs/security-checker": "^5.0",
         "symfony/debug-pack": "^1.0"
     },
     "config": {
@@ -68,10 +69,14 @@
         "post-update-cmd": [
             "@auto-scripts"
         ]
-    }, "repositories": [
-    {
-        "type": "vcs",
-        "url": "https://github.com/biig-io/DictionaryBundle"
+    },
+    "conflict": {
+        "symfony/symfony": "*"
+    },
+    "extra": {
+        "symfony": {
+            "allow-contrib": false,
+            "require": "4.2.*"
+        }
     }
-]
 }

config/packages/framework.yaml

 parameters:
-    app.version: 1.2.2
+    app.version: 1.3.0
 
 framework:
     secret: '%env(APP_SECRET)%'

config/services.yaml

@@ -9,11 +9,11 @@ services:
 
     App\Application\:
         resource: '../src/Application/*'
-        exclude: '../src/Application/{Controller,Entity,Migrations,Symfony/EventSubscriber,Symfony/Form,Tests,Kernel.php}'
+        exclude: '../src/Application/{Controller,Dictionary,Entity,Migrations,Symfony/EventSubscriber,Symfony/Form,Tests,Kernel.php}'
 
     App\Domain\:
         resource: '../src/Domain/*'
-        exclude: '../src/Domain/*/{Component/Mailer.php,Controller,Generator,Handler,Model,Symfony/EventSubscriber,Symfony/Form,Tests}'
+        exclude: '../src/Domain/*/{Component/Mailer.php,Controller,Dictionary,Generator,Handler,Model,Symfony/EventSubscriber,Symfony/Form,Tests}'
 
     PhpOffice\PhpWord\PhpWord: ~
     RandomLib\Factory: ~

config/services/dictionary.yaml

@@ -4,8 +4,6 @@ services:
         autoconfigure: true
         public: false
 
-    Knp\DictionaryBundle\Dictionary\DictionaryRegistry: "@knp_dictionary.dictionary.dictionary_registry"
-
     App\Domain\:
         resource: '../../src/Domain/*/Dictionary'
         tags: ['knp_dictionary.dictionary']

src/Domain/Reporting/Generator/Word/AbstractGenerator.php

@@ -18,6 +18,7 @@ use App\Domain\User\Dictionary\ContactCivilityDictionary;
 use PhpOffice\PhpWord\Element\Section;
 use PhpOffice\PhpWord\IOFactory;
 use PhpOffice\PhpWord\PhpWord;
+use PhpOffice\PhpWord\Settings;
 use PhpOffice\PhpWord\SimpleType\Jc;
 use PhpOffice\PhpWord\SimpleType\TblWidth;
 use PhpOffice\PhpWord\Style;
@@ -296,6 +297,7 @@ abstract class AbstractGenerator implements GeneratorInterface
      */
     public function generateResponse(PhpWord $document, string $documentName): BinaryFileResponse
     {
+        Settings::setOutputEscapingEnabled(true);
         $objWriter = IOFactory::createWriter($document, 'Word2007');
 
         $currentDate = (new \DateTimeImmutable())->format('Ymd');

src/Domain/Reporting/Generator/Word/MaturityGenerator.php

@@ -89,6 +89,9 @@ class MaturityGenerator extends AbstractGenerator implements ImpressionGenerator
                     $domainsName[$maturity->getDomain()->getPosition()] = $maturity->getDomain()->getName();
                 }
             }
+            \ksort($maturityList);
+            \ksort($domainsName);
+
             foreach ($maturityList as $position => $score) {
                 $row   = [];
                 $row[] = $domainsName[$position];
@@ -100,8 +103,6 @@ class MaturityGenerator extends AbstractGenerator implements ImpressionGenerator
                 $serie1[]    = $score['new'] / 10;
                 $tableData[] = $row;
             }
-            \ksort($maturityList);
-            \ksort($domainsName);
             // Display
             $section->addTitle("Résultat de l'évaluation du {$data['new']->getCreatedAt()->format('d/m/Y')}", 2);
 

src/Domain/Reporting/Generator/Word/TreatmentGenerator.php

@@ -231,7 +231,7 @@ class TreatmentGenerator extends AbstractGenerator implements ImpressionGenerato
                 ],
                 [
                     'Logiciel',
-                    \is_string($treatment->getSoftware()) ? \htmlspecialchars($treatment->getSoftware()) : null,
+                    \is_string($treatment->getSoftware()) ? $treatment->getSoftware() : null,
                 ],
                 [
                     'Gestion papier',

symfony.lock

@@ -341,6 +341,9 @@
             "ref": "e3868d2f4a5104f19f844fe551099a00c6562527"
         }
     },
+    "symfony/contracts": {
+        "version": "v1.0.2"
+    },
     "symfony/debug": {
         "version": "v3.4.9"
     },
@@ -410,9 +413,6 @@
     "symfony/intl": {
         "version": "v3.4.10"
     },
-    "symfony/lts": {
-        "version": "v3"
-    },
     "symfony/monolog-bridge": {
         "version": "v3.4.9"
     },
@@ -431,9 +431,6 @@
     "symfony/orm-pack": {
         "version": "v1.0.5"
     },
-    "symfony/polyfill-apcu": {
-        "version": "v1.8.0"
-    },
     "symfony/polyfill-intl-icu": {
         "version": "v1.8.0"
     },
@@ -473,9 +470,6 @@
             "ref": "f8a63faa0d9521526499c0a8f403c9964ecb0527"
         }
     },
-    "symfony/skeleton": {
-        "version": "v3.4.6"
-    },
     "symfony/stopwatch": {
         "version": "v3.4.9"
     },
@@ -515,6 +509,9 @@
     "symfony/var-dumper": {
         "version": "v3.4.9"
     },
+    "symfony/var-exporter": {
+        "version": "v4.2.1"
+    },
     "symfony/web-profiler-bundle": {
         "version": "3.3",
         "recipe": {