Optimize perf by replacing call_user_func with dynamic vars
This commit is contained in:
parent
db2c64d580
commit
0c6ef01713
@ -212,7 +212,7 @@ abstract class DoctrineType extends AbstractType
|
|||||||
// for equal query builders
|
// for equal query builders
|
||||||
$queryBuilderNormalizer = function (Options $options, $queryBuilder) {
|
$queryBuilderNormalizer = function (Options $options, $queryBuilder) {
|
||||||
if (\is_callable($queryBuilder)) {
|
if (\is_callable($queryBuilder)) {
|
||||||
$queryBuilder = \call_user_func($queryBuilder, $options['em']->getRepository($options['class']));
|
$queryBuilder = $queryBuilder($options['em']->getRepository($options['class']));
|
||||||
}
|
}
|
||||||
|
|
||||||
return $queryBuilder;
|
return $queryBuilder;
|
||||||
|
@ -29,7 +29,7 @@ class EntityType extends DoctrineType
|
|||||||
// for equal query builders
|
// for equal query builders
|
||||||
$queryBuilderNormalizer = function (Options $options, $queryBuilder) {
|
$queryBuilderNormalizer = function (Options $options, $queryBuilder) {
|
||||||
if (\is_callable($queryBuilder)) {
|
if (\is_callable($queryBuilder)) {
|
||||||
$queryBuilder = \call_user_func($queryBuilder, $options['em']->getRepository($options['class']));
|
$queryBuilder = $queryBuilder($options['em']->getRepository($options['class']));
|
||||||
|
|
||||||
if (null !== $queryBuilder && !$queryBuilder instanceof QueryBuilder) {
|
if (null !== $queryBuilder && !$queryBuilder instanceof QueryBuilder) {
|
||||||
throw new UnexpectedTypeException($queryBuilder, 'Doctrine\ORM\QueryBuilder');
|
throw new UnexpectedTypeException($queryBuilder, 'Doctrine\ORM\QueryBuilder');
|
||||||
|
@ -102,7 +102,7 @@ class ServerLogHandler extends AbstractHandler
|
|||||||
{
|
{
|
||||||
if ($this->processors) {
|
if ($this->processors) {
|
||||||
foreach ($this->processors as $processor) {
|
foreach ($this->processors as $processor) {
|
||||||
$record = \call_user_func($processor, $record);
|
$record = $processor($record);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -51,7 +51,7 @@ class RuntimeInstantiator implements InstantiatorInterface
|
|||||||
return $this->factory->createProxy(
|
return $this->factory->createProxy(
|
||||||
$definition->getClass(),
|
$definition->getClass(),
|
||||||
function (&$wrappedInstance, LazyLoadingInterface $proxy) use ($realInstantiator) {
|
function (&$wrappedInstance, LazyLoadingInterface $proxy) use ($realInstantiator) {
|
||||||
$wrappedInstance = \call_user_func($realInstantiator);
|
$wrappedInstance = $realInstantiator();
|
||||||
|
|
||||||
$proxy->setProxyInitializer(null);
|
$proxy->setProxyInitializer(null);
|
||||||
|
|
||||||
|
@ -122,11 +122,11 @@ class PhpArrayAdapterWrapper extends PhpArrayAdapter
|
|||||||
{
|
{
|
||||||
public function save(CacheItemInterface $item)
|
public function save(CacheItemInterface $item)
|
||||||
{
|
{
|
||||||
\call_user_func(\Closure::bind(function () use ($item) {
|
(\Closure::bind(function () use ($item) {
|
||||||
$this->values[$item->getKey()] = $item->get();
|
$this->values[$item->getKey()] = $item->get();
|
||||||
$this->warmUp($this->values);
|
$this->warmUp($this->values);
|
||||||
$this->values = eval(substr(file_get_contents($this->file), 6));
|
$this->values = eval(substr(file_get_contents($this->file), 6));
|
||||||
}, $this, PhpArrayAdapter::class));
|
}, $this, PhpArrayAdapter::class))();
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
@ -59,9 +59,9 @@ class CacheItemTest extends TestCase
|
|||||||
$this->assertSame($item, $item->tag('foo'));
|
$this->assertSame($item, $item->tag('foo'));
|
||||||
$this->assertSame($item, $item->tag(array('bar', 'baz')));
|
$this->assertSame($item, $item->tag(array('bar', 'baz')));
|
||||||
|
|
||||||
\call_user_func(\Closure::bind(function () use ($item) {
|
(\Closure::bind(function () use ($item) {
|
||||||
$this->assertSame(array('foo' => 'foo', 'bar' => 'bar', 'baz' => 'baz'), $item->tags);
|
$this->assertSame(array('foo' => 'foo', 'bar' => 'bar', 'baz' => 'baz'), $item->tags);
|
||||||
}, $this, CacheItem::class));
|
}, $this, CacheItem::class))();
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -116,11 +116,11 @@ class PhpArrayCacheWrapper extends PhpArrayCache
|
|||||||
{
|
{
|
||||||
public function set($key, $value, $ttl = null)
|
public function set($key, $value, $ttl = null)
|
||||||
{
|
{
|
||||||
\call_user_func(\Closure::bind(function () use ($key, $value) {
|
(\Closure::bind(function () use ($key, $value) {
|
||||||
$this->values[$key] = $value;
|
$this->values[$key] = $value;
|
||||||
$this->warmUp($this->values);
|
$this->warmUp($this->values);
|
||||||
$this->values = eval(substr(file_get_contents($this->file), 6));
|
$this->values = eval(substr(file_get_contents($this->file), 6));
|
||||||
}, $this, PhpArrayCache::class));
|
}, $this, PhpArrayCache::class))();
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
@ -130,13 +130,13 @@ class PhpArrayCacheWrapper extends PhpArrayCache
|
|||||||
if (!\is_array($values) && !$values instanceof \Traversable) {
|
if (!\is_array($values) && !$values instanceof \Traversable) {
|
||||||
return parent::setMultiple($values, $ttl);
|
return parent::setMultiple($values, $ttl);
|
||||||
}
|
}
|
||||||
\call_user_func(\Closure::bind(function () use ($values) {
|
(\Closure::bind(function () use ($values) {
|
||||||
foreach ($values as $key => $value) {
|
foreach ($values as $key => $value) {
|
||||||
$this->values[$key] = $value;
|
$this->values[$key] = $value;
|
||||||
}
|
}
|
||||||
$this->warmUp($this->values);
|
$this->warmUp($this->values);
|
||||||
$this->values = eval(substr(file_get_contents($this->file), 6));
|
$this->values = eval(substr(file_get_contents($this->file), 6));
|
||||||
}, $this, PhpArrayCache::class));
|
}, $this, PhpArrayCache::class))();
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
@ -43,7 +43,7 @@ class ConfigCacheFactory implements ConfigCacheFactoryInterface
|
|||||||
|
|
||||||
$cache = new ConfigCache($file, $this->debug);
|
$cache = new ConfigCache($file, $this->debug);
|
||||||
if (!$cache->isFresh()) {
|
if (!$cache->isFresh()) {
|
||||||
\call_user_func($callback, $cache);
|
$callback($cache);
|
||||||
}
|
}
|
||||||
|
|
||||||
return $cache;
|
return $cache;
|
||||||
|
@ -154,12 +154,12 @@ class ReflectionClassResource implements SelfCheckingResourceInterface, \Seriali
|
|||||||
|
|
||||||
if (interface_exists(EventSubscriberInterface::class, false) && $class->isSubclassOf(EventSubscriberInterface::class)) {
|
if (interface_exists(EventSubscriberInterface::class, false) && $class->isSubclassOf(EventSubscriberInterface::class)) {
|
||||||
yield EventSubscriberInterface::class;
|
yield EventSubscriberInterface::class;
|
||||||
yield print_r(\call_user_func(array($class->name, 'getSubscribedEvents')), true);
|
yield print_r($class->name::getSubscribedEvents(), true);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (interface_exists(ServiceSubscriberInterface::class, false) && $class->isSubclassOf(ServiceSubscriberInterface::class)) {
|
if (interface_exists(ServiceSubscriberInterface::class, false) && $class->isSubclassOf(ServiceSubscriberInterface::class)) {
|
||||||
yield ServiceSubscriberInterface::class;
|
yield ServiceSubscriberInterface::class;
|
||||||
yield print_r(\call_user_func(array($class->name, 'getSubscribedServices')), true);
|
yield print_r($class->name::getSubscribedServices(), true);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -40,7 +40,7 @@ class ResourceCheckerConfigCacheFactory implements ConfigCacheFactoryInterface
|
|||||||
|
|
||||||
$cache = new ResourceCheckerConfigCache($file, $this->resourceCheckers);
|
$cache = new ResourceCheckerConfigCache($file, $this->resourceCheckers);
|
||||||
if (!$cache->isFresh()) {
|
if (!$cache->isFresh()) {
|
||||||
\call_user_func($callback, $cache);
|
$callback($cache);
|
||||||
}
|
}
|
||||||
|
|
||||||
return $cache;
|
return $cache;
|
||||||
|
@ -80,7 +80,7 @@ class XmlUtils
|
|||||||
$e = null;
|
$e = null;
|
||||||
if (\is_callable($schemaOrCallable)) {
|
if (\is_callable($schemaOrCallable)) {
|
||||||
try {
|
try {
|
||||||
$valid = \call_user_func($schemaOrCallable, $dom, $internalErrors);
|
$valid = $schemaOrCallable($dom, $internalErrors);
|
||||||
} catch (\Exception $e) {
|
} catch (\Exception $e) {
|
||||||
$valid = false;
|
$valid = false;
|
||||||
}
|
}
|
||||||
|
@ -250,7 +250,7 @@ class Command
|
|||||||
$input->validate();
|
$input->validate();
|
||||||
|
|
||||||
if ($this->code) {
|
if ($this->code) {
|
||||||
$statusCode = \call_user_func($this->code, $input, $output);
|
$statusCode = ($this->code)($input, $output);
|
||||||
} else {
|
} else {
|
||||||
$statusCode = $this->execute($input, $output);
|
$statusCode = $this->execute($input, $output);
|
||||||
}
|
}
|
||||||
|
@ -121,7 +121,7 @@ class ProcessHelper extends Helper
|
|||||||
$output->write($formatter->progress(spl_object_hash($process), $this->escapeString($buffer), Process::ERR === $type));
|
$output->write($formatter->progress(spl_object_hash($process), $this->escapeString($buffer), Process::ERR === $type));
|
||||||
|
|
||||||
if (null !== $callback) {
|
if (null !== $callback) {
|
||||||
\call_user_func($callback, $type, $buffer);
|
$callback($type, $buffer);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
@ -496,7 +496,7 @@ final class ProgressBar
|
|||||||
$regex = "{%([a-z\-_]+)(?:\:([^%]+))?%}i";
|
$regex = "{%([a-z\-_]+)(?:\:([^%]+))?%}i";
|
||||||
$callback = function ($matches) {
|
$callback = function ($matches) {
|
||||||
if ($formatter = $this::getPlaceholderFormatterDefinition($matches[1])) {
|
if ($formatter = $this::getPlaceholderFormatterDefinition($matches[1])) {
|
||||||
$text = \call_user_func($formatter, $this, $this->output);
|
$text = $formatter($this, $this->output);
|
||||||
} elseif (isset($this->messages[$matches[1]])) {
|
} elseif (isset($this->messages[$matches[1]])) {
|
||||||
$text = $this->messages[$matches[1]];
|
$text = $this->messages[$matches[1]];
|
||||||
} else {
|
} else {
|
||||||
|
@ -196,7 +196,7 @@ class ProgressIndicator
|
|||||||
|
|
||||||
$this->overwrite(preg_replace_callback("{%([a-z\-_]+)(?:\:([^%]+))?%}i", function ($matches) use ($self) {
|
$this->overwrite(preg_replace_callback("{%([a-z\-_]+)(?:\:([^%]+))?%}i", function ($matches) use ($self) {
|
||||||
if ($formatter = $self::getPlaceholderFormatterDefinition($matches[1])) {
|
if ($formatter = $self::getPlaceholderFormatterDefinition($matches[1])) {
|
||||||
return \call_user_func($formatter, $self);
|
return $formatter($self);
|
||||||
}
|
}
|
||||||
|
|
||||||
return $matches[0];
|
return $matches[0];
|
||||||
|
@ -381,7 +381,7 @@ class QuestionHelper extends Helper
|
|||||||
}
|
}
|
||||||
|
|
||||||
try {
|
try {
|
||||||
return \call_user_func($question->getValidator(), $interviewer());
|
return $question->getValidator()($interviewer());
|
||||||
} catch (RuntimeException $e) {
|
} catch (RuntimeException $e) {
|
||||||
throw $e;
|
throw $e;
|
||||||
} catch (\Exception $error) {
|
} catch (\Exception $error) {
|
||||||
|
@ -155,7 +155,7 @@ class Translator implements TranslatorInterface
|
|||||||
throw new ExpressionErrorException(sprintf('Node "%s" not supported.', $node->getNodeName()));
|
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);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -167,7 +167,7 @@ class Translator implements TranslatorInterface
|
|||||||
throw new ExpressionErrorException(sprintf('Combiner "%s" not supported.', $combiner));
|
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));
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -179,7 +179,7 @@ class Translator implements TranslatorInterface
|
|||||||
throw new ExpressionErrorException(sprintf('Function "%s" not supported.', $function->getName()));
|
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);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -191,7 +191,7 @@ class Translator implements TranslatorInterface
|
|||||||
throw new ExpressionErrorException(sprintf('Pseudo-class "%s" not supported.', $pseudoClass));
|
throw new ExpressionErrorException(sprintf('Pseudo-class "%s" not supported.', $pseudoClass));
|
||||||
}
|
}
|
||||||
|
|
||||||
return \call_user_func($this->pseudoClassTranslators[$pseudoClass], $xpath);
|
return $this->pseudoClassTranslators[$pseudoClass]($xpath);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -203,7 +203,7 @@ class Translator implements TranslatorInterface
|
|||||||
throw new ExpressionErrorException(sprintf('Attribute matcher operator "%s" not supported.', $operator));
|
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);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -147,7 +147,7 @@ class DebugClassLoader
|
|||||||
require $file;
|
require $file;
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
\call_user_func($this->classLoader, $class);
|
($this->classLoader)($class);
|
||||||
$file = false;
|
$file = false;
|
||||||
}
|
}
|
||||||
} finally {
|
} finally {
|
||||||
|
@ -553,7 +553,7 @@ class ErrorHandler
|
|||||||
$this->exceptionHandler = null;
|
$this->exceptionHandler = null;
|
||||||
try {
|
try {
|
||||||
if (null !== $exceptionHandler) {
|
if (null !== $exceptionHandler) {
|
||||||
return \call_user_func($exceptionHandler, $exception);
|
return $exceptionHandler($exception);
|
||||||
}
|
}
|
||||||
$handlerException = $handlerException ?: $exception;
|
$handlerException = $handlerException ?: $exception;
|
||||||
} catch (\Throwable $handlerException) {
|
} catch (\Throwable $handlerException) {
|
||||||
|
@ -142,7 +142,7 @@ class ExceptionHandler
|
|||||||
$this->caughtBuffer = null;
|
$this->caughtBuffer = null;
|
||||||
|
|
||||||
try {
|
try {
|
||||||
\call_user_func($this->handler, $exception);
|
($this->handler)($exception);
|
||||||
$this->caughtLength = $caughtLength;
|
$this->caughtLength = $caughtLength;
|
||||||
} catch (\Exception $e) {
|
} catch (\Exception $e) {
|
||||||
if (!$caughtLength) {
|
if (!$caughtLength) {
|
||||||
|
@ -1160,7 +1160,7 @@ class ContainerBuilder extends Container implements TaggedContainerInterface
|
|||||||
throw new InvalidArgumentException(sprintf('The configure callable for class "%s" is not a callable.', \get_class($service)));
|
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;
|
return $service;
|
||||||
|
@ -28,6 +28,6 @@ class RealServiceInstantiator implements InstantiatorInterface
|
|||||||
*/
|
*/
|
||||||
public function instantiateProxy(ContainerInterface $container, Definition $definition, $id, $realInstantiator)
|
public function instantiateProxy(ContainerInterface $container, Definition $definition, $id, $realInstantiator)
|
||||||
{
|
{
|
||||||
return \call_user_func($realInstantiator);
|
return $realInstantiator();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -35,7 +35,7 @@ class ClosureLoader extends Loader
|
|||||||
*/
|
*/
|
||||||
public function load($resource, $type = null)
|
public function load($resource, $type = null)
|
||||||
{
|
{
|
||||||
\call_user_func($resource, $this->container);
|
$resource($this->container);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -108,7 +108,7 @@ class WrappedListener
|
|||||||
|
|
||||||
$e = $this->stopwatch->start($this->name, 'event_listener');
|
$e = $this->stopwatch->start($this->name, 'event_listener');
|
||||||
|
|
||||||
\call_user_func($this->listener, $event, $eventName, $this->dispatcher ?: $dispatcher);
|
($this->listener)($event, $eventName, $this->dispatcher ?: $dispatcher);
|
||||||
|
|
||||||
if ($e->isStarted()) {
|
if ($e->isStarted()) {
|
||||||
$e->stop();
|
$e->stop();
|
||||||
|
@ -209,7 +209,7 @@ class EventDispatcher implements EventDispatcherInterface
|
|||||||
if ($event->isPropagationStopped()) {
|
if ($event->isPropagationStopped()) {
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
\call_user_func($listener, $event, $eventName, $this);
|
$listener($event, $eventName, $this);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -51,7 +51,7 @@ class CustomFilterIterator extends \FilterIterator
|
|||||||
$fileinfo = $this->current();
|
$fileinfo = $this->current();
|
||||||
|
|
||||||
foreach ($this->filters as $filter) {
|
foreach ($this->filters as $filter) {
|
||||||
if (false === \call_user_func($filter, $fileinfo)) {
|
if (false === $filter($fileinfo)) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -41,7 +41,7 @@ class CallbackTransformer implements DataTransformerInterface
|
|||||||
*/
|
*/
|
||||||
public function transform($data)
|
public function transform($data)
|
||||||
{
|
{
|
||||||
return \call_user_func($this->transform, $data);
|
return ($this->transform)($data);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -57,6 +57,6 @@ class CallbackTransformer implements DataTransformerInterface
|
|||||||
*/
|
*/
|
||||||
public function reverseTransform($data)
|
public function reverseTransform($data)
|
||||||
{
|
{
|
||||||
return \call_user_func($this->reverseTransform, $data);
|
return ($this->reverseTransform)($data);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -155,7 +155,7 @@ class ArrayChoiceList implements ChoiceListInterface
|
|||||||
$givenValues = array();
|
$givenValues = array();
|
||||||
|
|
||||||
foreach ($choices as $i => $givenChoice) {
|
foreach ($choices as $i => $givenChoice) {
|
||||||
$givenValues[$i] = (string) \call_user_func($this->valueCallback, $givenChoice);
|
$givenValues[$i] = (string) ($this->valueCallback)($givenChoice);
|
||||||
}
|
}
|
||||||
|
|
||||||
return array_intersect($givenValues, array_keys($this->choices));
|
return array_intersect($givenValues, array_keys($this->choices));
|
||||||
@ -202,7 +202,7 @@ class ArrayChoiceList implements ChoiceListInterface
|
|||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
$choiceValue = (string) \call_user_func($value, $choice);
|
$choiceValue = (string) $value($choice);
|
||||||
$choicesByValues[$choiceValue] = $choice;
|
$choicesByValues[$choiceValue] = $choice;
|
||||||
$keysByValues[$choiceValue] = $key;
|
$keysByValues[$choiceValue] = $key;
|
||||||
$structuredValues[$key] = $choiceValue;
|
$structuredValues[$key] = $choiceValue;
|
||||||
|
@ -118,7 +118,7 @@ class DefaultChoiceListFactory implements ChoiceListFactoryInterface
|
|||||||
// $value may be an integer or a string, since it's stored in the array
|
// $value may be an integer or a string, since it's stored in the array
|
||||||
// keys. We want to guarantee it's a string though.
|
// keys. We want to guarantee it's a string though.
|
||||||
$key = $keys[$value];
|
$key = $keys[$value];
|
||||||
$nextIndex = \is_int($index) ? $index++ : \call_user_func($index, $choice, $key, $value);
|
$nextIndex = \is_int($index) ? $index++ : $index($choice, $key, $value);
|
||||||
|
|
||||||
// BC normalize label to accept a false value
|
// BC normalize label to accept a false value
|
||||||
if (null === $label) {
|
if (null === $label) {
|
||||||
@ -127,7 +127,7 @@ class DefaultChoiceListFactory implements ChoiceListFactoryInterface
|
|||||||
} elseif (false !== $label) {
|
} elseif (false !== $label) {
|
||||||
// If "choice_label" is set to false and "expanded" is true, the value false
|
// If "choice_label" is set to false and "expanded" is true, the value false
|
||||||
// should be passed on to the "label" option of the checkboxes/radio buttons
|
// should be passed on to the "label" option of the checkboxes/radio buttons
|
||||||
$dynamicLabel = \call_user_func($label, $choice, $key, $value);
|
$dynamicLabel = $label($choice, $key, $value);
|
||||||
$label = false === $dynamicLabel ? false : (string) $dynamicLabel;
|
$label = false === $dynamicLabel ? false : (string) $dynamicLabel;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -137,11 +137,11 @@ class DefaultChoiceListFactory implements ChoiceListFactoryInterface
|
|||||||
$label,
|
$label,
|
||||||
// The attributes may be a callable or a mapping from choice indices
|
// The attributes may be a callable or a mapping from choice indices
|
||||||
// to nested arrays
|
// to nested arrays
|
||||||
\is_callable($attr) ? \call_user_func($attr, $choice, $key, $value) : (isset($attr[$key]) ? $attr[$key] : array())
|
\is_callable($attr) ? $attr($choice, $key, $value) : (isset($attr[$key]) ? $attr[$key] : array())
|
||||||
);
|
);
|
||||||
|
|
||||||
// $isPreferred may be null if no choices are preferred
|
// $isPreferred may be null if no choices are preferred
|
||||||
if ($isPreferred && \call_user_func($isPreferred, $choice, $key, $value)) {
|
if ($isPreferred && $isPreferred($choice, $key, $value)) {
|
||||||
$preferredViews[$nextIndex] = $view;
|
$preferredViews[$nextIndex] = $view;
|
||||||
} else {
|
} else {
|
||||||
$otherViews[$nextIndex] = $view;
|
$otherViews[$nextIndex] = $view;
|
||||||
@ -200,7 +200,7 @@ class DefaultChoiceListFactory implements ChoiceListFactoryInterface
|
|||||||
|
|
||||||
private static function addChoiceViewGroupedBy($groupBy, $choice, $value, $label, $keys, &$index, $attr, $isPreferred, &$preferredViews, &$otherViews)
|
private static function addChoiceViewGroupedBy($groupBy, $choice, $value, $label, $keys, &$index, $attr, $isPreferred, &$preferredViews, &$otherViews)
|
||||||
{
|
{
|
||||||
$groupLabel = \call_user_func($groupBy, $choice, $keys[$value], $value);
|
$groupLabel = $groupBy($choice, $keys[$value], $value);
|
||||||
|
|
||||||
if (null === $groupLabel) {
|
if (null === $groupLabel) {
|
||||||
// If the callable returns null, don't group the choice
|
// If the callable returns null, don't group the choice
|
||||||
|
@ -46,7 +46,7 @@ class CallbackChoiceLoader implements ChoiceLoaderInterface
|
|||||||
return $this->choiceList;
|
return $this->choiceList;
|
||||||
}
|
}
|
||||||
|
|
||||||
return $this->choiceList = new ArrayChoiceList(\call_user_func($this->callback), $value);
|
return $this->choiceList = new ArrayChoiceList(($this->callback)(), $value);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -135,7 +135,7 @@ class ResizeFormListener implements EventSubscriberInterface
|
|||||||
/** @var FormInterface $child */
|
/** @var FormInterface $child */
|
||||||
foreach ($form as $name => $child) {
|
foreach ($form as $name => $child) {
|
||||||
$isNew = !isset($previousData[$name]);
|
$isNew = !isset($previousData[$name]);
|
||||||
$isEmpty = \is_callable($this->deleteEmpty) ? \call_user_func($this->deleteEmpty, $child->getData()) : $child->isEmpty();
|
$isEmpty = \is_callable($this->deleteEmpty) ? ($this->deleteEmpty)($child->getData()) : $child->isEmpty();
|
||||||
|
|
||||||
// $isNew can only be true if allowAdd is true, so we don't
|
// $isNew can only be true if allowAdd is true, so we don't
|
||||||
// need to check allowAdd again
|
// need to check allowAdd again
|
||||||
|
@ -73,7 +73,7 @@ class HttpFoundationRequestHandler implements RequestHandlerInterface
|
|||||||
$form->submit(null, false);
|
$form->submit(null, false);
|
||||||
|
|
||||||
$form->addError(new FormError(
|
$form->addError(new FormError(
|
||||||
\call_user_func($form->getConfig()->getOption('upload_max_size_message')),
|
$form->getConfig()->getOption('upload_max_size_message')(),
|
||||||
null,
|
null,
|
||||||
array('{{ max }}' => $this->serverParams->getNormalizedIniPostMaxSize())
|
array('{{ max }}' => $this->serverParams->getNormalizedIniPostMaxSize())
|
||||||
));
|
));
|
||||||
|
@ -180,7 +180,7 @@ class FormValidator extends ConstraintValidator
|
|||||||
private static function resolveValidationGroups($groups, FormInterface $form)
|
private static function resolveValidationGroups($groups, FormInterface $form)
|
||||||
{
|
{
|
||||||
if (!\is_string($groups) && \is_callable($groups)) {
|
if (!\is_string($groups) && \is_callable($groups)) {
|
||||||
$groups = \call_user_func($groups, $form);
|
$groups = $groups($form);
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($groups instanceof GroupSequence) {
|
if ($groups instanceof GroupSequence) {
|
||||||
|
@ -40,7 +40,7 @@ class UploadValidatorExtension extends AbstractTypeExtension
|
|||||||
$translationDomain = $this->translationDomain;
|
$translationDomain = $this->translationDomain;
|
||||||
$resolver->setNormalizer('upload_max_size_message', function (Options $options, $message) use ($translator, $translationDomain) {
|
$resolver->setNormalizer('upload_max_size_message', function (Options $options, $message) use ($translator, $translationDomain) {
|
||||||
return function () use ($translator, $translationDomain, $message) {
|
return function () use ($translator, $translationDomain, $message) {
|
||||||
return $translator->trans(\call_user_func($message), array(), $translationDomain);
|
return $translator->trans($message(), array(), $translationDomain);
|
||||||
};
|
};
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
@ -78,7 +78,7 @@ class NativeRequestHandler implements RequestHandlerInterface
|
|||||||
$form->submit(null, false);
|
$form->submit(null, false);
|
||||||
|
|
||||||
$form->addError(new FormError(
|
$form->addError(new FormError(
|
||||||
\call_user_func($form->getConfig()->getOption('upload_max_size_message')),
|
$form->getConfig()->getOption('upload_max_size_message')(),
|
||||||
null,
|
null,
|
||||||
array('{{ max }}' => $this->serverParams->getNormalizedIniPostMaxSize())
|
array('{{ max }}' => $this->serverParams->getNormalizedIniPostMaxSize())
|
||||||
));
|
));
|
||||||
|
@ -40,6 +40,6 @@ class UploadValidatorExtensionTest extends TypeTestCase
|
|||||||
$extension->configureOptions($resolver);
|
$extension->configureOptions($resolver);
|
||||||
$options = $resolver->resolve();
|
$options = $resolver->resolve();
|
||||||
|
|
||||||
$this->assertEquals('translated max {{ max }}!', \call_user_func($options['upload_max_size_message']));
|
$this->assertEquals('translated max {{ max }}!', $options['upload_max_size_message']());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1905,7 +1905,7 @@ class Request
|
|||||||
private static function createRequestFromFactory(array $query = array(), array $request = array(), array $attributes = array(), array $cookies = array(), array $files = array(), array $server = array(), $content = null)
|
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) {
|
if (self::$requestFactory) {
|
||||||
$request = \call_user_func(self::$requestFactory, $query, $request, $attributes, $cookies, $files, $server, $content);
|
$request = (self::$requestFactory)($query, $request, $attributes, $cookies, $files, $server, $content);
|
||||||
|
|
||||||
if (!$request instanceof self) {
|
if (!$request instanceof self) {
|
||||||
throw new \LogicException('The Request factory must return an instance of Symfony\Component\HttpFoundation\Request.');
|
throw new \LogicException('The Request factory must return an instance of Symfony\Component\HttpFoundation\Request.');
|
||||||
|
@ -111,7 +111,7 @@ class StreamedResponse extends Response
|
|||||||
throw new \LogicException('The Response callback must not be null.');
|
throw new \LogicException('The Response callback must not be null.');
|
||||||
}
|
}
|
||||||
|
|
||||||
\call_user_func($this->callback);
|
($this->callback)();
|
||||||
|
|
||||||
return $this;
|
return $this;
|
||||||
}
|
}
|
||||||
|
@ -390,7 +390,7 @@ class MockPdo extends \PDO
|
|||||||
public function prepare($statement, $driverOptions = array())
|
public function prepare($statement, $driverOptions = array())
|
||||||
{
|
{
|
||||||
return \is_callable($this->prepareResult)
|
return \is_callable($this->prepareResult)
|
||||||
? \call_user_func($this->prepareResult, $statement, $driverOptions)
|
? ($this->prepareResult)($statement, $driverOptions)
|
||||||
: $this->prepareResult;
|
: $this->prepareResult;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -91,7 +91,7 @@ class FileLinkFormatter implements \Serializable
|
|||||||
if ($this->requestStack && $this->baseDir && $this->urlFormat) {
|
if ($this->requestStack && $this->baseDir && $this->urlFormat) {
|
||||||
$request = $this->requestStack->getMasterRequest();
|
$request = $this->requestStack->getMasterRequest();
|
||||||
if ($request instanceof Request) {
|
if ($request instanceof Request) {
|
||||||
if ($this->urlFormat instanceof \Closure && !$this->urlFormat = \call_user_func($this->urlFormat)) {
|
if ($this->urlFormat instanceof \Closure && !$this->urlFormat = ($this->urlFormat)()) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -47,7 +47,7 @@ class OptionsResolverIntrospector
|
|||||||
*/
|
*/
|
||||||
public function getDefault(string $option)
|
public function getDefault(string $option)
|
||||||
{
|
{
|
||||||
return \call_user_func($this->get, 'defaults', $option, sprintf('No default value was set for the "%s" option.', $option));
|
return ($this->get)('defaults', $option, sprintf('No default value was set for the "%s" option.', $option));
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -57,7 +57,7 @@ class OptionsResolverIntrospector
|
|||||||
*/
|
*/
|
||||||
public function getLazyClosures(string $option): array
|
public function getLazyClosures(string $option): array
|
||||||
{
|
{
|
||||||
return \call_user_func($this->get, 'lazy', $option, sprintf('No lazy closures were set for the "%s" option.', $option));
|
return ($this->get)('lazy', $option, sprintf('No lazy closures were set for the "%s" option.', $option));
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -67,7 +67,7 @@ class OptionsResolverIntrospector
|
|||||||
*/
|
*/
|
||||||
public function getAllowedTypes(string $option): array
|
public function getAllowedTypes(string $option): array
|
||||||
{
|
{
|
||||||
return \call_user_func($this->get, 'allowedTypes', $option, sprintf('No allowed types were set for the "%s" option.', $option));
|
return ($this->get)('allowedTypes', $option, sprintf('No allowed types were set for the "%s" option.', $option));
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -77,7 +77,7 @@ class OptionsResolverIntrospector
|
|||||||
*/
|
*/
|
||||||
public function getAllowedValues(string $option): array
|
public function getAllowedValues(string $option): array
|
||||||
{
|
{
|
||||||
return \call_user_func($this->get, 'allowedValues', $option, sprintf('No allowed values were set for the "%s" option.', $option));
|
return ($this->get)('allowedValues', $option, sprintf('No allowed values were set for the "%s" option.', $option));
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -85,6 +85,6 @@ class OptionsResolverIntrospector
|
|||||||
*/
|
*/
|
||||||
public function getNormalizer(string $option): \Closure
|
public function getNormalizer(string $option): \Closure
|
||||||
{
|
{
|
||||||
return \call_user_func($this->get, 'normalizers', $option, sprintf('No normalizer was set for the "%s" option.', $option));
|
return ($this->get)('normalizers', $option, sprintf('No normalizer was set for the "%s" option.', $option));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1227,7 +1227,7 @@ class Process implements \IteratorAggregate
|
|||||||
if ($this->outputDisabled) {
|
if ($this->outputDisabled) {
|
||||||
return function ($type, $data) use ($callback) {
|
return function ($type, $data) use ($callback) {
|
||||||
if (null !== $callback) {
|
if (null !== $callback) {
|
||||||
\call_user_func($callback, $type, $data);
|
$callback($type, $data);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
@ -1242,7 +1242,7 @@ class Process implements \IteratorAggregate
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (null !== $callback) {
|
if (null !== $callback) {
|
||||||
\call_user_func($callback, $type, $data);
|
$callback($type, $data);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
@ -67,7 +67,7 @@ abstract class ObjectRouteLoader extends Loader
|
|||||||
throw new \BadMethodCallException(sprintf('Method "%s" not found on "%s" when importing routing resource "%s"', $method, \get_class($loaderObject), $resource));
|
throw new \BadMethodCallException(sprintf('Method "%s" not found on "%s" when importing routing resource "%s"', $method, \get_class($loaderObject), $resource));
|
||||||
}
|
}
|
||||||
|
|
||||||
$routeCollection = \call_user_func(array($loaderObject, $method), $this);
|
$routeCollection = $loaderObject->$method($this);
|
||||||
|
|
||||||
if (!$routeCollection instanceof RouteCollection) {
|
if (!$routeCollection instanceof RouteCollection) {
|
||||||
$type = \is_object($routeCollection) ? \get_class($routeCollection) : \gettype($routeCollection);
|
$type = \is_object($routeCollection) ? \get_class($routeCollection) : \gettype($routeCollection);
|
||||||
|
@ -96,7 +96,7 @@ abstract class AbstractObjectNormalizer extends AbstractNormalizer
|
|||||||
|
|
||||||
$attributeValue = $this->getAttributeValue($object, $attribute, $format, $context);
|
$attributeValue = $this->getAttributeValue($object, $attribute, $format, $context);
|
||||||
if ($maxDepthReached) {
|
if ($maxDepthReached) {
|
||||||
$attributeValue = \call_user_func($this->maxDepthHandler, $attributeValue, $object, $attribute, $format, $context);
|
$attributeValue = ($this->maxDepthHandler)($attributeValue, $object, $attribute, $format, $context);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (isset($this->callbacks[$attribute])) {
|
if (isset($this->callbacks[$attribute])) {
|
||||||
@ -345,7 +345,7 @@ abstract class AbstractObjectNormalizer extends AbstractNormalizer
|
|||||||
return (float) $data;
|
return (float) $data;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (\call_user_func('is_'.$builtinType, $data)) {
|
if (('is_'.$builtinType)($data)) {
|
||||||
return $data;
|
return $data;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -53,7 +53,7 @@ class ArrayDenormalizer implements ContextAwareDenormalizerInterface, Serializer
|
|||||||
|
|
||||||
$builtinType = isset($context['key_type']) ? $context['key_type']->getBuiltinType() : null;
|
$builtinType = isset($context['key_type']) ? $context['key_type']->getBuiltinType() : null;
|
||||||
foreach ($data as $key => $value) {
|
foreach ($data as $key => $value) {
|
||||||
if (null !== $builtinType && !\call_user_func('is_'.$builtinType, $key)) {
|
if (null !== $builtinType && !('is_'.$builtinType)($key)) {
|
||||||
throw new NotNormalizableValueException(sprintf('The type of the key "%s" must be "%s" ("%s" given).', $key, $builtinType, \gettype($key)));
|
throw new NotNormalizableValueException(sprintf('The type of the key "%s" must be "%s" ("%s" given).', $key, $builtinType, \gettype($key)));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -313,13 +313,13 @@ class PhpEngine implements EngineInterface, \ArrayAccess
|
|||||||
// the performance when the same value is escaped multiple times (e.g. loops)
|
// the performance when the same value is escaped multiple times (e.g. loops)
|
||||||
if (is_scalar($value)) {
|
if (is_scalar($value)) {
|
||||||
if (!isset(self::$escaperCache[$context][$value])) {
|
if (!isset(self::$escaperCache[$context][$value])) {
|
||||||
self::$escaperCache[$context][$value] = \call_user_func($this->getEscaper($context), $value);
|
self::$escaperCache[$context][$value] = $this->getEscaper($context)($value);
|
||||||
}
|
}
|
||||||
|
|
||||||
return self::$escaperCache[$context][$value];
|
return self::$escaperCache[$context][$value];
|
||||||
}
|
}
|
||||||
|
|
||||||
return \call_user_func($this->getEscaper($context), $value);
|
return $this->getEscaper($context)($value);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -238,7 +238,7 @@ EOF
|
|||||||
};
|
};
|
||||||
|
|
||||||
if (null !== $this->directoryIteratorProvider) {
|
if (null !== $this->directoryIteratorProvider) {
|
||||||
return \call_user_func($this->directoryIteratorProvider, $directory, $default);
|
return ($this->directoryIteratorProvider)($directory, $default);
|
||||||
}
|
}
|
||||||
|
|
||||||
return $default($directory);
|
return $default($directory);
|
||||||
@ -251,7 +251,7 @@ EOF
|
|||||||
};
|
};
|
||||||
|
|
||||||
if (null !== $this->isReadableProvider) {
|
if (null !== $this->isReadableProvider) {
|
||||||
return \call_user_func($this->isReadableProvider, $fileOrDirectory, $default);
|
return ($this->isReadableProvider)($fileOrDirectory, $default);
|
||||||
}
|
}
|
||||||
|
|
||||||
return $default($fileOrDirectory);
|
return $default($fileOrDirectory);
|
||||||
|
@ -40,7 +40,7 @@ class PluralizationRules
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (isset(self::$rules[$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) {
|
if (!\is_int($return) || $return < 0) {
|
||||||
return 0;
|
return 0;
|
||||||
|
@ -43,7 +43,7 @@ class CallbackValidator extends ConstraintValidator
|
|||||||
throw new ConstraintDefinitionException(sprintf('%s targeted by Callback constraint is not a valid callable', json_encode($method)));
|
throw new ConstraintDefinitionException(sprintf('%s targeted by Callback constraint is not a valid callable', json_encode($method)));
|
||||||
}
|
}
|
||||||
|
|
||||||
\call_user_func($method, $object, $this->context, $constraint->payload);
|
$method($object, $this->context, $constraint->payload);
|
||||||
} elseif (null !== $object) {
|
} elseif (null !== $object) {
|
||||||
if (!method_exists($object, $method)) {
|
if (!method_exists($object, $method)) {
|
||||||
throw new ConstraintDefinitionException(sprintf('Method "%s" targeted by Callback constraint does not exist in class %s', $method, \get_class($object)));
|
throw new ConstraintDefinitionException(sprintf('Method "%s" targeted by Callback constraint does not exist in class %s', $method, \get_class($object)));
|
||||||
|
@ -53,7 +53,7 @@ class ChoiceValidator extends ConstraintValidator
|
|||||||
) {
|
) {
|
||||||
throw new ConstraintDefinitionException('The Choice constraint expects a valid callback');
|
throw new ConstraintDefinitionException('The Choice constraint expects a valid callback');
|
||||||
}
|
}
|
||||||
$choices = \call_user_func($choices);
|
$choices = $choices();
|
||||||
} else {
|
} else {
|
||||||
$choices = $constraint->choices;
|
$choices = $constraint->choices;
|
||||||
}
|
}
|
||||||
|
@ -218,7 +218,7 @@ abstract class AbstractCloner implements ClonerInterface
|
|||||||
}
|
}
|
||||||
|
|
||||||
if ($this->prevErrorHandler) {
|
if ($this->prevErrorHandler) {
|
||||||
return \call_user_func($this->prevErrorHandler, $type, $msg, $file, $line, $context);
|
return ($this->prevErrorHandler)($type, $msg, $file, $line, $context);
|
||||||
}
|
}
|
||||||
|
|
||||||
return false;
|
return false;
|
||||||
|
@ -164,7 +164,7 @@ abstract class AbstractDumper implements DataDumperInterface, DumperInterface
|
|||||||
*/
|
*/
|
||||||
protected function dumpLine($depth)
|
protected function dumpLine($depth)
|
||||||
{
|
{
|
||||||
\call_user_func($this->lineDumper, $this->line, $depth, $this->indentPad);
|
($this->lineDumper)($this->line, $depth, $this->indentPad);
|
||||||
$this->line = '';
|
$this->line = '';
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -35,7 +35,7 @@ class VarDumper
|
|||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
return \call_user_func(self::$handler, $var);
|
return (self::$handler)($var);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static function setHandler(callable $callable = null)
|
public static function setHandler(callable $callable = null)
|
||||||
|
@ -229,7 +229,7 @@ EOF
|
|||||||
};
|
};
|
||||||
|
|
||||||
if (null !== $this->directoryIteratorProvider) {
|
if (null !== $this->directoryIteratorProvider) {
|
||||||
return \call_user_func($this->directoryIteratorProvider, $directory, $default);
|
return ($this->directoryIteratorProvider)($directory, $default);
|
||||||
}
|
}
|
||||||
|
|
||||||
return $default($directory);
|
return $default($directory);
|
||||||
@ -242,7 +242,7 @@ EOF
|
|||||||
};
|
};
|
||||||
|
|
||||||
if (null !== $this->isReadableProvider) {
|
if (null !== $this->isReadableProvider) {
|
||||||
return \call_user_func($this->isReadableProvider, $fileOrDirectory, $default);
|
return ($this->isReadableProvider)($fileOrDirectory, $default);
|
||||||
}
|
}
|
||||||
|
|
||||||
return $default($fileOrDirectory);
|
return $default($fileOrDirectory);
|
||||||
|
Reference in New Issue
Block a user