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

Merge pull request #10295 from nupplaphil/bug/php7_cs

Browse source 
Fix PHP 7.0 Coding Standards
This commit is contained in:
Hypolite Petovan 2021-05-23 07:38:38 -04:00 committed by GitHub
parent edbbaaadea 965cd8b096
commit 0238a15809
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 16 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/Content/Widget/TagCloud.php
View file

@ -127,8 +127,8 @@ class TagCloud
private static function tagCalc(array $arr) private static function tagCalc(array $arr)
{ {
$tags = []; $tags = [];
$min = 1e9; $min = 1000000000.0;
$max = -1e9; $max = -1000000000.0;
$x = 0; $x = 0;
if (!$arr) { if (!$arr) {
@ -145,7 +145,7 @@ class TagCloud
} }
usort($tags, 'self::tagsSort'); usort($tags, 'self::tagsSort');
$range = max(.01, $max - $min) * 1.0001; $range = max(0.01, $max - $min) * 1.0001;
for ($x = 0; $x < count($tags); $x ++) { for ($x = 0; $x < count($tags); $x ++) {
$tags[$x][2] = 1 + floor(9 * ($tags[$x][1] - $min) / $range); $tags[$x][2] = 1 + floor(9 * ($tags[$x][1] - $min) / $range);

8
src/Network/HTTPRequest.php
View file

@ -70,7 +70,7 @@ class HTTPRequest implements IHTTPRequest
* *
* @throws \Friendica\Network\HTTPException\InternalServerErrorException * @throws \Friendica\Network\HTTPException\InternalServerErrorException
*/ */
public function get(string $url, array $opts = [], int &$redirects = 0) public function get(string $url, array $opts = [], &$redirects = 0)
{ {
$stamp1 = microtime(true); $stamp1 = microtime(true);
@ -222,7 +222,7 @@ class HTTPRequest implements IHTTPRequest
* *
* @throws \Friendica\Network\HTTPException\InternalServerErrorException * @throws \Friendica\Network\HTTPException\InternalServerErrorException
*/ */
public function post(string $url, $params, array $headers = [], int $timeout = 0, int &$redirects = 0) public function post(string $url, $params, array $headers = [], int $timeout = 0, &$redirects = 0)
{ {
$stamp1 = microtime(true); $stamp1 = microtime(true);
@ -447,7 +447,7 @@ class HTTPRequest implements IHTTPRequest
* *
* @throws \Friendica\Network\HTTPException\InternalServerErrorException * @throws \Friendica\Network\HTTPException\InternalServerErrorException
*/ */
public function fetch(string $url, int $timeout = 0, string $accept_content = '', string $cookiejar = '', int &$redirects = 0) public function fetch(string $url, int $timeout = 0, string $accept_content = '', string $cookiejar = '', &$redirects = 0)
{ {
$ret = $this->fetchFull($url, $timeout, $accept_content, $cookiejar, $redirects); $ret = $this->fetchFull($url, $timeout, $accept_content, $cookiejar, $redirects);
@ -461,7 +461,7 @@ class HTTPRequest implements IHTTPRequest
* *
* @throws \Friendica\Network\HTTPException\InternalServerErrorException * @throws \Friendica\Network\HTTPException\InternalServerErrorException
*/ */
public function fetchFull(string $url, int $timeout = 0, string $accept_content = '', string $cookiejar = '', int &$redirects = 0) public function fetchFull(string $url, int $timeout = 0, string $accept_content = '', string $cookiejar = '', &$redirects = 0)
{ {
return $this->get( return $this->get(
$url, $url,

3
src/Object/Api/Mastodon/Status.php
View file

@ -114,7 +114,8 @@ class Status extends BaseDataTransferObject
$this->visibility = $visibility[$item['private']]; $this->visibility = $visibility[$item['private']];
$languages = json_decode($item['language'], true); $languages = json_decode($item['language'], true);
$this->language = is_array($languages) ? array_key_first($languages) : null; reset($languages);
$this->language = is_array($languages) ? key($languages) : null;
$this->uri = $item['uri']; $this->uri = $item['uri'];
$this->url = $item['plink'] ?? null; $this->url = $item['plink'] ?? null;