Rename and fixes

core-bundle/src/Resources/config/controller.yml

@@ -68,7 +68,7 @@ services:
         tags:
             - { name: contao.frontend_module, category: user }
 
-    Contao\CoreBundle\Controller\FrontendModule\RootPageDependentModuleController:
+    Contao\CoreBundle\Controller\FrontendModule\RootPageDependentModulesController:
         tags:
             - { name: contao.frontend_module, category: miscellaneous }
 

core-bundle/src/Resources/config/listener.yml

@@ -116,6 +116,16 @@ services:
         arguments:
             - '@database_connection'
 
+    contao.listener.data_container.root_page_dependent_select:
+        class: Contao\CoreBundle\EventListener\DataContainer\RootPageDependentSelectListener
+        arguments:
+            - '@database_connection'
+            - '@translator'
+            - '@contao.routing.scope_matcher'
+            - '@request_stack'
+            - '@contao.csrf.token_manager'
+            - '%contao.csrf_token_name%'
+
     contao.listener.data_container.theme_templates:
         class: Contao\CoreBundle\EventListener\DataContainer\ThemeTemplatesListener
         arguments:

core-bundle/src/Resources/contao/config/config.php

@@ -114,6 +114,7 @@
 use Contao\PurgeData;
 use Contao\RadioButton;
 use Contao\RadioTable;
+use Contao\RootPageDependentSelect;
 use Contao\SectionWizard;
 use Contao\SelectMenu;
 use Contao\SerpPreview;
@@ -332,34 +333,35 @@
 // Back end form fields
 $GLOBALS['BE_FFL'] = array
 (
-	'text'           => TextField::class,
-	'password'       => Password::class,
-	'textStore'      => TextStore::class,
-	'textarea'       => TextArea::class,
-	'select'         => SelectMenu::class,
-	'checkbox'       => CheckBox::class,
-	'checkboxWizard' => CheckBoxWizard::class,
-	'radio'          => RadioButton::class,
-	'radioTable'     => RadioTable::class,
-	'inputUnit'      => InputUnit::class,
-	'trbl'           => TrblField::class,
-	'chmod'          => ChmodTable::class,
-	'picker'         => Picker::class,
-	'pageTree'       => PageTree::class,
-	'pageSelector'   => PageSelector::class,
-	'fileTree'       => FileTree::class,
-	'fileSelector'   => FileSelector::class,
-	'fileUpload'     => Upload::class,
-	'tableWizard'    => TableWizard::class,
-	'listWizard'     => ListWizard::class,
-	'optionWizard'   => OptionWizard::class,
-	'moduleWizard'   => ModuleWizard::class,
-	'keyValueWizard' => KeyValueWizard::class,
-	'imageSize'      => ImageSize::class,
-	'timePeriod'     => TimePeriod::class,
-	'metaWizard'     => MetaWizard::class,
-	'sectionWizard'  => SectionWizard::class,
-	'serpPreview'    => SerpPreview::class
+	'text'                    => TextField::class,
+	'password'                => Password::class,
+	'textStore'               => TextStore::class,
+	'textarea'                => TextArea::class,
+	'select'                  => SelectMenu::class,
+	'checkbox'                => CheckBox::class,
+	'checkboxWizard'          => CheckBoxWizard::class,
+	'radio'                   => RadioButton::class,
+	'radioTable'              => RadioTable::class,
+	'inputUnit'               => InputUnit::class,
+	'trbl'                    => TrblField::class,
+	'chmod'                   => ChmodTable::class,
+	'picker'                  => Picker::class,
+	'pageTree'                => PageTree::class,
+	'pageSelector'            => PageSelector::class,
+	'fileTree'                => FileTree::class,
+	'fileSelector'            => FileSelector::class,
+	'fileUpload'              => Upload::class,
+	'tableWizard'             => TableWizard::class,
+	'listWizard'              => ListWizard::class,
+	'optionWizard'            => OptionWizard::class,
+	'moduleWizard'            => ModuleWizard::class,
+	'keyValueWizard'          => KeyValueWizard::class,
+	'imageSize'               => ImageSize::class,
+	'timePeriod'              => TimePeriod::class,
+	'metaWizard'              => MetaWizard::class,
+	'sectionWizard'           => SectionWizard::class,
+	'serpPreview'             => SerpPreview::class,
+	'rootPageDependentSelect' => RootPageDependentSelect::class
 );
 
 // Front end form fields

core-bundle/src/Resources/contao/languages/en/modules.xlf

@@ -308,11 +308,11 @@
       <trans-unit id="FMD.two_factor.1">
         <source>Generates a form to set up or change two-factor authentication</source>
       </trans-unit>
-      <trans-unit id="FMD.root_page_dependent_module.0">
-        <source>Root page dependent module</source>
+      <trans-unit id="FMD.root_page_dependent_modules.0">
+        <source>Root page dependent modules</source>
       </trans-unit>
       <trans-unit id="FMD.root_page_dependent_module.1">
-        <source>Generates a root page dependent module</source>
+        <source>Generates a root page dependent modules</source>
       </trans-unit>
     </body>
   </file>

core-bundle/src/Resources/contao/widgets/RootPageDependentModule.php → core-bundle/src/Resources/contao/widgets/RootPageDependentSelect.php

@@ -13,7 +13,7 @@
 /**
  * @property array $rootPages
  */
-class RootPageDependentModule extends SelectMenu
+class RootPageDependentSelect extends SelectMenu
 {
 	public function generate(): string
 	{

core-bundle/tests/Controller/FrontendModule/RootPageDependentModuleControllerTest.php → core-bundle/tests/Controller/FrontendModule/RootPageDependentModulesControllerTest.php

@@ -14,7 +14,7 @@
 
 use Contao\Controller;
 use Contao\CoreBundle\Cache\EntityCacheTags;
-use Contao\CoreBundle\Controller\FrontendModule\RootPageDependentModuleController;
+use Contao\CoreBundle\Controller\FrontendModule\RootPageDependentModulesController;
 use Contao\CoreBundle\Tests\TestCase;
 use Contao\ModuleModel;
 use Contao\PageModel;
@@ -24,7 +24,7 @@
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\RequestStack;
 
-class RootPageDependentModuleControllerTest extends TestCase
+class RootPageDependentModulesControllerTest extends TestCase
 {
     private ContainerBuilder $container;
 
@@ -40,7 +40,7 @@ protected function setUp(): void
 
     public function testReturnsEmptyResponse(): void
     {
-        $controller = new RootPageDependentModuleController();
+        $controller = new RootPageDependentModulesController();
         $controller->setContainer($this->mockContainerWithFrameworkTemplate());
 
         $response = $controller(new Request([], [], ['_scope' => 'frontend']), $this->getModuleModel(), 'main');
@@ -61,7 +61,7 @@ public function testPopulatesTheTemplateWithTheModule(): void
         $requestStack = new RequestStack();
         $requestStack->push($request);
 
-        $controller = new RootPageDependentModuleController();
+        $controller = new RootPageDependentModulesController();
         $controller->setContainer($this->mockContainerWithFrameworkTemplate($requestStack, 'example-content'));
 
         $response = $controller($request, $module, 'main');

core-bundle/tests/EventListener/DataContainer/RootPageDependentModuleListenerTest.php → core-bundle/tests/EventListener/DataContainer/RootPageDependentSelectListenerTest.php

@@ -12,7 +12,7 @@
 
 namespace Contao\CoreBundle\Tests\EventListener\DataContainer;
 
-use Contao\CoreBundle\EventListener\DataContainer\RootPageDependentModuleListener;
+use Contao\CoreBundle\EventListener\DataContainer\RootPageDependentSelectListener;
 use Contao\CoreBundle\Routing\ScopeMatcher;
 use Contao\TestCase\ContaoTestCase;
 use Doctrine\DBAL\Connection;
@@ -24,7 +24,7 @@
 use Symfony\Component\Security\Csrf\CsrfTokenManagerInterface;
 use Symfony\Contracts\Translation\TranslatorInterface;
 
-class RootPageDependentModuleListenerTest extends ContaoTestCase
+class RootPageDependentSelectListenerTest extends ContaoTestCase
 {
     public function testReturnsIfTheRequestIsNotABackendRequest(): void
     {
@@ -33,7 +33,7 @@ public function testReturnsIfTheRequestIsNotABackendRequest(): void
         $requestStack = new RequestStack();
         $requestStack->push($request);
 
-        $listener = new RootPageDependentModuleListener(
+        $listener = new RootPageDependentSelectListener(
             $this->createMock(Connection::class),
             $this->createMock(TranslatorInterface::class),
             $this->mockScopeMatcher(false, $request),
@@ -52,7 +52,7 @@ public function testReturnsIfThereAreNoFields(): void
         $requestStack = new RequestStack();
         $requestStack->push($request);
 
-        $listener = new RootPageDependentModuleListener(
+        $listener = new RootPageDependentSelectListener(
             $this->createMock(Connection::class),
             $this->createMock(TranslatorInterface::class),
             $this->mockScopeMatcher(true, $request),
@@ -75,7 +75,7 @@ public function testOnlyModifyFieldsWithProperInputType(): void
         $requestStack = new RequestStack();
         $requestStack->push($request);
 
-        $listener = new RootPageDependentModuleListener(
+        $listener = new RootPageDependentSelectListener(
             $this->createMock(Connection::class),
             $this->createMock(TranslatorInterface::class),
             $this->mockScopeMatcher(true, $request),
@@ -86,7 +86,7 @@ public function testOnlyModifyFieldsWithProperInputType(): void
 
         $this->populateGlobalsArray([
             'field1' => [
-                'inputType' => 'rootPageDependentModule',
+                'inputType' => 'rootPageDependentSelect',
             ],
             'field2' => [
                 'eval' => [],
@@ -100,7 +100,7 @@ public function testOnlyModifyFieldsWithProperInputType(): void
 
         $this->assertSame([
             'field1' => [
-                'inputType' => 'rootPageDependentModule',
+                'inputType' => 'rootPageDependentSelect',
                 'eval' => [
                     'rootPages' => [],
                     'blankOptionLabel' => null,
@@ -149,7 +149,7 @@ public function testAddRootPagesToFieldConfig(): void
             ->willReturn($statement)
         ;
 
-        $listener = new RootPageDependentModuleListener(
+        $listener = new RootPageDependentSelectListener(
             $connection,
             $this->createMock(TranslatorInterface::class),
             $this->mockScopeMatcher(true, $request),
@@ -160,15 +160,15 @@ public function testAddRootPagesToFieldConfig(): void
 
         $this->populateGlobalsArray([
             'field1' => [
-                'inputType' => 'rootPageDependentModule',
+                'inputType' => 'rootPageDependentSelect',
             ],
         ]);
 
         $listener->onLoadDataContainer('tl_module');
 
         $this->assertSame([
             'field1' => [
-                'inputType' => 'rootPageDependentModule',
+                'inputType' => 'rootPageDependentSelect',
                 'eval' => [
                     'rootPages' => [
                         1 => 'title-1 (language-1)',