fixing deprecation notices

classes/ETL/DataEndpoint/aStructuredFile.php

@@ -490,7 +490,7 @@ public function supportsComplexDataRecords()
      * @see Iterator::current()
      */
 
-    public function current()
+    public function current(): mixed
     {
         if ( ! $this->valid() ) {
             return false;

libraries/utilities.php

@@ -430,9 +430,13 @@ function checkForCenterLogo($apply_css = true)
 
 function filter_var($value, $filter = FILTER_DEFAULT, $options = null)
 {
-    return ( FILTER_VALIDATE_BOOLEAN == $filter && false === $value
-             ? false
-             : \filter_var($value, $filter, $options) );
+    if (FILTER_VALIDATE_BOOLEAN === $filter && false === $value) {
+        return false;
+    }
+    if (isset($options) && is_int($options) || is_array($options)) {
+        return \filter_var($value, $filter, $options);
+    }
+    return \filter_var($value, $filter);
 }
 
 /**