Cover markings in selectable fields

Close #39

phpstan-baseline.neon

@@ -1,22 +1,52 @@
 parameters:
 	ignoreErrors:
 		-
-			message: "#^Only booleans are allowed in a ternary operator condition, int\\|false given\\.$#"
+			message: "#^Class MDInvalidNodaLinkException is neither abstract nor final\\.$#"
 			count: 1
-			path: classes/MDAllowedValueSets/src/enums/MDNodaRepository.php
+			path: classes/MDAllowedValueSets/exceptions/MDInvalidNodaLinkException.php
 
 		-
-			message: "#^Calling file_get_contents\\(\\) is forbidden, use MD_STD\\:\\:file_get_contents\\(\\) instead$#"
+			message: "#^Class \"MDInvalidNodaLinkLcshIdIsGeneralLoc\" is not allowed to extend \"MDInvalidNodaLinkException\"\\.$#"
+			count: 1
+			path: classes/MDAllowedValueSets/exceptions/MDInvalidNodaLinkLcshIdIsGeneralLoc.php
+
+		-
+			message: "#^Class \"MDInvalidNodaLinkLocIdIsSh\" is not allowed to extend \"MDInvalidNodaLinkException\"\\.$#"
+			count: 1
+			path: classes/MDAllowedValueSets/exceptions/MDInvalidNodaLinkLocIdIsSh.php
+
+		-
+			message: "#^Match arm comparison between \\$this\\(MDCopyrightCollective\\)&MDCopyrightCollective\\:\\:vg_bildkunst and MDCopyrightCollective\\:\\:vg_bildkunst is always true\\.$#"
+			count: 3
+			path: classes/MDAllowedValueSets/src/enums/MDCopyrightCollective.php
+
+		-
+			message: "#^Match expression does not handle remaining values\\: MDMeasurementType\\:\\:height_frame\\|MDMeasurementType\\:\\:height_image_size\\|MDMeasurementType\\:\\:height_sheet_size\\|MDMeasurementType\\:\\:height_socle\\|MDMeasurementType\\:\\:length_frame\\|MDMeasurementType\\:\\:length_image_size\\|MDMeasurementType\\:\\:length_sheet_size\\|MDMeasurementType\\:\\:length_socle\\|MDMeasurementType\\:\\:width_frame\\|MDMeasurementType\\:\\:width_image_size\\|MDMeasurementType\\:\\:width_sheet_size\\|MDMeasurementType\\:\\:width_socle$#"
+			count: 1
+			path: classes/MDAllowedValueSets/src/enums/MDMeasurementType.php
+
+		-
+			message: "#^Class MDInvalidNodaLink is neither abstract nor final\\.$#"
+			count: 1
+			path: classes/MDErrorReporter/exceptions/updates/MDInvalidNodaLink.php
+
+		-
+			message: "#^Strict comparison using \\=\\=\\= between '35CA0E31F6F44FB5' and null will always evaluate to false\\.$#"
+			count: 1
+			path: classes/MDMailer/src/MDMailerHelper.php
+
+		-
+			message: "#^Calling file_get_contents\\(\\) is forbidden, use MD_STD\\:\\:file_get_contents\\(\\) instead\\.$#"
 			count: 1
 			path: classes/MDTlLoader/src/MDTlLoader.php
 
 		-
-			message: "#^Calling json_encode\\(\\) is forbidden, use MD_STD\\:\\:json_encode\\(\\) instead$#"
+			message: "#^Calling json_encode\\(\\) is forbidden, use MD_STD\\:\\:json_encode\\(\\) instead\\.$#"
 			count: 1
 			path: classes/MDTlLoader/src/MDTlLoader.php
 
 		-
-			message: "#^Calling mkdir\\(\\) is forbidden, use MD_STD\\:\\:mkdir\\(\\) instead$#"
+			message: "#^Calling mkdir\\(\\) is forbidden, use MD_STD\\:\\:mkdir\\(\\) instead\\.$#"
 			count: 1
 			path: classes/MDTlLoader/src/MDTlLoader.php
 
@@ -25,53 +55,43 @@ parameters:
 			count: 3
 			path: classes/MDTlLoader/src/MDTlLoader.php
 
-		-
-			message: "#^Strict comparison using \\!\\=\\= between string and false will always evaluate to true\\.$#"
-			count: 1
-			path: classes/MDTlLoader/src/MDTlLoader.php
-
-		-
-			message: "#^Unreachable statement \\- code above always terminates\\.$#"
-			count: 1
-			path: classes/MDTlLoader/src/MDTlLoader.php
-
 		-
 			message: "#^Variable variables are not allowed\\.$#"
 			count: 3
 			path: classes/MDTlLoader/src/MDTlLoader.php
 
 		-
-			message: "#^Calling file_get_contents\\(\\) is forbidden, use MD_STD\\:\\:file_get_contents\\(\\) instead$#"
+			message: "#^Calling file_get_contents\\(\\) is forbidden, use MD_STD\\:\\:file_get_contents\\(\\) instead\\.$#"
 			count: 1
 			path: classes/MD_STD/src/MD_STD.php
 
 		-
-			message: "#^Calling json_encode\\(\\) is forbidden, use MD_STD\\:\\:json_encode\\(\\) instead$#"
+			message: "#^Calling json_encode\\(\\) is forbidden, use MD_STD\\:\\:json_encode\\(\\) instead\\.$#"
 			count: 2
 			path: classes/MD_STD/src/MD_STD.php
 
 		-
-			message: "#^Calling levenshtein\\(\\) is forbidden, use MD_STD\\:\\:levenshtein\\(\\) instead$#"
+			message: "#^Calling levenshtein\\(\\) is forbidden, use MD_STD\\:\\:levenshtein\\(\\) instead\\.$#"
 			count: 1
 			path: classes/MD_STD/src/MD_STD.php
 
 		-
-			message: "#^Calling mkdir\\(\\) is forbidden, use MD_STD\\:\\:mkdir\\(\\) instead$#"
+			message: "#^Calling mkdir\\(\\) is forbidden, use MD_STD\\:\\:mkdir\\(\\) instead\\.$#"
 			count: 1
 			path: classes/MD_STD/src/MD_STD.php
 
 		-
-			message: "#^Calling realpath\\(\\) is forbidden, use MD_STD\\:\\:realpath\\(\\) instead$#"
+			message: "#^Calling realpath\\(\\) is forbidden, use MD_STD\\:\\:realpath\\(\\) instead\\.$#"
 			count: 1
 			path: classes/MD_STD/src/MD_STD.php
 
 		-
-			message: "#^Calling scandir\\(\\) is forbidden, use MD_STD\\:\\:scandir\\(\\) instead$#"
+			message: "#^Calling scandir\\(\\) is forbidden, use MD_STD\\:\\:scandir\\(\\) instead\\.$#"
 			count: 1
 			path: classes/MD_STD/src/MD_STD.php
 
 		-
-			message: "#^Calling unlink\\(\\) is forbidden, use MD_STD\\:\\:unlink\\(\\) instead$#"
+			message: "#^Calling unlink\\(\\) is forbidden, use MD_STD\\:\\:unlink\\(\\) instead\\.$#"
 			count: 1
 			path: classes/MD_STD/src/MD_STD.php
 
@@ -91,25 +111,40 @@ parameters:
 			path: classes/MD_STD/src/MD_STD.php
 
 		-
-			message: "#^Access to static property \\$redis_pw on an unknown class MD_CONF\\.$#"
+			message: "#^Calling move_uploaded_file\\(\\) is forbidden, use MD_STD_IN\\:\\:move_uploaded_file\\(\\) instead\\.$#"
 			count: 1
-			path: classes/MD_STD/src/MD_STD_CACHE.php
+			path: classes/MD_STD/src/MD_STD_IN.php
 
 		-
-			message: "#^Strict comparison using \\!\\=\\= between string and false will always evaluate to true\\.$#"
+			message: "#^Variable \\$output in empty\\(\\) always exists and is not falsy\\.$#"
-			count: 1
-			path: classes/MD_STD/src/MD_STD_CACHE.php
-
-		-
-			message: "#^Calling move_uploaded_file\\(\\) is forbidden, use MD_STD_IN\\:\\:move_uploaded_file\\(\\) instead$#"
 			count: 1
 			path: classes/MD_STD/src/MD_STD_IN.php
 
 		-
 			message: "#^Short ternary operator is not allowed\\. Use null coalesce operator if applicable or consider using long ternary\\.$#"
-			count: 4
+			count: 2
 			path: classes/MD_STD/src/MD_STD_SEC.php
 
+		-
+			message: "#^Unreachable statement \\- code above always terminates\\.$#"
+			count: 1
+			path: classes/MD_STD/tests/MD_STD_IN_Test.php
+
+		-
+			message: "#^Calling scandir\\(\\) is forbidden, use MD_STD\\:\\:scandir\\(\\) instead\\.$#"
+			count: 1
+			path: classes/MD_STD/tests/MD_STD_Test.php
+
+		-
+			message: "#^Access to undefined constant MDErrorReporter\\:\\:MD_ERROR_KNOWN\\.$#"
+			count: 1
+			path: functions/functions.php
+
+		-
+			message: "#^Cannot access constant MD_ERROR_KNOWN on MDErrorReporter\\.$#"
+			count: 2
+			path: functions/functions.php
+
 		-
 			message: "#^Call to static method PHPUnit\\\\Framework\\\\Assert\\:\\:assertTrue\\(\\) with true and non\\-falsy\\-string will always evaluate to true\\.$#"
 			count: 1

public/index.htm

@@ -4,7 +4,7 @@
 
     <meta name="viewport" content="width=device-width, initial-scale=1" />
     <meta http-equiv="content-type" content="text/html; charset=UTF-8"/>
-    <link rel="stylesheet" type="text/css" href="assets/css/csvxml.min.css?67bc901d7b393" />
+    <link rel="stylesheet" type="text/css" href="assets/css/csvxml.min.css?67bc92fc82e77" />
     <link rel="manifest" href="/manifest.json" />
     <meta name="theme-color" content="#aa4400" />
 
@@ -27,7 +27,7 @@
 </head>
 <body class="loading">
 
-<script src="assets/js/csvxmlV2.min.js?67bc901d7b395" type="text/javascript" async></script>
+<script src="assets/js/csvxmlV2.min.js?67bc92fc82e7e" type="text/javascript" async></script>
 
 </body>
 </html>

src/CsvxmlAvailableFields.php

@@ -791,6 +791,7 @@ final class CsvxmlAvailableFields {
             $tlLoader->tl("basis", "basis", 'event') . ": " . $tlLoader->tl("eventtype_name", "eventname", "51") => [],
             $tlLoader->tl("basis", "basis", 'event') . ": " . $tlLoader->tl("eventtype_name", "eventname", "52") => [],
             $tlLoader->tl("basis", "basis", 'exhibitions') => [],
+            $tlLoader->tl("object_addendum", "object_add", 'markings') => [],
         ];
 
         /*
@@ -1630,16 +1631,42 @@ final class CsvxmlAvailableFields {
 
         }
 
-        /*
         for ($i = 1; $i <= 2 * self::GENERAL_FIELD_MULTIPLIER; $i++) {
 
-            // To add $availableFields[$tlLoader->tl("object_addendum", "object_add", "markings")]["marking_type" . $i] = new FieldEntry(
+            $availableFields[$tlLoader->tl("object_addendum", "object_add", "markings")]["marking_type" . $i] = new FieldEntry(
-                dependsOn: ["marking_position1"],
+                dependsOn: ["marking_position" . $i, "marking_text" . $i],
-                name_human_readable: $tlLoader->tl("basis", "basis", "exhibitions"),
+                name_human_readable: $tlLoader->tl("object_addendum", "object_add", "markings") . ": Type",
+            );
+            $availableFields[$tlLoader->tl("object_addendum", "object_add", "markings")]["marking_position" . $i] = new FieldEntry(
+                dependsOn: ["marking_type" . $i, "marking_text" . $i],
+                name_human_readable: $tlLoader->tl("object_addendum", "object_add", "markings") . ": Position",
+            );
+            $availableFields[$tlLoader->tl("object_addendum", "object_add", "markings")]["marking_width_mm" . $i] = new FieldEntry(
+                dependsOn: ["marking_type" . $i, "marking_position" . $i, "marking_text" . $i],
+                name_human_readable: $tlLoader->tl("object_addendum", "object_add", "markings") . ": Width (mm)",
+            );
+            $availableFields[$tlLoader->tl("object_addendum", "object_add", "markings")]["marking_height_mm" . $i] = new FieldEntry(
+                dependsOn: ["marking_type" . $i, "marking_position" . $i, "marking_text" . $i],
+                name_human_readable: $tlLoader->tl("object_addendum", "object_add", "markings") . ": Height (mm)",
+            );
+            $availableFields[$tlLoader->tl("object_addendum", "object_add", "markings")]["marking_text" . $i] = new FieldEntry(
+                dependsOn: ["marking_type" . $i, "marking_position" . $i],
+                name_human_readable: $tlLoader->tl("object_addendum", "object_add", "markings") . ": Text",
+            );
+            $availableFields[$tlLoader->tl("object_addendum", "object_add", "markings")]["marking_note" . $i] = new FieldEntry(
+                dependsOn: ["marking_type" . $i, "marking_position" . $i, "marking_text" . $i],
+                name_human_readable: $tlLoader->tl("object_addendum", "object_add", "markings") . ": Note",
+            );
+            $availableFields[$tlLoader->tl("object_addendum", "object_add", "markings")]["marking_time" . $i] = new FieldEntry(
+                dependsOn: ["marking_type" . $i, "marking_position" . $i, "marking_text" . $i],
+                name_human_readable: $tlLoader->tl("object_addendum", "object_add", "markings") . ": Time",
+            );
+            $availableFields[$tlLoader->tl("object_addendum", "object_add", "markings")]["marking_persinst" . $i] = new FieldEntry(
+                dependsOn: ["marking_type" . $i, "marking_position" . $i, "marking_text" . $i],
+                name_human_readable: $tlLoader->tl("object_addendum", "object_add", "markings") . ": Actor",
             );
 
         }
-         */
 
         $this->_availableFields = $availableFields;