geckon01/Twig
1
0
Fork 0
mirror of https://github.com/twigphp/Twig.git synced 2026-10-25 13:16:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '2.x' into 3.x

Browse Source 
* 2.x:
  Allow dev versions
  Allow PHP 8 for extra packages
  Fix Travis
  Bump version to 2.13
  Fix integration tests
  Fix PHP 8 compat
  Install the phpunit-bridge with PHP 7.4 when testing nightly
  Add PHP 8 / nightly in Travis matrix
  Drop support for PHP 7.0
This commit is contained in:
Fabien Potencier
2020-05-19 15:23:33 +02:00
parent 427325c205 9270d3e0e0
commit d57e50d778
20 changed files with 52 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Node/Expression/CallExpression.php
+2 -1
View File
@@ -258,7 +258,8 @@ abstract class CallExpression extends AbstractExpression
$isPhpVariadic = false;
if ($isVariadic) {
$argument = end($parameters);
if ($argument && $argument->isArray() && $argument->isDefaultValueAvailable() && [] === $argument->getDefaultValue()) {
$isArray = $argument && $argument->hasType() && 'array' === $argument->getType()->getName();
if ($isArray && $argument->isDefaultValueAvailable() && [] === $argument->getDefaultValue()) {
array_pop($parameters);
} elseif ($argument && $argument->isVariadic()) {
array_pop($parameters);