Skip to content
Snippets Groups Projects
Unverified Commit 8fc8778c authored by Alex Pott's avatar Alex Pott
Browse files

Issue #3477324 by andypost, alexpott: Fix usage of str_getcsv() and fgetcsv() for PHP 8.4

(cherry picked from commit 9cf58fe1)
parent 27f7b679
No related branches found
No related tags found
28 merge requests!12227Issue #3181946 by jonmcl, mglaman,!12079Issue #3523476 by matthiasm11: Add empty check on operator,!12024Fix: DocBlock comment for return value of Drupal\Core\Database\Connection::transactionManager(),!11974Draft: Issue #3495165 by catch, joeyroth, berdir, texas-bronius: Better warning...,!11934Issue #3520997: DefaultLazyPluginCollection unnecessarily instantiates plugins when sorting collection,!11887Issue #3520065: The migrate Row class API is incomplete,!11636Draft: Issue #3515643 by macsim: fieldNameExists method is inconsistent,!11515Issue #3480419 by mondrake, smustgrave, catch: Method...,!11380Issue #3490698 by catch, spokje: Bump MINIMUM_STABILITY back to 'stable' when...,!11281Use Drupal Core Leadership terminology in MAINTAINERS.txt,!11239Issue #3507548: Allow workspace changes listing to show all items, without a pager,!11238Fix issue #3051797,!11213Issue #3506743 by tomislav.matokovic: Increasing the color contrast for the navigation block title against the background of the navigation sidebar to at least 4.5:1,!11147Draft: Try to avoid manually setting required cache contexts,!11108Issue #3490298 by nicxvan: Profiles can be missed in OOP hooks,!11093Drupal on MongoDB 11.1.x,!11017Issue #3502540: Add date filter for moderated content.,!11009Issue #3486972 migrate feed icon,!10999Cleaning up Taxonomy hooks and updating baseline.,!10977Issue #3501457: Fix path used in a A11y Test Admin,!10881Issue #3489329 by mfb, casey: symfony/http-foundation commit 32310ff breaks PathValidator,!10570Issue #3494197: Convert Twig engine hooks,!10567Issue #3494154: Index is not added if entity doesn't support revisions,!10548Revert "Issue #3478621 by catch, longwave, nicxvan: Add filecache to OOP hook attribute parsing",!10404Margin has been added,!10391Issue #3485117 by nexusnovaz, godotislate, nicxvan: Fix return type on...,!10388Issue #3485117 by nexusnovaz, godotislate, nicxvan: Fix return type on...,!10376Issue #3485117 by nexusnovaz, godotislate, nicxvan: Fix return type on...
Pipeline #343329 passed
Pipeline: drupal

#343330

    ......@@ -98,7 +98,7 @@ public function mail(array $message) {
    if (in_array(strtolower($name), self::MAILBOX_LIST_HEADERS, TRUE)) {
    // Split values by comma, but ignore commas encapsulated in double
    // quotes.
    $value = str_getcsv($value, ',');
    $value = str_getcsv($value, escape: '\\');
    }
    $headers->addHeader($name, $value);
    }
    ......
    ......@@ -127,7 +127,7 @@ public function mail(array $message) {
    if (in_array(strtolower($name), self::MAILBOX_LIST_HEADERS, TRUE)) {
    // Split values by comma, but ignore commas encapsulated in double
    // quotes.
    $value = str_getcsv($value, ',');
    $value = str_getcsv($value, escape: '\\');
    }
    $headers->addHeader($name, $value);
    }
    ......
    ......@@ -125,7 +125,7 @@ public function testMigrationState(): void {
    // Assert that each discovered migration has a corresponding declaration
    // in a migrate_drupal.yml.
    foreach ($discovered_unique as $datum) {
    $data = str_getcsv($datum);
    $data = str_getcsv($datum, escape: '');
    $in_finished = in_array($datum, $declared_unique[MigrationState::FINISHED]);
    $in_not_finished = in_array($datum, $declared_unique[MigrationState::NOT_FINISHED]);
    $found = $in_finished || $in_not_finished;
    ......@@ -137,7 +137,7 @@ public function testMigrationState(): void {
    // not finished.
    $discovered_not_finished = array_diff($discovered_unique, $declared_unique[MigrationState::FINISHED]);
    foreach ($discovered_not_finished as $datum) {
    $data = str_getcsv($datum);
    $data = str_getcsv($datum, escape: '');
    $this->assertContains($datum, $declared_unique[MigrationState::NOT_FINISHED], sprintf("No migration found for version '%s' with source_module '%s' and destination_module '%s' declared in module '%s'", $version, $data[1], $data[2], $data[0]));
    }
    }
    ......
    ......@@ -184,9 +184,9 @@ protected function readMultilingualContent($filename) {
    foreach ($translated_languages as $language) {
    if (file_exists($default_content_path . "$language/$filename") &&
    ($handle = fopen($default_content_path . "$language/$filename", 'r')) !== FALSE) {
    $header = fgetcsv($handle);
    $header = fgetcsv($handle, escape: '');
    $line_counter = 0;
    while (($content = fgetcsv($handle)) !== FALSE) {
    while (($content = fgetcsv($handle, escape: '')) !== FALSE) {
    $keyed_content[$language][$line_counter] = array_combine($header, $content);
    $line_counter++;
    }
    ......
    0% Loading or .
    You are about to add 0 people to the discussion. Proceed with caution.
    Please to comment