ignore null entities

ibrows · Mar 8, 2016 · 5124af7 · 5124af7
1 parent 20c4bf7
commit 5124af7
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/Exporter/Exporter.php b/Exporter/Exporter.php
@@ -393,6 +393,7 @@ public function createCsv(EntityMap $entityMap, $results)
             $row = array();
             /** @var FieldMap|TranslatableFieldMap $field */
             foreach ($entityMap->getFields() as $field) {
+
                 if ($field->hasJoinFields()) {
                     $joinEntity = $this->accessor->getValue($entity, $field->getPropertyPath());
 
@@ -555,11 +556,10 @@ protected function addAdditionalExport(FieldMap $field)
     }
 
     /**
-     * @param            $row
-     * @param bool|false $header
+     * @param $row
      * @return int|void
      */
-    protected function addRowToFile($row, $header = false)
+    protected function addRowToFile($row)
     {
         return fputcsv($this->fileHandle, $row, self::XML_DELIMITER, self::XML_ENCLOSURE);
     }
@@ -571,6 +571,9 @@ protected function addRowToFile($row, $header = false)
      */
     public function getColumnData($entity, $propertyPath)
     {
+        if(!$entity){
+            return null;
+        }
         return $this->accessor->getValue($entity, $propertyPath);
     }