From 32caadf4e6575b5d26778c0272e7a9e8b960a71c Mon Sep 17 00:00:00 2001 From: Matthias Schmidt Date: Mon, 29 Oct 2018 18:23:59 +0100 Subject: [PATCH] Fix IDE variable type recognitation/documentation issues in PIP GUI code See #2545 --- .../BBCodePackageInstallationPlugin.class.php | 2 ++ .../MenuPackageInstallationPlugin.class.php | 4 +++- ...ectTypePackageInstallationPlugin.class.php | 4 ++-- .../OptionPackageInstallationPlugin.class.php | 2 +- ...istenerPackageInstallationPlugin.class.php | 19 +++++++++++++------ 5 files changed, 21 insertions(+), 10 deletions(-) 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 900e5871ca..50fd25ba13 100644 --- 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 9cf88f404e..fcb2946217 100644 --- 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 bd23597beb..b7ce53d8bb 100644 --- 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 bf52351120..a6b05c6a06 100644 --- 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 c05155e9c2..6d6c9d9122 100644 --- 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']) ); -- 2.20.1