Merge branch 'master' of https://git.unicaen.fr/lib/unicaen/app

 Conflicts:
	CHANGELOG.md

CHANGELOG.md

 CHANGELOG
 =========
 
-3.1.21
+3.1.22
 ------
 - Le composant TabAjax ajoute les urls dans les attributs data-url des tab-panes
 
+3.1.21
+------
+- Dépendance composer supprimée : zfcampus/zf-asset-manager.
+- Dépendance composer assouplie : possibilité de passer à mPDF v8.
+
 3.1.20
 ------
 - Ajout du support de 2 fonctions SQL oracle/postgres : replace() et chr()

composer.json

@@ -8,7 +8,7 @@
         "ext-ldap":                                     "*",
         "beberlei/assert":                              "^2.9",
         "doctrine/doctrine-orm-module":                 "*",
-        "mpdf/mpdf":                                    "^7.1",
+        "mpdf/mpdf":                                    "^7.1 || ^8.0",
         "ocramius/proxy-manager":                       "^2.0",
         "zendframework/zend-config":                    "^3.2",
         "zendframework/zend-console":                   "^2.8",
@@ -33,8 +33,7 @@
         "zendframework/zend-servicemanager":            "^3.4",
         "zendframework/zend-session":                   "^2.8",
         "zendframework/zend-version":                   "^2.4",
-        "zendframework/zend-view":                      "^2.11",
-        "zfcampus/zf-asset-manager":                    "^1.2"
+        "zendframework/zend-view":                      "^2.11"
     },
     "require-dev": {
         "zendframework/zend-test":                      "^3.2",

config/module.config.php

@@ -49,13 +49,6 @@ use UnicaenApp\View\Helper\UserProfileSelectFactory;
 use Zend\Mvc\Console\Router\Simple;
 
 return [
-    'asset_manager'   => [
-        'resolver_configs' => [
-            'paths' => [
-                __DIR__ . '/../public',
-            ],
-        ],
-    ],
     'router'          => [
         'routes' => [
             // Base “route”, which describes the base match needed, the root of the tree

src/UnicaenApp/Exporter/Pdf.php

@@ -41,7 +41,7 @@ class Pdf implements ExporterInterface
     /**
      * @var PhpRenderer
      */
-    private $renderer;
+    protected $renderer;
     /**
      * @var mPDF
      */