Add component and scope args to FilterInterface::filter()

Author: jissereitsma

Filter/Capitalize.php

@@ -2,9 +2,11 @@
 
 namespace Loki\Components\Filter;
 
+use Loki\Components\Component\ComponentInterface;
+
 class Capitalize implements FilterInterface
 {
-    public function filter(mixed $value): mixed
+    public function filter(mixed $value, ?ComponentInterface $component = null, ?string $scope = null): mixed
     {
         return ucfirst((string)$value);
     }

Filter/Filter.php

@@ -2,30 +2,39 @@
 
 namespace Loki\Components\Filter;
 
+use Loki\Components\Component\ComponentInterface;
+
 class Filter
 {
     public function __construct(
         private readonly FilterRegistry $filterRegistry
     ) {
     }
 
-    public function filter(array $requestedFilters = [], mixed $data = null): mixed
-    {
+    public function filter(
+        ComponentInterface $component,
+        mixed $data = null,
+        ?string $scope = null
+    ): mixed {
+        $requestedFilters = $component->getFilters();
+
         if (empty($data) || is_bool($data) || is_int($data)) {
             return $data;
         }
 
         if (is_array($data)) {
             foreach ($data as $name => $value) {
-                $data[$name] = $this->filter($requestedFilters, $value);
+                $data[$name] = $this->filter($component, $value, $name);
             }
 
             return $data;
         }
 
-        $filters = $this->filterRegistry->getApplicableFilters($requestedFilters);
+        $filters = $this->filterRegistry->getApplicableFilters(
+            $requestedFilters
+        );
         foreach ($filters as $filter) {
-            $data = $filter->filter($data);
+            $data = $filter->filter($data, $component, $scope);
         }
 
         return $data;

Filter/FilterInterface.php

@@ -3,7 +3,9 @@
 
 namespace Loki\Components\Filter;
 
+use Loki\Components\Component\ComponentInterface;
+
 interface FilterInterface
 {
-    public function filter(mixed $value): mixed;
+    public function filter(mixed $value, ?ComponentInterface $component = null, ?string $scope = null): mixed;
 }

Filter/Lowercase.php

@@ -2,9 +2,11 @@
 
 namespace Loki\Components\Filter;
 
+use Loki\Components\Component\ComponentInterface;
+
 class Lowercase implements FilterInterface
 {
-    public function filter(mixed $value): mixed
+    public function filter(mixed $value, ?ComponentInterface $component = null, ?string $scope = null): mixed
     {
         return strtolower((string)$value);
     }

Filter/Number.php

@@ -2,9 +2,11 @@
 
 namespace Loki\Components\Filter;
 
+use Loki\Components\Component\ComponentInterface;
+
 class Number implements FilterInterface
 {
-    public function filter(mixed $value): mixed
+    public function filter(mixed $value, ?ComponentInterface $component = null, ?string $scope = null): mixed
     {
         return (int)$value;
     }

Filter/PositiveNumber.php

@@ -2,9 +2,11 @@
 
 namespace Loki\Components\Filter;
 
+use Loki\Components\Component\ComponentInterface;
+
 class PositiveNumber implements FilterInterface
 {
-    public function filter(mixed $value): mixed
+    public function filter(mixed $value, ?ComponentInterface $component = null, ?string $scope = null): mixed
     {
         if ($value > 0) {
             return $value;

Filter/Security.php

@@ -2,16 +2,18 @@
 
 namespace Loki\Components\Filter;
 
+use Loki\Components\Component\ComponentInterface;
+
 class Security implements FilterInterface
 {
-    public function filter(mixed $value): mixed
+    public function filter(mixed $value, ?ComponentInterface $component = null, ?string $scope = null): mixed
     {
        if (is_object($value)) {
             return $value;
         }
 
         $value = (string)$value;
-        $value = strip_tags($value);
+        //$value = strip_tags($value);
         $value = htmlspecialchars_decode($value);
         return $value;
     }

Filter/Trim.php

@@ -2,9 +2,11 @@
 
 namespace Loki\Components\Filter;
 
+use Loki\Components\Component\ComponentInterface;
+
 class Trim implements FilterInterface
 {
-    public function filter(mixed $value): mixed
+    public function filter(mixed $value, ?ComponentInterface $component = null, ?string $scope = null): mixed
     {
         return trim((string)$value);
     }

Filter/Uppercase.php

@@ -2,9 +2,11 @@
 
 namespace Loki\Components\Filter;
 
+use Loki\Components\Component\ComponentInterface;
+
 class Uppercase implements FilterInterface
 {
-    public function filter(mixed $value): mixed
+    public function filter(mixed $value, ?ComponentInterface $component = null, ?string $scope = null): mixed
     {
         return strtoupper((string)$value);
     }

Util/Controller/RepositoryDispatcher.php

@@ -26,7 +26,7 @@ public function dispatch(ComponentInterface $component, mixed $componentData): v
             return;
         }
 
-        $componentData = $this->filter->filter($component->getFilters(), $componentData);
+        $componentData = $this->filter->filter($component, $componentData);
         if (false === $this->validator->validate($component, $componentData)) {
             return;
         }