Merge pull request #24233 from demeritcowboy/zetapatookens

[civicrm-core.git] / composer.json

diff --git a/composer.json b/composer.json
index a35af088ad90064c00dc7ecb339b4698512929bc..71f8f71e3746e3e50603cbca294658552ed88569 100644 (file)
--- a/composer.json
+++ b/composer.json
@@ -51,6 +51,7 @@
   },
   "require": {
     "php": "~7.2.5 || ~7.3 || ~8",
+    "composer-runtime-api": "~2.0",
     "cache/integration-tests": "~0.17.0",
     "dompdf/dompdf" : "~2",
     "firebase/php-jwt": ">=3 <6",
@@ -62,12 +63,13 @@
     "symfony/filesystem": "~4.4",
     "symfony/process": "~4.4",
     "symfony/var-dumper": "~3.0 || ~4.4 || ~5.1",
+    "symfony/service-contracts": "~2.2",
     "psr/log": "~1.0 || ~2.0 || ~3.0",
     "symfony/finder": "~4.4",
     "tecnickcom/tcpdf" : "6.4.*",
     "totten/ca-config": "~22.05",
     "zetacomponents/base": "1.9.*",
-    "zetacomponents/mail": "1.9.*",
+    "zetacomponents/mail": "~1.9.3",
     "marcj/topsort": "~1.1",
     "phpoffice/phpword": "^0.18.0",
     "pear/validate_finance_creditcard": "0.7.0",
@@ -101,7 +103,8 @@
     "symfony/polyfill-php80": "^1.0",
     "symfony/polyfill-php81": "^1.0",
     "symfony/polyfill-php82": "^1.0",
-    "html2text/html2text": "^4.3.1"
+    "html2text/html2text": "^4.3.1",
+    "psr/container": "~1.0"
   },
   "scripts": {
     "post-install-cmd": [
@@ -315,9 +318,7 @@
         "PHP8.1 fix for passing null value into strlen": "https://patch-diff.githubusercontent.com/raw/PHPOffice/PHPWord/pull/2272.patch"
       },
       "zetacomponents/mail": {
-        "PHP 8.1 Compatability fixes": "https://patch-diff.githubusercontent.com/raw/zetacomponents/Mail/pull/88.patch",
         "CiviCRM Custom Patches for ZetaCompoents mail": "https://raw.githubusercontent.com/civicrm/civicrm-core/9d93748a36c7c5d44422911db1c98fb2f7067b34/tools/scripts/composer/patches/civicrm-custom-patches-zetacompoents-mail.patch",
-        "Allow single quotes to be used in return path": "https://github.com/zetacomponents/Mail/pull/86.patch",
         "CiviCRM Custom patch to fix a php8.1 issue found in CiviCRM unit tests": "https://raw.githubusercontent.com/civicrm/civicrm-core/5506f4ce5d46799857b4f4ddf34069e7541e9cc5/tools/scripts/composer/zetacomponents-php-81-civicrm-custom.patch"
       }
     },