Sekretaerbaer-Netz/friendica-addons-sekretaerbaer-netz
1
0
Fork 0
forked from Friendica/friendica-addons
Code Pull requests Activity

Fix PHPStan errors in statusnet addon

Browse source
This commit is contained in:
Art4 2025-02-26 14:35:00 +00:00
parent cfe27582ee
commit 512ad63dbf
3 changed files with 27 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

2
statusnet/library/codebirdsn.php
View file

@ -976,7 +976,7 @@ class CodebirdSN
* @param string $method The method that has been called * @param string $method The method that has been called
* @param string $reply The actual reply, JSON-encoded or URL-encoded * @param string $reply The actual reply, JSON-encoded or URL-encoded
* *
* @return array|object The parsed reply * @return string|array|object The parsed reply
*/ */
protected function _parseApiReply($method, $reply) protected function _parseApiReply($method, $reply)
{ {

16
statusnet/library/statusnetoauth.php
View file

@ -12,7 +12,7 @@ require_once __DIR__ . DIRECTORY_SEPARATOR . 'twitteroauth.php';
*/ */
class StatusNetOAuth extends TwitterOAuth class StatusNetOAuth extends TwitterOAuth
{ {
function get_maxlength() public function get_maxlength()
{ {
$config = $this->get($this->host . 'statusnet/config.json'); $config = $this->get($this->host . 'statusnet/config.json');
if (empty($config)) { if (empty($config)) {
@ -21,27 +21,27 @@ class StatusNetOAuth extends TwitterOAuth
return $config->site->textlimit; return $config->site->textlimit;
} }
function accessTokenURL() public function accessTokenURL()
{ {
return $this->host . 'oauth/access_token'; return $this->host . 'oauth/access_token';
} }
function authenticateURL() public function authenticateURL()
{ {
return $this->host . 'oauth/authenticate'; return $this->host . 'oauth/authenticate';
} }
function authorizeURL() public function authorizeURL()
{ {
return $this->host . 'oauth/authorize'; return $this->host . 'oauth/authorize';
} }
function requestTokenURL() public function requestTokenURL()
{ {
return $this->host . 'oauth/request_token'; return $this->host . 'oauth/request_token';
} }
function __construct($apipath, $consumer_key, $consumer_secret, $oauth_token = NULL, $oauth_token_secret = NULL) public function __construct($apipath, $consumer_key, $consumer_secret, $oauth_token = NULL, $oauth_token_secret = NULL)
{ {
parent::__construct($consumer_key, $consumer_secret, $oauth_token, $oauth_token_secret); parent::__construct($consumer_key, $consumer_secret, $oauth_token, $oauth_token_secret);
$this->host = $apipath; $this->host = $apipath;
@ -52,9 +52,9 @@ class StatusNetOAuth extends TwitterOAuth
* *
* Copied here from the TwitterOAuth library and complemented by applying the proxy settings of Friendica * Copied here from the TwitterOAuth library and complemented by applying the proxy settings of Friendica
* *
* @return array|object API results * @return array|object|mixed API results
*/ */
function http($url, $method, $postfields = NULL) public function http($url, $method, $postfields = NULL)
{ {
$this->http_info = []; $this->http_info = [];
$ci = curl_init(); $ci = curl_init();

36
statusnet/library/twitteroauth.php
View file

@ -45,11 +45,11 @@ class TwitterOAuth
public $http_header; public $http_header;
/** /**
* Contains the last HTTP request info * Contains the last HTTP request info
* @var string * @var array
*/ */
public $http_info; public $http_info;
/** @var OAuthToken */ /** @var OAuthToken|null */
private $token; private $token;
/** @var OAuthConsumer */ /** @var OAuthConsumer */
private $consumer; private $consumer;
@ -59,27 +59,27 @@ class TwitterOAuth
/** /**
* Set API URLS * Set API URLS
*/ */
function accessTokenURL() public function accessTokenURL()
{ {
return 'https://api.twitter.com/oauth/access_token'; return 'https://api.twitter.com/oauth/access_token';
} }
function authenticateURL() public function authenticateURL()
{ {
return 'https://twitter.com/oauth/authenticate'; return 'https://twitter.com/oauth/authenticate';
} }
function authorizeURL() public function authorizeURL()
{ {
return 'https://twitter.com/oauth/authorize'; return 'https://twitter.com/oauth/authorize';
} }
function requestTokenURL() public function requestTokenURL()
{ {
return 'https://api.twitter.com/oauth/request_token'; return 'https://api.twitter.com/oauth/request_token';
} }
function __construct($consumer_key, $consumer_secret, $oauth_token = null, $oauth_token_secret = null) public function __construct($consumer_key, $consumer_secret, $oauth_token = null, $oauth_token_secret = null)
{ {
$this->sha1_method = new OAuthSignatureMethod_HMAC_SHA1(); $this->sha1_method = new OAuthSignatureMethod_HMAC_SHA1();
$this->consumer = new OAuthConsumer($consumer_key, $consumer_secret); $this->consumer = new OAuthConsumer($consumer_key, $consumer_secret);
@ -96,7 +96,7 @@ class TwitterOAuth
* @param callable $oauth_callback * @param callable $oauth_callback
* @return array * @return array
*/ */
function getRequestToken($oauth_callback = null) public function getRequestToken($oauth_callback = null)
{ {
$parameters = []; $parameters = [];
if (!empty($oauth_callback)) { if (!empty($oauth_callback)) {
@ -114,7 +114,7 @@ class TwitterOAuth
* *
* @return string * @return string
*/ */
function getAuthorizeURL($token, $sign_in_with_twitter = TRUE) public function getAuthorizeURL($token, $sign_in_with_twitter = TRUE)
{ {
if (is_array($token)) { if (is_array($token)) {
$token = $token['oauth_token']; $token = $token['oauth_token'];
@ -137,7 +137,7 @@ class TwitterOAuth
* "user_id" => "9436992", * "user_id" => "9436992",
* "screen_name" => "abraham") * "screen_name" => "abraham")
*/ */
function getAccessToken($oauth_verifier = FALSE) public function getAccessToken($oauth_verifier = FALSE)
{ {
$parameters = []; $parameters = [];
if (!empty($oauth_verifier)) { if (!empty($oauth_verifier)) {
@ -162,7 +162,7 @@ class TwitterOAuth
* "screen_name" => "abraham", * "screen_name" => "abraham",
* "x_auth_expires" => "0") * "x_auth_expires" => "0")
*/ */
function getXAuthToken($username, $password) public function getXAuthToken($username, $password)
{ {
$parameters = []; $parameters = [];
$parameters['x_auth_username'] = $username; $parameters['x_auth_username'] = $username;
@ -182,7 +182,7 @@ class TwitterOAuth
* @param array $parameters * @param array $parameters
* @return mixed|string * @return mixed|string
*/ */
function get($url, $parameters = []) public function get($url, $parameters = [])
{ {
$response = $this->oAuthRequest($url, 'GET', $parameters); $response = $this->oAuthRequest($url, 'GET', $parameters);
if ($this->format === 'json' && $this->decode_json) { if ($this->format === 'json' && $this->decode_json) {
@ -199,7 +199,7 @@ class TwitterOAuth
* @param array $parameters * @param array $parameters
* @return mixed|string * @return mixed|string
*/ */
function post($url, $parameters = []) public function post($url, $parameters = [])
{ {
$response = $this->oAuthRequest($url, 'POST', $parameters); $response = $this->oAuthRequest($url, 'POST', $parameters);
if ($this->format === 'json' && $this->decode_json) { if ($this->format === 'json' && $this->decode_json) {
@ -216,7 +216,7 @@ class TwitterOAuth
* @param array $parameters * @param array $parameters
* @return mixed|string * @return mixed|string
*/ */
function delete($url, $parameters = []) public function delete($url, $parameters = [])
{ {
$response = $this->oAuthRequest($url, 'DELETE', $parameters); $response = $this->oAuthRequest($url, 'DELETE', $parameters);
if ($this->format === 'json' && $this->decode_json) { if ($this->format === 'json' && $this->decode_json) {
@ -234,7 +234,7 @@ class TwitterOAuth
* @param array $parameters * @param array $parameters
* @return mixed|string * @return mixed|string
*/ */
function oAuthRequest($url, $method, $parameters) public function oAuthRequest($url, $method, $parameters)
{ {
if (strrpos($url, 'https://') !== 0 && strrpos($url, 'http://') !== 0) { if (strrpos($url, 'https://') !== 0 && strrpos($url, 'http://') !== 0) {
$url = "{$this->host}{$url}.{$this->format}"; $url = "{$this->host}{$url}.{$this->format}";
@ -258,9 +258,9 @@ class TwitterOAuth
* @param string $url * @param string $url
* @param string $method * @param string $method
* @param mixed $postfields * @param mixed $postfields
* @return string API results * @return string|bool|mixed API results
*/ */
function http($url, $method, $postfields = null) public function http($url, $method, $postfields = null)
{ {
$this->http_info = []; $this->http_info = [];
$ci = curl_init(); $ci = curl_init();
@ -305,7 +305,7 @@ class TwitterOAuth
* @param string $header * @param string $header
* @return int * @return int
*/ */
function getHeader($ch, $header) public function getHeader($ch, $header)
{ {
$i = strpos($header, ':'); $i = strpos($header, ':');
if (!empty($i)) { if (!empty($i)) {