Unverified Commit 96e0b255 authored by Alex Pott's avatar Alex Pott
Browse files

Issue #3541053 by andypost: Fix deprecated curl_close() for PHP 8.5

parent 967e3af6

core/modules/page_cache/tests/src/Functional/PageCacheTest.php

+0 −1
Original line number Diff line number Diff line
@@ -626,7 +626,6 @@ protected function getHeaders($url): array { 
    curl_setopt($ch, CURLOPT_RETURNTRANSFER, TRUE);

    curl_setopt($ch, CURLOPT_USERAGENT, drupal_generate_test_ua($this->databasePrefix));

    $output = curl_exec($ch);

    curl_close($ch);



    $headers = [];

    foreach (explode("\n", $output) as $header) {

core/tests/Drupal/FunctionalJavascriptTests/WebDriverCurlService.php

+2 −2
Original line number Diff line number Diff line
@@ -137,12 +137,12 @@ public function execute($requestMethod, $url, $parameters = NULL, $extraOptions 
        $info['request_method'] = $requestMethod;



        if (array_key_exists(CURLOPT_FAILONERROR, $extraOptions) && $extraOptions[CURLOPT_FAILONERROR] && CURLE_GOT_NOTHING !== curl_errno($curl) && $error = curl_error($curl)) {

          curl_close($curl);

          $curl = NULL;



          throw WebDriverException::factory(WebDriverException::CURL_EXEC, sprintf("Curl error thrown for http %s to %s%s\n\n%s", $requestMethod, $url, $parameters && is_array($parameters) ? ' with params: ' . json_encode($parameters) : '', $error));

        }



        curl_close($curl);

        $curl = NULL;



        $result = json_decode($rawResult, TRUE);

        if (isset($result['status']) && $result['status'] === WebDriverException::STALE_ELEMENT_REFERENCE) {