Clean PHP8 compatibility errors detected by PHPstan

.gitignore

@@ -3,3 +3,4 @@ upgrade.log
 *~
 vendor
 /src/local.*
+tests-report.xml

src/includes/class/class.LSform.php

@@ -549,7 +549,7 @@ class LSform extends LSlog_staticLoggerClass {
    *
    * @retval LSformElement
    */
-  public function addElement($type,$name,$label,$params=array(),&$attr_html) {
+  public function addElement($type,$name,$label,$params,&$attr_html) {
     $elementType='LSformElement_'.$type;
     LSsession :: loadLSclass($elementType);
     if (!class_exists($elementType)) {

src/includes/class/class.LSformElement.php

@@ -365,7 +365,7 @@ class LSformElement extends LSlog_staticLoggerClass {
    *
    * @retval boolean True on success, False otherwise
    */
-  protected function split_autocomplete_attr_values($attr_value="", $multiple_value_delimiter="|", &$attr_values, &$last_attr_value) {
+  protected function split_autocomplete_attr_values($attr_value, $multiple_value_delimiter, &$attr_values, &$last_attr_value) {
     $attr_values = explode($multiple_value_delimiter, $attr_value);
     if (count($attr_values) > 1 && !$this -> getParam('multiple', false, 'bool')) {
       self :: log_error("The attribute ".$this -> name." is not multivalued.");

src/includes/class/class.LSformRule.php

@@ -50,7 +50,7 @@ class LSformRule extends LSlog_staticLoggerClass {
   *
   * @return boolean True if value is valid, False otherwise
   */
-  public static function validate_values($rule_name, $values, $options=array(), &$formElement) {
+  public static function validate_values($rule_name, $values, $options, &$formElement) {
     // Compute PHP class name of the rule
     $rule_class = "LSformRule_".$rule_name;
 
@@ -93,7 +93,7 @@ class LSformRule extends LSlog_staticLoggerClass {
   *
   * @return boolean True if value is valid, False otherwise
   */
-  public static function validate($value, $options=array(), &$formElement) {
+  public static function validate($value, $options, &$formElement) {
     return false;
   }
 

src/includes/class/class.LSformRule_LSformElement_select_validValue.php

@@ -36,7 +36,7 @@ class LSformRule_LSformElement_select_validValue extends LSformRule {
    *
    * @return boolean true if the value is valide, false if not
    */
-  public static function validate($value, $options=array(), &$formElement) {
+  public static function validate($value, $options, &$formElement) {
     $ret = $formElement -> isValidValue($value);
     if ($ret===False) return False;
     return True;

src/includes/class/class.LSformRule_alphanumeric.php

@@ -42,7 +42,7 @@ class LSformRule_alphanumeric extends LSformRule {
    *
    * @return boolean true si la valeur est valide, false sinon
    */
-  public static function validate($value, $options=array(), &$formElement) {
+  public static function validate($value, $options, &$formElement) {
 
      if (LSconfig :: get('params.withAccents', false, 'bool', $options)) {
          $regex = '/(*UTF8)^[0-9\p{L}]+$/';

src/includes/class/class.LSformRule_callable.php

@@ -46,7 +46,7 @@ class LSformRule_callable extends LSformRule {
    *
    * @return boolean true if the value is valid, false otherwise
    */
-  public static function validate($value, $options=array(), &$formElement) {
+  public static function validate($value, $options, &$formElement) {
     $callable = LSconfig :: get('params.callable', null, null, $options);
     if (is_callable($callable))
       return call_user_func_array(

src/includes/class/class.LSformRule_compare.php

@@ -35,34 +35,39 @@ class LSformRule_compare extends LSformRule {
   );
 
   // Operators mapping
-  static protected $_operators = array(
+  static protected $_operators_aliases = array(
-      'eq'  => '==',
+      '=='  => 'eq',
-      'neq' => '!=',
+      '!='  => 'neq',
-      'gt'  => '>',
+      '>'  => 'gt',
-      'gte' => '>=',
+      '>='  => 'gte',
-      'lt'  => '<',
+      '<'  => 'lt',
-      'lte' => '<='
+      '<='  => 'lte',
+  );
+  static protected $_operators_to_compare_function = array(
+      'eq'  => function($a, $b) {return floatval($a) == floatval($b);},
+      'neq' => function($a, $b) {return floatval($a) != floatval($b);},
+      'gt'  => function($a, $b) {return $a > $b;},
+      'gte' => function($a, $b) {return $a >= $b;},
+      'lt'  => function($a, $b) {return $a < $b;},
+      'lte' => function($a, $b) {return $a <= $b;},
   );
 
   /**
-   * Retourne l'operateur de comparaison.
+   * Return the compare function associated with the specified operator
    *
    * @access private
-   * @param  string  Nom de l'operateur
+   * @param  string  The operator name
    *
-   * @return string  Operateur à utiliser
+   * @return function  The compare function
    */
-  private static function _findOperator($operator_name) {
+  private static function _findOperatorCompareFunction($operator_name) {
-
+    if (empty($operator_name))
-    if (empty(self :: $operator_name)) {
+      $operator_name = 'eq';
-      return '==';
+    elseif (isset(self :: $_operators_aliases[$operator_name]))
-    } elseif (isset(self :: $_operators[$operator_name])) {
+      $operator_name = self :: $_operators_aliases[$operator_name];
-      return self :: $_operators[$operator_name];
+    elseif (!isset(self :: $_operators_to_compare_function[$operator_name]))
-    } elseif (in_array($operator_name, self :: $_operators)) {
+      $operator_name = 'eq';
-      return $operator_name;
+    return self :: $_operators_to_compare_function[$operator_name];
-    } else {
-      return '==';
-    }
   }
 
   /**
@@ -75,19 +80,13 @@ class LSformRule_compare extends LSformRule {
    *
    * @return boolean true si la valeur est valide, false sinon
    */
-  public static function validate($values, $options=array(), &$formElement) {
+  public static function validate($values, $options, &$formElement) {
     $operator = LSconfig :: get('params.operator', null, 'string', $options);
     if (!$operator) {
       LSerror :: addErrorCode('LSformRule_01',array('type' => 'compare', 'param' => 'operator'));
       return;
     }
-    $operator = self :: _findOperator($operator);
+    $compareFn = self :: _findOperatorCompareFunction($operator);
-    if ('==' != $operator && '!=' != $operator) {
-      $compareFn = create_function('$a, $b', 'return floatval($a) ' . $operator . ' floatval($b);');
-    }
-    else {
-      $compareFn = create_function('$a, $b', 'return $a ' . $operator . ' $b;');
-    }
     return $compareFn($values[0], $values[1]);
   }
 

src/includes/class/class.LSformRule_date.php

@@ -44,7 +44,7 @@ class LSformRule_date extends LSformRule {
   *
   * @return boolean True si les données sont valide, False sinon.
   */
-  public static function validate($value, $options=array(), &$formElement) {
+  public static function validate($value, $options, &$formElement) {
     $special_values = LSconfig :: get('params.special_values', array(), null, $options);
     if (in_array($value, $special_values))
       return true;

src/includes/class/class.LSformRule_differentPassword.php

@@ -42,7 +42,7 @@ class LSformRule_differentPassword extends LSformRule {
    *
    * @return boolean true si la valeur est valide, false sinon
    */
-  public static function validate($value, $options=array(), &$formElement) {
+  public static function validate($value, $options, &$formElement) {
     $otherPasswordAttributes = LSconfig :: get('params.otherPasswordAttributes', null, null, $options);
     if (!is_null($otherPasswordAttributes)) {
       // Load LSattr_ldap_password

src/includes/class/class.LSformRule_email.php

@@ -43,7 +43,7 @@ class LSformRule_email extends LSformRule {
    *
    * @return boolean true si la valeur est valide, false sinon
    */
-  public static function validate($value, $options=array(), &$formElement) {
+  public static function validate($value, $options, &$formElement) {
     return checkEmail(
       $value,
       LSconfig :: get('params.domain', null, null, $options),

src/includes/class/class.LSformRule_filesize.php

@@ -44,7 +44,7 @@ class LSformRule_filesize extends LSformRule {
    *
    * @return boolean true si la valeur est valide, false sinon
    */
-  public static function validate($value, $options=array(), &$formElement) {
+  public static function validate($value, $options, &$formElement) {
     // According to PHP doc, strlen() returns the number of bytes rather
     // than the number of characters in a string.
     // See: https://www.php.net/manual/en/function.strlen.php

src/includes/class/class.LSformRule_imagefile.php

@@ -40,7 +40,7 @@ class LSformRule_imagefile extends LSformRule {
    *
    * @return boolean true si la valeur est valide, false sinon
    */
-  public static function validate($value, $options=array(), &$formElement) {
+  public static function validate($value, $options, &$formElement) {
     $file = LSsession :: getTmpFile($value);
 
     $mimetype = mime_content_type($file);

src/includes/class/class.LSformRule_imagesize.php

@@ -48,7 +48,7 @@ class LSformRule_imagesize extends LSformRule {
    *
    * @return boolean true si la valeur est valide, false sinon
    */
-  public static function validate($value, $options=array(), &$formElement) {
+  public static function validate($value, $options, &$formElement) {
     $file = LSsession :: getTmpFile($value);
     list($width, $height, $type, $attr) = getimagesize($file);
     self :: log_debug("validate(): image size is $width x $height, type=$type, attr='$attr'");

src/includes/class/class.LSformRule_inarray.php

@@ -45,7 +45,7 @@ class LSformRule_inarray extends LSformRule {
    *
    * @return boolean true if the value is valid, false otherwise
    */
-  public static function validate($value, $options=array(), &$formElement) {
+  public static function validate($value, $options, &$formElement) {
     $possible_values = LSconfig :: get('params.possible_values', null, null, $options);
     $reverse = LSconfig :: get('params.reverse', false, 'bool', $options);
     if (!is_array($possible_values)) {

src/includes/class/class.LSformRule_integer.php

@@ -48,7 +48,7 @@ class LSformRule_integer extends LSformRule{
    *
    * @return boolean true if the value is valided, false otherwise
    */
-  public static function validate($value, $options=array(), &$formElement) {
+  public static function validate($value, $options, &$formElement) {
     $max = LSconfig :: get('params.max', null, 'int', $options);
     if(is_int($max) && $max != 0 && $value > $max) {
       self :: log_debug("value is too higth ($value > $max)");

src/includes/class/class.LSformRule_ldapSearchURI.php

@@ -46,7 +46,7 @@ class LSformRule_ldapSearchURI extends LSformRule {
    *
    * @return boolean true if the value is valid, false otherwise
    */
-  public static function validate($value, $options=array(), &$formElement) {
+  public static function validate($value, $options, &$formElement) {
     self :: log_trace("validate($value): options = ".varDump($options));
     $uri_parts = explode('?', $value);
 

src/includes/class/class.LSformRule_lettersonly.php

@@ -36,7 +36,7 @@ class LSformRule_lettersonly extends LSformRule {
    *
    * @return boolean true si la valeur est valide, false sinon
    */
-  public static function validate($value, $options=array(), &$formElement) {
+  public static function validate($value, $options, &$formElement) {
     $regex = '/^[a-zA-Z]+$/';
     LSsession :: loadLSclass('LSformRule_regex');
     return LSformRule_regex :: validate($value,$regex,$formElement);

src/includes/class/class.LSformRule_maxlength.php

@@ -42,7 +42,7 @@ class LSformRule_maxlength extends LSformRule {
    *
    * @return boolean true si la valeur est valide, false sinon
    */
-  public static function validate($value, $options=array(), &$formElement) {
+  public static function validate($value, $options, &$formElement) {
     $limit = LSconfig :: get('params.limit', null, 'int', $options);
     if(is_null($limit)) {
       LSerror :: addErrorCode('LSformRule_01',array('type' => 'maxlength', 'param' => 'limit'));

src/includes/class/class.LSformRule_mimetype.php

@@ -44,7 +44,7 @@ class LSformRule_mimetype extends LSformRule {
    *
    * @return boolean true si la valeur est valide, false sinon
    */
-  public static function validate($value, $options=array(), &$formElement) {
+  public static function validate($value, $options, &$formElement) {
     $file = LSsession :: getTmpFile($value);
     $real_mimetype = mime_content_type($file);
 

src/includes/class/class.LSformRule_minlength.php

@@ -42,7 +42,7 @@ class LSformRule_minlength extends LSformRule {
    *
    * @return boolean true si la valeur est valide, false sinon
    */
-  public static function validate($value, $options=array(), &$formElement) {
+  public static function validate($value, $options, &$formElement) {
     $limit = LSconfig :: get('params.limit', null, 'int', $options);
     if(is_null($limit)) {
       LSerror :: addErrorCode('LSformRule_01',array('type' => 'minlength', 'param' => 'limit'));

src/includes/class/class.LSformRule_nonzero.php

@@ -36,7 +36,7 @@ class LSformRule_nonzero extends LSformRule {
    *
    * @return boolean true si la valeur est valide, false sinon
    */
-  public static function validate($value, $options=array(), &$formElement) {
+  public static function validate($value, $options, &$formElement) {
     $regex = '/^-?[1-9][0-9]*/';
     LSsession :: loadLSclass('LSformRule_regex');
     return LSformRule_regex :: validate($value,$regex,$formElement);

src/includes/class/class.LSformRule_nopunctuation.php

@@ -36,7 +36,7 @@ class LSformRule_nopunctuation extends LSformRule {
    *
    * @return boolean true si la valeur est valide, false sinon
    */
-  public static function validate($value, $options=array(), &$formElement) {
+  public static function validate($value, $options, &$formElement) {
     $regex = '/^[^().\/\*\^\?#!@$%+=,\"\'><~\[\]{}]+$/';
     LSsession :: loadLSclass('LSformRule_regex');
     return LSformRule_regex :: validate($value,$regex,$formElement);

src/includes/class/class.LSformRule_numberOfValues.php

@@ -45,7 +45,7 @@ class LSformRule_numberOfValues extends LSformRule {
    *
    * @return boolean true if the value is valide, false if not
    */
-  public static function validate($value, $options=array(), &$formElement) {
+  public static function validate($value, $options, &$formElement) {
     $max_values = LSconfig :: get('params.max', null, 'int', $options);
     $min_values = LSconfig :: get('params.min', null, 'int', $options);
     if(is_null($max_values) && is_null($min_values)) {

src/includes/class/class.LSformRule_numeric.php

@@ -36,7 +36,7 @@ class LSformRule_numeric extends LSformRule{
    *
    * @return boolean true si la valeur est valide, false sinon
    */
-  public static function validate($value, $options=array(), &$formElement) {
+  public static function validate($value, $options, &$formElement) {
     $regex = '/(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/';
     LSsession :: loadLSclass('LSformRule_regex');
     return LSformRule_regex :: validate($value,$regex,$formElement);

src/includes/class/class.LSformRule_password.php

@@ -52,7 +52,7 @@ class LSformRule_password extends LSformRule {
    *
    * @return boolean true si la valeur est valide, false sinon
    */
-  public static function validate($value, $options=array(), &$formElement) {
+  public static function validate($value, $options, &$formElement) {
     $errors = array();
 
     $maxLength = LSconfig :: get('params.maxLength', null, 'int', $options);

src/includes/class/class.LSformRule_rangelength.php

@@ -43,7 +43,7 @@ class LSformRule_rangelength extends LSformRule {
    *
    * @return boolean true si la valeur est valide, false sinon
    */
-  public static function validate($value, $options=array(), &$formElement) {
+  public static function validate($value, $options, &$formElement) {
     $limits = LSconfig :: get('params.limits', null, null, $options);
     if(!is_array($limits) || count($limits) != 2) {
       LSerror :: addErrorCode('LSformRule_01',array('type' => 'rangelength', 'param' => 'limits'));

src/includes/class/class.LSformRule_regex.php

@@ -42,7 +42,7 @@ class LSformRule_regex extends LSformRule {
    *
    * @return boolean true si la valeur est valide, false sinon
    */
-  public static function validate($value, $options=array(), &$formElement) {
+  public static function validate($value, $options, &$formElement) {
     if (is_array($options)) {
       $regex = LSconfig :: get('params.regex', null, 'string', $options);
       if (!is_string($regex)) {

src/includes/class/class.LSformRule_required.php

@@ -36,7 +36,7 @@ class LSformRule_required extends LSformRule {
    *
    * @return boolean true si la valeur est valide, false sinon
    */
-  public static function validate($value, $options=array(), &$formElement) {
+  public static function validate($value, $options, &$formElement) {
     return ((string)$value != '');
   }
 

src/includes/class/class.LSformRule_ssh_pub_key.php

@@ -36,7 +36,7 @@ class LSformRule_ssh_pub_key extends LSformRule {
    *
    * @return boolean true if the value is valide, false if not
    */
-  public static function validate($value, $options=array(), &$formElement) {
+  public static function validate($value, $options, &$formElement) {
     if (preg_match('/^(ssh-[a-z0-9]+) +([^ ]+) +(.*)$/', $value, $m)) {
       $data=@base64_decode($m[2]);
       if (is_string($data))

src/includes/class/class.LSformRule_telephonenumber.php

@@ -36,7 +36,7 @@ class LSformRule_telephonenumber extends LSformRule {
    *
    * @return boolean true si la valeur est valide, false sinon
    */
-  public static function validate($value, $options=array(), &$formElement) {
+  public static function validate($value, $options, &$formElement) {
     $regex = '/^(01|02|03|04|05|06|08|09)[0-9]{8}$/';
     LSsession :: loadLSclass('LSformRule_regex');
     return LSformRule_regex :: validate($value,$regex,$formElement);

src/includes/class/class.LSformRule_zxcvbn.php

@@ -54,7 +54,7 @@ class LSformRule_zxcvbn extends LSformRule {
    *
    * @return boolean True if value is valid, False otherwise
    */
-  public static function validate($value, $options=array(), &$formElement) {
+  public static function validate($value, $options, &$formElement) {
     $zxcvbn = new Zxcvbn();
     $userData = array();
     $userDataAttrs = LSconfig :: get('params.userDataAttrs', array(), 'array', $options);