Fix deprecated root() call on TreeBuilder

webeweb · Jun 8, 2019 · 8dc6410 · 8dc6410
1 parent 8f08f74
commit 8dc6410
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 8 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,10 @@
 CHANGELOG
 =========
 
+### [1.2.1](https://github.com/webeweb/haveibeenpwned-bundle/tree/v1.2.1) (2019-06-08)
+
+- Fix deprecated root() call on TreeBuilder
+
 ### [1.2.0](https://github.com/webeweb/haveibeenpwned-bundle/tree/v1.2.0) (2019-06-08)
 
 - Change license

diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php
@@ -13,6 +13,7 @@
 
 use Symfony\Component\Config\Definition\Builder\TreeBuilder;
 use Symfony\Component\Config\Definition\ConfigurationInterface;
+use WBW\Bundle\CoreBundle\DependencyInjection\ConfigurationHelper;
 
 /**
  * Configuration.
@@ -27,14 +28,13 @@ class Configuration implements ConfigurationInterface {
      */
     public function getConfigTreeBuilder() {
 
-        $treeBuilder = new TreeBuilder();
+        $treeBuilder = new TreeBuilder(WBWHaveIBeenPwnedExtension::EXTENSION_ALIAS);
 
-        $rootNode = $treeBuilder->root("wbw_core");
+        $rootNode = ConfigurationHelper::getRootNode($treeBuilder, WBWHaveIBeenPwnedExtension::EXTENSION_ALIAS);
         $rootNode->children()
             ->booleanNode("event_listeners")->defaultTrue()->info("Load event listeners")->end()
             ->end();
 
         return $treeBuilder;
     }
-
 }
diff --git a/DependencyInjection/WBWHaveIBeenPwnedExtension.php b/DependencyInjection/WBWHaveIBeenPwnedExtension.php
@@ -24,11 +24,18 @@
  */
 class WBWHaveIBeenPwnedExtension extends Extension {
 
+    /**
+     * Extension alias.
+     *
+     * @var string
+     */
+    const EXTENSION_ALIAS = "wbw_haveibeenpwned";
+
     /**
      * {@inheritdoc}
      */
     public function getAlias() {
-        return "wbw_haveibeenpwned";
+        return self::EXTENSION_ALIAS;
     }
 
     /**

diff --git a/Tests/DependencyInjection/WBWHaveIBeenPwnedExtensionTest.php b/Tests/DependencyInjection/WBWHaveIBeenPwnedExtensionTest.php
@@ -41,12 +41,22 @@ protected function setUp() {
 
         // Set a configs array mock.
         $this->configs = [
-            "wbw_haveibeenpwned" => [
+            WBWHaveIBeenPwnedExtension::EXTENSION_ALIAS => [
                 "event_listeners" => true,
             ],
         ];
     }
 
+    /**
+     * Tests the __construct() method.
+     *
+     * @return void
+     */
+    public function testConstruct() {
+
+        $this->assertEquals("wbw_haveibeenpwned", WBWHaveIBeenPwnedExtension::EXTENSION_ALIAS);
+    }
+
     /**
      * Tests the getAlias() method.
      *
@@ -56,7 +66,7 @@ public function testGetAlias() {
 
         $obj = new WBWHaveIBeenPwnedExtension();
 
-        $this->assertEquals("wbw_haveibeenpwned", $obj->getAlias());
+        $this->assertEquals(WBWHaveIBeenPwnedExtension::EXTENSION_ALIAS, $obj->getAlias());
     }
 
     /**
@@ -95,7 +105,7 @@ public function testLoad() {
     public function testLoadWithoutEventListeners() {
 
         // Set the configs mock.
-        $this->configs["wbw_haveibeenpwned"]["event_listeners"] = false;
+        $this->configs[WBWHaveIBeenPwnedExtension::EXTENSION_ALIAS]["event_listeners"] = false;
 
         $obj = new WBWHaveIBeenPwnedExtension();
 

diff --git a/composer.json b/composer.json
@@ -19,7 +19,7 @@
     ],
     "require": {
         "php": "^5.6|^7.0",
-        "webeweb/core-bundle": "^2.0",
+        "webeweb/core-bundle": "^2.4",
         "webeweb/haveibeenpwned-library": "^1.2"
     },
     "require-dev": {