Merge pull request 'Tumblr: Make it compatible with PHP 7.4.0' (#1370) from heluecht/friendica-addons:tumblr-php-7.4 into 2023.03-rc

MrPetovan · MrPetovan · commit 5cae2bffb254 · 2023-04-11T20:03:50.000+02:00
Reviewed-on: https://git.friendi.ca/friendica/friendica-addons/pulls/1370
diff --git a/tumblr/tumblr.php b/tumblr/tumblr.php
@@ -442,7 +442,7 @@ function tumblr_send_npf(array $post): bool
 	}
 }
 
-function tumblr_connection(int $uid): GuzzleHttp\Client|null
+function tumblr_connection(int $uid): ?GuzzleHttp\Client
 {
 	$oauth_token        = DI::pConfig()->get($uid, 'tumblr', 'oauth_token');
 	$oauth_token_secret = DI::pConfig()->get($uid, 'tumblr', 'oauth_token_secret');

Original file line number	Diff line number	Diff line change
`@@ -442,7 +442,7 @@ function tumblr_send_npf(array $post): bool`
`442`	`442`	`}`
`443`	`443`	`}`
`444`	`444`
`445`		`-function tumblr_connection(int $uid): GuzzleHttp\Client\|null`
	`445`	`+function tumblr_connection(int $uid): ?GuzzleHttp\Client`
`446`	`446`	`{`
`447`	`447`	`$oauth_token = DI::pConfig()->get($uid, 'tumblr', 'oauth_token');`
`448`	`448`	`$oauth_token_secret = DI::pConfig()->get($uid, 'tumblr', 'oauth_token_secret');`