Merge pull request #108 from TripalCultivate/g4.90-updateImporterWith…

…NewValidators G4.90 Utilize all remaining new validators
TripalCultivate · Oct 24, 2024 · 79bb75f · 79bb75f
2 parents 7a4da98 + 56cae6a
commit 79bb75f
Show file tree

Hide file tree

Showing 15 changed files with 510 additions and 1,204 deletions.
diff --git a/...ultivate_phenotypes/src/Plugin/TripalImporter/TripalCultivatePhenotypesTraitsImporter.php b/...ultivate_phenotypes/src/Plugin/TripalImporter/TripalCultivatePhenotypesTraitsImporter.php
diff --git a/trpcultivate_phenotypes/src/Plugin/Validators/DataFile.php b/trpcultivate_phenotypes/src/Plugin/Validators/DataFile.php
diff --git a/trpcultivate_phenotypes/src/Plugin/Validators/Genus.php b/trpcultivate_phenotypes/src/Plugin/Validators/Genus.php
diff --git a/...pes/src/Plugin/Validators/genusExists.php → ...pes/src/Plugin/Validators/GenusExists.php b/...pes/src/Plugin/Validators/genusExists.php → ...pes/src/Plugin/Validators/GenusExists.php
@@ -17,12 +17,12 @@
  * Validate that genus exists and is configured.
  *
  * @TripalCultivatePhenotypesValidator(
- *   id = "trpcultivate_phenotypes_validator_genus_exists",
+ *   id = "genus_exists",
  *   validator_name = @Translation("Genus Exists and Configured Validator"),
  *   input_types = {"metadata"}
  * )
  */
-class genusExists extends TripalCultivatePhenotypesValidatorBase implements ContainerFactoryPluginInterface {
+class GenusExists extends TripalCultivatePhenotypesValidatorBase implements ContainerFactoryPluginInterface {
 
   /**
    * Genus Ontology Service;
@@ -66,7 +66,7 @@ public static function create(ContainerInterface $container, array $configuratio
   }
 
   /**
-   * Validate that genus provided exists and configured.
+   * Validate that genus provided exists and is configured.
    *
    * @param array $form_values
    *   The values entered to any form field elements implemented by the importer.
@@ -88,7 +88,7 @@ public function validateMetadata(array $form_values) {
 
     // Failed to locate the genus field element.
     if (!array_key_exists($expected_field_key, $form_values)) {
-      throw new \Exception('Failed to locate genus field element. genusExists validator expects a form field element name genus.');
+      throw new \Exception('Failed to locate genus field element. GenusExists validator expects a form field element name genus.');
     }
 
     // Validator response values for a valid genus value.