Перенес добавление системных данных в лог в класс-дебаггер

Author: ggrachdev

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

@@ -10,7 +10,7 @@
  * @author ggrachdev
  */
 class NoticeDebugger extends ConfigurationDebugger {
-    
+
     protected $log = [];
 
     public function notice(...$item) {
@@ -29,8 +29,87 @@ public function success(...$item) {
         return $this->noticeRaw('success', $item);
     }
 
-    public function getLog(): array {
-        return $this->log;
+    /**
+     * Получить лог
+     * 
+     * @global type $APPLICATION
+     * @param bool $needAddSystemData - Нужно ли вернуть так же системные поля
+     * @return array
+     */
+    public function getLog(bool $needAddSystemData = false): array {
+
+        if ($needAddSystemData) {
+            global $APPLICATION;
+
+            $log = $this->log;
+
+            if (!empty($_GET)) {
+                $log['GET'] = [
+                    [
+                        'file' => '',
+                        'line' => '',
+                        'data' => [
+                            $_GET
+                        ]
+                    ]
+                ];
+            }
+
+            if (!empty($_POST)) {
+                $log['POST'] = [
+                    [
+                        'file' => '',
+                        'line' => '',
+                        'data' => [
+                            $_POST
+                        ]
+                    ]
+                ];
+            }
+
+            if (!empty($_COOKIE)) {
+                $log['COOKIE'] = [
+                    [
+                        'file' => '',
+                        'line' => '',
+                        'data' => [
+                            $_COOKIE
+                        ]
+                    ]
+                ];
+            }
+
+            if (!empty($_SERVER)) {
+                $log['SERVER'] = [
+                    [
+                        'file' => '',
+                        'line' => '',
+                        'data' => [
+                            $_SERVER
+                        ]
+                    ]
+                ];
+            }
+
+            if (!empty($APPLICATION->GetPagePropertyList())) {
+                $log['BX'] = [
+                    [
+                        'file' => '',
+                        'line' => '',
+                        'data' => [
+                            [
+                                'PAGE_PROPERTIES' => $APPLICATION->GetPagePropertyList(),
+                                'DIR_PROPERTIES' => $APPLICATION->GetDirPropertyList()
+                            ]
+                        ]
+                    ]
+                ];
+            }
+
+            return $log;
+        } else {
+            return $this->log;
+        }
     }
 
     /**

module/ggrachdev.debugbar/classes/general/BitrixDebugger/Representer/DebugBarRepresenter.php

@@ -38,75 +38,6 @@ protected static function renderRightView(): string {
         return $view;
     }
 
-    protected static function getPreparedLog(Debugger $debugger) {
-        $log = $debugger->getLog();
-
-        if (!empty($_GET)) {
-            $log['GET'] = [
-                [
-                    'file' => '',
-                    'line' => '',
-                    'data' => [
-                        $_GET
-                    ]
-                ]
-            ];
-        }
-
-        if (!empty($_POST)) {
-            $log['POST'] = [
-                [
-                    'file' => '',
-                    'line' => '',
-                    'data' => [
-                        $_POST
-                    ]
-                ]
-            ];
-        }
-
-        if (!empty($_COOKIE)) {
-            $log['COOKIE'] = [
-                [
-                    'file' => '',
-                    'line' => '',
-                    'data' => [
-                        $_COOKIE
-                    ]
-                ]
-            ];
-        }
-
-        if (!empty($_SERVER)) {
-            $log['SERVER'] = [
-                [
-                    'file' => '',
-                    'line' => '',
-                    'data' => [
-                        $_SERVER
-                    ]
-                ]
-            ];
-        }
-
-        if (!empty($APPLICATION->GetPagePropertyList())) {
-            $log['BX'] = [
-                [
-                    'file' => '',
-                    'line' => '',
-                    'data' => [
-                        [
-                            'PAGE_PROPERTIES' => $APPLICATION->GetPagePropertyList(),
-                            'DIR_PROPERTIES' => $APPLICATION->GetDirPropertyList()
-                        ]
-                    ]
-                ]
-            ];
-        }
-
-        return $log;
-    }
-
     public static function render(Debugger $debugger): string {
 
         global $DBDebug, $APPLICATION;
@@ -118,7 +49,7 @@ public static function render(Debugger $debugger): string {
             self::addViewInRightSlot('<a target="_blank" href="/bitrix/admin/fileman_file_edit.php?path=/bitrix/.settings.php&full_src=Y" class="ggrach__debug_bar__right__item type-notice-error" title="В битриксе включен дебаг-режим, он замедляет работу сайта!">D</a>');
         }
 
-        $log = self::getPreparedLog($debugger);
+        $log = $debugger->getLog(true);
 
         if (!empty($log)) {
             foreach ($log as $typeLog => $arLogs) {