X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;ds=sidebyside;f=composer.json;h=fb0a9154945ff3c3c0388a21c8235ce3b9b5dede;hb=ab64b46a2a76978e3cdd67e98375c6a69708ee72;hp=829f8ae59f820ba24374d436f98ee6e103a72374;hpb=c065b02448de503cc42e94a41a4e6f97ba328010;p=civicrm-core.git

diff --git a/composer.json b/composer.json
index 829f8ae59f..fb0a915494 100644
--- a/composer.json
+++ b/composer.json
@@ -46,31 +46,30 @@
     "symfony/finder": "^2.8.44 || ~3.0",
     "tecnickcom/tcpdf" : "6.2.*",
     "totten/ca-config": "~17.05",
-    "zetacomponents/base": "1.7.*",
-    "zetacomponents/mail": "dev-1.7-civi",
+    "zetacomponents/base": "1.9.*",
+    "zetacomponents/mail": "dev-master",
     "marcj/topsort": "~1.1",
-    "phpoffice/phpword": "^0.14.0",
-    "pear/Validate_Finance_CreditCard": "dev-master",
+    "phpoffice/phpword": "^0.15.0",
+    "pear/validate_finance_creditcard": "dev-master",
     "civicrm/civicrm-cxn-rpc": "~0.19.01.08",
-    "pear/Auth_SASL": "1.1.0",
-    "pear/Net_SMTP": "1.6.*",
-    "pear/Net_socket": "1.0.*",
+    "pear/auth_sasl": "1.1.0",
+    "pear/net_smtp": "1.6.*",
+    "pear/net_socket": "1.0.*",
+    "pear/mail": "^1.4",
     "civicrm/civicrm-setup": "~0.2.0",
     "guzzlehttp/guzzle": "^6.3",
-    "psr/simple-cache": "~1.0.1"
+    "psr/simple-cache": "~1.0.1",
+    "cweagans/composer-patches": "~1.0",
+    "pear/log": "1.13.1",
+    "ezyang/htmlpurifier": "4.10"
   },
-  "repositories": [
-    {
-      "type": "git",
-      "url": "https://github.com/civicrm/zetacomponents-mail.git"
-    }
-  ],
   "scripts": {
     "post-install-cmd": [
       "bash tools/scripts/composer/dompdf-cleanup.sh",
       "bash tools/scripts/composer/tcpdf-cleanup.sh",
       "bash tools/scripts/composer/pear-exception-fix.sh",
       "bash tools/scripts/composer/net-smtp-fix.sh",
+      "bash tools/scripts/composer/pear-mail-fix.sh",
       "bash tools/scripts/composer/phpword-jquery.sh"
     ],
     "post-update-cmd": [
@@ -78,7 +77,21 @@
       "bash tools/scripts/composer/tcpdf-cleanup.sh",
       "bash tools/scripts/composer/pear-exception-fix.sh",
       "bash tools/scripts/composer/net-smtp-fix.sh",
+      "bash tools/scripts/composer/pear-mail-fix.sh",
       "bash tools/scripts/composer/phpword-jquery.sh"
     ]
+  },
+  "extra": {
+    "patches": {
+      "phpoffice/common": {
+        "Fix handling of libxml_disable_entity_loader": "tools/scripts/composer/patches/phpoffice-common-xml-entity-fix.patch"
+      },
+      "phpoffice/phpword": {
+        "Fix handling of libxml_disable_entity_loader": "tools/scripts/composer/patches/phpword-libxml-fix-global-handling.patch"
+      },
+      "zetacomponents/mail": {
+        "CiviCRM Custom Patches for ZetaCompoents mail": "tools/scripts/composer/patches/civicrm-custom-patches-zetacompoents-mail.patch"
+      }
+    }
   }
 }