Merge pull request #45 from spira/hotfix/elastic-index-fix

Now checking if the result set for a nested model is empty before add…
spira · Feb 18, 2016 · ec20c5d · ec20c5d
2 parents 6eca8d6 + 8058124
commit ec20c5d
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/Model/Model/IndexedModel.php b/Model/Model/IndexedModel.php
@@ -123,7 +123,10 @@ public function getIndexDocumentData()
             foreach ($this->indexRelations as $nestedModelName) {
                 /** @var IndexedModel|IndexedCollection $results */
                 $results = $this->$nestedModelName()->getResults();
-                if ($results instanceof Collection) {
+
+                if (is_null($results)) {
+                    break;
+                } elseif ($results instanceof Collection) {
                     $nestedData = $results->map(function (IndexedModel $result) {
                         return array_intersect_key($result->attributesToArray(), $result->mappingProperties);
                     });