Remove all calls to call_user_func()

nicolas-grekas · nicolas-grekas · commit fd266c7da93c · 2014-11-21T19:29:52.000+01:00
diff --git a/src/Symfony/Bridge/ProxyManager/LazyProxy/Instantiator/RuntimeInstantiator.php b/src/Symfony/Bridge/ProxyManager/LazyProxy/Instantiator/RuntimeInstantiator.php
@@ -51,7 +51,7 @@ public function instantiateProxy(ContainerInterface $container, Definition $defi
         return $this->factory->createProxy(
             $definition->getClass(),
             function (&$wrappedInstance, LazyLoadingInterface $proxy) use ($realInstantiator) {
-                $wrappedInstance = call_user_func($realInstantiator);
+                $wrappedInstance = $realInstantiator();
 
                 $proxy->setProxyInitializer(null);
 
diff --git a/src/Symfony/Component/Config/Util/XmlUtils.php b/src/Symfony/Component/Config/Util/XmlUtils.php
@@ -75,7 +75,7 @@ public static function loadFile($file, $schemaOrCallable = null)
             $e = null;
             if (is_callable($schemaOrCallable)) {
                 try {
-                    $valid = call_user_func($schemaOrCallable, $dom, $internalErrors);
+                    $valid = $schemaOrCallable($dom, $internalErrors);
                 } catch (\Exception $e) {
                     $valid = false;
                 }
diff --git a/src/Symfony/Component/Console/Command/Command.php b/src/Symfony/Component/Console/Command/Command.php
@@ -246,8 +246,8 @@ public function run(InputInterface $input, OutputInterface $output)
 
         $input->validate();
 
-        if ($this->code) {
-            $statusCode = call_user_func($this->code, $input, $output);
+        if ($code = $this->code) {
+            $statusCode = $code($input, $output);
         } else {
             $statusCode = $this->execute($input, $output);
         }
diff --git a/src/Symfony/Component/Console/Helper/DialogHelper.php b/src/Symfony/Component/Console/Helper/DialogHelper.php
@@ -467,7 +467,7 @@ private function validateAttempts($interviewer, OutputInterface $output, $valida
             }
 
             try {
-                return call_user_func($validator, $interviewer());
+                return $validator($interviewer());
             } catch (\Exception $error) {
             }
         }
diff --git a/src/Symfony/Component/Console/Helper/ProcessHelper.php b/src/Symfony/Component/Console/Helper/ProcessHelper.php
@@ -117,7 +117,7 @@ public function wrapCallback(OutputInterface $output, Process $process, $callbac
             $output->write($formatter->progress(spl_object_hash($process), $that->escapeString($buffer), Process::ERR === $type));
 
             if (null !== $callback) {
-                call_user_func($callback, $type, $buffer);
+                $callback($type, $buffer);
             }
         };
     }
diff --git a/src/Symfony/Component/Console/Helper/ProgressBar.php b/src/Symfony/Component/Console/Helper/ProgressBar.php
@@ -438,7 +438,7 @@ public function display()
         $messages = $this->messages;
         $this->overwrite(preg_replace_callback("{%([a-z\-_]+)(?:\:([^%]+))?%}i", function ($matches) use ($self, $output, $messages) {
             if ($formatter = $self::getPlaceholderFormatterDefinition($matches[1])) {
-                $text = call_user_func($formatter, $self, $output);
+                $text = $formatter($self, $output);
             } elseif (isset($messages[$matches[1]])) {
                 $text = $messages[$matches[1]];
             } else {
diff --git a/src/Symfony/Component/Console/Helper/QuestionHelper.php b/src/Symfony/Component/Console/Helper/QuestionHelper.php
@@ -353,13 +353,14 @@ private function validateAttempts($interviewer, OutputInterface $output, Questio
     {
         $error = null;
         $attempts = $question->getMaxAttempts();
+        $validator = $question->getValidator();
         while (null === $attempts || $attempts--) {
             if (null !== $error) {
                 $output->writeln($this->getHelperSet()->get('formatter')->formatBlock($error->getMessage(), 'error'));
             }
 
             try {
-                return call_user_func($question->getValidator(), $interviewer());
+                return $validator($interviewer());
             } catch (\Exception $error) {
             }
         }
diff --git a/src/Symfony/Component/CssSelector/XPath/Translator.php b/src/Symfony/Component/CssSelector/XPath/Translator.php
@@ -205,7 +205,7 @@ public function nodeToXPath(NodeInterface $node)
             throw new ExpressionErrorException(sprintf('Node "%s" not supported.', $node->getNodeName()));
         }
 
-        return call_user_func($this->nodeTranslators[$node->getNodeName()], $node, $this);
+        return $this->nodeTranslators[$node->getNodeName()]($node, $this);
     }
 
     /**
@@ -223,7 +223,7 @@ public function addCombination($combiner, NodeInterface $xpath, NodeInterface $c
             throw new ExpressionErrorException(sprintf('Combiner "%s" not supported.', $combiner));
         }
 
-        return call_user_func($this->combinationTranslators[$combiner], $this->nodeToXPath($xpath), $this->nodeToXPath($combinedXpath));
+        return $this->combinationTranslators[$combiner]($this->nodeToXPath($xpath), $this->nodeToXPath($combinedXpath));
     }
 
     /**
@@ -240,7 +240,7 @@ public function addFunction(XPathExpr $xpath, FunctionNode $function)
             throw new ExpressionErrorException(sprintf('Function "%s" not supported.', $function->getName()));
         }
 
-        return call_user_func($this->functionTranslators[$function->getName()], $xpath, $function);
+        return $this->functionTranslators[$function->getName()]($xpath, $function);
     }
 
     /**
@@ -257,7 +257,7 @@ public function addPseudoClass(XPathExpr $xpath, $pseudoClass)
             throw new ExpressionErrorException(sprintf('Pseudo-class "%s" not supported.', $pseudoClass));
         }
 
-        return call_user_func($this->pseudoClassTranslators[$pseudoClass], $xpath);
+        return $this->pseudoClassTranslators[$pseudoClass]($xpath);
     }
 
     /**
@@ -276,7 +276,7 @@ public function addAttributeMatching(XPathExpr $xpath, $operator, $attribute, $v
             throw new ExpressionErrorException(sprintf('Attribute matcher operator "%s" not supported.', $operator));
         }
 
-        return call_user_func($this->attributeMatchingTranslators[$operator], $xpath, $attribute, $value);
+        return $this->attributeMatchingTranslators[$operator]($xpath, $attribute, $value);
     }
 
     /**
diff --git a/src/Symfony/Component/Debug/DebugClassLoader.php b/src/Symfony/Component/Debug/DebugClassLoader.php
@@ -150,12 +150,13 @@ public function loadClass($class)
         ErrorHandler::stackErrors();
 
         try {
+            $classLoader = $this->classLoader;
             if ($this->isFinder) {
-                if ($file = $this->classLoader[0]->findFile($class)) {
+                if ($file = $classLoader[0]->findFile($class)) {
                     require $file;
                 }
             } else {
-                call_user_func($this->classLoader, $class);
+                $classLoader($class);
                 $file = false;
             }
         } catch (\Exception $e) {
diff --git a/src/Symfony/Component/Debug/ErrorHandler.php b/src/Symfony/Component/Debug/ErrorHandler.php
@@ -466,11 +466,11 @@ public function handleException(\Exception $exception, array $error = null)
                 }
             }
         }
-        if (empty($this->exceptionHandler)) {
+        if (!$exceptionHandler = $this->exceptionHandler) {
             throw $exception; // Give back $exception to the native handler
         }
         try {
-            call_user_func($this->exceptionHandler, $exception);
+            $exceptionHandler($exception);
         } catch (\Exception $handlerException) {
             $this->exceptionHandler = null;
             $this->handleException($handlerException);
diff --git a/src/Symfony/Component/Debug/ExceptionHandler.php b/src/Symfony/Component/Debug/ExceptionHandler.php
@@ -104,7 +104,7 @@ public function setFileLinkFormat($format)
      */
     public function handle(\Exception $exception)
     {
-        if (null === $this->handler || $exception instanceof OutOfMemoryException) {
+        if ($exception instanceof OutOfMemoryException || null === $handler = $this->handler) {
             $this->failSafeHandle($exception);
 
             return;
@@ -125,7 +125,7 @@ public function handle(\Exception $exception)
         $this->caughtBuffer = null;
 
         try {
-            call_user_func($this->handler, $exception);
+            $handler($exception);
             $this->caughtLength = $caughtLength;
         } catch (\Exception $e) {
             if (!$caughtLength) {
diff --git a/src/Symfony/Component/DependencyInjection/ContainerBuilder.php b/src/Symfony/Component/DependencyInjection/ContainerBuilder.php
@@ -992,7 +992,7 @@ public function createService(Definition $definition, $id, $tryProxy = true)
                 throw new InvalidArgumentException(sprintf('The configure callable for class "%s" is not a callable.', get_class($service)));
             }
 
-            call_user_func($callable, $service);
+            $callable($service);
         }
 
         return $service;
diff --git a/src/Symfony/Component/DependencyInjection/LazyProxy/Instantiator/RealServiceInstantiator.php b/src/Symfony/Component/DependencyInjection/LazyProxy/Instantiator/RealServiceInstantiator.php
@@ -28,6 +28,6 @@ class RealServiceInstantiator implements InstantiatorInterface
      */
     public function instantiateProxy(ContainerInterface $container, Definition $definition, $id, $realInstantiator)
     {
-        return call_user_func($realInstantiator);
+        return $realInstantiator();
     }
 }
diff --git a/src/Symfony/Component/DependencyInjection/Loader/ClosureLoader.php b/src/Symfony/Component/DependencyInjection/Loader/ClosureLoader.php
@@ -40,7 +40,7 @@ public function __construct(ContainerBuilder $container)
      */
     public function load($resource, $type = null)
     {
-        call_user_func($resource, $this->container);
+        $resource($this->container);
     }
 
     /**
diff --git a/src/Symfony/Component/EventDispatcher/Debug/WrappedListener.php b/src/Symfony/Component/EventDispatcher/Debug/WrappedListener.php
@@ -56,7 +56,8 @@ public function __invoke(Event $event, $eventName, EventDispatcherInterface $dis
 
         $e = $this->stopwatch->start($this->name, 'event_listener');
 
-        call_user_func($this->listener, $event, $eventName, $dispatcher);
+        $listener = $this->listener;
+        $listener($event, $eventName, $dispatcher);
 
         if ($e->isStarted()) {
             $e->stop();
diff --git a/src/Symfony/Component/EventDispatcher/EventDispatcher.php b/src/Symfony/Component/EventDispatcher/EventDispatcher.php
@@ -161,7 +161,7 @@ public function removeSubscriber(EventSubscriberInterface $subscriber)
     protected function doDispatch($listeners, $eventName, Event $event)
     {
         foreach ($listeners as $listener) {
-            call_user_func($listener, $event, $eventName, $this);
+            $listener($event, $eventName, $this);
             if ($event->isPropagationStopped()) {
                 break;
             }
diff --git a/src/Symfony/Component/Finder/Iterator/CustomFilterIterator.php b/src/Symfony/Component/Finder/Iterator/CustomFilterIterator.php
@@ -53,7 +53,7 @@ public function accept()
         $fileinfo = $this->current();
 
         foreach ($this->filters as $filter) {
-            if (false === call_user_func($filter, $fileinfo)) {
+            if (false === $filter($fileinfo)) {
                 return false;
             }
         }
diff --git a/src/Symfony/Component/Form/CallbackTransformer.php b/src/Symfony/Component/Form/CallbackTransformer.php
@@ -61,7 +61,9 @@ public function __construct($transform, $reverseTransform)
      */
     public function transform($data)
     {
-        return call_user_func($this->transform, $data);
+        $t = $this->transform;
+
+        return $t($data);
     }
 
     /**
@@ -77,6 +79,8 @@ public function transform($data)
      */
     public function reverseTransform($data)
     {
-        return call_user_func($this->reverseTransform, $data);
+        $r = $this->reverseTransform;
+
+        return $r($data);
     }
 }
diff --git a/src/Symfony/Component/Form/Extension/Validator/Constraints/FormValidator.php b/src/Symfony/Component/Form/Extension/Validator/Constraints/FormValidator.php
@@ -198,7 +198,7 @@ private static function getValidationGroups(FormInterface $form)
     private static function resolveValidationGroups($groups, FormInterface $form)
     {
         if (!is_string($groups) && is_callable($groups)) {
-            $groups = call_user_func($groups, $form);
+            $groups = $groups($form);
         }
 
         return (array) $groups;
diff --git a/src/Symfony/Component/HttpFoundation/JsonResponse.php b/src/Symfony/Component/HttpFoundation/JsonResponse.php
@@ -95,14 +95,13 @@ public function setCallback($callback = null)
      */
     public function setData($data = array())
     {
-        $errorHandler = null;
-        $errorHandler = set_error_handler(function () use (&$errorHandler) {
+        $errorHandler = set_error_handler(function ($type, $msg, $file, $line, $context) use (&$errorHandler) {
             if (JSON_ERROR_NONE !== json_last_error()) {
                 return;
             }
 
             if ($errorHandler) {
-                call_user_func_array($errorHandler, func_get_args());
+                $errorHandler($type, $msg, $file, $line, $context);
             }
         });
 
diff --git a/src/Symfony/Component/HttpFoundation/Request.php b/src/Symfony/Component/HttpFoundation/Request.php
@@ -1874,8 +1874,8 @@ private function getUrlencodedPrefix($string, $prefix)
 
     private static function createRequestFromFactory(array $query = array(), array $request = array(), array $attributes = array(), array $cookies = array(), array $files = array(), array $server = array(), $content = null)
     {
-        if (self::$requestFactory) {
-            $request = call_user_func(self::$requestFactory, $query, $request, $attributes, $cookies, $files, $server, $content);
+        if ($requestFactory = self::$requestFactory) {
+            $request = $requestFactory($query, $request, $attributes, $cookies, $files, $server, $content);
 
             if (!$request instanceof Request) {
                 throw new \LogicException('The Request factory must return an instance of Symfony\Component\HttpFoundation\Request.');
diff --git a/src/Symfony/Component/HttpFoundation/StreamedResponse.php b/src/Symfony/Component/HttpFoundation/StreamedResponse.php
@@ -92,11 +92,11 @@ public function sendContent()
 
         $this->streamed = true;
 
-        if (null === $this->callback) {
+        if (null === $callback = $this->callback) {
             throw new \LogicException('The Response callback must not be null.');
         }
 
-        call_user_func($this->callback);
+        $callback();
     }
 
     /**
diff --git a/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/PdoSessionHandlerTest.php b/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/PdoSessionHandlerTest.php
@@ -348,9 +348,9 @@ public function getAttribute($attribute)
 
     public function prepare($statement, $driverOptions = array())
     {
-        return is_callable($this->prepareResult)
-            ? call_user_func($this->prepareResult, $statement, $driverOptions)
-            : $this->prepareResult;
+        return is_callable($prepareResult = $this->prepareResult)
+            ? $prepareResult($statement, $driverOptions)
+            : $prepareResult;
     }
 
     public function beginTransaction()
diff --git a/src/Symfony/Component/Process/Process.php b/src/Symfony/Component/Process/Process.php
@@ -1289,7 +1289,7 @@ protected function buildCallback($callback)
             }
 
             if (null !== $callback) {
-                call_user_func($callback, $type, $data);
+                $callback($type, $data);
             }
         };
 
@@ -1369,6 +1369,7 @@ private function validateTimeout($timeout)
     private function readPipes($blocking, $close)
     {
         $result = $this->processPipes->readAndWrite($blocking, $close);
+        $callback = $this->callback;
 
         foreach ($result as $type => $data) {
             if (3 == $type) {
diff --git a/src/Symfony/Component/Serializer/Normalizer/GetSetMethodNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/GetSetMethodNormalizer.php
@@ -138,8 +138,8 @@ public function normalize($object, $format = null, array $context = array())
             if ($context['circular_reference_limit'][$objectHash] >= $this->circularReferenceLimit) {
                 unset($context['circular_reference_limit'][$objectHash]);
 
-                if ($this->circularReferenceHandler) {
-                    return call_user_func($this->circularReferenceHandler, $object);
+                if ($circularReferenceHandler = $this->circularReferenceHandler) {
+                    return $circularReferenceHandler($object);
                 }
 
                 throw new CircularReferenceException(sprintf('A circular reference has been detected (configured limit: %d).', $this->circularReferenceLimit));
@@ -164,7 +164,7 @@ public function normalize($object, $format = null, array $context = array())
 
                 $attributeValue = $method->invoke($object);
                 if (array_key_exists($attributeName, $this->callbacks)) {
-                    $attributeValue = call_user_func($this->callbacks[$attributeName], $attributeValue);
+                    $attributeValue = $this->callbacks[$attributeName]($attributeValue);
                 }
                 if (null !== $attributeValue && !is_scalar($attributeValue)) {
                     if (!$this->serializer instanceof NormalizerInterface) {
diff --git a/src/Symfony/Component/Serializer/Normalizer/PropertyNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/PropertyNormalizer.php
@@ -97,7 +97,7 @@ public function normalize($object, $format = null, array $context = array())
             $attributeValue = $property->getValue($object);
 
             if (array_key_exists($property->name, $this->callbacks)) {
-                $attributeValue = call_user_func($this->callbacks[$property->name], $attributeValue);
+                $attributeValue = $this->callbacks[$property->name]($attributeValue);
             }
             if (null !== $attributeValue && !is_scalar($attributeValue)) {
                 $attributeValue = $this->serializer->normalize($attributeValue, $format);
diff --git a/src/Symfony/Component/Templating/PhpEngine.php b/src/Symfony/Component/Templating/PhpEngine.php
@@ -340,17 +340,19 @@ public function escape($value, $context = 'html')
             return $value;
         }
 
+        $escaper = $this->getEscaper($context);
+
         // If we deal with a scalar value, we can cache the result to increase
         // the performance when the same value is escaped multiple times (e.g. loops)
         if (is_scalar($value)) {
             if (!isset(self::$escaperCache[$context][$value])) {
-                self::$escaperCache[$context][$value] = call_user_func($this->getEscaper($context), $value);
+                self::$escaperCache[$context][$value] = $escaper($value);
             }
 
             return self::$escaperCache[$context][$value];
         }
 
-        return call_user_func($this->getEscaper($context), $value);
+        return $escaper($value);
     }
 
     /**
diff --git a/src/Symfony/Component/Translation/PluralizationRules.php b/src/Symfony/Component/Translation/PluralizationRules.php
@@ -40,7 +40,7 @@ public static function get($number, $locale)
         }
 
         if (isset(self::$rules[$locale])) {
-            $return = call_user_func(self::$rules[$locale], $number);
+            $return = self::$rules[$locale]($number);
 
             if (!is_int($return) || $return < 0) {
                 return 0;
diff --git a/src/Symfony/Component/Validator/Constraints/CallbackValidator.php b/src/Symfony/Component/Validator/Constraints/CallbackValidator.php
@@ -55,7 +55,7 @@ public function validate($object, Constraint $constraint)
                     throw new ConstraintDefinitionException(sprintf('"%s::%s" targeted by Callback constraint is not a valid callable', $method[0], $method[1]));
                 }
 
-                call_user_func($method, $object, $this->context);
+                $method($object, $this->context);
 
                 continue;
             }
diff --git a/src/Symfony/Component/Validator/Constraints/ChoiceValidator.php b/src/Symfony/Component/Validator/Constraints/ChoiceValidator.php
diff --git a/src/Symfony/Component/VarDumper/Cloner/AbstractCloner.php b/src/Symfony/Component/VarDumper/Cloner/AbstractCloner.php
diff --git a/src/Symfony/Component/VarDumper/Dumper/AbstractDumper.php b/src/Symfony/Component/VarDumper/Dumper/AbstractDumper.php
diff --git a/src/Symfony/Component/VarDumper/VarDumper.php b/src/Symfony/Component/VarDumper/VarDumper.php

Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,7 @@ public static function loadFile($file, $schemaOrCallable = null)`
`75`	`75`	`$e = null;`
`76`	`76`	`if (is_callable($schemaOrCallable)) {`
`77`	`77`	`try {`
`78`		`- $valid = call_user_func($schemaOrCallable, $dom, $internalErrors);`
	`78`	`+ $valid = $schemaOrCallable($dom, $internalErrors);`
`79`	`79`	`} catch (\Exception $e) {`
`80`	`80`	`$valid = false;`
`81`	`81`	`}`
Original file line number	Diff line number	Diff line change
`@@ -246,8 +246,8 @@ public function run(InputInterface $input, OutputInterface $output)`
`246`	`246`
`247`	`247`	`$input->validate();`
`248`	`248`
`249`		`- if ($this->code) {`
`250`		`- $statusCode = call_user_func($this->code, $input, $output);`
	`249`	`+ if ($code = $this->code) {`
	`250`	`+ $statusCode = $code($input, $output);`
`251`	`251`	`} else {`
`252`	`252`	`$statusCode = $this->execute($input, $output);`
`253`	`253`	`}`
Original file line number	Diff line number	Diff line change
`@@ -467,7 +467,7 @@ private function validateAttempts($interviewer, OutputInterface $output, $valida`
`467`	`467`	`}`
`468`	`468`
`469`	`469`	`try {`
`470`		`- return call_user_func($validator, $interviewer());`
	`470`	`+ return $validator($interviewer());`
`471`	`471`	`} catch (\Exception $error) {`
`472`	`472`	`}`
`473`	`473`	`}`
Original file line number	Diff line number	Diff line change
`@@ -117,7 +117,7 @@ public function wrapCallback(OutputInterface $output, Process $process, $callbac`
`117`	`117`	`$output->write($formatter->progress(spl_object_hash($process), $that->escapeString($buffer), Process::ERR === $type));`
`118`	`118`
`119`	`119`	`if (null !== $callback) {`
`120`		`- call_user_func($callback, $type, $buffer);`
	`120`	`+ $callback($type, $buffer);`
`121`	`121`	`}`
`122`	`122`	`};`
`123`	`123`	`}`
Original file line number	Diff line number	Diff line change
`@@ -353,13 +353,14 @@ private function validateAttempts($interviewer, OutputInterface $output, Questio`
`353`	`353`	`{`
`354`	`354`	`$error = null;`
`355`	`355`	`$attempts = $question->getMaxAttempts();`
	`356`	`+ $validator = $question->getValidator();`
`356`	`357`	`while (null === $attempts \|\| $attempts--) {`
`357`	`358`	`if (null !== $error) {`
`358`	`359`	`$output->writeln($this->getHelperSet()->get('formatter')->formatBlock($error->getMessage(), 'error'));`
`359`	`360`	`}`
`360`	`361`
`361`	`362`	`try {`
`362`		`- return call_user_func($question->getValidator(), $interviewer());`
	`363`	`+ return $validator($interviewer());`
`363`	`364`	`} catch (\Exception $error) {`
`364`	`365`	`}`
`365`	`366`	`}`
Original file line number	Diff line number	Diff line change
`@@ -205,7 +205,7 @@ public function nodeToXPath(NodeInterface $node)`
`205`	`205`	`throw new ExpressionErrorException(sprintf('Node "%s" not supported.', $node->getNodeName()));`
`206`	`206`	`}`
`207`	`207`
`208`		`- return call_user_func($this->nodeTranslators[$node->getNodeName()], $node, $this);`
	`208`	`+ return $this->nodeTranslators[$node->getNodeName()]($node, $this);`
`209`	`209`	`}`
`210`	`210`
`211`	`211`	`/**`
`@@ -223,7 +223,7 @@ public function addCombination($combiner, NodeInterface $xpath, NodeInterface $c`
`223`	`223`	`throw new ExpressionErrorException(sprintf('Combiner "%s" not supported.', $combiner));`
`224`	`224`	`}`
`225`	`225`
`226`		`- return call_user_func($this->combinationTranslators[$combiner], $this->nodeToXPath($xpath), $this->nodeToXPath($combinedXpath));`
	`226`	`+ return $this->combinationTranslators[$combiner]($this->nodeToXPath($xpath), $this->nodeToXPath($combinedXpath));`
`227`	`227`	`}`
`228`	`228`
`229`	`229`	`/**`
`@@ -240,7 +240,7 @@ public function addFunction(XPathExpr $xpath, FunctionNode $function)`
`240`	`240`	`throw new ExpressionErrorException(sprintf('Function "%s" not supported.', $function->getName()));`
`241`	`241`	`}`
`242`	`242`
`243`		`- return call_user_func($this->functionTranslators[$function->getName()], $xpath, $function);`
	`243`	`+ return $this->functionTranslators[$function->getName()]($xpath, $function);`
`244`	`244`	`}`
`245`	`245`
`246`	`246`	`/**`
`@@ -257,7 +257,7 @@ public function addPseudoClass(XPathExpr $xpath, $pseudoClass)`
`257`	`257`	`throw new ExpressionErrorException(sprintf('Pseudo-class "%s" not supported.', $pseudoClass));`
`258`	`258`	`}`
`259`	`259`
`260`		`- return call_user_func($this->pseudoClassTranslators[$pseudoClass], $xpath);`
	`260`	`+ return $this->pseudoClassTranslators[$pseudoClass]($xpath);`
`261`	`261`	`}`
`262`	`262`
`263`	`263`	`/**`
`@@ -276,7 +276,7 @@ public function addAttributeMatching(XPathExpr $xpath, $operator, $attribute, $v`
`276`	`276`	`throw new ExpressionErrorException(sprintf('Attribute matcher operator "%s" not supported.', $operator));`
`277`	`277`	`}`
`278`	`278`
`279`		`- return call_user_func($this->attributeMatchingTranslators[$operator], $xpath, $attribute, $value);`
	`279`	`+ return $this->attributeMatchingTranslators[$operator]($xpath, $attribute, $value);`
`280`	`280`	`}`
`281`	`281`
`282`	`282`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -466,11 +466,11 @@ public function handleException(\Exception $exception, array $error = null)`
`466`	`466`	`}`
`467`	`467`	`}`
`468`	`468`	`}`
`469`		`- if (empty($this->exceptionHandler)) {`
	`469`	`+ if (!$exceptionHandler = $this->exceptionHandler) {`
`470`	`470`	`throw $exception; // Give back $exception to the native handler`
`471`	`471`	`}`
`472`	`472`	`try {`
`473`		`- call_user_func($this->exceptionHandler, $exception);`
	`473`	`+ $exceptionHandler($exception);`
`474`	`474`	`} catch (\Exception $handlerException) {`
`475`	`475`	`$this->exceptionHandler = null;`
`476`	`476`	`$this->handleException($handlerException);`