nupplaPhil/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Update return value type-hint of GServer::getProtocol

Browse source 
- Address https://github.com/friendica/friendica/issues/11630#issuecomment-1164880874
This commit is contained in:
Hypolite Petovan 2022-06-24 22:37:53 -04:00
parent c5b46fe748
commit 636b84b41c
2 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/Model/GServer.php
View file

@ -2047,10 +2047,10 @@ class GServer
* Fetch the protocol of the given server * Fetch the protocol of the given server
* *
* @param int $gsid Server id * @param int $gsid Server id
* @return int * @return ?int One of Post\DeliveryData protocol constants or null if unknown or gserver is missing
* @throws Exception * @throws Exception
*/ */
public static function getProtocol(int $gsid): int public static function getProtocol(int $gsid): ?int
{ {
if (empty($gsid)) { if (empty($gsid)) {
return null; return null;

20
src/Worker/Delivery.php
View file

@ -257,19 +257,19 @@ class Delivery
/** /**
* Deliver content via DFRN * Deliver content via DFRN
* *
* @param string $cmd Command * @param string $cmd Command
* @param array $contact Contact record of the receiver * @param array $contact Contact record of the receiver
* @param array $owner Owner record of the sender * @param array $owner Owner record of the sender
* @param array $items Item record of the content and the parent * @param array $items Item record of the content and the parent
* @param array $target_item Item record of the content * @param array $target_item Item record of the content
* @param boolean $public_message Is the content public? * @param boolean $public_message Is the content public?
* @param boolean $top_level Is it a thread starter? * @param boolean $top_level Is it a thread starter?
* @param boolean $followup Is it an answer to a remote post? * @param boolean $followup Is it an answer to a remote post?
* @param int $server_protocol The protocol of the server * @param int|null $server_protocol The protocol of the server
* @throws \Friendica\Network\HTTPException\InternalServerErrorException * @throws \Friendica\Network\HTTPException\InternalServerErrorException
* @throws \ImagickException * @throws \ImagickException
*/ */
private static function deliverDFRN(string $cmd, array $contact, array $owner, array $items, array $target_item, bool $public_message, bool $top_level, bool $followup, int $server_protocol) private static function deliverDFRN(string $cmd, array $contact, array $owner, array $items, array $target_item, bool $public_message, bool $top_level, bool $followup, int $server_protocol = null)
{ {
// Transmit Diaspora reshares via Diaspora if the Friendica contact support Diaspora // Transmit Diaspora reshares via Diaspora if the Friendica contact support Diaspora
if (Diaspora::isReshare($target_item['body'] ?? '') && !empty(FContact::getByURL($contact['addr'], false))) { if (Diaspora::isReshare($target_item['body'] ?? '') && !empty(FContact::getByURL($contact['addr'], false))) {