Code cleanup

opengento · Aug 11, 2022 · a65589e · a65589e
1 parent ba11cb8
commit a65589e
Show file tree

Hide file tree

Showing 13 changed files with 68 additions and 167 deletions.
diff --git a/Block/Adminhtml/System/Config/Form/Field/Type.php b/Block/Adminhtml/System/Config/Form/Field/Type.php
@@ -12,12 +12,11 @@
 
 class Type extends AbstractFieldArray
 {
-    protected function _construct()
+    protected function _prepareToRender(): void
     {
         $this->addColumn('custom_logger_key', ['label' => __('Logger key')]);
         $this->addColumn('custom_logger_value', ['label' => __('Logger value')]);
         $this->_addAfter = false;
         $this->_addButtonLabel = __('Add');
-        parent::_construct();
     }
 }
diff --git a/Config/Config.php b/Config/Config.php
diff --git a/Config/CustomConfiguration.php b/Config/CustomConfiguration.php
diff --git a/Handler/ConsoleHandler.php b/Handler/ConsoleHandler.php
@@ -45,14 +45,11 @@ public function __construct(
      */
     public function getInstance(): HandlerInterface
     {
-        return new StreamHandler(
-            'php://stdout',
-            $this->scopeConfig->getValue($this->levelPath)
-        );
+        return new StreamHandler('php://stdout', $this->scopeConfig->getValue($this->levelPath));
     }
 
     public function isEnabled(): bool
     {
-        return (bool)$this->scopeConfig->getValue($this->isEnabled);
+        return $this->scopeConfig->isSetFlag($this->isEnabled);
     }
 }
diff --git a/Handler/GelfHandler.php b/Handler/GelfHandler.php
@@ -57,6 +57,6 @@ public function getInstance(): HandlerInterface
 
     public function isEnabled(): bool
     {
-        return (bool)$this->scopeConfig->getValue($this->isEnabled);
+        return $this->scopeConfig->isSetFlag($this->isEnabled);
     }
 }
diff --git a/Handler/MailHandler.php b/Handler/MailHandler.php
@@ -72,6 +72,6 @@ public function getInstance(): HandlerInterface
 
     public function isEnabled(): bool
     {
-        return (bool)$this->scopeConfig->getValue($this->isEnabled);
+        return $this->scopeConfig->isSetFlag($this->isEnabled);
     }
 }
diff --git a/Handler/RotatingFileHandler.php b/Handler/RotatingFileHandler.php
@@ -79,6 +79,6 @@ public function getInstance(): HandlerInterface
 
     public function isEnabled(): bool
     {
-        return (bool)$this->scopeConfig->getValue($this->isEnabled);
+        return $this->scopeConfig->isSetFlag($this->isEnabled);
     }
-}
+}
diff --git a/Handler/SlackHandler.php b/Handler/SlackHandler.php
@@ -116,6 +116,6 @@ public function getInstance(): HandlerInterface
 
     public function isEnabled(): bool
     {
-        return (bool)$this->scopeConfig->getValue($this->isEnabled);
+        return $this->scopeConfig->isSetFlag($this->isEnabled);
     }
 }
diff --git a/Plugin/MonologPlugin.php b/Plugin/MonologPlugin.php
@@ -4,6 +4,8 @@
  * See COPYING.txt for license details.
  */
 
+declare(strict_types=1);
+
 namespace Opengento\Logger\Plugin;
 
 use Magento\Framework\Logger\Monolog;
@@ -18,8 +20,7 @@ public function aroundSetHandlers(Monolog $subject, callable $proceed, array $ha
         foreach ($handlers as $handler) {
             if ($handler instanceof MagentoHandlerInterface && $handler->isEnabled()) {
                 $magentoHandlers[] = $handler->getInstance();
-            }
-            if ($handler instanceof HandlerInterface) {
+            } elseif ($handler instanceof HandlerInterface) {
                 $magentoHandlers[] = $handler;
             }
         }

diff --git a/Processor/CustomContextProcessor.php b/Processor/CustomContextProcessor.php
@@ -8,34 +8,42 @@
 
 namespace Opengento\Logger\Processor;
 
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\Serialize\Serializer\Json;
+use Magento\Store\Model\ScopeInterface;
 use Monolog\Processor\ProcessorInterface;
-use Opengento\Logger\Config\Config;
-use Opengento\Logger\Config\CustomConfiguration;
 
 class CustomContextProcessor implements ProcessorInterface
 {
     /**
-     * @var CustomConfiguration
+     * @var ScopeConfigInterface
      */
-    private $customConfiguration;
+    private $scopeConfig;
 
-    public function __construct(CustomConfiguration $customConfiguration)
+    /**
+     * @var Json
+     */
+    private $serializer;
+
+    public function __construct(ScopeConfigInterface $scopeConfig, Json $serializer)
     {
-        $this->customConfiguration = $customConfiguration;
+        $this->scopeConfig = $scopeConfig;
+        $this->serializer = $serializer;
     }
 
     public function __invoke(array $records): array
     {
-        $customConfiguration = $this->customConfiguration->getUnserializedConfigValue(Config::CONFIG_LOGGER_CUSTOM_CONFIGURATION);
-
-        if (!$customConfiguration) {
-            return $records;
-        }
-
-        foreach ($customConfiguration as $value) {
+        foreach ($this->resolveTypesLogger() as $value) {
             $records['context'][$value['custom_logger_key']] = $value['custom_logger_value'];
         }
 
         return $records;
     }
+
+    private function resolveTypesLogger(?string $store = null): array
+    {
+        return $this->serializer->unserialize(
+            $this->scopeConfig->getValue('loggin/context/types_logger', ScopeInterface::SCOPE_STORE, $store) ?: '{}'
+        );
+    }
 }
diff --git a/Transport/UdpTransportWrapper.php b/Transport/UdpTransportWrapper.php
@@ -115,7 +115,7 @@ public function send(Message $message): int
 
     private function createTransporter(): UdpTransport
     {
-        return $this->transporter = $this->transportFactory->create([
+        return $this->transportFactory->create([
             'host' => $this->scopeConfig->getValue($this->hostPath),
             'port' => $this->scopeConfig->getValue($this->portPath),
             'chunkSize' => $this->chunkSize