From 06cb2769cceb61c0ce2bf2b88b7ea9c003841979 Mon Sep 17 00:00:00 2001 From: Jack Kwakman Date: Tue, 28 Nov 2017 13:38:20 +0100 Subject: [PATCH] Fixes some PHP 7.1 warnings Line 603 -> $this can be null and cannot be passed by reference. Created a null variable that can be passed by reference Lines 637, 1940 -> isError should not be called statically (available from PHP5.4 so can be used as it the same minimum version as the pear.php.net website) --- QuickForm.php | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/QuickForm.php b/QuickForm.php index ac1eecf..4fd31c7 100644 --- a/QuickForm.php +++ b/QuickForm.php @@ -600,7 +600,10 @@ function &_loadElement($event, $type, $args) $args[$i] = null; } } - $err = $elementObject->onQuickFormEvent($event, $args, $this); + + $null = isset($this) ? $this : null; + + $err = $elementObject->onQuickFormEvent($event, $args, $null); if ($err !== true) { return $err; } @@ -631,7 +634,7 @@ function &addElement($element) } else { $args = func_get_args(); $elementObject =& $this->_loadElement('addElement', $element, array_slice($args, 1)); - if (PEAR::isError($elementObject)) { + if ((new PEAR)->isError($elementObject)) { return $elementObject; } } @@ -1933,7 +1936,8 @@ function exportValues($elementList = null) } foreach ($elementList as $elementName) { $value = $this->exportValue($elementName); - if (PEAR::isError($value)) { + + if ((new PEAR)->isError($value)) { return $value; } $values[$elementName] = $value;