From 61a197f85274a539ea9c28006d02a1fd45ab8106 Mon Sep 17 00:00:00 2001 From: Seamus Lee Date: Sun, 18 Sep 2016 12:36:47 +1000 Subject: [PATCH] Upgrade phpword to be php7 compatiable --- composer.json | 2 +- composer.lock | 293 +++++++++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 278 insertions(+), 17 deletions(-) diff --git a/composer.json b/composer.json index 6ae2d7695e..64f2503d5a 100644 --- a/composer.json +++ b/composer.json @@ -21,7 +21,7 @@ "civicrm/civicrm-cxn-rpc": "~0.15.12.04", "zetacomponents/base": "1.7.*", "zetacomponents/mail": "dev-1.7-civi", - "phpoffice/phpword": "^0.12.1", + "phpoffice/phpword": "^0.13.0", "pear/Validate_Finance_CreditCard": "dev-master" }, "repositories": [ diff --git a/composer.lock b/composer.lock index 2b2476f065..d03ab98656 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": "647671f50570fcf03087cf4719750895", - "content-hash": "3475b3f4ae0936e68714b9f94d44f709", + "hash": "189ae04cf5b1ca1ee00d56a629a273c3", + "content-hash": "c2aba74bbb5b474831736b3e3bcbcb20", "packages": [ { "name": "civicrm/civicrm-cxn-rpc", @@ -108,6 +108,43 @@ "homepage": "https://github.com/dompdf/dompdf", "time": "2016-05-11 00:36:29" }, + { + "name": "pclzip/pclzip", + "version": "2.8.2", + "source": { + "type": "git", + "url": "https://github.com/ivanlanin/pclzip.git", + "reference": "19dd1de9d3f5fc4d7d70175b4c344dee329f45fd" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/ivanlanin/pclzip/zipball/19dd1de9d3f5fc4d7d70175b4c344dee329f45fd", + "reference": "19dd1de9d3f5fc4d7d70175b4c344dee329f45fd", + "shasum": "" + }, + "type": "library", + "autoload": { + "classmap": [ + "pclzip.lib.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "LGPL-2.1" + ], + "authors": [ + { + "name": "Vincent Blavet" + } + ], + "description": "A PHP library that offers compression and extraction functions for Zip formatted archives", + "homepage": "http://www.phpconcept.net/pclzip", + "keywords": [ + "php", + "zip" + ], + "time": "2014-06-05 11:42:24" + }, { "name": "pear/pear_exception", "version": "v1.0.0", @@ -275,23 +312,82 @@ "homepage": "https://github.com/PhenX/php-svg-lib", "time": "2015-05-06 18:49:49" }, + { + "name": "phpoffice/common", + "version": "v0.2.6", + "source": { + "type": "git", + "url": "https://github.com/PHPOffice/Common.git", + "reference": "c9be70c80637c28c728be78e66aad4878a34f8dd" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/PHPOffice/Common/zipball/c9be70c80637c28c728be78e66aad4878a34f8dd", + "reference": "c9be70c80637c28c728be78e66aad4878a34f8dd", + "shasum": "" + }, + "require": { + "pclzip/pclzip": "^2.8", + "php": ">=5.3.0" + }, + "require-dev": { + "phpdocumentor/phpdocumentor": "2.*", + "phploc/phploc": "2.*", + "phpmd/phpmd": "2.*", + "phpunit/phpunit": "3.7.*", + "sebastian/phpcpd": "2.*", + "squizlabs/php_codesniffer": "2.*" + }, + "type": "library", + "autoload": { + "psr-4": { + "PhpOffice\\Common\\": "src/Common/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "LGPL" + ], + "authors": [ + { + "name": "Mark Baker" + }, + { + "name": "Franck Lefevre", + "homepage": "http://rootslabs.net" + } + ], + "description": "PHPOffice Common", + "homepage": "http://phpoffice.github.io", + "keywords": [ + "common", + "component", + "office", + "php" + ], + "time": "2016-07-07 17:26:55" + }, { "name": "phpoffice/phpword", - "version": "v0.12.1", + "version": "v0.13.0", "source": { "type": "git", "url": "https://github.com/PHPOffice/PHPWord.git", - "reference": "38cb04d322007dd522cbdd8ba3cd50ab67ced0db" + "reference": "0a3f873972defb304de4fa2f5f53156558c11a7a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/PHPOffice/PHPWord/zipball/38cb04d322007dd522cbdd8ba3cd50ab67ced0db", - "reference": "38cb04d322007dd522cbdd8ba3cd50ab67ced0db", + "url": "https://api.github.com/repos/PHPOffice/PHPWord/zipball/0a3f873972defb304de4fa2f5f53156558c11a7a", + "reference": "0a3f873972defb304de4fa2f5f53156558c11a7a", "shasum": "" }, "require": { "ext-xml": "*", - "php": ">=5.3.3" + "php": ">=5.3.3", + "phpoffice/common": "0.2.*", + "zendframework/zend-escaper": "2.4.*", + "zendframework/zend-stdlib": "2.4.*", + "zendframework/zend-validator": "2.4.*" }, "require-dev": { "dompdf/dompdf": "0.6.*", @@ -300,16 +396,15 @@ "phploc/phploc": "2.*", "phpmd/phpmd": "2.*", "phpunit/phpunit": "3.7.*", - "sebastian/phpcpd": "2.*", "squizlabs/php_codesniffer": "1.*", - "tecnick.com/tcpdf": "6.*" + "tecnickcom/tcpdf": "6.*" }, "suggest": { - "dompdf/dompdf": "Used to write PDF", - "ext-gd2": "Used to add images", - "ext-xmlwriter": "Used to write DOCX and ODT", - "ext-xsl": "Used to apply XSL style sheet to main document part of OOXML template", - "ext-zip": "Used to write DOCX and ODT" + "dompdf/dompdf": "Allows writing PDF", + "ext-gd2": "Allows adding images", + "ext-xmlwriter": "Allows writing OOXML and ODF", + "ext-xsl": "Allows applying XSL style sheet to headers, to main document part, and to footers of an OOXML template", + "ext-zip": "Allows writing OOXML and ODF" }, "type": "library", "autoload": { @@ -343,7 +438,7 @@ "homepage": "http://ru.linkedin.com/pub/roman-syroeshko/34/a53/994/" } ], - "description": "PHPWord - A pure PHP library for reading and writing word processing documents (DOCX, ODT, RTF, HTML, PDF)", + "description": "PHPWord - A pure PHP library for reading and writing word processing documents (OOXML, ODF, RTF, HTML, PDF)", "homepage": "http://phpoffice.github.io", "keywords": [ "ISO IEC 29500", @@ -358,6 +453,7 @@ "doc", "docx", "html", + "odf", "odt", "office", "pdf", @@ -369,7 +465,7 @@ "word", "writer" ], - "time": "2015-08-30 14:30:44" + "time": "2016-07-31 08:53:39" }, { "name": "phpseclib/phpseclib", @@ -910,6 +1006,171 @@ "homepage": "https://github.com/totten/ca_config", "time": "2013-02-13 03:40:18" }, + { + "name": "zendframework/zend-escaper", + "version": "2.4.10", + "source": { + "type": "git", + "url": "https://github.com/zendframework/zend-escaper.git", + "reference": "13f468ff824f3c83018b90aff892a1b3201383a9" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/zendframework/zend-escaper/zipball/13f468ff824f3c83018b90aff892a1b3201383a9", + "reference": "13f468ff824f3c83018b90aff892a1b3201383a9", + "shasum": "" + }, + "require": { + "php": ">=5.3.23" + }, + "require-dev": { + "fabpot/php-cs-fixer": "1.7.*", + "phpunit/phpunit": "~4.0", + "satooshi/php-coveralls": "dev-master" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.4-dev", + "dev-develop": "2.5-dev" + } + }, + "autoload": { + "psr-4": { + "Zend\\Escaper\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "homepage": "https://github.com/zendframework/zend-escaper", + "keywords": [ + "escaper", + "zf2" + ], + "time": "2015-05-07 14:55:31" + }, + { + "name": "zendframework/zend-stdlib", + "version": "2.4.10", + "source": { + "type": "git", + "url": "https://github.com/zendframework/zend-stdlib.git", + "reference": "d8ecb629a72da9f91bd95c5af006384823560b42" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/zendframework/zend-stdlib/zipball/d8ecb629a72da9f91bd95c5af006384823560b42", + "reference": "d8ecb629a72da9f91bd95c5af006384823560b42", + "shasum": "" + }, + "require": { + "php": ">=5.3.23" + }, + "require-dev": { + "fabpot/php-cs-fixer": "1.7.*", + "phpunit/phpunit": "~4.0", + "satooshi/php-coveralls": "dev-master", + "zendframework/zend-eventmanager": "self.version", + "zendframework/zend-filter": "self.version", + "zendframework/zend-serializer": "self.version", + "zendframework/zend-servicemanager": "self.version" + }, + "suggest": { + "zendframework/zend-eventmanager": "To support aggregate hydrator usage", + "zendframework/zend-filter": "To support naming strategy hydrator usage", + "zendframework/zend-serializer": "Zend\\Serializer component", + "zendframework/zend-servicemanager": "To support hydrator plugin manager usage" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.4-dev", + "dev-develop": "2.5-dev" + } + }, + "autoload": { + "psr-4": { + "Zend\\Stdlib\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "homepage": "https://github.com/zendframework/zend-stdlib", + "keywords": [ + "stdlib", + "zf2" + ], + "time": "2015-07-21 13:55:46" + }, + { + "name": "zendframework/zend-validator", + "version": "2.4.10", + "source": { + "type": "git", + "url": "https://github.com/zendframework/zend-validator.git", + "reference": "81415511fe729e6de19a61936313cef43c80d337" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/zendframework/zend-validator/zipball/81415511fe729e6de19a61936313cef43c80d337", + "reference": "81415511fe729e6de19a61936313cef43c80d337", + "shasum": "" + }, + "require": { + "php": ">=5.3.23", + "zendframework/zend-stdlib": "~2.4.0" + }, + "require-dev": { + "fabpot/php-cs-fixer": "1.7.*", + "phpunit/phpunit": "~4.0", + "satooshi/php-coveralls": "dev-master", + "zendframework/zend-config": "~2.4.0", + "zendframework/zend-db": "~2.4.0", + "zendframework/zend-filter": "~2.4.0", + "zendframework/zend-i18n": "~2.4.0", + "zendframework/zend-math": "~2.4.0", + "zendframework/zend-servicemanager": "~2.4.0", + "zendframework/zend-session": "~2.4.0", + "zendframework/zend-uri": "~2.4.0" + }, + "suggest": { + "zendframework/zend-db": "Zend\\Db component", + "zendframework/zend-filter": "Zend\\Filter component, required by the Digits validator", + "zendframework/zend-i18n": "Zend\\I18n component to allow translation of validation error messages as well as to use the various Date validators", + "zendframework/zend-math": "Zend\\Math component", + "zendframework/zend-resources": "Translations of validator messages", + "zendframework/zend-servicemanager": "Zend\\ServiceManager component to allow using the ValidatorPluginManager and validator chains", + "zendframework/zend-session": "Zend\\Session component", + "zendframework/zend-uri": "Zend\\Uri component, required by the Uri and Sitemap\\Loc validators" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.4-dev", + "dev-develop": "2.5-dev" + } + }, + "autoload": { + "psr-4": { + "Zend\\Validator\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "description": "provides a set of commonly needed validators", + "homepage": "https://github.com/zendframework/zend-validator", + "keywords": [ + "validator", + "zf2" + ], + "time": "2015-09-08 21:04:17" + }, { "name": "zetacomponents/base", "version": "1.7", -- 2.25.1