Sanitizer: Fixed prefix key bug, and streamlined the API a bit

jamesread · Sep 2, 2023 · 3037f41 · 3037f41
1 parent 7d1f973
commit 3037f41
Showing 1 changed file with 12 additions and 14 deletions.
diff --git a/src/main/php/libAllure/Sanitizer.php b/src/main/php/libAllure/Sanitizer.php
@@ -38,7 +38,7 @@
 class Sanitizer
 {
     public $filterAllowUndefined = true;
-    public $onUndefinedDoVariableHunt = false;
+    private $onUndefinedSearchPrefixKeys = false;
 
     public const INPUT_GET = 1;
     public const INPUT_POST = 2;
@@ -68,6 +68,11 @@ public static function getInstance()
         return self::$instance;
     }
 
+    public function enableSearchingPrefixKeys()
+    {
+        $this->onUndefinedSearchPrefixKeys = true;
+    }
+
     public function triggerFailFilter($message)
     {
         throw new \Exception($message);
@@ -109,8 +114,12 @@ private function getInput($name)
             return $source[$name];
         }
 
-        if ($this->onUndefinedDoVariableHunt) {
-            $val = $this->variableHunt($source, $name);
+        if ($this->onUndefinedSearchPrefixKeys) {
+            foreach ($source as $key => $value) {
+                if (strstr($key, '-' . $name) !== false) {
+                    return $source[$key];
+                }
+            }
         }
 
         if (!$this->filterAllowUndefined) {
@@ -120,17 +129,6 @@ private function getInput($name)
         return null;
     }
 
-    private function variableHunt(array $source, $name)
-    {
-        foreach ($source as $key => $value) {
-            if (strstr($key, $name) !== false) {
-                return $source[$key];
-            }
-        }
-
-        return false;
-    }
-
     public function filterId()
     {
         return $this->filterUint('id');