diff --git a/composer.json b/composer.json index 0988e0cd9953..b8d17dbe0d5a 100644 --- a/composer.json +++ b/composer.json @@ -49,7 +49,7 @@ "zetacomponents/base": "1.7.*", "zetacomponents/mail": "dev-1.7-civi", "marcj/topsort": "~1.1", - "phpoffice/phpword": "^0.14.0", + "phpoffice/phpword": "^0.15.0", "pear/Validate_Finance_CreditCard": "dev-master", "civicrm/civicrm-cxn-rpc": "~0.17.07.01", "pear/Auth_SASL": "1.1.0", diff --git a/composer.lock b/composer.lock index 7b5f352c9f7c..d96bb1cd9eda 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "38f5450ab72f881008f5cd10bb588b6f", + "content-hash": "ab6d8ba012f54c69b8884a78953b2a67", "packages": [ { "name": "civicrm/civicrm-cxn-rpc", @@ -110,9 +110,6 @@ "extra": { "branch-alias": { "dev-develop": "0.7-dev" - }, - "patches_applied": { - "Fix Fatal error: Uncaught Dompdf Exception: No block-level parent found.": "tools/scripts/composer/patches/dompdf_no_block_level_parent_fix.patch" } }, "autoload": { @@ -799,16 +796,16 @@ }, { "name": "phpoffice/common", - "version": "v0.2.6", + "version": "0.2.9", "source": { "type": "git", "url": "https://github.com/PHPOffice/Common.git", - "reference": "c9be70c80637c28c728be78e66aad4878a34f8dd" + "reference": "edb5d32b1e3400a35a5c91e2539ed6f6ce925e4d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/PHPOffice/Common/zipball/c9be70c80637c28c728be78e66aad4878a34f8dd", - "reference": "c9be70c80637c28c728be78e66aad4878a34f8dd", + "url": "https://api.github.com/repos/PHPOffice/Common/zipball/edb5d32b1e3400a35a5c91e2539ed6f6ce925e4d", + "reference": "edb5d32b1e3400a35a5c91e2539ed6f6ce925e4d", "shasum": "" }, "require": { @@ -819,7 +816,7 @@ "phpdocumentor/phpdocumentor": "2.*", "phploc/phploc": "2.*", "phpmd/phpmd": "2.*", - "phpunit/phpunit": "3.7.*", + "phpunit/phpunit": "^4.8.36 || ^7.0", "sebastian/phpcpd": "2.*", "squizlabs/php_codesniffer": "2.*" }, @@ -850,38 +847,39 @@ "office", "php" ], - "time": "2016-07-07T17:26:55+00:00" + "time": "2018-07-13T14:12:34+00:00" }, { "name": "phpoffice/phpword", - "version": "v0.14.0", + "version": "0.15.0", "source": { "type": "git", "url": "https://github.com/PHPOffice/PHPWord.git", - "reference": "b614497ae6dd44280be1c2dda56772198bcd25ae" + "reference": "dfa2f36cad2b632b7ab1c56473e4f5db9a7caf7f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/PHPOffice/PHPWord/zipball/b614497ae6dd44280be1c2dda56772198bcd25ae", - "reference": "b614497ae6dd44280be1c2dda56772198bcd25ae", + "url": "https://api.github.com/repos/PHPOffice/PHPWord/zipball/dfa2f36cad2b632b7ab1c56473e4f5db9a7caf7f", + "reference": "dfa2f36cad2b632b7ab1c56473e4f5db9a7caf7f", "shasum": "" }, "require": { "ext-xml": "*", "php": "^5.3.3 || ^7.0", - "phpoffice/common": "^0.2", - "zendframework/zend-escaper": "^2.2", - "zendframework/zend-stdlib": "^2.2 || ^3.0" + "phpoffice/common": "^0.2.9", + "zendframework/zend-escaper": "^2.2" }, "require-dev": { "dompdf/dompdf": "0.8.*", - "friendsofphp/php-cs-fixer": "^2.0", - "mpdf/mpdf": "5.* || 6.* || 7.*", - "phpdocumentor/phpdocumentor": "2.*", + "ext-gd": "*", + "ext-zip": "*", + "friendsofphp/php-cs-fixer": "^2.2", + "mpdf/mpdf": "5.7.4 || 6.* || 7.*", + "php-coveralls/php-coveralls": "1.1.0 || ^2.0", "phploc/phploc": "2.* || 3.* || 4.*", "phpmd/phpmd": "2.*", - "phpunit/phpunit": "^4.8.36 || ^5.0", - "squizlabs/php_codesniffer": "^2.7", + "phpunit/phpunit": "^4.8.36 || ^7.0", + "squizlabs/php_codesniffer": "^2.9", "tecnickcom/tcpdf": "6.*" }, "suggest": { @@ -892,6 +890,11 @@ "ext-zip": "Allows writing OOXML and ODF" }, "type": "library", + "extra": { + "branch-alias": { + "dev-develop": "0.16-dev" + } + }, "autoload": { "psr-4": { "PhpOffice\\PhpWord\\": "src/PhpWord" @@ -953,7 +956,7 @@ "word", "writer" ], - "time": "2017-12-29T01:30:53+00:00" + "time": "2018-07-14T16:59:43+00:00" }, { "name": "phpseclib/phpseclib",