Allow serialization 5 levels deep (port of #554 to 2.x)

getsentry · May 4, 2018 · da97fce · da97fce
1 parent 9ec6d84
commit da97fce
Show file tree

Hide file tree

Showing 2 changed files with 59 additions and 12 deletions.
diff --git a/lib/Raven/Client.php b/lib/Raven/Client.php
@@ -471,7 +471,7 @@ public function sanitize(Event $event)
         $tagsContext = $event->getTagsContext();
 
         if (!empty($request)) {
-            $event = $event->withRequest($this->serializer->serialize($request));
+            $event = $event->withRequest($this->serializer->serialize($request, 5));
         }
         if (!empty($userContext)) {
             $event = $event->withUserContext($this->serializer->serialize($userContext, 3));

diff --git a/tests/ClientTest.php b/tests/ClientTest.php
@@ -503,32 +503,79 @@ public function testSanitizeUser()
         $this->assertEquals(['email' => 'foo@example.com'], $event->getUserContext());
     }
 
-    public function testSanitizeRequest()
+    /**
+     * @dataProvider deepRequestProvider
+     */
+    public function testSanitizeRequest(array $postData, array $expectedData)
     {
         $client = ClientBuilder::create()->getClient();
 
         $event = new Event($client->getConfig());
         $event = $event->withRequest([
-            'context' => [
-                'line' => 1216,
-                'stack' => [
-                    1, [2], 3,
-                ],
+            'method' => 'POST',
+            'url' => 'https://example.com/something',
+            'query_string' => '',
+            'data' => [
+                '_method' => 'POST',
+                'data' => $postData,
             ],
         ]);
 
         $event = $client->sanitize($event);
 
         $this->assertArraySubset([
-            'context' => [
-                'line' => 1216,
-                'stack' => [
-                    1, 'Array of length 1', 3,
-                ],
+            'method' => 'POST',
+            'url' => 'https://example.com/something',
+            'query_string' => '',
+            'data' => [
+                '_method' => 'POST',
+                'data' => $expectedData,
             ],
         ], $event->getRequest());
     }
 
+    public function deepRequestProvider()
+    {
+        return [
+            [
+                [
+                    'MyModel' => [
+                        'flatField' => 'my value',
+                        'nestedField' => [
+                            'key' => 'my other value',
+                        ],
+                    ],
+                ],
+                [
+                    'MyModel' => [
+                        'flatField' => 'my value',
+                        'nestedField' => [
+                            'key' => 'my other value',
+                        ],
+                    ],
+                ]
+            ],
+            [
+                [
+                    'Level 1' => [
+                        'Level 2' => [
+                            'Level 3' => [
+                                'Level 4' => 'something',
+                            ],
+                        ],
+                    ],
+                ],
+                [
+                    'Level 1' => [
+                        'Level 2' => [
+                            'Level 3' => 'Array of length 1',
+                        ],
+                    ],
+                ],
+            ],
+        ];
+    }
+
     private function assertMixedValueAndArray($expected_value, $actual_value)
     {
         if (null === $expected_value) {