Refactor reports: simplify structure of variables

16 files changed, 108 insertions, 108 deletions

diff --git a/tests/app/Module/AhnentafelReportModuleTest.php b/tests/app/Module/AhnentafelReportModuleTest.php
index 8b09f102c7..087a4082bb 100644
--- a/tests/app/Module/AhnentafelReportModuleTest.php
+++ b/tests/app/Module/AhnentafelReportModuleTest.php
@@ -99,14 +99,14 @@ class AhnentafelReportModuleTest extends TestCase
 
         $xml  = 'resources/' . $module->xmlFilename();
         $vars = [
-            'pid'      => ['id' => 'X1030'],
-            'maxgen'   => ['id' => '3'],
-            'sources'  => ['id' => 'on'],
-            'pageSize' => ['id' => 'A4'],
-            'notes'    => ['id' => 'on'],
-            'occu'     => ['id' => 'on'],
-            'resi'     => ['id' => 'on'],
-            'children' => ['id' => 'on'],
+            'pid'      => 'X1030',
+            'maxgen'   => '3',
+            'sources'  => 'on',
+            'pageSize' => 'A4',
+            'notes'    => 'on',
+            'occu'     => 'on',
+            'resi'     => 'on',
+            'children' => 'on',
         ];
 
         new ReportParserSetup($xml);
diff --git a/tests/app/Module/BirthDeathMarriageReportModuleTest.php b/tests/app/Module/BirthDeathMarriageReportModuleTest.php
index df94527da4..05fae47180 100644
--- a/tests/app/Module/BirthDeathMarriageReportModuleTest.php
+++ b/tests/app/Module/BirthDeathMarriageReportModuleTest.php
@@ -89,14 +89,14 @@ class BirthDeathMarriageReportModuleTest extends TestCase
 
         $xml  = 'resources/' . $module->xmlFilename();
         $vars = [
-            'name'       => ['id' => ''],
-            'bdmplace'   => ['id' => ''],
-            'birthdate1' => ['id' => ''],
-            'birthdate2' => ['id' => ''],
-            'deathdate1' => ['id' => ''],
-            'deathdate2' => ['id' => ''],
-            'sortby'     => ['id' => 'BIRT:DATE'],
-            'pageSize'   => ['id' => 'A4'],
+            'name'       => '',
+            'bdmplace'   => '',
+            'birthdate1' => '',
+            'birthdate2' => '',
+            'deathdate1' => '',
+            'deathdate2' => '',
+            'sortby'     => 'BIRT:DATE',
+            'pageSize'   => 'A4',
         ];
 
         new ReportParserSetup($xml);
diff --git a/tests/app/Module/BirthReportModuleTest.php b/tests/app/Module/BirthReportModuleTest.php
index 9cde358c0a..ed257ffdc0 100644
--- a/tests/app/Module/BirthReportModuleTest.php
+++ b/tests/app/Module/BirthReportModuleTest.php
@@ -98,12 +98,12 @@ class BirthReportModuleTest extends TestCase
 
         $xml  = 'resources/' . $module->xmlFilename();
         $vars = [
-            'name'       => ['id' => ''],
-            'birthplace' => ['id' => ''],
-            'birthdate1' => ['id' => ''],
-            'birthdate2' => ['id' => ''],
-            'sortby'     => ['id' => 'NAME'],
-            'pageSize'   => ['id' => 'A4'],
+            'name'       => '',
+            'birthplace' => '',
+            'birthdate1' => '',
+            'birthdate2' => '',
+            'sortby'     => 'NAME',
+            'pageSize'   => 'A4',
         ];
 
         new ReportParserSetup($xml);
diff --git a/tests/app/Module/CemeteryReportModuleTest.php b/tests/app/Module/CemeteryReportModuleTest.php
index b59f9ba194..c19e0e2a0f 100644
--- a/tests/app/Module/CemeteryReportModuleTest.php
+++ b/tests/app/Module/CemeteryReportModuleTest.php
@@ -98,10 +98,10 @@ class CemeteryReportModuleTest extends TestCase
 
         $xml  = 'resources/' . $module->xmlFilename();
         $vars = [
-            'deathplace' => ['id' => ''],
-            'adlist'     => ['id' => 'none'],
-            'sortby'     => ['id' => 'NAME'],
-            'pageSize'   => ['id' => 'A4'],
+            'deathplace' => '',
+            'adlist'     => 'none',
+            'sortby'     => 'NAME',
+            'pageSize'   => 'A4',
         ];
 
         new ReportParserSetup($xml);
diff --git a/tests/app/Module/ChangeReportModuleTest.php b/tests/app/Module/ChangeReportModuleTest.php
index baf260cb98..f8d63d611c 100644
--- a/tests/app/Module/ChangeReportModuleTest.php
+++ b/tests/app/Module/ChangeReportModuleTest.php
@@ -99,12 +99,12 @@ class ChangeReportModuleTest extends TestCase
 
         $xml  = 'resources/' . $module->xmlFilename();
         $vars = [
-            'changeRangeStart' => ['id' => Registry::timestampFactory()->now()->subtractMonths(1)->format('d M Y')],
-            'changeRangeEnd'   => ['id' => Registry::timestampFactory()->now()->format('d M Y')],
-            'pending'          => ['id' => 'yes'],
-            'sortby'           => ['id' => 'CHAN'],
-            'pageSize'         => ['id' => 'A4'],
-            'pageorient'       => ['id' => 'landscape'],
+            'changeRangeStart' => Registry::timestampFactory()->now()->subtractMonths(1)->format('d M Y'),
+            'changeRangeEnd'   => Registry::timestampFactory()->now()->format('d M Y'),
+            'pending'          => 'yes',
+            'sortby'           => 'CHAN',
+            'pageSize'         => 'A4',
+            'pageorient'       => 'landscape',
         ];
 
         new ReportParserSetup($xml);
diff --git a/tests/app/Module/DeathReportModuleTest.php b/tests/app/Module/DeathReportModuleTest.php
index d449926480..bd561e57c8 100644
--- a/tests/app/Module/DeathReportModuleTest.php
+++ b/tests/app/Module/DeathReportModuleTest.php
@@ -98,13 +98,13 @@ class DeathReportModuleTest extends TestCase
 
         $xml  = 'resources/' . $module->xmlFilename();
         $vars = [
-            'name'       => ['id' => ''],
-            'deathplace' => ['id' => ''],
-            'deathdate1' => ['id' => ''],
-            'deathdate2' => ['id' => ''],
-            'adlist'     => ['id' => 'none'],
-            'sortby'     => ['id' => 'NAME'],
-            'pageSize'   => ['id' => 'A4'],
+            'name'       => '',
+            'deathplace' => '',
+            'deathdate1' => '',
+            'deathdate2' => '',
+            'adlist'     => 'none',
+            'sortby'     => 'NAME',
+            'pageSize'   => 'A4',
         ];
 
         new ReportParserSetup($xml);
diff --git a/tests/app/Module/DescendancyReportModuleTest.php b/tests/app/Module/DescendancyReportModuleTest.php
index 18b80c8877..d852bb0eb4 100644
--- a/tests/app/Module/DescendancyReportModuleTest.php
+++ b/tests/app/Module/DescendancyReportModuleTest.php
@@ -99,10 +99,10 @@ class DescendancyReportModuleTest extends TestCase
 
         $xml  = 'resources/' . $module->xmlFilename();
         $vars = [
-            'pid'      => ['id' => 'X1030'],
-            'maxgen'   => ['id' => '3'],
-            'sources'  => ['id' => 'on'],
-            'pageSize' => ['id' => 'A4'],
+            'pid'      => 'X1030',
+            'maxgen'   => '3',
+            'sources'  => 'on',
+            'pageSize' => 'A4',
         ];
 
         new ReportParserSetup($xml);
diff --git a/tests/app/Module/FactSourcesReportModuleTest.php b/tests/app/Module/FactSourcesReportModuleTest.php
index 3b7e53b9ca..1df686e3de 100644
--- a/tests/app/Module/FactSourcesReportModuleTest.php
+++ b/tests/app/Module/FactSourcesReportModuleTest.php
@@ -98,10 +98,10 @@ class FactSourcesReportModuleTest extends TestCase
 
         $xml  = 'resources/' . $module->xmlFilename();
         $vars = [
-            'id'       => ['id' => 's1'],
-            'stype'    => ['id' => 'facts'],
-            'sortby'   => ['id' => 'BIRT:DATE'],
-            'pageSize' => ['id' => 'A4'],
+            'sid'      => 'X1102',
+            'stype'    => 'facts',
+            'sortby'   => 'BIRT:DATE',
+            'pageSize' => 'A4',
         ];
 
         new ReportParserSetup($xml);
diff --git a/tests/app/Module/FamilyGroupReportModuleTest.php b/tests/app/Module/FamilyGroupReportModuleTest.php
index 1361542ec9..10dbb4f591 100644
--- a/tests/app/Module/FamilyGroupReportModuleTest.php
+++ b/tests/app/Module/FamilyGroupReportModuleTest.php
@@ -98,13 +98,13 @@ class FamilyGroupReportModuleTest extends TestCase
 
         $xml  = 'resources/' . $module->xmlFilename();
         $vars = [
-            'id'       => ['id' => 'f1'],
-            'sources'  => ['id' => 'on'],
-            'notes'    => ['id' => 'on'],
-            'photos'   => ['id' => 'on'],
-            'colors'   => ['id' => 'on'],
-            'blanks'   => ['id' => 'on'],
-            'pageSize' => ['id' => 'A4'],
+            'id'       => 'f1',
+            'sources'  => 'on',
+            'notes'    => 'on',
+            'photos'   => 'on',
+            'colors'   => 'on',
+            'blanks'   => 'on',
+            'pageSize' => 'A4',
         ];
 
         new ReportParserSetup($xml);
diff --git a/tests/app/Module/IndividualFamiliesReportModuleTest.php b/tests/app/Module/IndividualFamiliesReportModuleTest.php
index 6ec1d0dc22..500c42aae5 100644
--- a/tests/app/Module/IndividualFamiliesReportModuleTest.php
+++ b/tests/app/Module/IndividualFamiliesReportModuleTest.php
@@ -99,15 +99,15 @@ class IndividualFamiliesReportModuleTest extends TestCase
 
         $xml  = 'resources/' . $module->xmlFilename();
         $vars = [
-            'pid'       => ['id' => 'X1030'],
-            'relatives' => ['id' => 'child-families'],
-            'maxgen'    => ['id' => '4'],
-            'sortby'    => ['id' => 'BIRT:DATE'],
-            'sources'   => ['id' => 'on'],
-            'notes'     => ['id' => 'on'],
-            'photos'    => ['id' => 'on'],
-            'pageSize'  => ['id' => 'A4'],
-            'colors'    => ['id' => 'on'],
+            'pid'       => 'X1030',
+            'relatives' => 'child-families',
+            'maxgen'    => '4',
+            'sortby'    => 'BIRT:DATE',
+            'sources'   => 'on',
+            'notes'     => 'on',
+            'photos'    => 'on',
+            'pageSize'  => 'A4',
+            'colors'    => 'on',
         ];
 
         new ReportParserSetup($xml);
diff --git a/tests/app/Module/IndividualReportModuleTest.php b/tests/app/Module/IndividualReportModuleTest.php
index 8ac0ada60b..ac976e98dd 100644
--- a/tests/app/Module/IndividualReportModuleTest.php
+++ b/tests/app/Module/IndividualReportModuleTest.php
@@ -96,12 +96,12 @@ class IndividualReportModuleTest extends TestCase
 
         $xml  = 'resources/' . $module->xmlFilename();
         $vars = [
-            'id'       => ['id' => 'X1030'],
-            'sources'   => ['id' => 'on'],
-            'notes'     => ['id' => 'on'],
-            'photos'    => ['id' => 'all'],
-            'colors'    => ['id' => 'on'],
-            'pageSize'  => ['id' => 'A4'],
+            'id'       => 'X1030',
+            'sources'  => 'on',
+            'notes'    => 'on',
+            'photos'   => 'all',
+            'colors'   => 'on',
+            'pageSize' => 'A4',
         ];
 
         new ReportParserSetup($xml);
diff --git a/tests/app/Module/MarriageReportModuleTest.php b/tests/app/Module/MarriageReportModuleTest.php
index 938438ec9b..e6e9478514 100644
--- a/tests/app/Module/MarriageReportModuleTest.php
+++ b/tests/app/Module/MarriageReportModuleTest.php
@@ -96,12 +96,12 @@ class MarriageReportModuleTest extends TestCase
 
         $xml  = 'resources/' . $module->xmlFilename();
         $vars = [
-            'name'      => ['id' => ''],
-            'marrplace' => ['id' => ''],
-            'marrdate1' => ['id' => ''],
-            'marrdate2' => ['id' => ''],
-            'sortby'    => ['id' => 'NAME'],
-            'pageSize'  => ['id' => 'A4'],
+            'name'      => '',
+            'marrplace' => '',
+            'marrdate1' => '',
+            'marrdate2' => '',
+            'sortby'    => 'NAME',
+            'pageSize'  => 'A4',
         ];
 
         new ReportParserSetup($xml);
diff --git a/tests/app/Module/MissingFactsReportModuleTest.php b/tests/app/Module/MissingFactsReportModuleTest.php
index 97f976a52f..5c5e038dfe 100644
--- a/tests/app/Module/MissingFactsReportModuleTest.php
+++ b/tests/app/Module/MissingFactsReportModuleTest.php
@@ -96,24 +96,24 @@ class MissingFactsReportModuleTest extends TestCase
 
         $xml  = 'resources/' . $module->xmlFilename();
         $vars = [
-            'pid'       => ['id' => 'X1030'],
-            'relatives' => ['id' => 'direct-ancestors'],
-            'maxgen'    => ['id' => '*'],
-            'pageSize'  => ['id' => 'A4'],
-            'sortby'    => ['id' => 'NAME'],
-            'fbirt'     => ['id' => 'on'],
-            'fburi'     => ['id' => 'on'],
-            'fdeat'     => ['id' => 'on'],
-            'fsour'     => ['id' => 'on'],
-            'fbapm'     => ['id' => 'on'],
-            'fbarm'     => ['id' => 'on'],
-            'fbasm'     => ['id' => 'on'],
-            'fconf'     => ['id' => 'on'],
-            'fenga'     => ['id' => 'on'],
-            'ffcom'     => ['id' => 'on'],
-            'fmarb'     => ['id' => 'on'],
-            'fmarr'     => ['id' => 'on'],
-            'freli'     => ['id' => 'on'],
+            'pid'       => 'X1030',
+            'relatives' => 'direct-ancestors',
+            'maxgen'    => '*',
+            'pageSize'  => 'A4',
+            'sortby'    => 'NAME',
+            'fbirt'     => 'on',
+            'fburi'     => 'on',
+            'fdeat'     => 'on',
+            'fsour'     => 'on',
+            'fbapm'     => 'on',
+            'fbarm'     => 'on',
+            'fbasm'     => 'on',
+            'fconf'     => 'on',
+            'fenga'     => 'on',
+            'ffcom'     => 'on',
+            'fmarb'     => 'on',
+            'fmarr'     => 'on',
+            'freli'     => 'on',
         ];
 
         new ReportParserSetup($xml);
diff --git a/tests/app/Module/OccupationReportModuleTest.php b/tests/app/Module/OccupationReportModuleTest.php
index 8e4cdeeb91..564af569b9 100644
--- a/tests/app/Module/OccupationReportModuleTest.php
+++ b/tests/app/Module/OccupationReportModuleTest.php
@@ -96,9 +96,9 @@ class OccupationReportModuleTest extends TestCase
 
         $xml  = 'resources/' . $module->xmlFilename();
         $vars = [
-            'occupation' => ['id' => 'king'],
-            'pageSize'  => ['id' => 'A4'],
-            'sortby'    => ['id' => 'NAME'],
+            'occupation' => 'king',
+            'pageSize'   => 'A4',
+            'sortby'     => 'NAME',
         ];
 
         new ReportParserSetup($xml);
diff --git a/tests/app/Module/PedigreeReportModuleTest.php b/tests/app/Module/PedigreeReportModuleTest.php
index a8e7729d05..b906b09265 100644
--- a/tests/app/Module/PedigreeReportModuleTest.php
+++ b/tests/app/Module/PedigreeReportModuleTest.php
@@ -96,9 +96,9 @@ class PedigreeReportModuleTest extends TestCase
 
         $xml  = 'resources/' . $module->xmlFilename();
         $vars = [
-            'pid'         => ['id' => 'X1030'],
-            'spouses'     => ['id' => 'on'],
-            'orientation' => ['id' => 'portrait'],
+            'pid'         => 'X1030',
+            'spouses'     => 'on',
+            'orientation' => 'portrait',
         ];
 
         new ReportParserSetup($xml);
diff --git a/tests/app/Module/RelatedIndividualsReportModuleTest.php b/tests/app/Module/RelatedIndividualsReportModuleTest.php
index bd2cbdefa9..1d2902ea35 100644
--- a/tests/app/Module/RelatedIndividualsReportModuleTest.php
+++ b/tests/app/Module/RelatedIndividualsReportModuleTest.php
@@ -96,15 +96,15 @@ class RelatedIndividualsReportModuleTest extends TestCase
 
         $xml  = 'resources/' . $module->xmlFilename();
         $vars = [
-            'pid'       => ['id' => 'X1030'],
-            'relatives' => ['id' => 'child-family'],
-            'maxgen'    => ['id' => '4'],
-            'sortby'    => ['id' => 'BIRT:DATE'],
-            'sources'   => ['id' => 'on'],
-            'notes'     => ['id' => 'on'],
-            'photos'    => ['id' => 'all'],
-            'colors'    => ['id' => 'on'],
-            'pageSize'  => ['id' => 'A4'],
+            'pid'       => 'X1030',
+            'relatives' => 'child-family',
+            'maxgen'    => '4',
+            'sortby'    => 'BIRT:DATE',
+            'sources'   => 'on',
+            'notes'     => 'on',
+            'photos'    => 'all',
+            'colors'    => 'on',
+            'pageSize'  => 'A4',
         ];
 
         new ReportParserSetup($xml);