Merge remote-tracking branch 'origin/master' into master

Author: curtisdelicata

src/Commands/GedcomImporter.php

@@ -2,8 +2,8 @@
 
 namespace GenealogiaWebsite\LaravelGedcom\Commands;
 
-use Illuminate\Console\Command;
 use GenealogiaWebsite\LaravelGedcom\Facades\GedcomParserFacade;
+use Illuminate\Console\Command;
 
 class GedcomImporter extends Command
 {

src/Utils/GedcomParser.php

@@ -272,7 +272,7 @@ private function getPerson($individual)
         $attr = $individual->getAllAttr();
         $events = $individual->getAllEven();
         $note = $individual->getNote();
-        $sour = $individual->getSour();
+        $indv_sour = $individual->getSour();
         $alia = $individual->getAlia(); // string array
         $asso = $individual->getAsso();
         $subm = $individual->getSubm();
@@ -314,17 +314,23 @@ private function getPerson($individual)
         $_gid = $person->id;
         if ($names != null && count($names) > 0) {
             foreach ($names as $item) {
-                \GenealogiaWebsite\LaravelGedcom\Utils\Importer\Indi\Name::read($this->conn, $item, $_group, $_gid);
+                if ($item) {
+                    \GenealogiaWebsite\LaravelGedcom\Utils\Importer\Indi\Name::read($this->conn, $item, $_group, $_gid);
+                }
             }
         }
         if ($note != null && count($note) > 0) {
             foreach ($note as $item) {
-                \GenealogiaWebsite\LaravelGedcom\Utils\Importer\NoteRef::read($this->conn, $item, $_group, $_gid);
+                if ($item) {
+                    \GenealogiaWebsite\LaravelGedcom\Utils\Importer\NoteRef::read($this->conn, $item, $_group, $_gid);
+                }
             }
         }
-        if ($sour !== null && count($sour) > 0) {
-            foreach ($sour as $item) {
-                \GenealogiaWebsite\LaravelGedcom\Utils\Importer\SourRef::read($this->conn, $item, $_group, $_gid, $this->sour_ids, $this->obje_ids);
+        if ($indv_sour != null && count($indv_sour) > 0) {
+            foreach ($indv_sour as $item) {
+                if ($item) {
+                    \GenealogiaWebsite\LaravelGedcom\Utils\Importer\SourRef::read($this->conn, $item, $_group, $_gid, $this->sour_ids, $this->obje_ids);
+                }
             }
         }