test: Pass draft identifier to testcase

Author: DannyvdSluijs

src/JsonSchema/DraftIdentifiers.php

@@ -21,24 +21,39 @@ class DraftIdentifiers extends Enum
     public const DRAFT_2019_09 = 'https://json-schema.org/draft/2019-09/schema';
     public const DRAFT_2020_12 = 'https://json-schema.org/draft/2020-12/schema';
 
+    /** @var array<DraftIdentifiers::DRAFT_*, string>  */
+    private const MAPPING = [
+        self::DRAFT_3 => 'draft03',
+        self::DRAFT_4 => 'draft04',
+        self::DRAFT_6 => 'draft06',
+        self::DRAFT_7 => 'draft07',
+        self::DRAFT_2019_09 => 'draft2019-09',
+        self::DRAFT_2020_12 => 'draft2020-12',
+    ];
+
+    private const FALLBACK_MAPPING = [
+        'draft3' => self::DRAFT_3,
+        'draft4' => self::DRAFT_4,
+        'draft6' => self::DRAFT_6,
+        'draft7' => self::DRAFT_7,
+    ];
+
     public function toConstraintName(): string
     {
-        switch ($this->getValue()) {
-            case self::DRAFT_3:
-                return 'draft03';
-            case self::DRAFT_4:
-                return 'draft04';
-            case self::DRAFT_6:
-                return 'draft06';
-            case self::DRAFT_7:
-                return 'draft07';
-            case self::DRAFT_2019_09:
-                return 'draft2019-09';
-            case self::DRAFT_2020_12:
-                return 'draft2020-12';
-            default:
-                throw new \Exception('Unsupported schema URI: ' . $this->getValue());
+        return self::MAPPING[$this->getValue()];
+    }
+
+    public static function fromConstraintName(string $name): DraftIdentifiers
+    {
+        $reverseMap = array_flip(self::MAPPING);
+        if (!array_key_exists($name, $reverseMap)) {
+            if (array_key_exists($name, self::FALLBACK_MAPPING)) {
+                return DraftIdentifiers::byValue(self::FALLBACK_MAPPING[$name]);
+            }
+            throw new \InvalidArgumentException("$name is not a valid constraint name.");
         }
+
+        return DraftIdentifiers::byValue($reverseMap[$name]);
     }
 
     public function withoutFragment(): string

tests/JsonSchemaTestSuiteTest.php

@@ -7,6 +7,7 @@
 use CallbackFilterIterator;
 use JsonSchema\Constraints\Constraint;
 use JsonSchema\Constraints\Factory;
+use JsonSchema\DraftIdentifiers;
 use JsonSchema\SchemaStorage;
 use JsonSchema\SchemaStorageInterface;
 use JsonSchema\Validator;
@@ -28,14 +29,17 @@ public function testTestCaseValidatesCorrectly(
         $schema,
         $data,
         int $checkMode,
+        DraftIdentifiers $draft,
         bool $expectedValidationResult,
         bool $optional
     ): void {
         $schemaStorage = new SchemaStorage();
         $id = is_object($schema) && property_exists($schema, 'id') ? $schema->id : SchemaStorage::INTERNAL_PROVIDED_SCHEMA_URI;
         $schemaStorage->addSchema($id, $schema);
         $this->loadRemotesIntoStorage($schemaStorage);
-        $validator = new Validator(new Factory($schemaStorage));
+        $factory = new Factory($schemaStorage);
+        $factory->setDefaultDialect($draft->getValue());
+        $validator = new Validator($factory);
 
         try {
             $validator->validate($data, $schema, $checkMode);
@@ -64,7 +68,7 @@ public function casesDataProvider(): \Generator
         $drafts = array_filter(glob($testDir . '/*'), static function (string $filename) {
             return is_dir($filename);
         });
-        $skippedDrafts = ['draft2019-09', 'draft2020-12', 'draft-next', 'latest'];
+        $skippedDrafts = ['draft3', 'draft4', 'draft6', 'draft2019-09', 'draft2020-12', 'draft-next', 'latest'];
 
         foreach ($drafts as $draft) {
             $baseDraftName = basename($draft);
@@ -105,6 +109,7 @@ function ($file) {
                             'schema' => $testCase->schema,
                             'data' => $test->data,
                             'checkMode' => $this->getCheckModeForDraft($baseDraftName),
+                            'draft' => DraftIdentifiers::fromConstraintName($baseDraftName),
                             'expectedValidationResult' => $test->valid,
                             'optional' => str_contains($file->getPathname(), '/optional/')
                         ];