diff --git a/src/Symfony/Component/ExpressionLanguage/Node/BinaryNode.php b/src/Symfony/Component/ExpressionLanguage/Node/BinaryNode.php index cbbee60ccf..597cc8918d 100644 --- a/src/Symfony/Component/ExpressionLanguage/Node/BinaryNode.php +++ b/src/Symfony/Component/ExpressionLanguage/Node/BinaryNode.php @@ -87,11 +87,12 @@ class BinaryNode extends Node if (isset(self::$functions[$operator])) { $right = $this->nodes['right']->evaluate($functions, $values); - if ('not in' == $operator) { - return !call_user_func('in_array', $left, $right); + if ('not in' === $operator) { + return !in_array($left, $right); } + $f = self::$functions[$operator]; - return call_user_func(self::$functions[$operator], $left, $right); + return $f($left, $right); } switch ($operator) { diff --git a/src/Symfony/Component/Process/Tests/AbstractProcessTest.php b/src/Symfony/Component/Process/Tests/AbstractProcessTest.php index 4dcb53ffa0..982a4d53de 100644 --- a/src/Symfony/Component/Process/Tests/AbstractProcessTest.php +++ b/src/Symfony/Component/Process/Tests/AbstractProcessTest.php @@ -992,7 +992,7 @@ abstract class AbstractProcessTest extends \PHPUnit_Framework_TestCase $p = $this->getProcess('php -r "usleep(500000);"'); $p->disableOutput(); $this->setExpectedException($exception, $exceptionMessage); - call_user_func(array($p, $startMethod), function () {}); + $p->{$startMethod}(function () {}); } public function provideStartMethods() @@ -1013,7 +1013,7 @@ abstract class AbstractProcessTest extends \PHPUnit_Framework_TestCase $p->disableOutput(); $p->start(); $this->setExpectedException('Symfony\Component\Process\Exception\LogicException', 'Output has been disabled.'); - call_user_func(array($p, $fetchMethod)); + $p->{$fetchMethod}(); } public function provideOutputFetchingMethods() diff --git a/src/Symfony/Component/PropertyAccess/PropertyAccessor.php b/src/Symfony/Component/PropertyAccess/PropertyAccessor.php index 6173784370..872f32b208 100644 --- a/src/Symfony/Component/PropertyAccess/PropertyAccessor.php +++ b/src/Symfony/Component/PropertyAccess/PropertyAccessor.php @@ -505,11 +505,11 @@ class PropertyAccessor implements PropertyAccessorInterface } foreach ($itemToRemove as $item) { - call_user_func(array($object, $removeMethod), $item); + $object->{$removeMethod}($item); } foreach ($itemsToAdd as $item) { - call_user_func(array($object, $addMethod), $item); + $object->{$addMethod}($item); } }