X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=composer.json;h=050b5362f20977de45e1e76841451e819683de17;hb=dfb2d79b861b701fde4dbbffb098b516637887e5;hp=b3798a1bdb9aa1da0812329069e78a9cab4ab4ad;hpb=204893a2a1fdebd46dd0fa046d62da8346fd8aae;p=civicrm-core.git

diff --git a/composer.json b/composer.json
index b3798a1bdb..050b5362f2 100644
--- a/composer.json
+++ b/composer.json
@@ -42,12 +42,13 @@
     "symfony/event-dispatcher": "^2.8.44 || ~3.0",
     "symfony/filesystem": "^2.8.44 || ~3.0",
     "symfony/process": "^2.8.44 || ~3.0",
+    "symfony/yaml": "^2.8.44 || ~3.0",
     "psr/log": "~1.1",
     "symfony/finder": "^2.8.44 || ~3.0",
     "tecnickcom/tcpdf" : "6.2.*",
     "totten/ca-config": "~17.05",
     "zetacomponents/base": "1.9.*",
-    "zetacomponents/mail": "dev-1.8-civi",
+    "zetacomponents/mail": "dev-master",
     "marcj/topsort": "~1.1",
     "phpoffice/phpword": "^0.15.0",
     "pear/validate_finance_creditcard": "dev-master",
@@ -61,14 +62,11 @@
     "psr/simple-cache": "~1.0.1",
     "cweagans/composer-patches": "~1.0",
     "pear/log": "1.13.1",
-    "ezyang/htmlpurifier": "4.10"
+    "katzien/php-mime-type": "2.1.0"
+  },
+  "require-dev": {
+    "cache/integration-tests": "dev-master"
   },
-  "repositories": [
-    {
-      "type": "git",
-      "url": "https://github.com/civicrm/zetacomponents-mail.git"
-    }
-  ],
   "scripts": {
     "post-install-cmd": [
       "bash tools/scripts/composer/dompdf-cleanup.sh",
@@ -94,6 +92,9 @@
       },
       "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"
       }
     }
   }