Merge pull request #2931 from wallabag/php-7.1

Use wallabag/tcpdf

diff --git a/.travis.yml b/.travis.yml
index 8c8093bf4ed88967ab847856a84506a6c0f00107..29ca7dc3a80d925775e5b38b7c2f6814d1b05b28 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -44,7 +44,6 @@ matrix:
         - php: 7.0
           env: CS_FIXER=run VALIDATE_TRANSLATION_FILE=run ASSETS=build DB=sqlite
     allow_failures:
-        - php: 7.1
         - php: nightly
 
 # exclude v1 branches

diff --git a/composer.json b/composer.json
index b919f446c32866cd19bea0005559357fa6548e65..c43d2dcf58fbce150c1f4a1b880fe280a42f2fac 100644 (file)
--- a/composer.json
+++ b/composer.json
@@ -58,7 +58,7 @@
         "jms/serializer-bundle": "~1.1",
         "nelmio/api-doc-bundle": "~2.7",
         "mgargano/simplehtmldom": "~1.5",
-        "tecnickcom/tc-lib-pdf": "dev-master",
+        "wallabag/tcpdf": "^6.2",
         "simplepie/simplepie": "~1.3.1",
         "willdurand/hateoas-bundle": "~1.0",
         "htmlawed/htmlawed": "~1.1.19",