Debugger: Fix loading source context as array from source-contexts.js…

…on (#1102)

* Failing test for providing extSourceContexts as an array rather than object

* Fix case where extended source context is already the serialized version

* Fix typo

Debugger/src/Debuggee.php

@@ -380,7 +380,7 @@ public function info()
                 return is_array($esc) ? $esc['context'] : $esc->context()->info();
             }, $this->extSourceContexts),
             'extSourceContexts' => array_map(function ($esc) {
-                return $esc->info();
+                return is_array($esc) ? $esc : $esc->info();
             }, $this->extSourceContexts)
         ];
         if ($this->status) {

Debugger/tests/Unit/DebuggeeTest.php

@@ -150,4 +150,21 @@ public function testRegisterSetsDebuggeeId()
         $this->assertTrue($debuggee->register());
         $this->assertEquals('debuggee1', $debuggee->id());
     }
+
+    public function testDebuggeeExtendedSourceContextSerialization()
+    {
+        $debuggee = new Debuggee($this->connection->reveal(), [
+            'project' => 'project1',
+            'extSourceContexts' => [
+                [
+                    'context' => []
+                ]
+            ]
+        ]);
+        $info = $debuggee->info();
+        $this->assertArrayHasKey('extSourceContexts', $info);
+        $this->assertCount(1, $info['extSourceContexts']);
+        $this->assertArrayHasKey('sourceContexts', $info);
+        $this->assertCount(1, $info['sourceContexts']);
+    }
 }