update FR translations THX kalon33

[friendica.git] / src / Protocol / Salmon.php

diff --git a/src/Protocol/Salmon.php b/src/Protocol/Salmon.php
index cf202ba13c0823b19ea0321880b9afe5c45ed151..98af26c15c3130b01e5a21aaca82565953b415a9 100644 (file)
--- a/src/Protocol/Salmon.php
+++ b/src/Protocol/Salmon.php
@@ -43,7 +43,7 @@ class Salmon
         * @return mixed
         * @throws \Friendica\Network\HTTPException\InternalServerErrorException
         */
-       public static function getKey($uri, $keyhash)
+       public static function getKey(string $uri, string $keyhash)
        {
                $ret = [];
 
@@ -109,18 +109,18 @@ class Salmon
         * @return integer
         * @throws \Friendica\Network\HTTPException\InternalServerErrorException
         */
-       public static function slapper($owner, $url, $slap)
+       public static function slapper(array $owner, string $url, string $slap): int
        {
                // does contact have a salmon endpoint?
 
                if (!strlen($url)) {
-                       return;
+                       return -1;
                }
 
                if (!$owner['sprvkey']) {
                        Logger::notice(sprintf("user '%s' (%d) does not have a salmon private key. Send failed.",
                        $owner['name'], $owner['uid']));
-                       return;
+                       return -1;
                }
 
                Logger::info('slapper called for '.$url.'. Data: ' . $slap);
@@ -157,7 +157,7 @@ class Salmon
                $salmon = XML::fromArray($xmldata, $xml, false, $namespaces);
 
                // slap them
-               $postResult = DI::httpClient()->post($url, $salmon, HttpClientAccept::DEFAULT, [
+               $postResult = DI::httpClient()->post($url, $salmon, [
                        'Content-type' => 'application/magic-envelope+xml',
                        'Content-length' => strlen($salmon),
                ]);
@@ -182,7 +182,7 @@ class Salmon
                        $salmon = XML::fromArray($xmldata, $xml, false, $namespaces);
 
                        // slap them
-                       $postResult = DI::httpClient()->post($url, $salmon, HttpClientAccept::DEFAULT, [
+                       $postResult = DI::httpClient()->post($url, $salmon, [
                                'Content-type' => 'application/magic-envelope+xml',
                                'Content-length' => strlen($salmon),
                        ]);
@@ -205,7 +205,7 @@ class Salmon
                        $salmon = XML::fromArray($xmldata, $xml, false, $namespaces);
 
                        // slap them
-                       $postResult = DI::httpClient()->post($url, $salmon, HttpClientAccept::DEFAULT, [
+                       $postResult = DI::httpClient()->post($url, $salmon, [
                                'Content-type' => 'application/magic-envelope+xml',
                                'Content-length' => strlen($salmon)]);
                        $return_code = $postResult->getReturnCode();
@@ -229,7 +229,7 @@ class Salmon
         * @return string
         * @throws \Exception
         */
-       public static function salmonKey($pubkey)
+       public static function salmonKey(string $pubkey): string
        {
                Crypto::pemToMe($pubkey, $modulus, $exponent);
                return 'RSA' . '.' . Strings::base64UrlEncode($modulus, true) . '.' . Strings::base64UrlEncode($exponent, true);