From bd158008b20b95dbe7de891bccb7d69b514058d6 Mon Sep 17 00:00:00 2001 From: yuri Date: Tue, 4 Oct 2016 12:58:24 +0300 Subject: [PATCH] update tcpdf --- application/Espo/Core/Pdf/Tcpdf.php | 2 +- composer.json | 4 +-- composer.lock | 44 ++++++++++++++--------------- 3 files changed, 24 insertions(+), 26 deletions(-) diff --git a/application/Espo/Core/Pdf/Tcpdf.php b/application/Espo/Core/Pdf/Tcpdf.php index 4f48d30040..ccaeb62399 100644 --- a/application/Espo/Core/Pdf/Tcpdf.php +++ b/application/Espo/Core/Pdf/Tcpdf.php @@ -29,7 +29,7 @@ namespace Espo\Core\Pdf; -require "vendor/tecnick.com/tcpdf/tcpdf.php"; +require "vendor/tecnickcom/tcpdf/tcpdf.php"; class Tcpdf extends \TCPDF { diff --git a/composer.json b/composer.json index 852f22a604..63921063a6 100644 --- a/composer.json +++ b/composer.json @@ -8,10 +8,10 @@ "zendframework/zend-ldap": "2.*", "monolog/monolog": "1.*", "yzalis/identicon": "*", - "tecnick.com/tcpdf": "6.*", "zordius/lightncandy": "0.*", "composer/semver": "^1.4", - "zendframework/zend-servicemanager": "^3.1" + "zendframework/zend-servicemanager": "^3.1", + "tecnickcom/tcpdf": "^6.2" }, "autoload": { "psr-0": { diff --git a/composer.lock b/composer.lock index da2fe303f5..19fd5c76b7 100644 --- a/composer.lock +++ b/composer.lock @@ -4,8 +4,8 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "hash": "eacb4846dfd17c282e56cbf6e747d2d1", - "content-hash": "ca2be90f88c1ba6a2a88926a1d99df6b", + "hash": "46075698dc4d8c1138cae376ebc572c9", + "content-hash": "b941abc20f072ef97ac9ac3f8c53f5c7", "packages": [ { "name": "composer/semver", @@ -771,17 +771,17 @@ "time": "2014-02-16 18:18:25" }, { - "name": "tecnick.com/tcpdf", - "version": "6.2.9", + "name": "tecnickcom/tcpdf", + "version": "6.2.12", "source": { "type": "git", "url": "https://github.com/tecnickcom/TCPDF.git", - "reference": "fa6ab8a1e1fbabb9e6cfd2f807514fa1497240e4" + "reference": "2f732eaa91b5665274689b1d40b285a7bacdc37f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/tecnickcom/TCPDF/zipball/fa6ab8a1e1fbabb9e6cfd2f807514fa1497240e4", - "reference": "fa6ab8a1e1fbabb9e6cfd2f807514fa1497240e4", + "url": "https://api.github.com/repos/tecnickcom/TCPDF/zipball/2f732eaa91b5665274689b1d40b285a7bacdc37f", + "reference": "2f732eaa91b5665274689b1d40b285a7bacdc37f", "shasum": "" }, "require": { @@ -831,8 +831,7 @@ "pdf417", "qrcode" ], - "abandoned": "tecnickcom/tcpdf", - "time": "2015-06-18 09:12:38" + "time": "2015-09-12 10:08:34" }, { "name": "yzalis/identicon", @@ -1630,39 +1629,38 @@ }, { "name": "phpunit/phpunit", - "version": "3.7.32", + "version": "3.7.38", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "2752cbb9ea5bd84c2811b34b6953f76965ec7a2f" + "reference": "38709dc22d519a3d1be46849868aa2ddf822bcf6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/2752cbb9ea5bd84c2811b34b6953f76965ec7a2f", - "reference": "2752cbb9ea5bd84c2811b34b6953f76965ec7a2f", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/38709dc22d519a3d1be46849868aa2ddf822bcf6", + "reference": "38709dc22d519a3d1be46849868aa2ddf822bcf6", "shasum": "" }, "require": { + "ext-ctype": "*", "ext-dom": "*", + "ext-json": "*", "ext-pcre": "*", "ext-reflection": "*", "ext-spl": "*", "php": ">=5.3.3", - "phpunit/php-code-coverage": "~1.2.1", - "phpunit/php-file-iterator": ">=1.3.1", - "phpunit/php-text-template": ">=1.1.1", - "phpunit/php-timer": ">=1.0.4", - "phpunit/phpunit-mock-objects": "~1.2.0", + "phpunit/php-code-coverage": "~1.2", + "phpunit/php-file-iterator": "~1.3", + "phpunit/php-text-template": "~1.1", + "phpunit/php-timer": "~1.0", + "phpunit/phpunit-mock-objects": "~1.2", "symfony/yaml": "~2.0" }, "require-dev": { "pear-pear.php.net/pear": "1.9.4" }, "suggest": { - "ext-json": "*", - "ext-simplexml": "*", - "ext-tokenizer": "*", - "phpunit/php-invoker": ">=1.1.0,<1.2.0" + "phpunit/php-invoker": "~1.1" }, "bin": [ "composer/bin/phpunit" @@ -1700,7 +1698,7 @@ "testing", "xunit" ], - "time": "2014-02-25 03:47:29" + "time": "2014-10-17 09:04:17" }, { "name": "phpunit/phpunit-mock-objects",