Updates for static tests, removed Set-Cookie array initialization

Author: pmzandbergen

lib/internal/Magento/Framework/HTTP/Client/Curl.php

@@ -454,9 +454,6 @@ protected function parseHeaders($ch, $data)
 
             if (strlen($name)) {
                 if ('set-cookie' === strtolower($name)) {
-                    if (!isset($this->_responseHeaders['Set-Cookie'])) {
-                        $this->_responseHeaders['Set-Cookie'] = [];
-                    }
                     $this->_responseHeaders['Set-Cookie'][] = $value;
                 } else {
                     $this->_responseHeaders[$name] = $value;

lib/internal/Magento/Framework/HTTP/Test/Unit/Client/CurlMockTest.php

@@ -8,7 +8,7 @@
 
 namespace Magento\Framework\HTTP\Test\Unit\Client;
 
-use Magento\Framework\HTTP\Client\CurlMock;
+use Magento\Framework\HTTP\Test\Unit\Client\Mock\CurlMock;
 use PHPUnit\Framework\TestCase;
 
 /**

lib/internal/Magento/Framework/HTTP/Test/Unit/Client/Mock/CurlMock.php

@@ -0,0 +1,41 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Framework\HTTP\Test\Unit\Client\Mock;
+
+use Magento\Framework\HTTP\Client\Curl;
+
+/**
+ * Extended Curl class with modifications for testing
+ */
+class CurlMock extends Curl
+{
+    // @codingStandardsIgnoreStart
+    /**
+     * Unfortunately, it is necessary for the tests to set this function public.
+     *
+     * @param resource $ch curl handle, not needed
+     * @param string $data
+     * @return int
+     * @throws \Exception
+     */
+    public function parseHeaders($ch, $data)
+    {
+        return parent::parseHeaders($ch, $data);
+    }
+    // @codingStandardsIgnoreEnd
+
+    /**
+     * Return Curl resource, only used for testing.
+     *
+     * @return resource
+     */
+    public function getResource()
+    {
+        return $this->_ch;
+    }
+}

lib/internal/Magento/Framework/HTTP/Test/Unit/Client/_files/curl_exec_mock.php

@@ -20,34 +20,3 @@ function curl_exec($resource)
 {
     return call_user_func(CurlMockTest::$curlExectClosure);
 }
-
-/**
- * Extended Curl class with modifications for testing
- */
-class CurlMock extends Curl
-{
-    // @codingStandardsIgnoreStart
-    /**
-     * Unfortunately, it is necessary for the tests to set this function public.
-     *
-     * @param resource $ch curl handle, not needed
-     * @param string $data
-     * @return int
-     * @throws \Exception
-     */
-    public function parseHeaders($ch, $data)
-    {
-        return parent::parseHeaders($ch, $data);
-    }
-    // @codingStandardsIgnoreEnd
-
-    /**
-     * Return Curl resource, only used for testing.
-     *
-     * @return resource
-     */
-    public function getResource()
-    {
-        return $this->_ch;
-    }
-}