Missing ADDR fields for new data

28 files changed, 84 insertions, 15 deletions

diff --git a/app/Elements/Adoption.php b/app/Elements/Adoption.php
index 2ae30c5c08..b070deac88 100644
--- a/app/Elements/Adoption.php
+++ b/app/Elements/Adoption.php
@@ -28,6 +28,7 @@ class Adoption extends AbstractEventElement
         'DATE' => '0:1',
         'AGE'  => '0:1',
         'PLAC' => '0:1',
+        'ADDR' => '0:1',
         'FAMC' => '0:1',
         'NOTE' => '0:M',
         'OBJE' => '0:M',
diff --git a/app/Elements/AdultChristening.php b/app/Elements/AdultChristening.php
index a4656145d7..ef1fe88b37 100644
--- a/app/Elements/AdultChristening.php
+++ b/app/Elements/AdultChristening.php
@@ -22,12 +22,13 @@ namespace Fisharebest\Webtrees\Elements;
 /**
  * Adult Christening
  */
-class AdultChristening extends AbstractElement
+class AdultChristening extends AbstractEventElement
 {
     protected const SUBTAGS = [
         'DATE' => '0:1',
         'AGE'  => '0:1',
         'PLAC' => '0:1',
+        'ADDR' => '0:1',
         'NOTE' => '0:M',
         'OBJE' => '0:M',
         'SOUR' => '0:M',
diff --git a/app/Elements/Baptism.php b/app/Elements/Baptism.php
index ee175dcdde..e9ddbe6d4e 100644
--- a/app/Elements/Baptism.php
+++ b/app/Elements/Baptism.php
@@ -28,6 +28,7 @@ class Baptism extends AbstractEventElement
         'DATE' => '0:1',
         'AGE'  => '0:1',
         'PLAC' => '0:1',
+        'ADDR' => '0:1',
         'NOTE' => '0:M',
         'OBJE' => '0:M',
         'SOUR' => '0:M',
diff --git a/app/Elements/BarMitzvah.php b/app/Elements/BarMitzvah.php
index dddc70e60d..2d3a03245a 100644
--- a/app/Elements/BarMitzvah.php
+++ b/app/Elements/BarMitzvah.php
@@ -28,6 +28,7 @@ class BarMitzvah extends AbstractEventElement
         'DATE' => '0:1',
         'AGE'  => '0:1',
         'PLAC' => '0:1',
+        'ADDR' => '0:1',
         'NOTE' => '0:M',
         'OBJE' => '0:M',
         'SOUR' => '0:M',
diff --git a/app/Elements/BasMitzvah.php b/app/Elements/BasMitzvah.php
index 160dd298a6..ee907ebc71 100644
--- a/app/Elements/BasMitzvah.php
+++ b/app/Elements/BasMitzvah.php
@@ -28,6 +28,7 @@ class BasMitzvah extends AbstractEventElement
         'DATE' => '0:1',
         'AGE'  => '0:1',
         'PLAC' => '0:1',
+        'ADDR' => '0:1',
         'NOTE' => '0:M',
         'OBJE' => '0:M',
         'SOUR' => '0:M',
diff --git a/app/Elements/Birth.php b/app/Elements/Birth.php
index cd7d3b7033..a01983287b 100644
--- a/app/Elements/Birth.php
+++ b/app/Elements/Birth.php
@@ -27,6 +27,7 @@ class Birth extends AbstractEventElement
     protected const SUBTAGS = [
         'DATE' => '0:1',
         'PLAC' => '0:1',
+        'ADDR' => '0:1',
         'FAMC' => '0:1',
         'NOTE' => '0:M',
         'OBJE' => '0:M',
diff --git a/app/Elements/Blessing.php b/app/Elements/Blessing.php
index 4b06d07e4e..984196379e 100644
--- a/app/Elements/Blessing.php
+++ b/app/Elements/Blessing.php
@@ -22,12 +22,13 @@ namespace Fisharebest\Webtrees\Elements;
 /**
  * Blessing
  */
-class Blessing extends AbstractElement
+class Blessing extends AbstractEventElement
 {
     protected const SUBTAGS = [
         'DATE' => '0:1',
         'AGE'  => '0:1',
         'PLAC' => '0:1',
+        'ADDR' => '0:1',
         'NOTE' => '0:M',
         'OBJE' => '0:M',
         'SOUR' => '0:M',
diff --git a/app/Elements/Burial.php b/app/Elements/Burial.php
index 5c2a548146..9974512537 100644
--- a/app/Elements/Burial.php
+++ b/app/Elements/Burial.php
@@ -27,6 +27,7 @@ class Burial extends AbstractEventElement
     protected const SUBTAGS = [
         'DATE' => '0:1',
         'PLAC' => '0:1',
+        'ADDR' => '0:1',
         'NOTE' => '0:M',
         'OBJE' => '0:M',
         'SOUR' => '0:M',
diff --git a/app/Elements/Census.php b/app/Elements/Census.php
index eed74881f3..8eba75c711 100644
--- a/app/Elements/Census.php
+++ b/app/Elements/Census.php
@@ -37,6 +37,7 @@ class Census extends AbstractElement
         'DATE' => '0:1',
         'AGE'  => '0:1',
         'PLAC' => '0:1',
+        'ADDR' => '0:1',
         'NOTE' => '0:M',
         'OBJE' => '0:M',
         'SOUR' => '0:M',
diff --git a/app/Elements/Christening.php b/app/Elements/Christening.php
index a29aeb3e24..509e8a2c86 100644
--- a/app/Elements/Christening.php
+++ b/app/Elements/Christening.php
@@ -22,12 +22,13 @@ namespace Fisharebest\Webtrees\Elements;
 /**
  * Christening
  */
-class Christening extends AbstractElement
+class Christening extends AbstractEventElement
 {
     protected const SUBTAGS = [
         'DATE' => '0:1',
         'AGE'  => '0:1',
         'PLAC' => '0:1',
+        'ADDR' => '0:1',
         'FAMC' => '0:1',
         'NOTE' => '0:M',
         'OBJE' => '0:M',
diff --git a/app/Elements/Confirmation.php b/app/Elements/Confirmation.php
index 12c4214cd0..26f3c033e0 100644
--- a/app/Elements/Confirmation.php
+++ b/app/Elements/Confirmation.php
@@ -22,12 +22,13 @@ namespace Fisharebest\Webtrees\Elements;
 /**
  * Confirmation
  */
-class Confirmation extends AbstractElement
+class Confirmation extends AbstractEventElement
 {
     protected const SUBTAGS = [
         'DATE' => '0:1',
         'AGE'  => '0:1',
         'PLAC' => '0:1',
+        'ADDR' => '0:1',
         'RELI' => '0:1',
         'NOTE' => '0:M',
         'OBJE' => '0:M',
diff --git a/app/Elements/Cremation.php b/app/Elements/Cremation.php
index e718948b68..14d0be7d52 100644
--- a/app/Elements/Cremation.php
+++ b/app/Elements/Cremation.php
@@ -22,11 +22,12 @@ namespace Fisharebest\Webtrees\Elements;
 /**
  * Cremation
  */
-class Cremation extends AbstractElement
+class Cremation extends AbstractEventElement
 {
     protected const SUBTAGS = [
         'DATE' => '0:1',
         'PLAC' => '0:1',
+        'ADDR' => '0:1',
         'NOTE' => '0:M',
         'OBJE' => '0:M',
         'SOUR' => '0:M',
diff --git a/app/Elements/Death.php b/app/Elements/Death.php
index 88775e7984..8027c06adf 100644
--- a/app/Elements/Death.php
+++ b/app/Elements/Death.php
@@ -29,6 +29,7 @@ class Death extends AbstractEventElement
         'DATE' => '0:1',
         'AGE'  => '0:1',
         'PLAC' => '0:1',
+        'ADDR' => '0:1',
         'NOTE' => '0:M',
         'OBJE' => '0:M',
         'SOUR' => '0:M',
diff --git a/app/Elements/EventDescriptor.php b/app/Elements/EventDescriptor.php
index 09e27d5c1f..11cadb74d9 100644
--- a/app/Elements/EventDescriptor.php
+++ b/app/Elements/EventDescriptor.php
@@ -34,13 +34,14 @@ use Fisharebest\Webtrees\Tree;
  * 2 PLAC Cove, Cache, Utah
  * 2 AGNC Cove City Redevelopment
  */
-class EventDescriptor extends AbstractElement
+class EventDescriptor extends AbstractEventElement
 {
     protected const MAXIMUM_LENGTH = 90;
 
     protected const SUBTAGS = [
         'DATE' => '0:1',
         'PLAC' => '0:1',
+        'ADDR' => '0:1',
         'NOTE' => '0:M',
         'OBJE' => '0:M',
         'SOUR' => '0:M',
diff --git a/app/Elements/FirstCommunion.php b/app/Elements/FirstCommunion.php
index eb24946a88..82fc1e363b 100644
--- a/app/Elements/FirstCommunion.php
+++ b/app/Elements/FirstCommunion.php
@@ -22,12 +22,13 @@ namespace Fisharebest\Webtrees\Elements;
 /**
  * First Communion
  */
-class FirstCommunion extends AbstractElement
+class FirstCommunion extends AbstractEventElement
 {
     protected const SUBTAGS = [
         'DATE' => '0:1',
         'AGE'  => '0:1',
         'PLAC' => '0:1',
+        'ADDR' => '0:1',
         'NOTE' => '0:M',
         'OBJE' => '0:M',
         'SOUR' => '0:M',
diff --git a/app/Elements/Graduation.php b/app/Elements/Graduation.php
index 476211fc7f..7f713db8dc 100644
--- a/app/Elements/Graduation.php
+++ b/app/Elements/Graduation.php
@@ -28,6 +28,7 @@ class Graduation extends AbstractEventElement
         'DATE' => '0:1',
         'AGE'  => '0:1',
         'PLAC' => '0:1',
+        'ADDR' => '0:1',
         'AGNC' => '0:1',
         'NOTE' => '0:M',
         'OBJE' => '0:M',
diff --git a/app/Elements/Marriage.php b/app/Elements/Marriage.php
index f750fe44b4..48726b42d7 100644
--- a/app/Elements/Marriage.php
+++ b/app/Elements/Marriage.php
@@ -30,6 +30,7 @@ class Marriage extends AbstractEventElement
         'HUSB' => '0:1',
         'WIFE' => '0:1',
         'PLAC' => '0:1',
+        'ADDR' => '0:1',
         'NOTE' => '0:M',
         'OBJE' => '0:M',
         'SOUR' => '0:M',
diff --git a/app/Elements/MarriageBanns.php b/app/Elements/MarriageBanns.php
index 1e6bf61145..7aecb4a9fb 100644
--- a/app/Elements/MarriageBanns.php
+++ b/app/Elements/MarriageBanns.php
@@ -22,6 +22,18 @@ namespace Fisharebest\Webtrees\Elements;
 /**
  * Marriage Banns
  */
-class MarriageBanns extends AbstractElement
+class MarriageBanns extends AbstractEventElement
 {
+    protected const SUBTAGS = [
+        'TYPE' => '0:1',
+        'DATE' => '0:1',
+        'HUSB' => '0:1',
+        'WIFE' => '0:1',
+        'PLAC' => '0:1',
+        'ADDR' => '0:1',
+        'NOTE' => '0:M',
+        'OBJE' => '0:M',
+        'SOUR' => '0:M',
+        'RESN' => '0:1',
+    ];
 }
diff --git a/app/Elements/MarriageContract.php b/app/Elements/MarriageContract.php
index f4ba44519d..fc1eb60088 100644
--- a/app/Elements/MarriageContract.php
+++ b/app/Elements/MarriageContract.php
@@ -22,6 +22,17 @@ namespace Fisharebest\Webtrees\Elements;
 /**
  * Marriage Contract
  */
-class MarriageContract extends AbstractElement
+class MarriageContract extends AbstractEventElement
 {
+    protected const SUBTAGS = [
+        'TYPE' => '0:1',
+        'DATE' => '0:1',
+        'HUSB' => '0:1',
+        'WIFE' => '0:1',
+        'PLAC' => '0:1',
+        'NOTE' => '0:M',
+        'OBJE' => '0:M',
+        'SOUR' => '0:M',
+        'RESN' => '0:1',
+    ];
 }
diff --git a/app/Elements/MarriageLicence.php b/app/Elements/MarriageLicence.php
index 624cecbdc6..6cf39b7477 100644
--- a/app/Elements/MarriageLicence.php
+++ b/app/Elements/MarriageLicence.php
@@ -22,6 +22,17 @@ namespace Fisharebest\Webtrees\Elements;
 /**
  * Marriage Licence
  */
-class MarriageLicence extends AbstractElement
+class MarriageLicence extends AbstractEventElement
 {
+    protected const SUBTAGS = [
+        'TYPE' => '0:1',
+        'DATE' => '0:1',
+        'HUSB' => '0:1',
+        'WIFE' => '0:1',
+        'PLAC' => '0:1',
+        'NOTE' => '0:M',
+        'OBJE' => '0:M',
+        'SOUR' => '0:M',
+        'RESN' => '0:1',
+    ];
 }
diff --git a/app/Elements/MarriageSettlement.php b/app/Elements/MarriageSettlement.php
index 9c23378bdf..ad6265d36b 100644
--- a/app/Elements/MarriageSettlement.php
+++ b/app/Elements/MarriageSettlement.php
@@ -22,6 +22,17 @@ namespace Fisharebest\Webtrees\Elements;
 /**
  * Marriage Settlement
  */
-class MarriageSettlement extends AbstractElement
+class MarriageSettlement extends AbstractEventElement
 {
+    protected const SUBTAGS = [
+        'TYPE' => '0:1',
+        'DATE' => '0:1',
+        'HUSB' => '0:1',
+        'WIFE' => '0:1',
+        'PLAC' => '0:1',
+        'NOTE' => '0:M',
+        'OBJE' => '0:M',
+        'SOUR' => '0:M',
+        'RESN' => '0:1',
+    ];
 }
diff --git a/app/Elements/Occupation.php b/app/Elements/Occupation.php
index 31b98fd9cb..d2360f99dd 100644
--- a/app/Elements/Occupation.php
+++ b/app/Elements/Occupation.php
@@ -29,6 +29,7 @@ class Occupation extends AbstractElement
     protected const SUBTAGS = [
         'DATE' => '0:1',
         'PLAC' => '0:1',
+        'ADDR' => '0:1',
         'AGNC' => '0:1',
         'NOTE' => '0:M',
         'OBJE' => '0:M',
diff --git a/app/Elements/Possessions.php b/app/Elements/Possessions.php
index 077ddc94e7..af9a646c32 100644
--- a/app/Elements/Possessions.php
+++ b/app/Elements/Possessions.php
@@ -28,6 +28,7 @@ class Possessions extends AbstractElement
     protected const SUBTAGS = [
         'DATE' => '0:1',
         'PLAC' => '0:1',
+        'ADDR' => '0:1',
         'NOTE' => '0:M',
         'OBJE' => '0:M',
         'SOUR' => '0:M',
diff --git a/app/Elements/Residence.php b/app/Elements/Residence.php
index b194f94d2f..453a92a628 100644
--- a/app/Elements/Residence.php
+++ b/app/Elements/Residence.php
@@ -27,6 +27,7 @@ class Residence extends AbstractElement
     protected const SUBTAGS = [
         'DATE' => '0:1',
         'PLAC' => '0:1',
+        'ADDR' => '0:1',
         'NOTE' => '0:M',
         'OBJE' => '0:M',
         'SOUR' => '0:M',
diff --git a/app/Elements/Retirement.php b/app/Elements/Retirement.php
index 15aa242a4a..b6b23426bd 100644
--- a/app/Elements/Retirement.php
+++ b/app/Elements/Retirement.php
@@ -28,6 +28,7 @@ class Retirement extends AbstractElement
         'DATE' => '0:1',
         'AGE'  => '0:1',
         'PLAC' => '0:1',
+        'ADDR' => '0:1',
         'AGNC' => '0:1',
         'NOTE' => '0:M',
         'OBJE' => '0:M',
diff --git a/app/Elements/ScholasticAchievement.php b/app/Elements/ScholasticAchievement.php
index c6be60a909..69f9b4a110 100644
--- a/app/Elements/ScholasticAchievement.php
+++ b/app/Elements/ScholasticAchievement.php
@@ -23,11 +23,12 @@ namespace Fisharebest\Webtrees\Elements;
  * SCHOLASTIC_ACHIEVEMENT := {Size=1:248}
  * A description of a scholastic or educational achievement or pursuit.
  */
-class ScholasticAchievement extends AbstractElement
+class ScholasticAchievement extends AbstractEventElement
 {
     protected const SUBTAGS = [
         'DATE' => '0:1',
         'PLAC' => '0:1',
+        'ADDR' => '0:1',
         'AGNC' => '0:1',
         'NOTE' => '0:M',
         'OBJE' => '0:M',
diff --git a/app/Elements/Will.php b/app/Elements/Will.php
index f6e2fd5e26..4f49cd04ac 100644
--- a/app/Elements/Will.php
+++ b/app/Elements/Will.php
@@ -27,6 +27,7 @@ class Will extends AbstractElement
     protected const SUBTAGS = [
         'DATE' => '0:1',
         'PLAC' => '0:1',
+        'ADDR' => '0:1',
         'NOTE' => '0:M',
         'OBJE' => '0:M',
         'SOUR' => '0:M',
diff --git a/app/Factories/ElementFactory.php b/app/Factories/ElementFactory.php
index 4ad7c8dba0..951010b83a 100644
--- a/app/Factories/ElementFactory.php
+++ b/app/Factories/ElementFactory.php
@@ -42,6 +42,7 @@ use Fisharebest\Webtrees\Elements\ApprovedSystemId;
 use Fisharebest\Webtrees\Elements\AttributeDescriptor;
 use Fisharebest\Webtrees\Elements\AutomatedRecordId;
 use Fisharebest\Webtrees\Elements\Baptism;
+use Fisharebest\Webtrees\Elements\BarMitzvah;
 use Fisharebest\Webtrees\Elements\BasMitzvah;
 use Fisharebest\Webtrees\Elements\Birth;
 use Fisharebest\Webtrees\Elements\Blessing;
@@ -462,7 +463,7 @@ class ElementFactory implements ElementFactoryInterface
             'INDI:BAPM'                => new Baptism(I18N::translate('Baptism')),
             'INDI:BAPM:DATE'           => new DateValue(I18N::translate('Date of baptism')),
             'INDI:BAPM:PLAC'           => new PlaceName(I18N::translate('Place of baptism')),
-            'INDI:BARM'                => new PlaceName(I18N::translate('Bar mitzvah')),
+            'INDI:BARM'                => new BarMitzvah(I18N::translate('Bar mitzvah')),
             'INDI:BARM:DATE'           => new DateValue(I18N::translate('Date of bar mitzvah')),
             'INDI:BARM:PLAC'           => new PlaceName(I18N::translate('Place of bar mitzvah')),
             'INDI:BASM'                => new BasMitzvah(I18N::translate('Bat mitzvah')),
@@ -500,8 +501,8 @@ class ElementFactory implements ElementFactoryInterface
             'INDI:CONL:STAT:DATE'      => new ChangeDate(I18N::translate('Status change date')),
             'INDI:CONL:TEMP'           => new TempleCode(I18N::translate('Temple')),
             'INDI:CREM'                => new Cremation(I18N::translate('Cremation')),
-            'INDI:CREM:DATE'           => new Cremation(I18N::translate('Date of cremation')),
-            'INDI:CREM:PLAC'           => new Cremation(I18N::translate('Place of cremation')),
+            'INDI:CREM:DATE'           => new DateValue(I18N::translate('Date of cremation')),
+            'INDI:CREM:PLAC'           => new PlaceName(I18N::translate('Place of cremation')),
             'INDI:DEAT'                => new Death(I18N::translate('Death')),
             'INDI:DEAT:CAUS'           => new CauseOfEvent(I18N::translate('Cause of death')),
             'INDI:DEAT:DATE'           => new DateValue(I18N::translate('Date of death')),