clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #12296 from MrPetovan/bug/deprecated 

Address some PHP 8.1 deprecation notices
This commit is contained in:
Michael Vogel 2022-11-30 07:19:46 +01:00 committed by GitHub
parent 6c2f42ed03 150c0e0750
commit cd3e842f76
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Model/APContact.php
View File

@ -305,8 +305,8 @@ class APContact
$apcontact['pubkey'] = null; $apcontact['pubkey'] = null;
if (!empty($compacted['w3id:publicKey'])) { if (!empty($compacted['w3id:publicKey'])) {
$apcontact['pubkey'] = trim(JsonLD::fetchElement($compacted['w3id:publicKey'], 'w3id:publicKeyPem', '@value')); $apcontact['pubkey'] = trim(JsonLD::fetchElement($compacted['w3id:publicKey'], 'w3id:publicKeyPem', '@value') ?? '');
if (strstr($apcontact['pubkey'], 'RSA ')) { if (strpos($apcontact['pubkey'], 'RSA ') !== false) {
$apcontact['pubkey'] = Crypto::rsaToPem($apcontact['pubkey']); $apcontact['pubkey'] = Crypto::rsaToPem($apcontact['pubkey']);
} }
} }

1
src/Navigation/Notifications/ValueObject/Introduction.php
View File

@ -226,6 +226,7 @@ class Introduction implements \JsonSerializable
/** /**
* @inheritDoc * @inheritDoc
*/ */
#[\ReturnTypeWillChange]
public function jsonSerialize() public function jsonSerialize()
{ {
return $this->toArray(); return $this->toArray();

8
src/Protocol/DFRN.php
View File

@ -538,7 +538,7 @@ class DFRN
XML::addElement($doc, $author, 'poco:utcOffset', DateTimeFormat::timezoneNow($profile['timezone'], 'P')); XML::addElement($doc, $author, 'poco:utcOffset', DateTimeFormat::timezoneNow($profile['timezone'], 'P'));
if (trim($profile['homepage']) != '') { if (trim($profile['homepage'])) {
$urls = $doc->createElement('poco:urls'); $urls = $doc->createElement('poco:urls');
XML::addElement($doc, $urls, 'poco:type', 'homepage'); XML::addElement($doc, $urls, 'poco:type', 'homepage');
XML::addElement($doc, $urls, 'poco:value', $profile['homepage']); XML::addElement($doc, $urls, 'poco:value', $profile['homepage']);
@ -546,7 +546,7 @@ class DFRN
$author->appendChild($urls); $author->appendChild($urls);
} }
if (trim($profile['pub_keywords']) != '') { if (trim($profile['pub_keywords'] ?? '')) {
$keywords = explode(',', $profile['pub_keywords']); $keywords = explode(',', $profile['pub_keywords']);
foreach ($keywords as $keyword) { foreach ($keywords as $keyword) {
@ -554,7 +554,7 @@ class DFRN
} }
} }
if (trim($profile['xmpp']) != '') { if (trim($profile['xmpp'])) {
$ims = $doc->createElement('poco:ims'); $ims = $doc->createElement('poco:ims');
XML::addElement($doc, $ims, 'poco:type', 'xmpp'); XML::addElement($doc, $ims, 'poco:type', 'xmpp');
XML::addElement($doc, $ims, 'poco:value', $profile['xmpp']); XML::addElement($doc, $ims, 'poco:value', $profile['xmpp']);
@ -562,7 +562,7 @@ class DFRN
$author->appendChild($ims); $author->appendChild($ims);
} }
if (trim($profile['locality'] . $profile['region'] . $profile['country-name']) != '') { if (trim($profile['locality'] . $profile['region'] . $profile['country-name'])) {
$element = $doc->createElement('poco:address'); $element = $doc->createElement('poco:address');
XML::addElement($doc, $element, 'poco:formatted', Profile::formatLocation($profile)); XML::addElement($doc, $element, 'poco:formatted', Profile::formatLocation($profile));