X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=composer.json;h=fe9964f0f09b34ece5b84eb927ccbaea9fbae0ef;hb=15edb87b8025079a6757e3bf4104f53fa7b881a2;hp=0b476092822b33df4021873bca419a998742548f;hpb=245f0957e0173ff8a9fdd5f65e578df2447357c0;p=civicrm-core.git diff --git a/composer.json b/composer.json index 0b47609282..fe9964f0f0 100644 --- a/composer.json +++ b/composer.json @@ -33,7 +33,10 @@ }, "psr-4": { "Civi\\": [".", "Civi/", "setup/src/"] - } + }, + "files": [ + "guzzle_php81_shim.php" + ] }, "include-path": ["vendor/tecnickcom"], "config": { @@ -59,6 +62,7 @@ "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.*", @@ -79,7 +83,7 @@ "pear/log": "1.13.3", "adrienrn/php-mimetyper": "0.2.2", "civicrm/composer-downloads-plugin": "^3.0", - "league/csv": "^9.6", + "league/csv": "~9.6.2", "league/oauth2-client": "^2.4", "league/oauth2-google": "^3.0", "tplaner/when": "~3.0.0", @@ -89,16 +93,17 @@ "ext-intl": "*", "pear/mail_mime": "~1.10", "pear/db": "1.11", - "civicrm/composer-compile-lib": "~0.3 || ~1.0", + "civicrm/composer-compile-lib": "~0.6 || ~1.0", "ext-json": "*", "ezyang/htmlpurifier": "^4.13", "phpoffice/phpspreadsheet": "^1.18", "symfony/polyfill-php73": "^1.23", - "symfony/polyfill-php74": "^1.26", - "symfony/polyfill-php80": "^1.26", - "symfony/polyfill-php81": "^1.26", - "symfony/polyfill-php82": "^1.26", - "html2text/html2text": "^4.3.1" + "symfony/polyfill-php74": "^1.0", + "symfony/polyfill-php80": "^1.0", + "symfony/polyfill-php81": "^1.0", + "symfony/polyfill-php82": "^1.0", + "html2text/html2text": "^4.3.1", + "psr/container": "~1.0" }, "scripts": { "post-install-cmd": [ @@ -107,7 +112,8 @@ "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" + "bash tools/scripts/composer/phpword-jquery.sh", + "bash tools/scripts/composer/guzzle-mockhandler-fix.sh" ], "post-update-cmd": [ "bash tools/scripts/composer/dompdf-cleanup.sh", @@ -115,7 +121,8 @@ "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" + "bash tools/scripts/composer/phpword-jquery.sh", + "bash tools/scripts/composer/guzzle-mockhandler-fix.sh" ] }, "repositories": { @@ -280,6 +287,13 @@ "adrienrn/php-mimetyper": { "Update gitignore to ensure that sites that manage via git don't miss out on the important db.json file": "https://patch-diff.githubusercontent.com/raw/adrienrn/php-mimetyper/pull/15.patch" }, + "league/csv": { + "Adding in eol support to fputcsv for php8.1": "https://raw.githubusercontent.com/civicrm/civicrm-core/cacdbfaeaed8e04d504bf2fc604536137c03abeb/tools/scripts/composer/leage_csv_fputcsv.patch", + "Remove deprecated flag from php8.1": "https://github.com/thephpleague/csv/commit/380f884922a6cdaaaaab3ad4bfc7d1d710af736e.patch", + "Fix php8.1 deprecation errors part 1": "https://github.com/thephpleague/csv/commit/613db0b20157a1114cb1f9a801bd4c9c1f609cdf.patch", + "Fix php8.1 deprecation errors part 2": "https://github.com/thephpleague/csv/commit/49e2b08ca025ebaf87a904b5645f535c807b6f10.patch", + "Fix php8.1 notice issues part 3": "https://github.com/thephpleague/csv/commit/b83e972caea3cd22e7aaf65c5cffff1d49b46b69.patch" + }, "html2text/html2text": { "Fix deprecation warning in php8.1 on html_entity_decode": "https://raw.githubusercontent.com/civicrm/civicrm-core/e758d20e9f613ca6c4cf652c23d2cd7e5d3af3ce/tools/scripts/composer/html2text_html2_text_php81_deprecation.patch" }, @@ -287,6 +301,9 @@ "Apply patch to ensure that MySQLI reporting remains the same in php8.1": "https://patch-diff.githubusercontent.com/raw/pear/DB/pull/13.patch", "Apply CiviCRM Customisations for the pear:db package": "https://raw.githubusercontent.com/civicrm/civicrm-core/2ad420c394/tools/scripts/composer/pear_db_civicrm_changes.patch" }, + "pear/log": { + "Apply patch for php8.1": "https://patch-diff.githubusercontent.com/raw/pear/Log/pull/23.patch" + }, "pear/mail": { "Apply CiviCRM Customisations for CRM-1367 and CRM-5946": "https://raw.githubusercontent.com/civicrm/civicrm-core/36319938a5bf26c1e7e2110a26a65db6a5979268/tools/scripts/composer/patches/pear-mail.patch" }, @@ -296,9 +313,14 @@ "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/phpword": { + "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" + "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" } }, "compile-includes": ["ext/greenwich/composer.compile.json"],