Make ->formatParams recursive

stripe · May 15, 2020 · 76ecf45 · 76ecf45
1 parent a75a888
commit 76ecf45
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 2 deletions.
diff --git a/lib/Service/AbstractService.php b/lib/Service/AbstractService.php
@@ -40,14 +40,17 @@ public function getClient()
      *
      * @param null|array $params
      */
-    private static function formatParams($params)
+    public static function formatParams($params)
     {
         if (null === $params) {
             return $params;
         }
+
         $formatted = [];
         foreach ($params as $k => $v) {
-            if (null === $v) {
+            if (\is_array($v)) {
+                $formatted[$k] = static::formatParams($v);
+            } elseif (null === $v) {
                 $formatted[$k] = '';
             } else {
                 $formatted[$k] = $v;

diff --git a/tests/Stripe/Service/AbstractServiceTest.php b/tests/Stripe/Service/AbstractServiceTest.php
@@ -57,4 +57,16 @@ public function testRetrieveThrowsIfIdNullIsWhitespace()
 
         $this->service->retrieve(' ');
     }
+
+    public function testFormatParams()
+    {
+        $result = \Stripe\Service\AbstractService::formatParams(['foo' => null]);
+        static::assertTrue('' === $result['foo']);
+        static::assertTrue(null !== $result['foo']);
+
+        $result = \Stripe\Service\AbstractService::formatParams(['foo' => ['bar' => null, 'baz' => 1]]);
+        static::assertTrue('' === $result['foo']['bar']);
+        static::assertTrue(null !== $result['foo']['bar']);
+        static::assertTrue(1 === $result['foo']['baz']);
+    }
 }