Merge pull request #71 from vanilla/fix/php74-issues

Fix PHP deprecation
vanilla · Dec 1, 2019 · dded822 · dded822
2 parents 4137672 + 04091b0
commit dded822
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 1 deletion.
diff --git a/src/ValidationField.php b/src/ValidationField.php
@@ -191,7 +191,7 @@ public function val($key, $default = null) {
      * @return bool Returns **true** if the field has a key or **false** otherwise.
      */
     public function hasVal($key) {
-        return array_key_exists($key, $this->field);
+        return isset($this->field[$key]) || (is_array($this->field) && array_key_exists($key, $this->field));
     }
 
     /**

diff --git a/tests/RealWorldTest.php b/tests/RealWorldTest.php
@@ -116,4 +116,19 @@ public function testNestedMergedFilteredAdd() {
         $validatedData = $filteredSchema->validate($data);
         $this->assertEquals($expectedData, $validatedData);
     }
+
+    /**
+     * A nested schema object should have its default value respected.
+     */
+    public function testNestedDefaultRequired() {
+        $schema = Schema::parse([
+            'letter' => Schema::parse([
+                'default' => 'a',
+                'type' => 'string',
+            ])
+        ]);
+        $data = [];
+        $data = $schema->validate($data);
+        $this->assertEquals(['letter' => 'a'], $data);
+    }
 }