Rename `doGetElementData()` to `fetchElementData()`
authorMatthias Schmidt <gravatronics@live.com>
Mon, 19 Nov 2018 17:27:37 +0000 (18:27 +0100)
committerMatthias Schmidt <gravatronics@live.com>
Mon, 19 Nov 2018 17:27:37 +0000 (18:27 +0100)
See #2545

29 files changed:
wcfsetup/install/files/lib/system/devtools/pip/TMultiXmlGuiPackageInstallationPlugin.class.php
wcfsetup/install/files/lib/system/devtools/pip/TXmlGuiPackageInstallationPlugin.class.php
wcfsetup/install/files/lib/system/package/plugin/ACLOptionPackageInstallationPlugin.class.php
wcfsetup/install/files/lib/system/package/plugin/ACPMenuPackageInstallationPlugin.class.php
wcfsetup/install/files/lib/system/package/plugin/ACPSearchProviderPackageInstallationPlugin.class.php
wcfsetup/install/files/lib/system/package/plugin/AbstractMenuPackageInstallationPlugin.class.php
wcfsetup/install/files/lib/system/package/plugin/AbstractOptionPackageInstallationPlugin.class.php
wcfsetup/install/files/lib/system/package/plugin/BBCodePackageInstallationPlugin.class.php
wcfsetup/install/files/lib/system/package/plugin/BoxPackageInstallationPlugin.class.php
wcfsetup/install/files/lib/system/package/plugin/ClipboardActionPackageInstallationPlugin.class.php
wcfsetup/install/files/lib/system/package/plugin/CoreObjectPackageInstallationPlugin.class.php
wcfsetup/install/files/lib/system/package/plugin/CronjobPackageInstallationPlugin.class.php
wcfsetup/install/files/lib/system/package/plugin/EventListenerPackageInstallationPlugin.class.php
wcfsetup/install/files/lib/system/package/plugin/LanguagePackageInstallationPlugin.class.php
wcfsetup/install/files/lib/system/package/plugin/MediaProviderPackageInstallationPlugin.class.php
wcfsetup/install/files/lib/system/package/plugin/MenuItemPackageInstallationPlugin.class.php
wcfsetup/install/files/lib/system/package/plugin/MenuPackageInstallationPlugin.class.php
wcfsetup/install/files/lib/system/package/plugin/ObjectTypeDefinitionPackageInstallationPlugin.class.php
wcfsetup/install/files/lib/system/package/plugin/ObjectTypePackageInstallationPlugin.class.php
wcfsetup/install/files/lib/system/package/plugin/OptionPackageInstallationPlugin.class.php
wcfsetup/install/files/lib/system/package/plugin/PIPPackageInstallationPlugin.class.php
wcfsetup/install/files/lib/system/package/plugin/PagePackageInstallationPlugin.class.php
wcfsetup/install/files/lib/system/package/plugin/SmileyPackageInstallationPlugin.class.php
wcfsetup/install/files/lib/system/package/plugin/TemplateListenerPackageInstallationPlugin.class.php
wcfsetup/install/files/lib/system/package/plugin/UserGroupOptionPackageInstallationPlugin.class.php
wcfsetup/install/files/lib/system/package/plugin/UserMenuPackageInstallationPlugin.class.php
wcfsetup/install/files/lib/system/package/plugin/UserNotificationEventPackageInstallationPlugin.class.php
wcfsetup/install/files/lib/system/package/plugin/UserOptionPackageInstallationPlugin.class.php
wcfsetup/install/files/lib/system/package/plugin/UserProfileMenuPackageInstallationPlugin.class.php

index 31ffb5ced988ea4a77f71eec034e99a6d821f9eb..4e2a2af6f8801df2bcc0d88b303a6de15340ad4d 100644 (file)
@@ -122,7 +122,7 @@ trait TMultiXmlGuiPackageInstallationPlugin {
                                $entryList->addEntry(
                                        $this->getElementIdentifier($element),
                                        // we skip the event here to avoid firing all of those events
-                                       array_intersect_key($this->doGetElementData($element), $entryList->getKeys())
+                                       array_intersect_key($this->fetchElementData($element), $entryList->getKeys())
                                );
                        }
                }
index 574c5d23603a9c8e2eb81aa3516c9a290ed7005e..67c018d0ba4beb30684a81caf81617cd0f6f261e 100644 (file)
@@ -235,18 +235,18 @@ trait TXmlGuiPackageInstallationPlugin {
         * @param       bool            $saveData       is `true` if data is intended to be saved and otherwise `false`
         * @return      array
         */
-       abstract protected function doGetElementData(\DOMElement $element, $saveData);
+       abstract protected function fetchElementData(\DOMElement $element, $saveData);
        
        /**
         * Extracts the PIP object data from the given XML element by calling
-        * `doGetElementData` and firing an event.
+        * `fetchElementData` and firing an event.
         * 
         * @param       \DOMElement     $element        element whose data is returned
         * @param       bool            $saveData       is `true` if data is intended to be saved and otherwise `false`
         * @return      array
         */
        protected function getElementData(\DOMElement $element, $saveData = false) {
-               $elementData = $this->doGetElementData($element, $saveData);
+               $elementData = $this->fetchElementData($element, $saveData);
                
                $data = [
                        'element' => $element,
@@ -318,7 +318,7 @@ XML;
                        $entryList->addEntry(
                                $this->getElementIdentifier($element),
                                // we skip the event here to avoid firing all of those events
-                               array_intersect_key($this->doGetElementData($element, false), $entryList->getKeys())
+                               array_intersect_key($this->fetchElementData($element, false), $entryList->getKeys())
                        );
                }
                
index f800730b4982264a30274004b8b691ce22e864fe..5aa0fb85526ef707a72ebf1b1153991f3d43f29e 100644 (file)
@@ -509,7 +509,7 @@ class ACLOptionPackageInstallationPlugin extends AbstractOptionPackageInstallati
         * @inheritDoc
         * @since       3.2
         */
-       protected function doGetElementData(\DOMElement $element, $saveData) {
+       protected function fetchElementData(\DOMElement $element, $saveData) {
                $data = [
                        'packageID' => $this->installation->getPackage()->packageID,
                        'objectType' => $element->getElementsByTagName('objecttype')->item(0)->nodeValue
index 50fa14f0267fc4936af6f38d02b528ce7ab9ae31..54f048a3001bd0c91f68ca091da5c0090b45a7e0 100644 (file)
@@ -128,8 +128,8 @@ class ACPMenuPackageInstallationPlugin extends AbstractMenuPackageInstallationPl
         * @inheritDoc
         * @since       3.2
         */
-       protected function doGetElementData(\DOMElement $element, $saveData) {
-               $data = parent::doGetElementData($element, $saveData);
+       protected function fetchElementData(\DOMElement $element, $saveData) {
+               $data = parent::fetchElementData($element, $saveData);
                
                $icon = $element->getElementsByTagName('icon')->item(0);
                if ($icon !== null) {
index cb769c02eaaf88e5d3f35627ce3bbdadb018fa9c..882b52c9d59aca01c03990a62823e31792811250 100644 (file)
@@ -113,7 +113,7 @@ class ACPSearchProviderPackageInstallationPlugin extends AbstractXMLPackageInsta
         * @inheritDoc
         * @since       3.2
         */
-       protected function doGetElementData(\DOMElement $element, $saveData) {
+       protected function fetchElementData(\DOMElement $element, $saveData) {
                $data = [
                        'className' => $element->getElementsByTagName('classname')->item(0)->nodeValue,
                        'packageID' => $this->installation->getPackage()->packageID,
index 620d91143ba5ca32b5a042d4d2c8a70729ed3934..367127e7fd30d29b1e3d0ee34e66e046bccfaaaf 100644 (file)
@@ -317,7 +317,7 @@ abstract class AbstractMenuPackageInstallationPlugin extends AbstractXMLPackageI
         * @inheritDoc
         * @since       3.2
         */
-       protected function doGetElementData(\DOMElement $element, $saveData) {
+       protected function fetchElementData(\DOMElement $element, $saveData) {
                $data = [
                        'menuItem' => $element->getAttribute('name'),
                        'packageID' => $this->installation->getPackage()->packageID
index e644947b336f78b7551c9568956465e1ae782184..55bbac7efb12179bef8c80c94e3d41e9a58ebb90 100644 (file)
@@ -695,7 +695,7 @@ abstract class AbstractOptionPackageInstallationPlugin extends AbstractXMLPackag
         * @inheritDoc
         * @since       3.2
         */
-       protected function doGetElementData(\DOMElement $element, $saveData) {
+       protected function fetchElementData(\DOMElement $element, $saveData) {
                $data = [];
                
                switch ($this->entryType) {
index 37e01027c64a2a38abdb0811b6f4e9212ea30976..e5e606c34e74d3e3c1a3c5e6fb9ceb6f7ecc16af 100644 (file)
@@ -233,7 +233,7 @@ class BBCodePackageInstallationPlugin extends AbstractXMLPackageInstallationPlug
         * @inheritDoc
         * @since       3.2
         */
-       protected function doGetElementData(\DOMElement $element, $saveData) {
+       protected function fetchElementData(\DOMElement $element, $saveData) {
                $data = [
                        'attributes' => [],
                        'bbcodeTag' => $element->getAttribute('name'),
index 36ad15c2b91aa238dbce0351f404c726ab280ccc..bc09e7c5cecd2ddabd157b3b6ad2dc5f8a4650ba 100644 (file)
@@ -614,7 +614,7 @@ class BoxPackageInstallationPlugin extends AbstractXMLPackageInstallationPlugin
         * @inheritDoc
         * @since       3.2
         */
-       protected function doGetElementData(\DOMElement $element, $saveData) {
+       protected function fetchElementData(\DOMElement $element, $saveData) {
                $data = [
                        'boxType' => $element->getElementsByTagName('boxType')->item(0)->nodeValue,
                        'content' => [],
index ef28aa975e7f624fbcf20add696240646e50df77..3480ca0be281a4cb821710feef8f3fcbdd7e4942 100644 (file)
@@ -249,7 +249,7 @@ class ClipboardActionPackageInstallationPlugin extends AbstractXMLPackageInstall
         * @inheritDoc
         * @since       3.2
         */
-       protected function doGetElementData(\DOMElement $element, $saveData) {
+       protected function fetchElementData(\DOMElement $element, $saveData) {
                $data = [
                        'actionClassName' => $element->getElementsByTagName('actionclassname')->item(0)->nodeValue,
                        'actionName' => $element->getAttribute('name'),
index 703b7a24b0824799726d46b2bdc5b1d34b8b1c95..9a45fb230d921a7b5121185943219659d7055601 100644 (file)
@@ -132,7 +132,7 @@ class CoreObjectPackageInstallationPlugin extends AbstractXMLPackageInstallation
         * @inheritDoc
         * @since       3.2
         */
-       protected function doGetElementData(\DOMElement $element, $saveData) {
+       protected function fetchElementData(\DOMElement $element, $saveData) {
                return [
                        'objectName' => $element->getElementsByTagName('objectname')->item(0)->nodeValue,
                        'packageID' => $this->installation->getPackage()->packageID
index 0a1c5df043f5127ac4e30a115f218535795d1c4d..41b5ac279e74c073cc22c76e08fe2d61a038e71e 100644 (file)
@@ -249,7 +249,7 @@ class CronjobPackageInstallationPlugin extends AbstractXMLPackageInstallationPlu
         * @inheritDoc
         * @since       3.2
         */
-       protected function doGetElementData(\DOMElement $element, $saveData) {
+       protected function fetchElementData(\DOMElement $element, $saveData) {
                $data = [
                        'className' => $element->getElementsByTagName('classname')->item(0)->nodeValue,
                        'cronjobName' => $element->getAttribute('name'),
index 3b78f113399c8d08f4f78cf1643c2864e2e3a8e2..c1da54d24dee868a72d156f87d7ff4f4c917ac31 100644 (file)
@@ -285,7 +285,7 @@ class EventListenerPackageInstallationPlugin extends AbstractXMLPackageInstallat
         * @inheritDoc
         * @since       3.2
         */
-       protected function doGetElementData(\DOMElement $element, $saveData) {
+       protected function fetchElementData(\DOMElement $element, $saveData) {
                $data = [
                        'eventClassName' => $element->getElementsByTagName('eventclassname')->item(0)->nodeValue,
                        'eventName' => StringUtil::normalizeCsv($element->getElementsByTagName('eventname')->item(0)->nodeValue),
index baecb7e17912db1735a75eaf1d01f1d5dd56fc5d..867dd5a225a93a0ddc30eaab945cba68cd833951 100644 (file)
@@ -500,7 +500,7 @@ class LanguagePackageInstallationPlugin extends AbstractXMLPackageInstallationPl
         * @inheritDoc
         * @since       3.2
         */
-       protected function doGetElementData(\DOMElement $element, $saveData) {
+       protected function fetchElementData(\DOMElement $element, $saveData) {
                $data = [
                        'languageID' => LanguageFactory::getInstance()->getLanguageByCode($element->ownerDocument->documentElement->getAttribute('languagecode'))->languageID,
                        'languageItem' => $element->getAttribute('name'),
index 6e42a48e9bab098b5cfc00598fe08f28567284f1..e004373af9b0a9f1fccc9662cefa40c80c79b9ab 100644 (file)
@@ -201,7 +201,7 @@ class MediaProviderPackageInstallationPlugin extends AbstractXMLPackageInstallat
         * @inheritDoc
         * @since       3.2
         */
-       protected function doGetElementData(\DOMElement $element, $saveData) {
+       protected function fetchElementData(\DOMElement $element, $saveData) {
                $data = [
                        'name' => $element->getAttribute('name'),
                        'packageID' => $this->installation->getPackage()->packageID,
index 9ca8878dacecd077b48eb052de4ff5a16be986df..17859d9ff77f0ec8411de34646a841b167c11ac3 100644 (file)
@@ -427,7 +427,7 @@ class MenuItemPackageInstallationPlugin extends AbstractXMLPackageInstallationPl
         * @inheritDoc
         * @since       3.2
         */
-       protected function doGetElementData(\DOMElement $element, $saveData) {
+       protected function fetchElementData(\DOMElement $element, $saveData) {
                $data = [
                        'identifier' => $element->getAttribute('identifier'),
                        'packageID' => $this->installation->getPackageID(),
index fcb294621762db271e1f7420f18d1c9edc5366d9..406537c43737bde68f6494bef945cd5acb8119ce 100644 (file)
@@ -408,7 +408,7 @@ class MenuPackageInstallationPlugin extends AbstractXMLPackageInstallationPlugin
         * @inheritDoc
         * @since       3.2
         */
-       protected function doGetElementData(\DOMElement $element, $saveData) {
+       protected function fetchElementData(\DOMElement $element, $saveData) {
                $data = [
                        'identifier' => $element->getAttribute('identifier'),
                        'packageID' => $this->installation->getPackageID(),
index 3962b6b046b18f43b90e9b71ae1bfadca4a8232f..9eb84104171ecaf47badcf955ba0b144bd00ab0f 100644 (file)
@@ -145,7 +145,7 @@ class ObjectTypeDefinitionPackageInstallationPlugin extends AbstractXMLPackageIn
         * @inheritDoc
         * @since       3.2
         */
-       protected function doGetElementData(\DOMElement $element, $saveData) {
+       protected function fetchElementData(\DOMElement $element, $saveData) {
                $data = [
                        'definitionName' => $element->getElementsByTagName('name')->item(0)->nodeValue,
                        'packageID' => $this->installation->getPackage()->packageID
index b7ce53d8bb690b4c63da05686443479c888f8eba..dfd8a80e1174e8c4ec24e5227ac967207a39f2e2 100644 (file)
@@ -179,7 +179,7 @@ class ObjectTypePackageInstallationPlugin extends AbstractXMLPackageInstallation
         * @inheritDoc
         * @since       3.2
         */
-       protected function doGetElementData(\DOMElement $element, $saveData) {
+       protected function fetchElementData(\DOMElement $element, $saveData) {
                $data = [
                        'definitionID' => $this->getDefinitionID($element->getElementsByTagName('definitionname')->item(0)->nodeValue),
                        'objectType' => $element->getElementsByTagName('name')->item(0)->nodeValue,
index 878fb9f98bfae99984274d1993ac53bb110026b0..e9d977deecfe569e6f058ccb94a79a9b2ed0ec25 100644 (file)
@@ -244,8 +244,8 @@ class OptionPackageInstallationPlugin extends AbstractOptionPackageInstallationP
         * @inheritDoc
         * @since       3.2
         */
-       protected function doGetElementData(\DOMElement $element, $saveData) {
-               $data = parent::doGetElementData($element, $saveData);
+       protected function fetchElementData(\DOMElement $element, $saveData) {
+               $data = parent::fetchElementData($element, $saveData);
                
                switch ($this->entryType) {
                        case 'options':
index 4aae6675ec1d9024662ae4e2b6c8865d98146525..beb0457899ea52e2b8c6cf1c21eed752e48d0418 100644 (file)
@@ -148,7 +148,7 @@ class PIPPackageInstallationPlugin extends AbstractXMLPackageInstallationPlugin
         * @inheritDoc
         * @since       3.2
         */
-       protected function doGetElementData(\DOMElement $element, $saveData) {
+       protected function fetchElementData(\DOMElement $element, $saveData) {
                return [
                        'className' => $element->nodeValue,
                        'pluginName' => $element->getAttribute('name'),
index 81bf670690bfa1b7cd47691490882fc966e9ab16..56376feeef9f190f96f09eba1bddb0960e2a7259 100644 (file)
@@ -635,7 +635,7 @@ class PagePackageInstallationPlugin extends AbstractXMLPackageInstallationPlugin
         * @inheritDoc
         * @since       3.2
         */
-       protected function doGetElementData(\DOMElement $element, $saveData) {
+       protected function fetchElementData(\DOMElement $element, $saveData) {
                $data = [
                        'identifier' => $element->getAttribute('identifier'),
                        'originIsSystem' => 1,
index 25ca849228036d8f2ff4f4ccf6e9db23ccf804d4..453a8c11a968f14a2f562999ade25437cf658526 100644 (file)
@@ -227,7 +227,7 @@ class SmileyPackageInstallationPlugin extends AbstractXMLPackageInstallationPlug
         * @inheritDoc
         * @since       3.2
         */
-       protected function doGetElementData(\DOMElement $element, $saveData) {
+       protected function fetchElementData(\DOMElement $element, $saveData) {
                $data = [
                        'packageID' => $this->installation->getPackage()->packageID,
                        'smileyCode' => $element->getAttribute('name'),
index 0f883d6a6ae27b7291d8cb521c4544d4521d5b2a..e753d9829ef90bb07ae8ed6c804f2f1db3696a55 100644 (file)
@@ -388,7 +388,7 @@ class TemplateListenerPackageInstallationPlugin extends AbstractXMLPackageInstal
         * @inheritDoc
         * @since       3.2
         */
-       protected function doGetElementData(\DOMElement $element, $saveData) {
+       protected function fetchElementData(\DOMElement $element, $saveData) {
                $data = [
                        'environment' => $element->getElementsByTagName('environment')->item(0)->nodeValue,
                        'eventName' => $element->getElementsByTagName('eventname')->item(0)->nodeValue,
index 630e8a6a8d47aff119019b935b403fae1ea5a0ea..0632b16b8b7c1cc5c5fd5b887f05ab9b83430ae9 100644 (file)
@@ -268,8 +268,8 @@ class UserGroupOptionPackageInstallationPlugin extends AbstractOptionPackageInst
         * @inheritDoc
         * @since       3.2
         */
-       protected function doGetElementData(\DOMElement $element, $saveData) {
-               $data = parent::doGetElementData($element, $saveData);
+       protected function fetchElementData(\DOMElement $element, $saveData) {
+               $data = parent::fetchElementData($element, $saveData);
                
                switch ($this->entryType) {
                        case 'options':
index d3e6d5223d228d1e748f53af32fc636b2ab057e5..3b0f05c4041263d1da9ad3fa3ae3c473eab307a7 100644 (file)
@@ -126,8 +126,8 @@ class UserMenuPackageInstallationPlugin extends AbstractMenuPackageInstallationP
         * @inheritDoc
         * @since       3.2
         */
-       protected function doGetElementData(\DOMElement $element, $saveData) {
-               $data = parent::doGetElementData($element, $saveData);
+       protected function fetchElementData(\DOMElement $element, $saveData) {
+               $data = parent::fetchElementData($element, $saveData);
                
                $className = $element->getElementsByTagName('classname')->item(0);
                if ($className !== null) {
index c344e66d1a0b491b3145a2d8cf4f2b9f439bfcda..2a3ee6dfa85eba7713b0f73d99814800dd1a4772 100644 (file)
@@ -286,7 +286,7 @@ class UserNotificationEventPackageInstallationPlugin extends AbstractXMLPackageI
         * @inheritDoc
         * @since       3.2
         */
-       protected function doGetElementData(\DOMElement $element, $saveData) {
+       protected function fetchElementData(\DOMElement $element, $saveData) {
                $data = [
                        'className' => $element->getElementsByTagName('classname')->item(0)->nodeValue,
                        'eventName' => $element->getElementsByTagName('name')->item(0)->nodeValue,
index 05544a331b9676badbf468855d4c185bf3dfaeef..aff2dc364623e5487a062a0915aeff2237ec5366 100644 (file)
@@ -335,8 +335,8 @@ class UserOptionPackageInstallationPlugin extends AbstractOptionPackageInstallat
         * @inheritDoc
         * @since       3.2
         */
-       protected function doGetElementData(\DOMElement $element, $saveData) {
-               $data = parent::doGetElementData($element, $saveData);
+       protected function fetchElementData(\DOMElement $element, $saveData) {
+               $data = parent::fetchElementData($element, $saveData);
                
                switch ($this->entryType) {
                        case 'options':
index d34635a0b8e4146055233cd5b28f9cbdcf234b71..5fcab5f996cd9be80fe8dcda6fcab672086f7d66 100644 (file)
@@ -177,7 +177,7 @@ class UserProfileMenuPackageInstallationPlugin extends AbstractXMLPackageInstall
         * @inheritDoc
         * @since       3.2
         */
-       protected function doGetElementData(\DOMElement $element, $saveData) {
+       protected function fetchElementData(\DOMElement $element, $saveData) {
                $data = [
                        'className' => $element->getElementsByTagName('classname')->item(0)->nodeValue,
                        'menuItem' => $element->getAttribute('name'),