PHP 8 Support (#782)
Thanks @kornrunner for these changes: * Test against PHP 8 * U-Tests: FFProbe: OptionsTester: handle phpunit deprecation of at * FiltersCollection: tweak for call_user_func_array and PHP 8 named arguments
This commit is contained in:
parent
6a61d67288
commit
a1a3281dbf
3 changed files with 9 additions and 9 deletions
|
|
@ -38,7 +38,7 @@ class FiltersCollection implements \Countable, \IteratorAggregate
|
|||
return 0;
|
||||
}
|
||||
|
||||
return count(call_user_func_array('array_merge', $this->filters));
|
||||
return count(call_user_func_array('array_merge', array_values($this->filters)));
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -51,7 +51,7 @@ class FiltersCollection implements \Countable, \IteratorAggregate
|
|||
$this->sorted = $this->filters;
|
||||
} else {
|
||||
krsort($this->filters);
|
||||
$this->sorted = call_user_func_array('array_merge', $this->filters);
|
||||
$this->sorted = call_user_func_array('array_merge', array_values($this->filters));
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue