Upgrade to Quickform 3.2.16 #224
Conversation
|
(Standard links)
|
|
Jenkins re-test this please |
| @@ -45,7 +45,7 @@ class HTML_QuickForm_Rule_Range extends HTML_QuickForm_Rule | |||
| * @access public | |||
| * @return boolean true if value is valid | |||
| */ | |||
| function validate($value, $options) | |||
| function validate($value, $options = null) | |||
There was a problem hiding this comment.
So this is weird - it doesn't match the parent signature - but it didn't before either - feels smelly but I guess....
/**
* Validates a value
*
* @access public
* @abstract
*/
function validate($value)
{
return true;
}
| * @access private | ||
| * @return mixed | ||
| */ | ||
| function _findValue(&$values) | ||
| function _findValue(&$sc1 = null) |
There was a problem hiding this comment.
Did we miss a trick here - it seems less compatible with the parent
/**
* Tries to find the element value from the values array
*
* @since 2.7
* @access private
* @return mixed
*/
function _findValue(&$values)
{
There was a problem hiding this comment.
Not sure that is the change but this is the direct comparison from 3.2.11 to 3.2.16 of the upstream https://gist.github.com/seamuslee001/0a67ad08359f46b183a7e26f05c99658#file-quickform_diff-diff-L748
| * @access public | ||
| * @return void | ||
| */ | ||
| function accept(&$renderer) | ||
| function accept(&$renderer, $sc1 = false, $sc2 = null) |
There was a problem hiding this comment.
Also not matching the parent
* @param HTML_QuickForm_Renderer renderer object
* @param bool Whether an element is required
* @param string An error message associated with an element
* @access public
* @return void
*/
function accept(&$renderer, $required=false, $error=null)
{
$renderer->renderElement($this, $required, $error);
} // end func accept
// }}}
There was a problem hiding this comment.
Again change comes from straight upstream https://gist.github.com/seamuslee001/0a67ad08359f46b183a7e26f05c99658#file-quickform_diff-diff-L812
| * This is essentially a hidden element and should be rendered as one | ||
| */ | ||
| function accept(&$renderer) | ||
| /** |
There was a problem hiding this comment.
parent is ```
function accept(&$renderer, $required=false, $error=null)
{
$renderer->renderElement($this, $required, $error);
} // end func accept
// }}}
There was a problem hiding this comment.
https://gist.github.com/seamuslee001/0a67ad08359f46b183a7e26f05c99658#file-quickform_diff-diff-L851 change comes directly from upstream
| * @access public | ||
| * @return void | ||
| */ | ||
| function accept(&$renderer) | ||
| function accept(&$renderer, $sc1 = false, $sc2 = null) |
There was a problem hiding this comment.
ah this might BE the parent!
There was a problem hiding this comment.
no it's HTML_QuickForm_element
| @@ -0,0 +1,159 @@ | |||
| <?php | |||
|
@seamuslee001 so there is no chance we've missed our parent signature changes somehow. The only thing I see is some possible function signature discrepancies - but they won't be quiet failures so I'm ok with merging as we can fix any resulting notices if we need to |
|
Thanks @eileenmcnaughton |
This is a revised PR following discussion between myself and @colemanw. Following Coleman's idea i did a diff between the original version 3.2.11 and 3.2.16 and created this gist https://gist.github.com/seamuslee001/0a67ad08359f46b183a7e26f05c99658 of the difference. I left out the changes for security. I should also note that our version of hierselect.php is really really really old. I have therefor left it out of this PR as we need to consider it separately