Signature contracts change, prefix - I

ggrachdev · ggrachdev · commit 2ee04630e216 · 2021-05-25T11:08:07.000+04:00
diff --git a/ggrachdev.debugbar/classes/general/BitrixDebugger/Configurator/DebuggerConfigurator.php b/ggrachdev.debugbar/classes/general/BitrixDebugger/Configurator/DebuggerConfigurator.php
@@ -2,14 +2,14 @@
 
 namespace GGrach\BitrixDebugger\Configurator;
 
-use \GGrach\BitrixDebugger\Contract\ShowModableContract;
+use \GGrach\BitrixDebugger\Contract\IShowModable;
 
 /**
  * Description of DebugConfigurator
  *
  * @author ggrachdev
  */
-class DebuggerConfigurator implements ShowModableContract {
+class DebuggerConfigurator implements IShowModable {
 
     /**
      * Путь до лог файлов разного уровня
diff --git a/ggrachdev.debugbar/classes/general/BitrixDebugger/Contract/IShowModable.php b/ggrachdev.debugbar/classes/general/BitrixDebugger/Contract/IShowModable.php
@@ -7,7 +7,7 @@
  * 
  * @author ggrachdev
  */
-interface ShowModableContract {
+interface IShowModable {
 
     /**
      * Получить режимы отображения установленные
diff --git a/ggrachdev.debugbar/classes/general/BitrixDebugger/Debugger/Debugger.php b/ggrachdev.debugbar/classes/general/BitrixDebugger/Debugger/Debugger.php
@@ -4,11 +4,11 @@
 
 use GGrach\BitrixDebugger\Configurator\DebuggerConfigurator;
 use GGrach\BitrixDebugger\Configurator\DebugBarConfigurator;
-use GGrach\Filtrator\FiltratorContract;
+use GGrach\Filtrator\IFiltrator;
 use GGrach\Filtrator\Filtrator;
 
 /**
- * Ответственность: создание полноценного объекта, который позволит осуществлять все возможные операции через текучий интерфейс
+ * Создание полноценного объекта, который позволит осуществлять все возможные операции через текучий интерфейс
  *
  * @author ggrachdev
  */
@@ -29,7 +29,7 @@ public function __construct($debuggerConfigurator = null, $debugBarConfigurator
 
         if ($filtrator === null) {
             $this->setFiltrator(new Filtrator());
-        } elseif ($filtrator instanceof FiltratorContract) {
+        } elseif ($filtrator instanceof IFiltrator) {
             $this->setFiltrator($filtrator);
         }
     }
diff --git a/ggrachdev.debugbar/classes/general/BitrixDebugger/Debugger/FilterDebugger.php b/ggrachdev.debugbar/classes/general/BitrixDebugger/Debugger/FilterDebugger.php
@@ -2,7 +2,7 @@
 
 namespace GGrach\BitrixDebugger\Debugger;
 
-use GGrach\Filtrator\FiltratorContract;
+use GGrach\Filtrator\IFiltrator;
 
 /**
  * Ответственность: фильтрация входящих данных для дебага
@@ -12,7 +12,7 @@
 class FilterDebugger extends ConfigurationDebugger {
 
     /**
-     * @var FiltratorContract
+     * @var IFiltrator
      */
     protected $filtrator;
 
@@ -43,7 +43,7 @@ public function __call($name, $arguments) {
         return $this;
     }
 
-    public function getFiltrator(): FiltratorContract {
+    public function getFiltrator(): IFiltrator {
         return $this->filtrator;
     }
 
@@ -52,7 +52,7 @@ public function addFilter(string $nameMethod, callable $callback): self {
         return $this;
     }
 
-    public function setFiltrator(FiltratorContract $filtrator): self {
+    public function setFiltrator(IFiltrator $filtrator): self {
         $this->filtrator = $filtrator;
         return $this;
     }
diff --git a/ggrachdev.debugbar/classes/general/BitrixDebugger/Validator/ShowModeDebuggerValidator.php b/ggrachdev.debugbar/classes/general/BitrixDebugger/Validator/ShowModeDebuggerValidator.php
@@ -2,7 +2,7 @@
 
 namespace GGrach\BitrixDebugger\Validator;
 
-use GGrach\BitrixDebugger\Contract\ShowModableContract;
+use GGrach\BitrixDebugger\Contract\IShowModable;
 
 /**
  * Проверка допустимых действий для режимов отображения
@@ -11,11 +11,11 @@
  */
 class ShowModeDebuggerValidator {
 
-    public static function needShowInDebugBar(ShowModableContract $showModable) {
+    public static function needShowInDebugBar(IShowModable $showModable) {
         return in_array('debug_bar', $showModable->getShowModes());
     }
 
-    public static function needShowInCode(ShowModableContract $showModable) {
+    public static function needShowInCode(IShowModable $showModable) {
         global $USER;
         return in_array('code', $showModable->getShowModes()) && \is_object($USER) && $USER->IsAdmin();
     }
diff --git a/ggrachdev.debugbar/classes/general/Filtrator/Filtrator.php b/ggrachdev.debugbar/classes/general/Filtrator/Filtrator.php
@@ -2,12 +2,12 @@
 
 namespace GGrach\Filtrator;
 
-use \GGrach\Filtrator\FiltratorContract;
+use \GGrach\Filtrator\IFiltrator;
 
 /**
  * @author ggrachdev
  */
-class Filtrator implements FiltratorContract {
+class Filtrator implements IFiltrator {
 
     private $customFilters = [];
 
@@ -45,7 +45,7 @@ public function hasFilter(string $filterType): bool {
         return \array_key_exists($filterType, $this->customFilters);
     }
 
-    public function addFilterRule(string $filterName, callable $callback): FiltratorContract {
+    public function addFilterRule(string $filterName, callable $callback): IFiltrator {
         if (!$this->hasFilter($filterName)) {
             $this->customFilters[$filterName] = $callback;
         }
diff --git a/ggrachdev.debugbar/classes/general/Filtrator/IFiltrator.php b/ggrachdev.debugbar/classes/general/Filtrator/IFiltrator.php
@@ -2,7 +2,7 @@
 
 namespace GGrach\Filtrator;
 
-interface FiltratorContract {
+interface IFiltrator {
     public function filtrate($data);
     
     public function hasFilter(string $filterType): bool;
diff --git a/ggrachdev.debugbar/classes/general/Writer/Contract/IWritable.php b/ggrachdev.debugbar/classes/general/Writer/Contract/IWritable.php
@@ -7,7 +7,7 @@
  * 
  * @author ggrachdev
  */
-interface WritableContract {
+interface IWritable {
 
     /**
      * Запись данных в ресурс
diff --git a/ggrachdev.debugbar/classes/general/Writer/FileWriter.php b/ggrachdev.debugbar/classes/general/Writer/FileWriter.php
@@ -2,14 +2,14 @@
 
 namespace GGrach\Writer;
 
-use GGrach\Writer\Contract\WritableContract;
+use GGrach\Writer\Contract\IWritable;
 
 /**
  * Запись данных в файл
  *
  * @author ggrachdev
  */
-class FileWriter implements WritableContract {
+class FileWriter implements IWritable {
 
     /**
      * Запись данных в ресурс
diff --git a/ggrachdev.debugbar/include.php b/ggrachdev.debugbar/include.php
@@ -21,7 +21,7 @@
     "\\GGrach\\BitrixDebugger\\Debugger\\LogFileDebugger" => "classes/general/BitrixDebugger/Debugger/LogFileDebugger.php",
     "\\GGrach\\BitrixDebugger\\Debugger\\ConfigurationDebugger" => "classes/general/BitrixDebugger/Debugger/ConfigurationDebugger.php",
     "\\GGrach\\BitrixDebugger\\Debugger\\FilterDebugger" => "classes/general/BitrixDebugger/Debugger/FilterDebugger.php",
-    "\\GGrach\\BitrixDebugger\\Contract\\ShowModableContract" => "classes/general/BitrixDebugger/Contract/ShowModableContract.php",
+    "\\GGrach\\BitrixDebugger\\Contract\\IShowModable" => "classes/general/BitrixDebugger/Contract/IShowModable.php",
     "\\GGrach\\BitrixDebugger\\Configurator\\DebuggerConfigurator" => "classes/general/BitrixDebugger/Configurator/DebuggerConfigurator.php",
     "\\GGrach\\BitrixDebugger\\Configurator\\DebugBarConfigurator" => "classes/general/BitrixDebugger/Configurator/DebugBarConfigurator.php",    
     "\\GGrach\\BitrixDebugger\\Cache\\RuntimeCache" => "classes/general/BitrixDebugger/Cache/RuntimeCache.php",    
@@ -30,10 +30,10 @@
     "\\GGrach\\BitrixDebugger\\Events\\OnEndBufferContent" => "classes/general/BitrixDebugger/Events/OnEndBufferContent.php",
     // Writer
     "\\GGrach\\Writer\\FileWriter" => "classes/general/Writer/FileWriter.php",
-    "\\GGrach\\Writer\\Contract\\WritableContract" => "classes/general/Writer/Contract/WritableContract.php",
+    "\\GGrach\\Writer\\Contract\\IWritable" => "classes/general/Writer/Contract/IWritable.php",
     // Filtrator
     "\\GGrach\\Filtrator\\Filtrator" => "classes/general/Filtrator/Filtrator.php",
-    "\\GGrach\\Filtrator\\FiltratorContract" => "classes/general/Filtrator/FiltratorContract.php"
+    "\\GGrach\\Filtrator\\IFiltrator" => "classes/general/Filtrator/IFiltrator.php"
 ]);
 $ggrachDebuggerConfigurator = new \GGrach\BitrixDebugger\Configurator\DebuggerConfigurator();
 $ggrachDebugBarConfigurator = new \GGrach\BitrixDebugger\Configurator\DebugBarConfigurator();

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`*`
`8`	`8`	`* @author ggrachdev`
`9`	`9`	`*/`
`10`		`-interface ShowModableContract {`
	`10`	`+interface IShowModable {`
`11`	`11`
`12`	`12`	`/**`
`13`	`13`	`* Получить режимы отображения установленные`
Original file line number	Diff line number	Diff line change
`@@ -4,11 +4,11 @@`
`4`	`4`
`5`	`5`	`use GGrach\BitrixDebugger\Configurator\DebuggerConfigurator;`
`6`	`6`	`use GGrach\BitrixDebugger\Configurator\DebugBarConfigurator;`
`7`		`-use GGrach\Filtrator\FiltratorContract;`
	`7`	`+use GGrach\Filtrator\IFiltrator;`
`8`	`8`	`use GGrach\Filtrator\Filtrator;`
`9`	`9`
`10`	`10`	`/**`
`11`		`- * Ответственность: создание полноценного объекта, который позволит осуществлять все возможные операции через текучий интерфейс`
	`11`	`+ * Создание полноценного объекта, который позволит осуществлять все возможные операции через текучий интерфейс`
`12`	`12`	`*`
`13`	`13`	`* @author ggrachdev`
`14`	`14`	`*/`
`@@ -29,7 +29,7 @@ public function __construct($debuggerConfigurator = null, $debugBarConfigurator`
`29`	`29`
`30`	`30`	`if ($filtrator === null) {`
`31`	`31`	`$this->setFiltrator(new Filtrator());`
`32`		`- } elseif ($filtrator instanceof FiltratorContract) {`
	`32`	`+ } elseif ($filtrator instanceof IFiltrator) {`
`33`	`33`	`$this->setFiltrator($filtrator);`
`34`	`34`	`}`
`35`	`35`	`}`