fix deprecation on rootNode of configuration file and tests files (#28)

FrDeamon · Oct 7, 2019 · dbbd8fb · dbbd8fb
1 parent 17a475e
commit dbbd8fb
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 5 deletions.
diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php
@@ -17,8 +17,13 @@ class Configuration implements ConfigurationInterface
      */
     public function getConfigTreeBuilder(): TreeBuilder
     {
-        $treeBuilder = new TreeBuilder();
-        $rootNode = $treeBuilder->root('deamon_logger_extra');
+        $treeBuilder = new TreeBuilder('deamon_logger_extra');
+        // Keep compatibility with symfony/config < 4.2
+        if (!method_exists($treeBuilder, 'getRootNode')) {
+            $rootNode = $treeBuilder->root('deamon_logger_extra');
+        } else {
+            $rootNode = $treeBuilder->getRootNode();
+        }
 
         $rootNode->children()
                 ->arrayNode('application')->isRequired()

diff --git a/Processors/Monolog/DeamonLoggerExtraWebProcessor.php b/Processors/Monolog/DeamonLoggerExtraWebProcessor.php
@@ -3,9 +3,11 @@
 namespace Deamon\LoggerExtraBundle\Processors\Monolog;
 
 use Deamon\LoggerExtraBundle\Services\DeamonLoggerExtraContext;
-use Symfony\Bridge\Monolog\Processor\WebProcessor as BaseWebProcessor;
+use Monolog\Processor\WebProcessor as BaseWebProcessor;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\RequestStack;
+use Symfony\Component\HttpKernel\Event\RequestEvent;
+use Symfony\Component\HttpKernel\KernelEvents;
 use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorage;
 use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
 use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
@@ -56,7 +58,7 @@ class DeamonLoggerExtraWebProcessor extends BaseWebProcessor
 
     public function __construct(?array $config = null)
     {
-        parent::__construct();
+        parent::__construct([]);
         $this->channelPrefix = $config['channel_prefix'];
         $this->displayConfig = $config['display'];
         $this->userClass = $config['user_class'];
@@ -202,6 +204,21 @@ private function configShowExtraInfo(string $extraInfo): bool
         return isset($this->displayConfig[$extraInfo]) && $this->displayConfig[$extraInfo];
     }
 
+    public function onKernelRequest(RequestEvent $event)
+    {
+        if ($event->isMasterRequest()) {
+            $this->serverData = $event->getRequest()->server->all();
+            $this->serverData['REMOTE_ADDR'] = $event->getRequest()->getClientIp();
+        }
+    }
+
+    public static function getSubscribedEvents()
+    {
+        return [
+            KernelEvents::REQUEST => ['onKernelRequest', 4096],
+        ];
+    }
+
     /**
      * @param DeamonLoggerExtraContext $loggerExtraContext
      */

diff --git a/Tests/DependencyInjection/DeamonLoggerExtraExtensionTest.php b/Tests/DependencyInjection/DeamonLoggerExtraExtensionTest.php
@@ -23,7 +23,7 @@ class DeamonLoggerExtraExtensionTest extends TestCase
      */
     private $container;
 
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();