Исправлены ошибки, добавлен фильтр keys

Author: ggrachdev

module/ggrachdev.debugbar/classes/general/BitrixDebugger/Debugger/FilterDebugger.php

@@ -13,6 +13,11 @@ class FilterDebugger extends ConfigurationDebugger {
 
     protected FiltratorContract $filtrator;
 
+    /**
+     * @var bool Не нужно сбрасывать фильтр после каждой операции логирования?
+     */
+    protected bool $isFreezedFilter = false;
+
     public function getFiltrator(): FiltratorContract {
         return $this->filtrator;
     }
@@ -23,11 +28,27 @@ public function setFiltrator(FiltratorContract $filtrator): self {
     }
 
     public function resetFilter(): self {
-        $this->getFiltrator()->clearFilters();
+        if (!$this->isFreezedFilter()) {
+            $this->getFiltrator()->clearFilters();
+        }
         return $this;
     }
 
-    public function filtrateItem(array $itemData): array {
+    public function isFreezedFilter(): self {
+        return $this->isFreezedFilter === true;
+    }
+
+    public function unfreezeFilter(): self {
+        $this->isFreezedFilter = false;
+        return $this;
+    }
+
+    public function freezeFilter(): self {
+        $this->isFreezedFilter = true;
+        return $this;
+    }
+
+    public function filtrateItem($itemData) {
         return $this->getFiltrator()->filtrate($itemData);
     }
 
@@ -41,6 +62,13 @@ public function last(): self {
         return $this;
     }
 
+    public function keys(array $availableKeys): self {
+        $this->getFiltrator()->addFilter('keys', [
+            'keys' => $availableKeys
+        ]);
+        return $this;
+    }
+
     public function limit(int $limit = 10): self {
         $this->getFiltrator()->addFilter('limit', [
             'count' => $limit

module/ggrachdev.debugbar/classes/general/Filtrator/Filtrator.php

@@ -12,7 +12,7 @@
 class Filtrator implements FiltratorContract {
 
     public const FILTERS_NAME = [
-        'limit', 'first', 'last'
+        'limit', 'first', 'last', 'keys'
     ];
 
     protected array $filters;
@@ -26,21 +26,36 @@ public function addFilter(string $filterType, array $filterParams = []): void {
         }
     }
 
-    protected function filtrateItem(string $filterType, array $filterParams, array $data): array {
+    protected function filtrateItem(string $filterType, array $filterParams, $data) {
         switch ($filterType) {
             case 'limit':
-                if (empty($filterParams['count'])) {
-                    $filterParams['count'] = 10;
+                if (\is_array($data) && !empty($data)) {
+                    if (!empty($filterParams['count'])) {
+                        $filterParams['count'] = 10;
+                    }
+                    $data = array_slice($data, 0, $filterParams['count'], true);
                 }
-                $data = array_slice($data, 0, $filterParams['count'], true);
                 break;
             case 'first':
-                if (!empty($data[0])) {
+                if (\is_array($data) && !empty($data[0])) {
                     $data = $data[0];
                 }
                 break;
+            case 'keys':
+                if (\is_array($data) && !empty($data) && !empty($filterParams['keys'])) {
+                    $newData = [];
+
+                    foreach ($data as $k => $v) {
+                        if (\in_array($k, $filterParams['keys'])) {
+                            $newData[$k] = $v;
+                        }
+                    }
+
+                    $data = $newData;
+                }
+                break;
             case 'last':
-                if (!empty($data)) {
+                if (\is_array($data) && !empty($data)) {
                     $data = $data[sizeof($data) - 1];
                 }
                 break;
@@ -53,7 +68,7 @@ public function clearFilters(): void {
         $this->filters = [];
     }
 
-    public function filtrate(array $data): array {
+    public function filtrate($data) {
         if (!empty($this->filters)) {
             foreach ($this->filters as $arFilter) {
                 $data = $this->filtrateItem($arFilter['type'], $arFilter['params'], $data);

module/ggrachdev.debugbar/classes/general/Filtrator/FiltratorContract.php

@@ -7,7 +7,7 @@
  * @author ggrachdev
  */
 interface FiltratorContract {
-    public function filtrate(array $data): array;
+    public function filtrate($data);
 
     public function filtrateItem(string $filterType,array $data): array;
 

module/ggrachdev.debugbar/classes/general/Filtrator/structure.puml

@@ -2,8 +2,8 @@
     skinparam classAttributeIconSize 0
 
     interface FiltratorContract {
-      + array filtrate(array $data)
-      # array filtrateItem(string $filterType, array $filterParams, array $data)
+      + mixed filtrate(mixed $data)
+      # array filtrateItem(string $filterType, array $filterParams, mixed $data): mixed
 
       + void addFilter(string $filterType, array $filterParams = [])
       + bool hasFilter(string $filterType)
@@ -14,8 +14,8 @@
       # const array FILTERS_NAME
       # array $filters
 
-      + array filtrate(array $data)
-      # array filtrateItem(string $filterType, array $filterParams, array $data)
+      + mixed filtrate(mixed $data)
+      # array filtrateItem(string $filterType, array $filterParams, mixed $data): mixed
 
       + void addFilter(string $filterType, array $filterParams = [])
       + bool hasFilter(string $filterType)