Merge pull request #20459 from eileenmcnaughton/trigg

[civicrm-core.git] / composer.json

diff --git a/composer.json b/composer.json
index 58e03fcb964636af2cd7f6aaa5091f5acfd478da..0d08d2fce1db23b2767ef128c96980427762e666 100644 (file)
--- a/composer.json
+++ b/composer.json
@@ -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.*",
@@ -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"
       }