Улучшен скелет noticeRaw в Debugger'e

Author: ggrachdev

.gitignore

@@ -1,2 +1,3 @@
 /nbproject/
-/vendor/
+/vendor/
+/todo.txt

src/BitrixDebugger/Configurator/DebuggerConfigurator.php

@@ -37,14 +37,30 @@ public function setLogPath(string $logType, string $pathFile): self {
     }
 
     /**
-     * Получить пути всех-лог файлов
+     * Получить пути всех лог-типов
      * 
-     * @return type
+     * @return array
      */
-    public function getLogPaths() {
+    public function getLogPaths(): array {
         return $this->logPaths;
     }
 
+    /**
+     * Получить путь лог-типа
+     * 
+     * @return string | null
+     */
+    public function getLogPath(string $typeLog) {
+        if(\array_key_exists($typeLog, $this->getLogPaths()))
+        {
+            return $this->getLogPaths()[$typeLog];
+        }
+        else
+        {
+            return null;
+        }
+    }
+
     public function getLogChunkDelimeter() {
         return $this->logChunkDelimeter;
     }

src/BitrixDebugger/Contract/ShowModableContract.php

@@ -30,4 +30,12 @@ public function getShowModesEnum(): array;
      * @return bool Результат
      */
     public function setShowModes(array $showModes): bool;
+    
+    /**
+     * Установить один режим отображения
+     * 
+     * @param string $showMode
+     * @return bool Результат
+     */
+    public function setShowMode(string $showMode): bool;
 }

src/BitrixDebugger/Debugger/Debugger.php

@@ -5,77 +5,60 @@
 use GGrach\BitrixDebugger\Configurator\DebuggerConfigurator;
 use GGrach\BitrixDebugger\Configurator\DebugBarConfigurator;
 use GGrach\BitrixDebugger\Contract\ShowModableContract;
-
+use GGrach\BitrixDebugger\Validator\ShowModeDebuggerValidator;
+use GGrach\BitrixDebugger\Debugger\DebuggerShowModable;
 
 /**
  * Description of Debugger
  *
  * @author ggrachdev
  * @version 0.01
  */
-class Debugger implements ShowModableContract {
-
-    public function __construct($debuggerConfigurator = null, $debugBarConfigurator = null) {
-        if ($debuggerConfigurator === null) {
-            $this->configuratorDebugger = new DebuggerConfigurator();
-        } elseif ($debuggerConfigurator instanceof DebuggerConfigurator) {
-            $this->configuratorDebugger = $debuggerConfigurator;
-        }
-
-        if ($debugBarConfigurator === null) {
-            $this->configuratorDebugBar = new DebugBarConfigurator();
-        } elseif ($debugBarConfigurator instanceof DebugBarConfigurator) {
-            $this->configuratorDebugBar = $debugBarConfigurator;
-        }
-    }
+class Debugger extends DebuggerShowModable implements ShowModableContract {
 
     /**
      *
      * @var DebuggerConfigurator 
      */
-    private $configuratorDebugger;
+    protected $configuratorDebugger;
 
     /**
      *
      * @var DebugBarConfigurator 
      */
-    private $configuratorDebugBar;
+    protected $configuratorDebugBar;
 
     /**
      * Лог
      * 
      * @var array
      */
-    private $log = [];
+    protected $log = [];
 
     /**
      * a - показывать только для администратора
      * d - показывать только в дебаг-баре
      * 
      * @var string
      */
-    private $options = 'ad';
+    protected $options = 'ad';
 
-    /**
-     * Где показывать
-     * 
-     * everywhere - и в дебаг-баре и в коде и залогировать
-     * code - в коде
-     * debug_bar - в дебаг-баре
-     * log - залогировать
-     * no - не показывать нигде
-     * 
-     * @var array
-     */
-    protected $showModes = ['everywhere'];
-    
-    public function getShowModes()
-    {
-        return $this->showModes;
+    public function __construct($debuggerConfigurator = null, $debugBarConfigurator = null) {
+        if ($debuggerConfigurator === null) {
+            $this->configuratorDebugger = new DebuggerConfigurator();
+        } elseif ($debuggerConfigurator instanceof DebuggerConfigurator) {
+            $this->configuratorDebugger = $debuggerConfigurator;
+        }
+
+        if ($debugBarConfigurator === null) {
+            $this->configuratorDebugBar = new DebugBarConfigurator();
+        } elseif ($debugBarConfigurator instanceof DebugBarConfigurator) {
+            $this->configuratorDebugBar = $debugBarConfigurator;
+        }
     }
 
-    public function options($options) {
-        
+    public function options(array $options) {
+        $this->options = $options;
     }
 
     public function notice(...$item) {
@@ -90,21 +73,33 @@ public function success(...$item) {
         $this->noticeRaw('success', $item);
     }
 
-    public function noticeRaw(string $type, $items) {
+    /**
+     * Кастомизированное уведомление
+     * 
+     * @param type $typeNotice
+     * @param type $item
+     */
+    public function debug($typeNotice, ...$item) {
+        $this->noticeRaw($typeNotice, $item);
+    }
+
+    protected function noticeRaw(string $type, $items) {
 
-        if ($this->needShowInDebugBar()) {
-            $this->log[] = $items;
+        if (ShowModeDebuggerValidator::needShowInDebugBar($this)) {
+            $this->log = array_merge($this->log, $items);
         }
-    }
 
-    public function getShowModesEnum(): array {
-        // @todo
-        return [];
-    }
+        if (ShowModeDebuggerValidator::needShowInCode($this)) {
+            
+        }
 
-    public function setShowModes(array $showModes): bool {
-        // @todo
-        return true;
+        if (ShowModeDebuggerValidator::needWriteInLog($this)) {
+            $logFile = $this->configuratorDebugger->getLogPath($type);
+            
+            if ($logFile) {
+                
+            }
+        }
     }
 
 }

src/BitrixDebugger/Debugger/DebuggerShowModable.php

@@ -0,0 +1,66 @@
+<?php
+
+namespace GGrach\BitrixDebugger\Debugger;
+
+use GGrach\BitrixDebugger\Configurator\DebuggerConfigurator;
+use GGrach\BitrixDebugger\Configurator\DebugBarConfigurator;
+use GGrach\BitrixDebugger\Contract\ShowModableContract;
+use GGrach\BitrixDebugger\Validator\ShowModeDebuggerValidator;
+
+/**
+ * Description of Debugger
+ *
+ * @author ggrachdev
+ * @version 0.01
+ */
+class DebuggerShowModable implements ShowModableContract {
+
+    /**
+     * Где показывать
+     * 
+     * code - в коде
+     * debug_bar - в дебаг-баре
+     * log - в логе
+     * 
+     * @var array
+     */
+    protected $showModes = ['code', 'debug_bar'];
+
+    public function getShowModes() {
+        return $this->showModes;
+    }
+
+    public function getShowModesEnum(): array {
+        return ['code', 'debug_bar', 'log'];
+    }
+
+    public function setShowModes(array $showModes): bool {
+        $result = true;
+
+        if (!empty($showModes)) {
+
+            $avaliableModes = $this->getShowModesEnum();
+
+            // @todo array_udiff
+            foreach ($showModes as $mode) {
+                if (!\in_array($mode, $avaliableModes)) {
+                    $result = false;
+                    break;
+                }
+            }
+
+            if ($result) {
+                $this->showModes = $showModes;
+            }
+        } else {
+            $result = false;
+        }
+
+        return $result;
+    }
+
+    public function setShowMode(string $showMode): bool {
+        return $this->setShowModes([$showMode]);
+    }
+
+}

src/BitrixDebugger/Facade/.gitkeep

@@ -0,0 +1 @@
+

src/BitrixDebugger/Validator/ShowModeDebuggerValidator.php

@@ -0,0 +1,26 @@
+<?php
+
+namespace GGrach\BitrixDebugger\Validator;
+
+use GGrach\BitrixDebugger\Contract\ShowModableContract;
+
+/**
+ * Description of ShowModeDebuggerValidator
+ *
+ * @author ggrachdev
+ */
+class ShowModeDebuggerValidator {
+
+    public static function needShowInDebugBar(ShowModableContract $debugger) {
+        return in_array('debug_bar', $debugger->getShowModes());
+    }
+
+    public static function needShowInCode(ShowModableContract $debugger) {
+        return in_array('code', $debugger->getShowModes());
+    }
+
+    public static function needWriteInLog(ShowModableContract $debugger) {
+        return in_array('log', $debugger->getShowModes());
+    }
+
+}