From 75392632aab453a4394287c9712abe210417ca4f Mon Sep 17 00:00:00 2001 From: Seamus Lee Date: Mon, 25 Jul 2022 08:48:37 +1000 Subject: [PATCH] [REF][PHP8.1] Apply patches from upstream to ensure league/csv can work on php8.1 --- composer.json | 7 +++++++ composer.lock | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 6dbcbab98ebd..db34008c1513 100644 --- a/composer.json +++ b/composer.json @@ -280,6 +280,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" }, diff --git a/composer.lock b/composer.lock index 8adb9aaddfdc..bb71007712b0 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "2b12312ec9937f1286f2fc9c89ab89e6", + "content-hash": "d3f9eac4e515b2362f8a91da1cef29f1", "packages": [ { "name": "adrienrn/php-mimetyper",