Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2024-12-22 12:40:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'fix-phpstan-errors' into replace-app-with-apphelper-in-tests

Browse source
This commit is contained in:
Art4 2024-12-16 22:37:37 +00:00
commit 99d6599747
2 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/Model/Item.php
View file

@ -4207,7 +4207,7 @@ class Item
if (!$mimetype) { if (!$mimetype) {
try { try {
$curlResult = DI::httpClient()->head($uri, [HttpClientOptions::ACCEPT_CONTENT => HttpClientAccept::JSON_AS, HttpClientOptions::REQUEST => HttpClientRequest::ACTIVITYPUB]); $curlResult = DI::httpClient()->head($uri, [HttpClientOptions::ACCEPT_CONTENT => HttpClientAccept::JSON_AS, HttpClientOptions::REQUEST => HttpClientRequest::ACTIVITYPUB]);
$mimetype = empty($curlResult) ? '' : $curlResult->getContentType(); $mimetype = $curlResult->getContentType();
} catch (\Throwable $th) { } catch (\Throwable $th) {
Logger::info('Error while fetching HTTP link via HEAD', ['uid' => $uid, 'uri' => $uri, 'code' => $th->getCode(), 'message' => $th->getMessage()]); Logger::info('Error while fetching HTTP link via HEAD', ['uid' => $uid, 'uri' => $uri, 'code' => $th->getCode(), 'message' => $th->getMessage()]);
return 0; return 0;
@ -4218,7 +4218,7 @@ class Item
try { try {
// Issue 14126: Workaround for Mastodon servers that return "application/json" on a "head" request. // Issue 14126: Workaround for Mastodon servers that return "application/json" on a "head" request.
$curlResult = HTTPSignature::fetchRaw($uri, $uid); $curlResult = HTTPSignature::fetchRaw($uri, $uid);
$mimetype = empty($curlResult) ? '' : $curlResult->getContentType(); $mimetype = $curlResult->getContentType();
} catch (\Throwable $th) { } catch (\Throwable $th) {
Logger::info('Error while fetching HTTP link via signed GET', ['uid' => $uid, 'uri' => $uri, 'code' => $th->getCode(), 'message' => $th->getMessage()]); Logger::info('Error while fetching HTTP link via signed GET', ['uid' => $uid, 'uri' => $uri, 'code' => $th->getCode(), 'message' => $th->getMessage()]);
return 0; return 0;

7
src/Protocol/ATProtocol.php
View file

@ -166,10 +166,9 @@ final class ATProtocol
* Perform an XRPC post for a given user * Perform an XRPC post for a given user
* @see https://atproto.com/specs/xrpc#lexicon-http-endpoints * @see https://atproto.com/specs/xrpc#lexicon-http-endpoints
* *
* @param integer $uid User ID * @param int $uid User ID
* @param string $url Endpoints like "com.atproto.repo.createRecord" * @param string $url Endpoints like "com.atproto.repo.createRecord"
* @param [type] $parameters array or StdClass with parameters * @param array|stdClass $parameters array or StdClass with parameters
* @return stdClass|null
*/ */
public function XRPCPost(int $uid, string $url, $parameters): ?stdClass public function XRPCPost(int $uid, string $url, $parameters): ?stdClass
{ {