Merge branch '7.2' into 7.x

* 7.2:
  Fix self-deprecation in testcase

src/Kunstmaan/NodeBundle/Tests/DependencyInjection/KunstmaanNodeExtensionTest.php

@@ -22,7 +22,7 @@ protected function getContainerExtensions(): array
     public function testCorrectParametersHaveBeenSet()
     {
         $this->container->setParameter('twig.form.resources', []);
-        $this->load(['enable_improved_router' => true]);
+        $this->load(['enable_improved_router' => true, 'enable_improved_urlchooser' => true]);
 
         $this->assertContainerBuilderHasParameter('twig.form.resources');
         $this->assertContainerBuilderHasParameter('kunstmaan_node.show_add_homepage', true);
@@ -32,7 +32,7 @@ public function testCorrectParametersHaveBeenSet()
         $this->assertContainerBuilderHasParameter('kunstmaan_node.lock_enabled', false);
         $this->assertContainerBuilderHasParameter('kunstmaan_node.version_timeout', 3600);
         $this->assertContainerBuilderHasParameter('kunstmaan_node.url_chooser.lazy_increment', 2);
-        $this->assertContainerBuilderHasParameter('kunstmaan_node.enable_improved_urlchooser', false);
+        $this->assertContainerBuilderHasParameter('kunstmaan_node.enable_improved_urlchooser', true);
     }
 
     /**
@@ -44,4 +44,14 @@ public function testImprovedRouterConfigDeprecation()
         $this->container->setParameter('twig.form.resources', []);
         $this->load();
     }
+
+    /**
+     * @group legacy
+     */
+    public function testImprovedUrlChooserConfigDeprecation()
+    {
+        $this->expectDeprecation('Since kunstmaan/node-bundle 7.2: Not setting the "kunstmaan_node.enable_improved_urlchooser" config to true is deprecated, it will always be true in 8.0.');
+        $this->container->setParameter('twig.form.resources', []);
+        $this->load();
+    }
 }