1
0
Fork 0

Merge pull request #12153 from nupplaphil/feat/woodpecker

Woodpecker: Update PHP version
This commit is contained in:
Hypolite Petovan 2022-11-09 20:36:33 -05:00 committed by GitHub
commit 87bb4d44a2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 17 additions and 15 deletions

View file

@ -39,7 +39,7 @@ pipeline:
branch: [ develop, '*-rc' ] branch: [ develop, '*-rc' ]
event: push event: push
composer_install: composer_install:
image: friendicaci/php7.4:php7.4.18 image: friendicaci/php7.4:php7.4.33
commands: commands:
- export COMPOSER_HOME=.composer - export COMPOSER_HOME=.composer
- composer validate - composer validate

View file

@ -1,7 +1,7 @@
matrix: matrix:
include: include:
- PHP_MAJOR_VERSION: 7.4 - PHP_MAJOR_VERSION: 7.4
PHP_VERSION: 7.4.18 PHP_VERSION: 7.4.33
branches: branches:
exclude: [ stable ] exclude: [ stable ]

View file

@ -1,11 +1,13 @@
matrix: matrix:
include: include:
- PHP_MAJOR_VERSION: 7.3 - PHP_MAJOR_VERSION: 7.3
PHP_VERSION: 7.3.28 PHP_VERSION: 7.3.33
- PHP_MAJOR_VERSION: 7.4 - PHP_MAJOR_VERSION: 7.4
PHP_VERSION: 7.4.18 PHP_VERSION: 7.4.33
- PHP_MAJOR_VERSION: 8.0 - 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: pipeline:
php-lint: php-lint:

View file

@ -37,7 +37,7 @@ pipeline:
branch: stable branch: stable
event: tag event: tag
composer_install: composer_install:
image: friendicaci/php7.4:php7.4.18 image: friendicaci/php7.4:php7.4.33
commands: commands:
- export COMPOSER_HOME=.composer - export COMPOSER_HOME=.composer
- composer validate - composer validate

View file

@ -130,7 +130,7 @@ class Page implements ArrayAccess
* The return value will be casted to boolean if non-boolean was returned. * The return value will be casted to boolean if non-boolean was returned.
* @since 5.0.0 * @since 5.0.0
*/ */
public function offsetExists($offset) public function offsetExists($offset): bool
{ {
return isset($this->page[$offset]); return isset($this->page[$offset]);
} }

View file

@ -188,10 +188,10 @@ class L10n
{ {
$lang_variable = $server['HTTP_ACCEPT_LANGUAGE'] ?? null; $lang_variable = $server['HTTP_ACCEPT_LANGUAGE'] ?? null;
$acceptedLanguages = preg_split('/,\s*/', $lang_variable); if (empty($lang_variable)) {
if (empty($acceptedLanguages)) {
$acceptedLanguages = []; $acceptedLanguages = [];
} else {
$acceptedLanguages = preg_split('/,\s*/', $lang_variable);
} }
// Add get as absolute quality accepted language (except this language isn't valid) // Add get as absolute quality accepted language (except this language isn't valid)

View file

@ -485,11 +485,11 @@ class Network
$get('host') . $get('host') .
($port ? ":$port" : ''); ($port ? ":$port" : '');
return (strlen($scheme) ? $scheme . ':' : '') . return (!empty($scheme) ? $scheme . ':' : '') .
(strlen($authority) ? '//' . $authority : '') . (!empty($authority) ? '//' . $authority : '') .
$get('path') . $get('path') .
(strlen($query) ? '?' . $query : '') . (!empty($query) ? '?' . $query : '') .
(strlen($fragment) ? '#' . $fragment : ''); (!empty($fragment) ? '#' . $fragment : '');
} }
/** /**

View file

@ -60,7 +60,7 @@ class ReversedFileReader implements \Iterator
$this->fh = fopen($filename, 'r'); $this->fh = fopen($filename, 'r');
if (!$this->fh) { if (!$this->fh) {
// this should use a custom exception. // this should use a custom exception.
throw \Exception("Unable to open $filename"); throw new \Exception("Unable to open $filename");
} }
$this->filesize = filesize($filename); $this->filesize = filesize($filename);
$this->pos = -1; $this->pos = -1;