mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-14 04:52:36 +02:00
Code Issues Projects Releases Wiki Activity

MDL-60526 forms: Prevent duplicate type attributes

Browse Source 
The exporter for mform elements does not skip "type" (which is included as a separate value).
This commit is contained in:
Damyon Wiese 2017-10-27 13:32:38 +08:00
parent 0164f50e80
commit fda2fa2680
2 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/form/templatable_form_element.php
View File

@ -51,7 +51,7 @@ trait templatable_form_element {
$context = [];
// Not all elements have all of these attributes - but they are common enough to be valid for a few.
$standardattributes = ['id', 'name', 'label', 'multiple', 'checked', 'error', 'size', 'value'];
$standardattributes = ['id', 'name', 'label', 'multiple', 'checked', 'error', 'size', 'value', 'type'];
$standardproperties = ['helpbutton', 'hiddenLabel'];
// Standard attributes.

34
lib/tests/formslib_test.php
View File

@ -283,7 +283,7 @@ class core_formslib_testcase extends advanced_testcase {
$this->assertDebuggingCalled("Did you remember to call setType() for 'texttest'? Defaulting to PARAM_RAW cleaning.");
// Check form still there though.
$this->expectOutputRegex('/<input[^>]*name="texttest[^>]*type="text/');
$this->expectOutputRegex('/<input[^>]*type="text[^>]*name="texttest/');
$mform->display();
}
@ -303,7 +303,7 @@ class core_formslib_testcase extends advanced_testcase {
$this->assertDebuggingCalled("Did you remember to call setType() for 'urltest'? Defaulting to PARAM_RAW cleaning.");
// Check form still there though.
$this->expectOutputRegex('/<input[^>]*name="urltest"[^>]*type="text/');
$this->expectOutputRegex('/<input[^>]*type="url[^>]*name="urltest"/');
$mform->display();
}
@ -312,7 +312,7 @@ class core_formslib_testcase extends advanced_testcase {
$this->assertDebuggingCalled("Did you remember to call setType() for 'repeattest[0]'? Defaulting to PARAM_RAW cleaning.");
// Check form still there though.
$this->expectOutputRegex('/<input[^>]*name="repeattest[^>]*type="text/');
$this->expectOutputRegex('/<input[^>]*type="text[^>]*name="repeattest/');
$mform->display();
}
@ -320,55 +320,55 @@ class core_formslib_testcase extends advanced_testcase {
$mform = new formslib_settype_debugging_repeat_ok();
// No debugging expected here.
$this->expectOutputRegex('/<input[^>]*name="repeattest[^>]*type="text/');
$this->expectOutputRegex('/<input[^>]*type="text[^>]*name="repeattest/');
$mform->display();
}
public function test_settype_debugging_group() {
$mform = new formslib_settype_debugging_group();
$this->assertDebuggingCalled("Did you remember to call setType() for 'groupel1'? Defaulting to PARAM_RAW cleaning.");
$this->expectOutputRegex('/<input[^>]*name="groupel1"[^>]*type="text/');
$this->expectOutputRegex('/<input[^>]*name="groupel2"[^>]*type="text/');
$this->expectOutputRegex('/<input[^>]*type="text[^>]*name="groupel1"/');
$this->expectOutputRegex('/<input[^>]*type="text[^>]*name="groupel2"/');
$mform->display();
}
public function test_settype_debugging_namedgroup() {
$mform = new formslib_settype_debugging_namedgroup();
$this->assertDebuggingCalled("Did you remember to call setType() for 'namedgroup[groupel1]'? Defaulting to PARAM_RAW cleaning.");
$this->expectOutputRegex('/<input[^>]*name="namedgroup\[groupel1\]"[^>]*type="text/');
$this->expectOutputRegex('/<input[^>]*name="namedgroup\[groupel2\]"[^>]*type="text/');
$this->expectOutputRegex('/<input[^>]*type="text[^>]*name="namedgroup\[groupel1\]"/');
$this->expectOutputRegex('/<input[^>]*type="text[^>]*name="namedgroup\[groupel2\]"/');
$mform->display();
}
public function test_settype_debugging_funky_name() {
$mform = new formslib_settype_debugging_funky_name();
$this->assertDebuggingCalled("Did you remember to call setType() for 'blah[foo][bar][1]'? Defaulting to PARAM_RAW cleaning.");
$this->expectOutputRegex('/<input[^>]*name="blah\[foo\]\[bar\]\[0\]"[^>]*type="text/');
$this->expectOutputRegex('/<input[^>]*name="blah\[foo\]\[bar\]\[1\]"[^>]*type="text/');
$this->expectOutputRegex('/<input[^>]*type="text[^>]*name="blah\[foo\]\[bar\]\[0\]"/');
$this->expectOutputRegex('/<input[^>]*type="text[^>]*name="blah\[foo\]\[bar\]\[1\]"/');
$mform->display();
}
public function test_settype_debugging_type_inheritance() {
$mform = new formslib_settype_debugging_type_inheritance();
$this->expectOutputRegex('/<input[^>]*name="blah\[foo\]\[bar\]\[0\]"[^>]*type="text/');
$this->expectOutputRegex('/<input[^>]*name="blah\[bar\]\[foo\]\[1\]"[^>]*type="text/');
$this->expectOutputRegex('/<input[^>]*name="blah\[any\]\[other\]\[2\]"[^>]*type="text/');
$this->expectOutputRegex('/<input[^>]*type="text[^>]*name="blah\[foo\]\[bar\]\[0\]"/');
$this->expectOutputRegex('/<input[^>]*type="text[^>]*name="blah\[bar\]\[foo\]\[1\]"/');
$this->expectOutputRegex('/<input[^>]*type="text[^>]*name="blah\[any\]\[other\]\[2\]"/');
$mform->display();
}
public function test_settype_debugging_type_group_in_repeat() {
$mform = new formslib_settype_debugging_type_group_in_repeat();
$this->assertDebuggingCalled("Did you remember to call setType() for 'test2[0]'? Defaulting to PARAM_RAW cleaning.");
$this->expectOutputRegex('/<input[^>]*name="test1\[0\]"[^>]*type="text/');
$this->expectOutputRegex('/<input[^>]*name="test2\[0\]"[^>]*type="text/');
$this->expectOutputRegex('/<input[^>]*type="text[^>]*name="test1\[0\]"/');
$this->expectOutputRegex('/<input[^>]*type="text[^>]*name="test2\[0\]"/');
$mform->display();
}
public function test_settype_debugging_type_namedgroup_in_repeat() {
$mform = new formslib_settype_debugging_type_namedgroup_in_repeat();
$this->assertDebuggingCalled("Did you remember to call setType() for 'namedgroup[0][test2]'? Defaulting to PARAM_RAW cleaning.");
$this->expectOutputRegex('/<input[^>]*name="namedgroup\[0\]\[test1\]"[^>]*type="text/');
$this->expectOutputRegex('/<input[^>]*name="namedgroup\[0\]\[test2\]"[^>]*type="text/');
$this->expectOutputRegex('/<input[^>]*type="text[^>]*name="namedgroup\[0\]\[test1\]"/');
$this->expectOutputRegex('/<input[^>]*type="text[^>]*name="namedgroup\[0\]\[test2\]"/');
$mform->display();
}