Amend pr comments

Author: estringana

src/DDTrace/Integrations/Stripe/StripeIntegration.php

@@ -79,11 +79,14 @@ public static function extractCheckoutSessionFields($session): array
         $discounts = self::getNestedValue($session, 'discounts');
         if (is_array($discounts) && count($discounts) > 0) {
             $discount = $discounts[0];
-            $payload['discounts.coupon'] = self::getNestedValue($discount, 'coupon');
-            $payload['discounts.promotion_code'] = self::getNestedValue($discount, 'promotion_code');
-        } else {
-            $payload['discounts.coupon'] = null;
-            $payload['discounts.promotion_code'] = null;
+            $coupon = self::getNestedValue($discount, 'coupon');
+            $promotionCode = self::getNestedValue($discount, 'promotion_code');
+            if ($coupon !== null) {
+                $payload['discounts.coupon'] = $coupon;
+            }
+            if ($promotionCode !== null) {
+                $payload['discounts.promotion_code'] = $promotionCode;
+            }
         }
 
         return $payload;
@@ -140,7 +143,7 @@ public static function init(): int
     {
         self::hookCheckoutSessionCreate();
         self::hookPaymentIntentCreate();
-        self::hookEventConstructFrom();
+        self::hookWebhookConstructEvent();
 
         return Integration::LOADED;
     }
@@ -171,11 +174,11 @@ private static function hookPaymentIntentCreate()
         \DDTrace\hook_method('Stripe\PaymentIntent', 'create', null, $onCreate);
     }
 
-    private static function hookEventConstructFrom()
+    private static function hookWebhookConstructEvent()
     {
         \DDTrace\hook_method(
-            'Stripe\Event',
-            'constructFrom',
+            'Stripe\Webhook',
+            'constructEvent',
             null,
             static function ($This, $scope, $args, $retval, $exception) {
                 if ($exception === null && $retval !== null) {

tests/Integrations/Stripe/Latest/StripeTest.php

@@ -73,6 +73,16 @@ private function hasEventWithAnyKey(array $eventWrappers, array $keys): bool
         return false;
     }
 
+    private function constructWebhookEvent(array $payload, string $secret = 'whsec_test_secret'): \Stripe\Event
+    {
+        $payloadJson = json_encode($payload);
+        $timestamp = time();
+        $signedPayload = $timestamp . '.' . $payloadJson;
+        $signature = hash_hmac('sha256', $signedPayload, $secret);
+        $sigHeader = "t={$timestamp},v1={$signature}";
+        return \Stripe\Webhook::constructEvent($payloadJson, $sigHeader, $secret);
+    }
+
     protected function ddTearDown()
     {
         parent::ddTearDown();
@@ -97,7 +107,7 @@ public function testPaymentSuccessWebhook()
                 ]
             ];
 
-            \Stripe\Event::constructFrom($payload);
+            $this->constructWebhookEvent($payload);
 
             $allEvents = AppsecStatus::getInstance()->getEvents(['push_addresses'], []);
 
@@ -143,7 +153,7 @@ public function testPaymentFailureWebhook()
                 ]
             ];
 
-            \Stripe\Event::constructFrom($payload);
+            $this->constructWebhookEvent($payload);
 
             $allEvents = AppsecStatus::getInstance()->getEvents(['push_addresses'], []);
 
@@ -186,7 +196,7 @@ public function testPaymentCancellationWebhook()
                 ]
             ];
 
-            \Stripe\Event::constructFrom($payload);
+            $this->constructWebhookEvent($payload);
 
             $allEvents = AppsecStatus::getInstance()->getEvents(['push_addresses'], []);
 
@@ -222,7 +232,7 @@ public function testWebhookInvalidOrUnsupportedEvents()
                 ]
             ];
 
-            \Stripe\Event::constructFrom($payload);
+            $this->constructWebhookEvent($payload);
 
             $allEvents = AppsecStatus::getInstance()->getEvents(['push_addresses'], []);
 
@@ -257,14 +267,7 @@ public function testPaymentSuccessWebhookViaConstructEvent()
                     ]
                 ]
             ];
-            $payloadJson = json_encode($payload);
-            $secret = 'whsec_test_secret';
-            $timestamp = time();
-            $signedPayload = $timestamp . '.' . $payloadJson;
-            $signature = hash_hmac('sha256', $signedPayload, $secret);
-            $sigHeader = "t={$timestamp},v1={$signature}";
-
-            $event = \Stripe\Webhook::constructEvent($payloadJson, $sigHeader, $secret);
+            $event = $this->constructWebhookEvent($payload);
 
             $this->assertSame('payment_intent.succeeded', $event->type);
 
@@ -583,7 +586,7 @@ public function __construct(string $responseBody, int $responseCode = 200)
         $this->responseCode = $responseCode;
     }
 
-    public function request($method, $absUrl, $headers, $params, $hasFile)
+    public function request($method, $absUrl, $headers, $params, $hasFile, $apiMode = null, $maxNetworkRetries = null)
     {
         return [$this->responseBody, $this->responseCode, []];
     }