Merge pull request #33497 from andrewbess/improvement/CE-32868-update-monolog-to-latest-version

Updated monolog/monolog to 2.3.1

Author: andrewbess

app/code/Magento/Developer/Model/Logger/Handler/Debug.php

@@ -3,18 +3,23 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Developer\Model\Logger\Handler;
 
+use Exception;
 use Magento\Config\Setup\ConfigOptionsList;
-use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\App\DeploymentConfig;
 use Magento\Framework\App\State;
+use Magento\Framework\Exception\FileSystemException;
+use Magento\Framework\Exception\RuntimeException;
 use Magento\Framework\Filesystem\DriverInterface;
-use Magento\Framework\App\DeploymentConfig;
+use Magento\Framework\Logger\Handler\Debug as DebugHandler;
 
 /**
  * Enable/disable debug logging based on the store config setting
  */
-class Debug extends \Magento\Framework\Logger\Handler\Debug
+class Debug extends DebugHandler
 {
     /**
      * @var State
@@ -30,14 +35,14 @@ class Debug extends \Magento\Framework\Logger\Handler\Debug
      * @param DriverInterface $filesystem
      * @param State $state
      * @param DeploymentConfig $deploymentConfig
-     * @param string $filePath
-     * @throws \Exception
+     * @param string|null $filePath
+     * @throws Exception
      */
     public function __construct(
         DriverInterface $filesystem,
         State $state,
         DeploymentConfig $deploymentConfig,
-        $filePath = null
+        ?string $filePath = null
     ) {
         parent::__construct($filesystem, $filePath);
 
@@ -48,30 +53,34 @@ public function __construct(
     /**
      * @inheritdoc
      */
-    public function isHandling(array $record)
+    public function isHandling(array $record): bool
     {
         if ($this->deploymentConfig->isAvailable()) {
-            return
-                parent::isHandling($record)
-                && $this->isLoggingEnabled();
+            return parent::isHandling($record) && $this->isLoggingEnabled();
         }
 
         return parent::isHandling($record);
     }
 
     /**
-     * Check that logging functionality is enabled.
+     * Check that logging functionality is enabled
      *
      * @return bool
+     * @throws FileSystemException
+     * @throws RuntimeException
      */
     private function isLoggingEnabled(): bool
     {
-        $configValue = $this->deploymentConfig->get(ConfigOptionsList::CONFIG_PATH_DEBUG_LOGGING);
+        $configValue = $this->deploymentConfig->get(
+            ConfigOptionsList::CONFIG_PATH_DEBUG_LOGGING
+        );
+
         if ($configValue === null) {
             $isEnabled = $this->state->getMode() !== State::MODE_PRODUCTION;
         } else {
-            $isEnabled = (bool)$configValue;
+            $isEnabled = (bool) $configValue;
         }
+
         return $isEnabled;
     }
 }

composer.json

@@ -63,7 +63,7 @@
         "magento/composer": "1.7.0",
         "magento/magento-composer-installer": ">=0.1.11",
         "magento/zendframework1": "~1.14.2",
-        "monolog/monolog": "^1.17",
+        "monolog/monolog": "^2.3",
         "pelago/emogrifier": "^5.0.0",
         "php-amqplib/php-amqplib": "~3.0.0",
         "phpseclib/mcrypt_compat": "1.0.8",