mirror of
https://github.com/friendica/friendica
synced 2024-12-23 07:20:15 +00:00
Merge pull request #12153 from nupplaphil/feat/woodpecker
Woodpecker: Update PHP version
This commit is contained in:
commit
87bb4d44a2
8 changed files with 17 additions and 15 deletions
|
@ -39,7 +39,7 @@ pipeline:
|
|||
branch: [ develop, '*-rc' ]
|
||||
event: push
|
||||
composer_install:
|
||||
image: friendicaci/php7.4:php7.4.18
|
||||
image: friendicaci/php7.4:php7.4.33
|
||||
commands:
|
||||
- export COMPOSER_HOME=.composer
|
||||
- composer validate
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
matrix:
|
||||
include:
|
||||
- PHP_MAJOR_VERSION: 7.4
|
||||
PHP_VERSION: 7.4.18
|
||||
PHP_VERSION: 7.4.33
|
||||
|
||||
branches:
|
||||
exclude: [ stable ]
|
||||
|
|
|
@ -1,11 +1,13 @@
|
|||
matrix:
|
||||
include:
|
||||
- PHP_MAJOR_VERSION: 7.3
|
||||
PHP_VERSION: 7.3.28
|
||||
PHP_VERSION: 7.3.33
|
||||
- PHP_MAJOR_VERSION: 7.4
|
||||
PHP_VERSION: 7.4.18
|
||||
PHP_VERSION: 7.4.33
|
||||
- PHP_MAJOR_VERSION: 8.0
|
||||
PHP_VERSION: 8.0.5
|
||||
PHP_VERSION: 8.0.25
|
||||
# - PHP_MAJOR_VERSION: 8.1
|
||||
# PHP_VERSION: 8.1.12
|
||||
|
||||
pipeline:
|
||||
php-lint:
|
||||
|
|
|
@ -37,7 +37,7 @@ pipeline:
|
|||
branch: stable
|
||||
event: tag
|
||||
composer_install:
|
||||
image: friendicaci/php7.4:php7.4.18
|
||||
image: friendicaci/php7.4:php7.4.33
|
||||
commands:
|
||||
- export COMPOSER_HOME=.composer
|
||||
- composer validate
|
||||
|
|
|
@ -130,7 +130,7 @@ class Page implements ArrayAccess
|
|||
* The return value will be casted to boolean if non-boolean was returned.
|
||||
* @since 5.0.0
|
||||
*/
|
||||
public function offsetExists($offset)
|
||||
public function offsetExists($offset): bool
|
||||
{
|
||||
return isset($this->page[$offset]);
|
||||
}
|
||||
|
|
|
@ -188,10 +188,10 @@ class L10n
|
|||
{
|
||||
$lang_variable = $server['HTTP_ACCEPT_LANGUAGE'] ?? null;
|
||||
|
||||
$acceptedLanguages = preg_split('/,\s*/', $lang_variable);
|
||||
|
||||
if (empty($acceptedLanguages)) {
|
||||
if (empty($lang_variable)) {
|
||||
$acceptedLanguages = [];
|
||||
} else {
|
||||
$acceptedLanguages = preg_split('/,\s*/', $lang_variable);
|
||||
}
|
||||
|
||||
// Add get as absolute quality accepted language (except this language isn't valid)
|
||||
|
|
|
@ -485,11 +485,11 @@ class Network
|
|||
$get('host') .
|
||||
($port ? ":$port" : '');
|
||||
|
||||
return (strlen($scheme) ? $scheme . ':' : '') .
|
||||
(strlen($authority) ? '//' . $authority : '') .
|
||||
return (!empty($scheme) ? $scheme . ':' : '') .
|
||||
(!empty($authority) ? '//' . $authority : '') .
|
||||
$get('path') .
|
||||
(strlen($query) ? '?' . $query : '') .
|
||||
(strlen($fragment) ? '#' . $fragment : '');
|
||||
(!empty($query) ? '?' . $query : '') .
|
||||
(!empty($fragment) ? '#' . $fragment : '');
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
@ -60,7 +60,7 @@ class ReversedFileReader implements \Iterator
|
|||
$this->fh = fopen($filename, 'r');
|
||||
if (!$this->fh) {
|
||||
// this should use a custom exception.
|
||||
throw \Exception("Unable to open $filename");
|
||||
throw new \Exception("Unable to open $filename");
|
||||
}
|
||||
$this->filesize = filesize($filename);
|
||||
$this->pos = -1;
|
||||
|
|
Loading…
Reference in a new issue