Address Symfony 4.x deprecations

Author: ronisaha

DependencyInjection/Configuration.php

@@ -23,14 +23,16 @@
  */
 class Configuration implements ConfigurationInterface
 {
+    const ROOT_NODE_NAME = 'xiidea_easy_audit';
+
     /**
      * {@inheritdoc}
      */
     public function getConfigTreeBuilder()
     {
-        $treeBuilder = new TreeBuilder();
+        $treeBuilder = new TreeBuilder(self::ROOT_NODE_NAME);
 
-        $rootNode = $treeBuilder->root('xiidea_easy_audit');
+        $rootNode = $this->getRootNode($treeBuilder);
 
         $this->addRequiredConfigs($rootNode);
         $this->addDefaultServices($rootNode);
@@ -204,4 +206,17 @@ private function isEmpty()
             return empty($v);
         };
     }
+
+    /**
+     * @param TreeBuilder $treeBuilder
+     * @return ArrayNodeDefinition|\Symfony\Component\Config\Definition\Builder\NodeDefinition
+     */
+    protected function getRootNode($treeBuilder)
+    {
+        if (method_exists($treeBuilder, 'getRootNode')) {
+            return $treeBuilder->getRootNode();
+        }
+
+        return $treeBuilder->root(self::ROOT_NODE_NAME);
+    }
 }

Subscriber/DoctrineSubscriber.php

@@ -15,6 +15,7 @@
 use Doctrine\Common\Persistence\Event\LifecycleEventArgs;
 use Doctrine\Common\Util\ClassUtils;
 use Symfony\Component\EventDispatcher\EventDispatcher;
+use Symfony\Component\EventDispatcher\LegacyEventDispatcherProxy;
 use Xiidea\EasyAuditBundle\Annotation\SubscribeDoctrineEvents;
 use Xiidea\EasyAuditBundle\Events\DoctrineObjectEvent;
 use Xiidea\EasyAuditBundle\Events\DoctrineEvents;
@@ -243,6 +244,10 @@ private function isScheduledForDelete($entity)
      */
     public function setDispatcher($dispatcher)
     {
+        if(class_exists(LegacyEventDispatcherProxy::class)) {
+            $dispatcher = LegacyEventDispatcherProxy::decorate($dispatcher);
+        }
+
         $this->dispatcher = $dispatcher;
     }
 }

Tests/DependencyInjection/ConfigurationTest.php

@@ -0,0 +1,50 @@
+<?php
+
+namespace Xiidea\EasyAuditBundle\Tests\DependencyInjection;
+
+
+use PHPUnit\Framework\TestCase;
+use Xiidea\EasyAuditBundle\DependencyInjection\Configuration;
+use Xiidea\EasyAuditBundle\Tests\Fixtures\Common\TestableConfiguration;
+
+class TreeBuilderOld {
+
+    public function root()
+    {
+        return 'ROOT_METHOD';
+    }
+}
+
+class TreeBuilderNew extends TreeBuilderOld {
+
+    public function getRootNode()
+    {
+        return 'GET_ROOT_NODE_METHOD';
+    }
+}
+
+class ConfigurationTest extends TestCase
+{
+
+    public function testGetRootNodeByCallingGetRootNodeMethodOfBuilder()
+    {
+        $configuration = new TestableConfiguration();
+
+
+        $result = $configuration->getRootNodeOfBuilder(new TreeBuilderNew());
+
+        $this->assertEquals('GET_ROOT_NODE_METHOD', $result);
+
+    }
+
+    public function testGetRootNodeByCallingRootMethodOfBuilder()
+    {
+        $configuration = new TestableConfiguration();
+
+
+        $result = $configuration->getRootNodeOfBuilder(new TreeBuilderOld());
+
+        $this->assertEquals('ROOT_METHOD', $result);
+
+    }
+}

Tests/Fixtures/Common/TestableConfiguration.php

@@ -0,0 +1,15 @@
+<?php
+
+
+namespace Xiidea\EasyAuditBundle\Tests\Fixtures\Common;
+
+
+use Xiidea\EasyAuditBundle\DependencyInjection\Configuration;
+
+class TestableConfiguration extends Configuration
+{
+    public function getRootNodeOfBuilder($builder)
+    {
+        return $this->getRootNode($builder);
+    }
+}