ability to dump resultSet from method getData()

serp-spider · Nov 25, 2017 · d6e1b36 · d6e1b36
1 parent aa59e55
commit d6e1b36
Show file tree

Hide file tree

Showing 2 changed files with 41 additions and 2 deletions.
diff --git a/src/Core/Serp/BaseResult.php b/src/Core/Serp/BaseResult.php
@@ -65,10 +65,16 @@ public function getData()
         $data = [];
         foreach ($this->data as $k => $v) {
             $datum = $this->getDataValue($k);
-            if (is_array($datum)) {
-                foreach ($datum as $subK => $subV) {
+            if (is_array($datum) || (is_object($datum) && $datum instanceof ResultSetInterface)) {
+                // make sur datum is an array
+                $baseDatum = $datum;
+                $datum = [];
+
+                foreach ($baseDatum as $subK => $subV) {
                     if (is_object($subV) && $subV instanceof ResultDataInterface) {
                         $datum[$subK] = $subV->getData();
+                    } else {
+                        $datum[$subK] = $subV;
                     }
                 }
             } elseif (is_object($datum) && $datum instanceof ResultDataInterface) {

diff --git a/test/suites/TDD/Core/Serp/BaseResultTest.php b/test/suites/TDD/Core/Serp/BaseResultTest.php
@@ -6,6 +6,7 @@
 namespace Serps\Test\TDD\Core;
 
 use Serps\Core\Serp\BaseResult;
+use Serps\Core\Serp\ResultSet;
 
 /**
  * @covers Serps\Core\Serp\BaseResult
@@ -103,6 +104,38 @@ public function testNestedInArrayGetData()
     }
 
 
+    public function testResultsetNestedInArrayGetData()
+    {
+
+
+
+        $result = new BaseResult('classical', [
+            'foo' => 'bar',
+            'bar' => function () {
+                $resultSet = new ResultSet();
+                $resultSet->addItems([
+                    new BaseResult('foo', [
+                        'bar' => 'baz',
+                        'foo' => 'qux'
+                    ]),
+                    new BaseResult('foo', [
+                        'bar' => 'far',
+                        'foo' => 'boz'
+                    ]),
+                ]);
+                return $resultSet;
+            }
+        ]);
+        $this->assertEquals([
+            'foo' => 'bar',
+            'bar' => [
+                ['bar' => 'baz', 'foo' => 'qux'],
+                ['bar' => 'far', 'foo' => 'boz'],
+            ]
+        ], $result->getData());
+    }
+
+
 
 
     public function testGetDataValue()