ACP2E-3096: Incorrect curl headers making newrelic:create:deploy-marker not working

Author: bubasuma

lib/internal/Magento/Framework/HTTP/Test/Unit/Adapter/CurlTest.php

@@ -8,6 +8,7 @@
 namespace Magento\Framework\HTTP\Test\Unit\Adapter;
 
 use Magento\Framework\HTTP\Adapter\Curl;
+use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 
 class CurlTest extends TestCase
@@ -18,39 +19,153 @@ class CurlTest extends TestCase
     protected $model;
 
     /**
-     * @var \Closure
+     * @var MockObject|\StdClass
      */
-    public static $curlExectClosure;
+    public static $curlMock;
 
     protected function setUp(): void
     {
+        self::$curlMock = $this->getMockBuilder(\StdClass::class)
+            ->addMethods(['setopt', 'exec'])
+            ->getMock();
         require_once __DIR__ . '/_files/curl_exec_mock.php';
         $this->model = new Curl();
     }
 
+    protected function tearDown(): void
+    {
+        self::$curlMock = null;
+    }
+
     /**
      * @param string $response
      * @dataProvider readDataProvider
      */
     public function testRead($response)
     {
-        self::$curlExectClosure = function () use ($response) {
-            return $response;
-        };
+        self::$curlMock->expects($this->once())
+            ->method('exec')
+            ->willReturn($response);
         $this->assertEquals(file_get_contents(__DIR__ . '/_files/curl_response_expected.txt'), $this->model->read());
     }
 
-    /**
-     * @param string $response
-     */
     public function testReadFailure()
     {
-        self::$curlExectClosure = function () {
-            return false;
-        };
+        self::$curlMock->expects($this->once())
+            ->method('exec')
+            ->willReturn(false);
         $this->assertEquals('', $this->model->read());
     }
 
+    /**
+     * @param string $method
+     * @param string $url
+     * @param string $http_ver
+     * @param array $headers
+     * @param string $body
+     * @param array $setopt
+     * @return void
+     * @dataProvider writeDataProvider
+     */
+    public function testWrite(
+        string $method,
+        string $url,
+        string $http_ver,
+        array $headers,
+        string $body,
+        array $setopt
+    ): void {
+        $defaultConfig = [];
+        $configKeyToCurlProp = (new \ReflectionProperty(Curl::class, '_allowedParams'))->getValue($this->model);
+        foreach ((new \ReflectionProperty(Curl::class, '_config'))->getValue($this->model) as $key => $value) {
+            if (isset($configKeyToCurlProp[$key])) {
+                $defaultConfig[] = [$configKeyToCurlProp[$key], $value];
+            }
+        }
+        $setopt = array_merge(
+            $defaultConfig,
+            [
+                [CURLOPT_URL, $url],
+                [CURLOPT_RETURNTRANSFER, true],
+            ],
+            $setopt,
+            [
+                [CURLOPT_HEADER, true],
+            ]
+        );
+        self::$curlMock->expects($this->exactly(count($setopt)))
+            ->method('setopt')
+            ->with(
+                $this->isInstanceOf(\CurlHandle::class),
+                $this->callback(
+                    function (int $opt) use ($setopt) {
+                        static $it = 0;
+                        return $opt === $setopt[$it++][0];
+                    }
+                ),
+                $this->callback(
+                    function (mixed $val) use ($setopt) {
+                        static $it = 0;
+                        return $val === $setopt[$it++][1];
+                    }
+                )
+            )
+            ->willReturn(true);
+
+        $this->model->write($method, $url, $http_ver, $headers, $body);
+    }
+
+    /**
+     * @return array
+     */
+    public function writeDataProvider()
+    {
+        return [
+            'headers is empty' => [
+                'POST',
+                'http://example.com',
+                '1.1',
+                [],
+                '{"key": "value"}',
+                [
+                    [CURLOPT_POST, true],
+                    [CURLOPT_CUSTOMREQUEST, 'POST'],
+                    [CURLOPT_POSTFIELDS, '{"key": "value"}'],
+                    [CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1],
+                    [CURLOPT_HTTPHEADER, []],
+                ]
+            ],
+            'headers is an indexed array' => [
+                'POST',
+                'http://example.com',
+                '1.1',
+                ['Content-Type: application/json'],
+                '{"key": "value"}',
+                [
+                    [CURLOPT_POST, true],
+                    [CURLOPT_CUSTOMREQUEST, 'POST'],
+                    [CURLOPT_POSTFIELDS, '{"key": "value"}'],
+                    [CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1],
+                    [CURLOPT_HTTPHEADER, ['Content-Type: application/json']],
+                ]
+            ],
+            'headers is an associative array' => [
+                'POST',
+                'http://example.com',
+                '1.1',
+                ['Content-Type' => 'application/json'],
+                '{"key": "value"}',
+                [
+                    [CURLOPT_POST, true],
+                    [CURLOPT_CUSTOMREQUEST, 'POST'],
+                    [CURLOPT_POSTFIELDS, '{"key": "value"}'],
+                    [CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1],
+                    [CURLOPT_HTTPHEADER, ['Content-Type: application/json']],
+                ]
+            ],
+        ];
+    }
+
     /**
      * @return array
      */

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

@@ -18,5 +18,19 @@
  */
 function curl_exec($resource)
 {
-    return call_user_func(CurlTest::$curlExectClosure);
+    return CurlTest::$curlMock->exec($resource);
+}
+
+/**
+ * Override global PHP function curl_setopt
+ *
+ * @param mixed $handle
+ * @param int $option
+ * @param mixed $value
+ * @return bool
+ * @see \curl_setopt()
+ */
+function curl_setopt(mixed $handle, int $option, mixed $value): bool
+{
+    return CurlTest::$curlMock->setopt($handle, $option, $value);
 }