X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=composer.json;h=f8e66dad71119f4f7776bb3efc2bb74ed2017fd0;hb=6857c2f654e13426e1a183ded4932e4c6a63a4ee;hp=604bf273ce73e85cb20d3ae17f694154168cbab8;hpb=65981f12becede9291f399bd40d733e9c95ce209;p=civicrm-core.git diff --git a/composer.json b/composer.json index 604bf273ce..f8e66dad71 100644 --- a/composer.json +++ b/composer.json @@ -44,7 +44,7 @@ "require": { "php": "~7.2", "cache/integration-tests": "~0.17.0", - "dompdf/dompdf" : "~0.8", + "dompdf/dompdf" : "~1.0.0", "firebase/php-jwt": ">=3 <6", "electrolinux/phpquery": "^0.9.6", "symfony/config": "~3.0 || ~4.4", @@ -61,8 +61,8 @@ "zetacomponents/base": "1.9.*", "zetacomponents/mail": "1.9.*", "marcj/topsort": "~1.1", - "phpoffice/phpword": "^0.15.0", - "pear/validate_finance_creditcard": "dev-master", + "phpoffice/phpword": "^0.18.0", + "pear/validate_finance_creditcard": "0.7.0", "civicrm/civicrm-cxn-rpc": "~0.20.12.01 || ~0.19.01.10", "pear/auth_sasl": "1.1.0", "pear/net_smtp": "1.9.*", @@ -71,7 +71,7 @@ "guzzlehttp/guzzle": "^6.3", "psr/simple-cache": "~1.0.1", "cweagans/composer-patches": "~1.0", - "pear/log": "1.13.2", + "pear/log": "1.13.3", "adrienrn/php-mimetyper": "0.2.2", "civicrm/composer-downloads-plugin": "^3.0", "league/csv": "^9.2", @@ -170,7 +170,7 @@ "ignore": [".*", "node_modules", "docs", "Gruntfile.js", "index.html", "package.json", "test"] }, "ckeditor": { - "url": "https://github.com/ckeditor/ckeditor-releases/archive/4.14.0.zip" + "url": "https://github.com/ckeditor/ckeditor-releases/archive/4.16.1.zip" }, "crossfilter-1.3.x": { "url": "https://github.com/crossfilter/crossfilter/archive/1.3.14.zip", @@ -281,12 +281,6 @@ "pear/net_smtp": { "Add in CiviCRM custom error message for CRM-8744": "https://raw.githubusercontent.com/civicrm/civicrm-core/a6a0ff13d2a155ad962529595dceaef728116f96/tools/scripts/composer/patches/net-smtp-patch.patch" }, - "phpoffice/common": { - "Fix handling of libxml_disable_entity_loader": "https://raw.githubusercontent.com/civicrm/civicrm-core/9d93748a36c7c5d44422911db1c98fb2f7067b34/tools/scripts/composer/patches/phpoffice-common-xml-entity-fix.patch" - }, - "phpoffice/phpword": { - "Fix handling of libxml_disable_entity_loader": "https://raw.githubusercontent.com/civicrm/civicrm-core/9d93748a36c7c5d44422911db1c98fb2f7067b34/tools/scripts/composer/patches/phpword-libxml-fix-global-handling.patch" - }, "zetacomponents/mail": { "CiviCRM Custom Patches for ZetaCompoents mail": "https://raw.githubusercontent.com/civicrm/civicrm-core/9d93748a36c7c5d44422911db1c98fb2f7067b34/tools/scripts/composer/patches/civicrm-custom-patches-zetacompoents-mail.patch" }