Fix IDE variable type recognitation/documentation issues in PIP GUI code

See #2545

diff --git a/wcfsetup/install/files/lib/system/package/plugin/BBCodePackageInstallationPlugin.class.php b/wcfsetup/install/files/lib/system/package/plugin/BBCodePackageInstallationPlugin.class.php
index 900e5871ca7bdb9842dda727e0d79a96262992b3..50fd25ba1369d44d287977f180e6a1c0d81bf55c 100644 (file)
--- a/wcfsetup/install/files/lib/system/package/plugin/BBCodePackageInstallationPlugin.class.php
+++ b/wcfsetup/install/files/lib/system/package/plugin/BBCodePackageInstallationPlugin.class.php
@@ -456,6 +456,8 @@ class BBCodePackageInstallationPlugin extends AbstractXMLPackageInstallationPlug
                // add dependencies
                /** @var BooleanFormField $showButton */
                $showButton = $dataContainer->getNodeById('showButton');
+               
+               /** @var RadioButtonFormField $iconType */
                $iconType = $dataContainer->getNodeById('iconType');
                
                $dataContainer->getNodeById('buttonLabel')->addDependency(

diff --git a/wcfsetup/install/files/lib/system/package/plugin/MenuPackageInstallationPlugin.class.php b/wcfsetup/install/files/lib/system/package/plugin/MenuPackageInstallationPlugin.class.php
index 9cf88f404ee731a547f6537e7e012812b13c182b..fcb294621762db271e1f7420f18d1c9edc5366d9 100644 (file)
--- a/wcfsetup/install/files/lib/system/package/plugin/MenuPackageInstallationPlugin.class.php
+++ b/wcfsetup/install/files/lib/system/package/plugin/MenuPackageInstallationPlugin.class.php
@@ -394,9 +394,11 @@ class MenuPackageInstallationPlugin extends AbstractXMLPackageInstallationPlugin
                        );
                }
                
+               /** @var TextFormField $identifier */
+               $identifier = $form->getNodeById('identifier');
                $form->getNodeById('boxPosition')->addDependency(
                        ValueFormFieldDependency::create('identifier')
-                               ->field($form->getNodeById('identifier'))
+                               ->field($identifier)
                                ->values(['com.woltlab.wcf.MainMenu'])
                                ->negate()
                );

diff --git a/wcfsetup/install/files/lib/system/package/plugin/ObjectTypePackageInstallationPlugin.class.php b/wcfsetup/install/files/lib/system/package/plugin/ObjectTypePackageInstallationPlugin.class.php
index bd23597bebdb78392798ffc3ddab088c9f6483e5..b7ce53d8bb690b4c63da05686443479c888f8eba 100644 (file)
--- a/wcfsetup/install/files/lib/system/package/plugin/ObjectTypePackageInstallationPlugin.class.php
+++ b/wcfsetup/install/files/lib/system/package/plugin/ObjectTypePackageInstallationPlugin.class.php
@@ -301,7 +301,7 @@ class ObjectTypePackageInstallationPlugin extends AbstractXMLPackageInstallation
                                })),
                ]);
                
-               /** @var SingleSelectionFormField $definitionName */
+               /** @var SingleSelectionFormField $definitionID */
                $definitionID = $form->getNodeById('definitionID');
                
                // add general field dependencies
@@ -753,7 +753,7 @@ XML;
         * @since       3.2
         */
        public function getObjectTypeDefinitionDataContainer(IFormDocument $form, $definitionName) {
-               /** @var SingleSelectionFormField $definitionNameField */
+               /** @var SingleSelectionFormField $definitionIDField */
                $definitionIDField = $form->getNodeById('definitionID');
                
                $definitionPieces = explode('.', $definitionName);

diff --git a/wcfsetup/install/files/lib/system/package/plugin/OptionPackageInstallationPlugin.class.php b/wcfsetup/install/files/lib/system/package/plugin/OptionPackageInstallationPlugin.class.php
index bf523511201b2e6d2fa4383f4f051c45c591b908..a6b05c6a06c9b8667fe52cb3586cf0e30091a338 100644 (file)
--- a/wcfsetup/install/files/lib/system/package/plugin/OptionPackageInstallationPlugin.class.php
+++ b/wcfsetup/install/files/lib/system/package/plugin/OptionPackageInstallationPlugin.class.php
@@ -204,7 +204,7 @@ class OptionPackageInstallationPlugin extends AbstractOptionPackageInstallationP
                                                ->description('wcf.acp.pip.option.options.requireI18n.description'),
                                ]);
                                
-                               /** @var SingleSelectionFormField $supportI18n */
+                               /** @var SingleSelectionFormField $optionType */
                                $optionType = $form->getNodeById('optionType');
                                
                                /** @var BooleanFormField $supportI18n */

diff --git a/wcfsetup/install/files/lib/system/package/plugin/TemplateListenerPackageInstallationPlugin.class.php b/wcfsetup/install/files/lib/system/package/plugin/TemplateListenerPackageInstallationPlugin.class.php
index c05155e9c2bbd783fdf3712baa1773d92ff3287d..6d6c9d91220ac247300c1d425072a69b8f3b3ca8 100644 (file)
--- a/wcfsetup/install/files/lib/system/package/plugin/TemplateListenerPackageInstallationPlugin.class.php
+++ b/wcfsetup/install/files/lib/system/package/plugin/TemplateListenerPackageInstallationPlugin.class.php
@@ -223,6 +223,8 @@ class TemplateListenerPackageInstallationPlugin extends AbstractXMLPackageInstal
                                ->filterable()
                ]);
                
+               /** @var SingleSelectionFormField $frontendTemplateName */
+               $frontendTemplateName = $form->getNodeById('frontendTemplateName');
                foreach ($templateEvents as $templateName => $events) {
                        $dataContainer->appendChild(
                                SingleSelectionFormField::create($templateName . '_eventName')
@@ -233,12 +235,14 @@ class TemplateListenerPackageInstallationPlugin extends AbstractXMLPackageInstal
                                        ->options(array_combine($events, $events))
                                        ->addDependency(
                                                ValueFormFieldDependency::create('templateName')
-                                                       ->field($form->getNodeById('frontendTemplateName'))
+                                                       ->field($frontendTemplateName)
                                                        ->values([$templateName])
                                        )
                        );
                }
                
+               /** @var SingleSelectionFormField $acpTemplateName */
+               $acpTemplateName = $form->getNodeById('acpTemplateName');
                foreach ($acpTemplateEvents as $templateName => $events) {
                        $dataContainer->appendChild(
                                SingleSelectionFormField::create('acp_' . $templateName . '_eventName')
@@ -249,7 +253,7 @@ class TemplateListenerPackageInstallationPlugin extends AbstractXMLPackageInstal
                                        ->options(array_combine($events, $events))
                                        ->addDependency(
                                                ValueFormFieldDependency::create('acpTemplateName')
-                                                       ->field($form->getNodeById('acpTemplateName'))
+                                                       ->field($acpTemplateName)
                                                        ->values([$templateName])
                                        )
                        );
@@ -269,10 +273,10 @@ class TemplateListenerPackageInstallationPlugin extends AbstractXMLPackageInstal
                                        /** @var TextFormField $nameField */
                                        $nameField = $formField->getDocument()->getNodeById('name');
                                        
-                                       /** @var SingleSelectionFormField $actionNameFormField */
+                                       /** @var SingleSelectionFormField $templateNameFormField */
                                        $templateNameFormField = $formField->getDocument()->getNodeById('templateName');
                                        
-                                       /** @var SingleSelectionFormField $actionNameFormField */
+                                       /** @var SingleSelectionFormField $acpTemplateNameFormField */
                                        $acpTemplateNameFormField = $formField->getDocument()->getNodeById('acpTemplateName');
                                        
                                        if (
@@ -333,14 +337,17 @@ class TemplateListenerPackageInstallationPlugin extends AbstractXMLPackageInstal
                                ->required()
                ]);
                
+               /** @var SingleSelectionFormField $environment */
+               $environment = $form->getNodeById('environment');
+               
                $form->getNodeById('frontendTemplateName')->addDependency(
                        ValueFormFieldDependency::create('environment')
-                               ->field($form->getNodeById('environment'))
+                               ->field($environment)
                                ->values(['user'])
                );
                $form->getNodeById('acpTemplateName')->addDependency(
                        ValueFormFieldDependency::create('environment')
-                               ->field($form->getNodeById('environment'))
+                               ->field($environment)
                                ->values(['admin'])
                );