X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;ds=sidebyside;f=composer.lock;h=4e2fd42aa8fef4683b1ede4a4b3d0acbefb22ff2;hb=d1c5a34c937988e99af7cdde6cd9ba63281c89b9;hp=f998fe0c80d5f82ce3894fc2cd39655c04f69c57;hpb=41cef035decdd31dff853f2d88118359419aeeba;p=civicrm-core.git diff --git a/composer.lock b/composer.lock index f998fe0c80..4e2fd42aa8 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": "d87e8c07e37c51a65ff849235d04e3dc", + "content-hash": "93a9f686f7eb00fb9d766d262eedb09b", "packages": [ { "name": "civicrm/civicrm-cxn-rpc", @@ -80,6 +80,50 @@ "description": "CiviCRM installation library", "time": "2018-01-23T06:26:55+00:00" }, + { + "name": "cweagans/composer-patches", + "version": "1.6.5", + "source": { + "type": "git", + "url": "https://github.com/cweagans/composer-patches.git", + "reference": "2ec4f00ff5fb64de584c8c4aea53bf9053ecb0b3" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/cweagans/composer-patches/zipball/2ec4f00ff5fb64de584c8c4aea53bf9053ecb0b3", + "reference": "2ec4f00ff5fb64de584c8c4aea53bf9053ecb0b3", + "shasum": "" + }, + "require": { + "composer-plugin-api": "^1.0", + "php": ">=5.3.0" + }, + "require-dev": { + "composer/composer": "~1.0", + "phpunit/phpunit": "~4.6" + }, + "type": "composer-plugin", + "extra": { + "class": "cweagans\\Composer\\Patches" + }, + "autoload": { + "psr-4": { + "cweagans\\Composer\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Cameron Eagans", + "email": "me@cweagans.net" + } + ], + "description": "Provides a way to patch Composer packages.", + "time": "2018-05-11T18:00:16+00:00" + }, { "name": "dompdf/dompdf", "version": "v0.8.0", @@ -110,9 +154,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": { @@ -185,6 +226,53 @@ "homepage": "http://code.google.com/p/phpquery/", "time": "2013-03-21T12:39:33+00:00" }, + { + "name": "ezyang/htmlpurifier", + "version": "v4.10.0", + "source": { + "type": "git", + "url": "https://github.com/ezyang/htmlpurifier.git", + "reference": "d85d39da4576a6934b72480be6978fb10c860021" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/ezyang/htmlpurifier/zipball/d85d39da4576a6934b72480be6978fb10c860021", + "reference": "d85d39da4576a6934b72480be6978fb10c860021", + "shasum": "" + }, + "require": { + "php": ">=5.2" + }, + "require-dev": { + "simpletest/simpletest": "^1.1" + }, + "type": "library", + "autoload": { + "psr-0": { + "HTMLPurifier": "library/" + }, + "files": [ + "library/HTMLPurifier.composer.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "LGPL" + ], + "authors": [ + { + "name": "Edward Z. Yang", + "email": "admin@htmlpurifier.org", + "homepage": "http://ezyang.com" + } + ], + "description": "Standards compliant HTML filter written in PHP", + "homepage": "http://htmlpurifier.org/", + "keywords": [ + "html" + ], + "time": "2018-02-23T01:58:20+00:00" + }, { "name": "guzzlehttp/guzzle", "version": "6.3.0", @@ -550,6 +638,59 @@ "description": "More info available on: http://pear.php.net/package/Console_Getopt", "time": "2015-07-20T20:28:12+00:00" }, + { + "name": "pear/log", + "version": "1.13.1", + "source": { + "type": "git", + "url": "https://github.com/pear/Log.git", + "reference": "c4be9ded2353c7c231d4c35cc3da75b209453803" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/pear/Log/zipball/c4be9ded2353c7c231d4c35cc3da75b209453803", + "reference": "c4be9ded2353c7c231d4c35cc3da75b209453803", + "shasum": "" + }, + "require": { + "pear/pear_exception": "1.0.0", + "php": ">5.2" + }, + "require-dev": { + "phpunit/phpunit": "*" + }, + "suggest": { + "pear/db": "Install optionally via your project's composer.json" + }, + "type": "library", + "autoload": { + "psr-0": { + "Log": "./" + } + }, + "notification-url": "https://packagist.org/downloads/", + "include-path": [ + "" + ], + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Jon Parise", + "email": "jon@php.net", + "homepage": "http://www.indelible.org", + "role": "Developer" + } + ], + "description": "PEAR Logging Framework", + "homepage": "http://pear.github.io/Log/", + "keywords": [ + "log", + "logging" + ], + "time": "2016-04-16T00:49:33+00:00" + }, { "name": "pear/mail", "version": "v1.4.1", @@ -634,14 +775,6 @@ "pear/auth_sasl": "Install optionally via your project's composer.json" }, "type": "library", - "extra": { - "patches_applied": { - "CRM-8744 Display CiviCRM Specific error message": "tools/scripts/composer/patches/net-smtp-patch.patch", - "Fix PHP7 Compliance": "tools/scripts/composer/patches/net-smtp-php7-patch.patch", - "Fix Pass by reference issues": "tools/scripts/composer/patches/net-smtp-ref-patch.patch", - "Fix TLS support issue in PHP5.6": "tools/scripts/composer/patches/net-smtp-tls-patch.patch" - } - }, "autoload": { "psr-0": { "Net": "./" @@ -948,16 +1081,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": { @@ -968,11 +1101,16 @@ "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.*" }, "type": "library", + "extra": { + "patches_applied": { + "Fix handling of libxml_disable_entity_loader": "tools/scripts/composer/patches/phpoffice-common-xml-entity-fix.patch" + } + }, "autoload": { "psr-4": { "PhpOffice\\Common\\": "src/Common/" @@ -999,38 +1137,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": { @@ -1041,6 +1180,14 @@ "ext-zip": "Allows writing OOXML and ODF" }, "type": "library", + "extra": { + "branch-alias": { + "dev-develop": "0.16-dev" + }, + "patches_applied": { + "Fix handling of libxml_disable_entity_loader": "tools/scripts/composer/patches/phpword-libxml-fix-global-handling.patch" + } + }, "autoload": { "psr-4": { "PhpOffice\\PhpWord\\": "src/PhpWord" @@ -1102,7 +1249,7 @@ "word", "writer" ], - "time": "2017-12-29T01:30:53+00:00" + "time": "2018-07-14T16:59:43+00:00" }, { "name": "phpseclib/phpseclib", @@ -2097,18 +2244,22 @@ }, { "name": "zetacomponents/base", - "version": "1.7", + "version": "1.9.1", "source": { "type": "git", "url": "https://github.com/zetacomponents/Base.git", - "reference": "2612ee3ce88902632d45b93e379277e9d46b70a7" + "reference": "489e20235989ddc97fdd793af31ac803972454f1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zetacomponents/Base/zipball/2612ee3ce88902632d45b93e379277e9d46b70a7", - "reference": "2612ee3ce88902632d45b93e379277e9d46b70a7", + "url": "https://api.github.com/repos/zetacomponents/Base/zipball/489e20235989ddc97fdd793af31ac803972454f1", + "reference": "489e20235989ddc97fdd793af31ac803972454f1", "shasum": "" }, + "require-dev": { + "phpunit/phpunit": "~5.7", + "zetacomponents/unit-test": "*" + }, "type": "library", "autoload": { "classmap": [ @@ -2117,7 +2268,7 @@ }, "notification-url": "https://packagist.org/downloads/", "license": [ - "apache2" + "Apache-2.0" ], "authors": [ { @@ -2153,24 +2304,42 @@ ], "description": "The Base package provides the basic infrastructure that all packages rely on. Therefore every component relies on this package.", "homepage": "https://github.com/zetacomponents", - "time": "2009-06-29T10:47:39+00:00" + "time": "2017-11-28T11:30:00+00:00" }, { "name": "zetacomponents/mail", - "version": "dev-1.7-civi", + "version": "dev-master", "source": { "type": "git", - "url": "https://github.com/civicrm/zetacomponents-mail.git", - "reference": "e0feff0e1860f16fa2b3c42795c0351db58120a0" + "url": "https://github.com/zetacomponents/Mail.git", + "reference": "b60e9a543f6c3d9a9ec74452d4ff5736a1c63a77" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/zetacomponents/Mail/zipball/b60e9a543f6c3d9a9ec74452d4ff5736a1c63a77", + "reference": "b60e9a543f6c3d9a9ec74452d4ff5736a1c63a77", + "shasum": "" + }, + "require": { + "zetacomponents/base": "~1.8" + }, + "require-dev": { + "zetacomponents/unit-test": "*" }, "type": "library", + "extra": { + "patches_applied": { + "CiviCRM Custom Patches for ZetaCompoents mail": "tools/scripts/composer/patches/civicrm-custom-patches-zetacompoents-mail.patch" + } + }, "autoload": { "classmap": [ "src" ] }, + "notification-url": "https://packagist.org/downloads/", "license": [ - "apache2" + "Apache-2.0" ], "authors": [ { @@ -2204,18 +2373,18 @@ "name": "Alexandru Stanoi" }, { - "name": "Sinisa Dukaric" + "name": "Christian Michel" }, { - "name": "Mikko Koppanen" + "name": "Sinisa Dukaric" }, { - "name": "Christian Michel" + "name": "Mikko Koppanen" } ], "description": "The component allows you construct and/or parse Mail messages conforming to the mail standard. It has support for attachments, multipart messages and HTML mail. It also interfaces with SMTP to send mail or IMAP, POP3 or mbox to retrieve e-mail.", "homepage": "https://github.com/zetacomponents", - "time": "2017-03-14T06:51:24+00:00" + "time": "2019-02-13T11:33:09+00:00" } ], "packages-dev": [],