Remove type hints and @api annotation

- Remove scalar type and return hints
- Inline mapHostData method & get rid of SupressWarning
- Remove @api on new interface & implementation

Author: renttek

lib/internal/Magento/Framework/Config/Data/ConfigDataFactory.php

@@ -36,7 +36,7 @@ public function __construct(ObjectManagerInterface $objectManager)
      * @param string $fileKey
      * @return ConfigData
      */
-    public function create(string $fileKey) : ConfigData
+    public function create($fileKey)
     {
         return $this->objectManager->create(ConfigData::class, ['fileKey' => $fileKey]);
     }

setup/src/Magento/Setup/Model/ConfigGenerator.php

@@ -242,33 +242,27 @@ public function createCacheHostsConfig(array $data)
 
         if (isset($data[ConfigOptionsListConstants::INPUT_KEY_CACHE_HOSTS])) {
             $hosts = explode(',', $data[ConfigOptionsListConstants::INPUT_KEY_CACHE_HOSTS]);
-            $hosts = array_map([$this, 'mapHostData'], $hosts);
-            $configData->set(ConfigOptionsListConstants::CONFIG_PATH_CACHE_HOSTS, $hosts);
-        }
 
-        $configData->setOverrideWhenSave(true);
-        return $configData;
-    }
+            $hosts = array_map(
+                function ($hostData) {
+                    $hostDataParts = explode(':', trim($hostData));
 
-    /**
-     * Splits host data to host and port and returns them as an assoc. array.
-     *
-     * @param string $hostData
-     *
-     * @return array
-     *
-     * @SuppressWarnings(PHPMD.UnusedPrivateMethod)
-     */
-    private function mapHostData(string $hostData) : array
-    {
-        $hostDataParts = explode(':', trim($hostData));
+                    $tmp = ['host' => $hostDataParts[0]];
 
-        $tmp = ['host' => $hostDataParts[0]];
+                    if (isset($hostDataParts[1])) {
+                        $tmp['port'] = $hostDataParts[1];
+                    }
+
+                    return $tmp;
+                },
+                $hosts
+            );
 
-        if (isset($hostDataParts[1])) {
-            $tmp['port'] = $hostDataParts[1];
+            $configData->set(ConfigOptionsListConstants::CONFIG_PATH_CACHE_HOSTS, $hosts);
         }
 
-        return $tmp;
+        $configData->setOverrideWhenSave(true);
+        return $configData;
     }
+
 }

setup/src/Magento/Setup/Model/CryptKeyGenerator.php

@@ -11,7 +11,6 @@
 
 /**
  * Generates a crypt
- * @api
  */
 class CryptKeyGenerator implements CryptKeyGeneratorInterface
 {
@@ -39,7 +38,7 @@ public function __construct(Random $random)
      *
      * @throws \Magento\Framework\Exception\LocalizedException
      */
-    public function generate() : string
+    public function generate()
     {
         return md5($this->getRandomString());
     }
@@ -49,7 +48,7 @@ public function generate() : string
      *
      * @return string
      */
-    private function getRandomString() : string
+    private function getRandomString()
     {
         return $this->random->getRandomString(ConfigOptionsListConstants::STORE_KEY_RANDOM_STRING_SIZE);
     }

setup/src/Magento/Setup/Model/CryptKeyGeneratorInterface.php

@@ -8,7 +8,6 @@
 
 /**
  * Interface for crypt key generators.
- * @api
  */
 interface CryptKeyGeneratorInterface
 {
@@ -19,5 +18,5 @@ interface CryptKeyGeneratorInterface
      *
      * @return string
      */
-    public function generate() : string;
+    public function generate();
 }