fix: Update RequestOptions#redactedApiKey to stop exploding null. (stripe#1289)

dcr-stripe · web-flow · commit 3a95278fb78b · 2022-05-23T09:58:44.000-04:00
diff --git a/lib/Util/RequestOptions.php b/lib/Util/RequestOptions.php
@@ -154,8 +154,13 @@ public static function parse($options, $strict = false)
         throw new \Stripe\Exception\InvalidArgumentException($message);
     }
 
+    /** @return string */
     private function redactedApiKey()
     {
+        if (null === $this->apiKey) {
+            return '';
+        }
+
         $pieces = \explode('_', $this->apiKey, 3);
         $last = \array_pop($pieces);
         $redactedLast = \strlen($last) > 4
diff --git a/tests/Stripe/Util/RequestOptionsTest.php b/tests/Stripe/Util/RequestOptionsTest.php
@@ -168,5 +168,9 @@ public function testDebugInfo()
         $opts = RequestOptions::parse(['api_key' => '1234567890abcdefghijklmn']);
         $debugInfo = \print_r($opts, true);
         static::compatAssertStringContainsString('[apiKey] => ********************klmn', $debugInfo);
+
+        $opts = RequestOptions::parse([]);
+        $debugInfo = \print_r($opts, true);
+        static::compatAssertStringContainsString("[apiKey] => \n", $debugInfo);
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -154,8 +154,13 @@ public static function parse($options, $strict = false)`
`154`	`154`	`throw new \Stripe\Exception\InvalidArgumentException($message);`
`155`	`155`	`}`
`156`	`156`
	`157`	`+ /** @return string */`
`157`	`158`	`private function redactedApiKey()`
`158`	`159`	`{`
	`160`	`+ if (null === $this->apiKey) {`
	`161`	`+ return '';`
	`162`	`+ }`
	`163`	`+`
`159`	`164`	`$pieces = \explode('_', $this->apiKey, 3);`
`160`	`165`	`$last = \array_pop($pieces);`
`161`	`166`	`$redactedLast = \strlen($last) > 4`
Original file line number	Diff line number	Diff line change
`@@ -168,5 +168,9 @@ public function testDebugInfo()`
`168`	`168`	`$opts = RequestOptions::parse(['api_key' => '1234567890abcdefghijklmn']);`
`169`	`169`	`$debugInfo = \print_r($opts, true);`
`170`	`170`	`static::compatAssertStringContainsString('[apiKey] => ********************klmn', $debugInfo);`
	`171`	`+`
	`172`	`+ $opts = RequestOptions::parse([]);`
	`173`	`+ $debugInfo = \print_r($opts, true);`
	`174`	`+ static::compatAssertStringContainsString("[apiKey] => \n", $debugInfo);`
`171`	`175`	`}`
`172`	`176`	`}`