Keys modes debug relocate in constants

Author: ggrachdev

ggrachdev.debugbar/classes/general/BitrixDebugger/Configurator/DebuggerConfigurator.php

@@ -29,57 +29,56 @@ class DebuggerConfigurator implements IShowModable {
      * @var string
      */
     protected $logChunkDelimeter = "\n======\n";
+    
+    public const SHOW_MODE_IN_CODE = 'code';
+    public const SHOW_MODE_IN_DEBUG_BAR = 'debug_bar';
 
     /**
-     * Где показывать
+     * Текущие режимы отображения
      * 
      * code - в коде
      * debug_bar - в дебаг-баре
      * 
      * @var array
      */
-    protected $showModes = ['code', 'debug_bar'];
+    protected $showModes = [self::SHOW_MODE_IN_CODE, self::SHOW_MODE_IN_DEBUG_BAR];
 
     public function getShowModes(): array {
         return $this->showModes;
     }
 
     public function notShowDebugPanel() {
         $nowModes = $this->getShowModes();
-        if (\in_array('debug_bar', $nowModes)) {
-            unset($nowModes[\array_search('debug_bar', $nowModes)]);
+        if (\in_array(self::SHOW_MODE_IN_DEBUG_BAR, $nowModes)) {
+            unset($nowModes[\array_search(self::SHOW_MODE_IN_DEBUG_BAR, $nowModes)]);
             $this->setShowModes(\array_unique($nowModes));
         }
         return $this;
     }
 
     public function notShowDebugInCode() {
         $nowModes = $this->getShowModes();
-        if (\in_array('code', $nowModes)) {
-            unset($nowModes[\array_search('code', $nowModes)]);
+        if (\in_array(self::SHOW_MODE_IN_CODE, $nowModes)) {
+            unset($nowModes[\array_search(self::SHOW_MODE_IN_CODE, $nowModes)]);
             $this->setShowModes(\array_unique($nowModes));
         }
         return $this;
     }
 
     public function showDebugPanel() {
         $nowModes = $this->getShowModes();
-        $nowModes[] = 'debug_bar';
+        $nowModes[] = self::SHOW_MODE_IN_DEBUG_BAR;
         $this->setShowModes(\array_unique($nowModes));
         return $this;
     }
 
     public function showDebugInCode() {
         $nowModes = $this->getShowModes();
-        $nowModes[] = 'code';
+        $nowModes[] = self::SHOW_MODE_IN_CODE;
         $this->setShowModes(\array_unique($nowModes));
         return $this;
     }
 
-    public function getShowModesEnum(): array {
-        return ['code', 'debug_bar'];
-    }
-
     public function setShowModes(array $showModes): bool {
         $result = true;
 

ggrachdev.debugbar/classes/general/BitrixDebugger/Validator/ShowModeDebuggerValidator.php

@@ -3,6 +3,7 @@
 namespace GGrach\BitrixDebugger\Validator;
 
 use GGrach\BitrixDebugger\Contract\IShowModable;
+use GGrach\BitrixDebugger\Configurator\DebuggerConfigurator;
 
 /**
  * Проверка допустимых действий для режимов отображения
@@ -12,12 +13,12 @@
 class ShowModeDebuggerValidator {
 
     public static function needShowInDebugBar(IShowModable $showModable) {
-        return in_array('debug_bar', $showModable->getShowModes());
+        return in_array(DebuggerConfigurator::SHOW_MODE_IN_DEBUG_BAR, $showModable->getShowModes());
     }
 
     public static function needShowInCode(IShowModable $showModable) {
         global $USER;
-        return in_array('code', $showModable->getShowModes()) && \is_object($USER) && $USER->IsAdmin();
+        return in_array(DebuggerConfigurator::SHOW_MODE_IN_CODE, $showModable->getShowModes()) && \is_object($USER) && $USER->IsAdmin();
     }
 
 }