symfony · fabpot · Feb 12, 2021 · Feb 11, 2021
diff --git a/src/Symfony/Component/ExpressionLanguage/ExpressionFunction.php b/src/Symfony/Component/ExpressionLanguage/ExpressionFunction.php
@@ -85,12 +85,12 @@ public static function fromPhp($phpFunctionName, $expressionFunctionName = null)
            throw new \InvalidArgumentException(sprintf('An expression function name must be defined when PHP function "%s" is namespaced.', $phpFunctionName));
        }

-        $compiler = function () use ($phpFunctionName) {
-            return sprintf('\%s(%s)', $phpFunctionName, implode(', ', \func_get_args()));
+        $compiler = function (...$args) use ($phpFunctionName) {
+            return sprintf('\%s(%s)', $phpFunctionName, implode(', ', $args));
        };

-        $evaluator = function () use ($phpFunctionName) {
-            return $phpFunctionName(...\array_slice(\func_get_args(), 1));
+        $evaluator = function ($p, ...$args) use ($phpFunctionName) {
+            return $phpFunctionName(...$args);
        };

        return new self($expressionFunctionName ?: end($parts), $compiler, $evaluator);

diff --git a/src/Symfony/Component/Filesystem/Filesystem.php b/src/Symfony/Component/Filesystem/Filesystem.php
@@ -746,14 +746,16 @@ private function getSchemeAndHierarchy(string $filename): array
    }

    /**
+     * @param mixed ...$args
+     *
     * @return mixed
     */
-    private static function box(callable $func)
+    private static function box(callable $func, ...$args)
    {
        self::$lastError = null;
        set_error_handler(__CLASS__.'::handleError');
        try {
-            $result = $func(...\array_slice(\func_get_args(), 1));
+            $result = $func(...$args);
            restore_error_handler();

            return $result;

diff --git a/src/Symfony/Component/Intl/Tests/Locale/AbstractLocaleTest.php b/src/Symfony/Component/Intl/Tests/Locale/AbstractLocaleTest.php
@@ -27,5 +27,10 @@ public function testSetDefault()
        $this->assertSame('en_GB', $this->call('getDefault'));
    }

-    abstract protected function call($methodName);
+    /**
+     * @param mixed ...$args
+     *
+     * @return mixed
+     */
+    abstract protected function call(string $methodName, ...$args);
 }
diff --git a/src/Symfony/Component/Intl/Tests/Locale/LocaleTest.php b/src/Symfony/Component/Intl/Tests/Locale/LocaleTest.php
@@ -139,10 +139,8 @@ public function testSetDefaultAcceptsEn()
        $this->assertSame('en', $this->call('getDefault'));
    }

-    protected function call($methodName)
+    protected function call(string $methodName, ...$args)
    {
-        $args = \array_slice(\func_get_args(), 1);
-
        return Locale::{$methodName}(...$args);
    }
 }
diff --git a/src/Symfony/Component/Intl/Tests/Locale/Verification/LocaleTest.php b/src/Symfony/Component/Intl/Tests/Locale/Verification/LocaleTest.php
@@ -29,10 +29,8 @@ protected function setUp(): void
        parent::setUp();
    }

-    protected function call($methodName)
+    protected function call(string $methodName, ...$args)
    {
-        $args = \array_slice(\func_get_args(), 1);
-
        return \Locale::{$methodName}(...$args);
    }
 }