Merge pull request #92 from Setasign/development

Development
Setasign · Feb 19, 2020 · ff7e43e · ff7e43e
2 parents 3c26600 + 34daf3b
commit ff7e43e
Show file tree

Hide file tree

Showing 56 changed files with 159 additions and 223 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -6,6 +6,7 @@ php:
   - '7.1'
   - '7.2'
   - '7.3'
+  - '7.4'
 
 before_script:
   - composer selfupdate

diff --git a/LICENSE.txt b/LICENSE.txt
@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2017 Setasign - Jan Slabon, https://www.setasign.com
+Copyright (c) 2020 Setasign GmbH & Co. KG, https://www.setasign.com
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/README.md b/README.md
@@ -85,8 +85,8 @@ If you want to use tFPDF, your have to update your composer.json respectively to
 ```json
 {
     "require": {
-        "tecnickcom/tfpdf": "1.25",
-        "setasign/fpdi": "^2.1"
+        "tecnickcom/tfpdf": "1.31",
+        "setasign/fpdi": "^2.3"
     }
 }
 ```

diff --git a/composer.json b/composer.json
@@ -18,6 +18,9 @@
         "php": "^5.6 || ^7.0",
         "ext-zlib": "*"
     },
+    "conflict": {
+        "setasign/tfpdf": "<1.31"
+    },
     "authors": [
         {
             "name": "Jan Slabon",
@@ -40,7 +43,7 @@
         "phpunit/phpunit": "~5.7",
         "setasign/fpdf": "~1.8",
         "tecnickcom/tcpdf": "~6.2",
-        "setasign/tfpdf": "1.25"
+        "setasign/tfpdf": "1.31"
     },
     "autoload-dev": {
         "psr-4": {

diff --git a/composer.lock b/composer.lock
diff --git a/src/FpdfTpl.php b/src/FpdfTpl.php
@@ -3,7 +3,7 @@
  * This file is part of FPDI
  *
  * @package   setasign\Fpdi
- * @copyright Copyright (c) 2019 Setasign - Jan Slabon (https://www.setasign.com)
+ * @copyright Copyright (c) 2020 Setasign GmbH & Co. KG (https://www.setasign.com)
  * @license   http://opensource.org/licenses/mit-license The MIT License
  */
 

diff --git a/src/FpdfTplTrait.php b/src/FpdfTplTrait.php
@@ -3,7 +3,7 @@
  * This file is part of FPDI
  *
  * @package   setasign\Fpdi
- * @copyright Copyright (c) 2019 Setasign - Jan Slabon (https://www.setasign.com)
+ * @copyright Copyright (c) 2020 Setasign GmbH & Co. KG (https://www.setasign.com)
  * @license   http://opensource.org/licenses/mit-license The MIT License
  */
-Original file line number
+Diff line change
@@ Expand Up / @@ -6,6 +6,7 @@ php: @@
       - '7.1'
       - '7.2'
       - '7.3'
+      - '7.4'
     before_script:
       - composer selfupdate
@@ Expand Down @@