Revert "LYNX-445: Magento\TestFramework\TestCase\GraphQl\Client::processResponseHeaders() does not allow to process multiple Set-Cookie headers (#261)"

This reverts commit 56c42a8.

Author: svera

dev/tests/api-functional/testsuite/Magento/GraphQl/PageCache/DisableSessionTest.php renamed to dev/tests/Magento/GraphQl/PageCache/DisableSessionTest.php

@@ -16,17 +16,15 @@
 
 namespace Magento\GraphQl\PageCache;
 
-use Magento\Framework\App\PageCache\Version;
-use Magento\TestFramework\Fixture\Config;
 use Magento\TestFramework\TestCase\GraphQlAbstract;
+use Magento\TestFramework\Fixture\Config;
+use Magento\Framework\App\PageCache\Version;
 
 /**
  * Test absence/presence of private_content_version cookie in GraphQl POST HTTP responses
  */
 class DisableSessionTest extends GraphQlAbstract
 {
-    private const PHPSESSID_COOKIE_NAME = 'PHPSESSID';
-
     #[
         Config('graphql/session/disable', '1')
     ]
@@ -35,14 +33,10 @@ public function testPrivateSessionContentCookieNotPresentWhenSessionDisabled()
         $result = $this->graphQlMutationWithResponseHeaders($this->getMutation());
         $this->assertArrayHasKey('headers', $result);
         if (!empty($result['headers']['Set-Cookie'])) {
-            $this->assertFalse(
-                $this->isCookieSet($result['headers']['Set-Cookie'], self::PHPSESSID_COOKIE_NAME),
-                self::PHPSESSID_COOKIE_NAME . ' should not be present in HTTP response'
-            );
-
-            $this->assertFalse(
-                $this->isCookieSet($result['headers']['Set-Cookie'], Version::COOKIE_NAME),
-                Version::COOKIE_NAME . ' should not be present in HTTP response'
+            $this->assertStringNotContainsString(
+                Version::COOKIE_NAME,
+                $result['headers']['Set-Cookie'],
+                Version::COOKIE_NAME . ' should not be present in Set-Cookie header'
             );
         }
     }
@@ -55,30 +49,11 @@ public function testPrivateSessionContentCookiePresentWhenSessionEnabled()
         $result = $this->graphQlMutationWithResponseHeaders($this->getMutation());
         $this->assertArrayHasKey('headers', $result);
         $this->assertArrayHasKey('Set-Cookie', $result['headers'], 'Set-Cookie HTTP response header should be present');
-
-        $this->assertTrue(
-            $this->isCookieSet($result['headers']['Set-Cookie'], self::PHPSESSID_COOKIE_NAME),
-            self::PHPSESSID_COOKIE_NAME . ' should be present in HTTP response'
+        $this->assertStringContainsString(
+            Version::COOKIE_NAME,
+            $result['headers']['Set-Cookie'],
+            Version::COOKIE_NAME . ' should be set by the server'
         );
-
-        $this->assertTrue(
-            $this->isCookieSet($result['headers']['Set-Cookie'], Version::COOKIE_NAME),
-            Version::COOKIE_NAME . ' should be present in HTTP response'
-        );
-    }
-
-    /**
-     * Checks if $cookieName was set by server in any of Set-Cookie header(s)
-     *
-     * @param array $setCookieHeader
-     * @param string $cookieName
-     * @return bool
-     */
-    private function isCookieSet(array $setCookieHeader, string $cookieName): bool
-    {
-        return count(array_filter($setCookieHeader, function ($cookie) use ($cookieName) {
-            return str_starts_with($cookie, $cookieName);
-        })) > 0;
     }
 
     /**

dev/tests/api-functional/framework/Magento/TestFramework/TestCase/GraphQl/Client.php

@@ -22,8 +22,6 @@ class Client
     public const GRAPHQL_METHOD_POST = 'POST';
     /**#@-*/
 
-    private const SET_COOKIE_HEADER_NAME = 'Set-Cookie';
-
     /** @var CurlClient */
     private $curlClient;
 
@@ -266,15 +264,7 @@ private function processResponseHeaders(string $headers): array
         foreach ($headerLines as $headerLine) {
             $headerParts = preg_split('/: /', $headerLine, 2);
             if (count($headerParts) == 2) {
-                $headerName = trim($headerParts[0]);
-                if ($headerName === self::SET_COOKIE_HEADER_NAME) {
-                    if (!isset($headersArray[self::SET_COOKIE_HEADER_NAME])) {
-                        $headersArray[self::SET_COOKIE_HEADER_NAME] = [];
-                    }
-                    $headersArray[self::SET_COOKIE_HEADER_NAME][] = trim($headerParts[1]);
-                } else {
-                    $headersArray[$headerName] = trim($headerParts[1]);
-                }
+                $headersArray[trim($headerParts[0])] = trim($headerParts[1]);
             } elseif (preg_match('/HTTP\/[\.0-9]+/', $headerLine)) {
                 $headersArray[trim('Status-Line')] = trim($headerLine);
             }