Fix type validation failing for "any" and false-y type wording

justinrainbow · Apr 6, 2022 · 03a5d22 · 03a5d22
1 parent 4c74da5
commit 03a5d22
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 2 deletions.
diff --git a/src/JsonSchema/Constraints/TypeConstraint.php b/src/JsonSchema/Constraints/TypeConstraint.php
@@ -151,7 +151,7 @@ protected function implodeWith(array $elements, $delimiter = ', ', $listEnd = fa
      */
     protected function validateTypeNameWording($type)
     {
-        if (!isset(self::$wording[$type])) {
+        if (!array_key_exists($type, self::$wording)) {
             throw new StandardUnexpectedValueException(
                 sprintf(
                     'No wording for %s available, expected wordings are: [%s]',

diff --git a/tests/Constraints/TypeTest.php b/tests/Constraints/TypeTest.php
@@ -94,7 +94,31 @@ private function assertTypeConstraintError($expected, TypeConstraint $actual)
         $this->assertSame($expected, $actualMessage); // the same for the strictness
     }
 
-    public function testValidateTypeNameWording()
+    public function validNameWordingDataProvider()
+    {
+        $wordings = array();
+
+        foreach (array_keys(TypeConstraint::$wording) as $value) {
+            $wordings[] = array($value);
+        }
+
+        return $wordings;
+    }
+
+    /**
+     * @dataProvider validNameWordingDataProvider
+     */
+    public function testValidateTypeNameWording($nameWording)
+    {
+        $t = new TypeConstraint();
+        $r = new \ReflectionObject($t);
+        $m = $r->getMethod('validateTypeNameWording');
+        $m->setAccessible(true);
+
+        $m->invoke($t, $nameWording);
+    }
+
+    public function testInvalidateTypeNameWording()
     {
         $t = new TypeConstraint();
         $r = new \ReflectionObject($t);