PHP 8.1 compatibility fixes
This commit is contained in:
parent
b0fff14c5a
commit
ec6825374b
5 changed files with 4 additions and 6 deletions
2
.github/workflows/ci.yml
vendored
2
.github/workflows/ci.yml
vendored
|
@ -15,8 +15,6 @@ jobs:
|
||||||
php-versions: ['7.2', '7.3', '7.4', '8.0']
|
php-versions: ['7.2', '7.3', '7.4', '8.0']
|
||||||
cs-fixer: [ true ]
|
cs-fixer: [ true ]
|
||||||
include:
|
include:
|
||||||
- php-versions: '7.1'
|
|
||||||
cs-fixer: false
|
|
||||||
- php-versions: '8.1'
|
- php-versions: '8.1'
|
||||||
cs-fixer: false
|
cs-fixer: false
|
||||||
steps:
|
steps:
|
||||||
|
|
|
@ -63,7 +63,6 @@ class AddressBooks extends \Flake\Core\Controller {
|
||||||
$aAddressBooks = [];
|
$aAddressBooks = [];
|
||||||
$oAddressBooks = $this->oUser->getAddressBooksBaseRequester()->execute();
|
$oAddressBooks = $this->oUser->getAddressBooksBaseRequester()->execute();
|
||||||
|
|
||||||
reset($oAddressBooks);
|
|
||||||
foreach ($oAddressBooks as $addressbook) {
|
foreach ($oAddressBooks as $addressbook) {
|
||||||
$aAddressBooks[] = [
|
$aAddressBooks[] = [
|
||||||
"linkedit" => $this->linkEdit($addressbook),
|
"linkedit" => $this->linkEdit($addressbook),
|
||||||
|
|
|
@ -61,7 +61,6 @@ class Users extends \Flake\Core\Controller {
|
||||||
$aUsers = [];
|
$aUsers = [];
|
||||||
$oUsers = \Baikal\Model\User::getBaseRequester()->execute();
|
$oUsers = \Baikal\Model\User::getBaseRequester()->execute();
|
||||||
|
|
||||||
reset($oUsers);
|
|
||||||
foreach ($oUsers as $user) {
|
foreach ($oUsers as $user) {
|
||||||
$aUsers[] = [
|
$aUsers[] = [
|
||||||
"linkcalendars" => \BaikalAdmin\Controller\Users::linkCalendars($user),
|
"linkcalendars" => \BaikalAdmin\Controller\Users::linkCalendars($user),
|
||||||
|
|
|
@ -31,10 +31,12 @@ class Collection extends \Flake\Core\FLObject implements \Iterator {
|
||||||
protected $aCollection = [];
|
protected $aCollection = [];
|
||||||
protected $aMeta = [];
|
protected $aMeta = [];
|
||||||
|
|
||||||
|
#[\ReturnTypeWillChange]
|
||||||
function current() {
|
function current() {
|
||||||
return current($this->aCollection);
|
return current($this->aCollection);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[\ReturnTypeWillChange]
|
||||||
function key() {
|
function key() {
|
||||||
return key($this->aCollection);
|
return key($this->aCollection);
|
||||||
}
|
}
|
||||||
|
|
|
@ -13,9 +13,9 @@
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"require": {
|
"require": {
|
||||||
"php" : "^7.1 || ^8.0",
|
"php" : "^7.2 || ^8.0",
|
||||||
"sabre/dav" : "~4.3.0",
|
"sabre/dav" : "~4.3.0",
|
||||||
"twig/twig" : "~2.13.1",
|
"twig/twig" : "~2.14.8",
|
||||||
"symfony/yaml" : "^3.4"
|
"symfony/yaml" : "^3.4"
|
||||||
},
|
},
|
||||||
"require-dev" : {
|
"require-dev" : {
|
||||||
|
|
Loading…
Reference in a new issue