Merge pull request #7 from engcom-Foxtrot/2.4-dev-php8-sync

MC-40472: Sync php8 branches with 2.4 branches

Author: sivaschenko

ReCaptchaMigration/Setup/Patch/Data/MigrateConfigToRecaptchaModules.php

@@ -115,10 +115,16 @@ private function copyRecaptchaKeys(string $scope): void
     {
         $type = $this->getActiveRecaptchaType();
         if ($type) {
-            $this->copyRecord(
-                "msp_securitysuite_recaptcha/general/public_key",
+            $publicKey = $this->scopeConfig->getValue(
                 "recaptcha_$scope/type_$type/public_key"
             );
+            $publicKeyLegacy = $this->scopeConfig->getValue(
+                'msp_securitysuite_recaptcha/general/public_key'
+            );
+            if (!$publicKey && $publicKeyLegacy) {
+                $publicKeyEncrypted = $this->encryptor->encrypt($publicKeyLegacy);
+                $this->writer->save("recaptcha_$scope/type_$type/public_key", $publicKeyEncrypted);
+            }
             $privateKey = $this->scopeConfig->getValue(
                 "recaptcha_$scope/type_$type/private_key"
             );