From 025d2d6e088cc05e0ec608866387b70d481251a1 Mon Sep 17 00:00:00 2001 From: Nav Date: Fri, 9 Feb 2024 23:35:53 +0000 Subject: [PATCH] Updated TDF validation script to use new services --- .../ValidateTargetDescriptionFiles.php | 40 +++++++++++++++---- 1 file changed, 32 insertions(+), 8 deletions(-) diff --git a/build/scripts/ValidateTargetDescriptionFiles.php b/build/scripts/ValidateTargetDescriptionFiles.php index 845564e8..25a49cd7 100644 --- a/build/scripts/ValidateTargetDescriptionFiles.php +++ b/build/scripts/ValidateTargetDescriptionFiles.php @@ -1,6 +1,9 @@ findTargetDescriptionFiles(TDF_PATH); print count($xmlFiles) . ' target descriptions files found in ' . TDF_PATH . PHP_EOL . PHP_EOL; } else { @@ -28,12 +46,18 @@ foreach ($xmlFiles as $xmlFile) { $xmlFilePath = $xmlFile->getPathname(); print 'Processing ' . $xmlFilePath . PHP_EOL; - $targetDescriptionFile = TargetDescriptionFiles\Factory::loadTdfFromFile($xmlFilePath); - $validationFailures = $targetDescriptionFile->validate(); - if (in_array($targetDescriptionFile->configurationValue, $processedTargetConfigValues)) { + $xmlDocument = new \DOMDocument(); + $xmlDocument->load($xmlFilePath); + $targetDescriptionFile = $xmlService->fromXml($xmlDocument); + + $validationFailures = $targetDescriptionFile instanceof Avr8TargetDescriptionFile + ? $avrValidationService->validateAvr8Tdf($targetDescriptionFile) + : $validationService->validateTdf($targetDescriptionFile); + + if (in_array($targetDescriptionFile->getConfigurationValue(), $processedTargetConfigValues)) { $validationFailures[] = 'Duplicate target configuration value ("' - . $targetDescriptionFile->configurationValue . '")'; + . $targetDescriptionFile->getConfigurationValue() . '")'; } if (!empty($validationFailures)) { @@ -52,7 +76,7 @@ foreach ($xmlFiles as $xmlFile) { print "\033[0m"; - $processedTargetConfigValues[] = $targetDescriptionFile->configurationValue; + $processedTargetConfigValues[] = $targetDescriptionFile->getConfigurationValue(); } print 'Validated ' . count($xmlFiles) . ' TDFs' . PHP_EOL;