Add more callable type hints

nicolas-grekas · nicolas-grekas · commit 7685cddf9583 · 2015-10-05T18:52:37.000+02:00
diff --git a/src/Symfony/Bridge/Twig/Command/DebugCommand.php b/src/Symfony/Bridge/Twig/Command/DebugCommand.php
@@ -149,7 +149,7 @@ private function getMetadata($type, $entity)
                     return;
                 }
                 $refl = new \ReflectionMethod($cb[0], $cb[1]);
-            } elseif (is_object($cb) && is_callable($cb)) {
+            } elseif (is_object($cb) && method_exists($cb, '__invoke')) {
                 $refl = new \ReflectionMethod($cb, '__invoke');
             } elseif (function_exists($cb)) {
                 $refl = new \ReflectionFunction($cb);
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/debug_prod.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/debug_prod.xml
@@ -12,7 +12,7 @@
         <service id="debug.debug_handlers_listener" class="Symfony\Component\HttpKernel\EventListener\DebugHandlersListener">
             <tag name="kernel.event_subscriber" />
             <tag name="monolog.logger" channel="php" />
-            <argument /><!-- Exception handler -->
+            <argument>null</argument><!-- Exception handler -->
             <argument type="service" id="logger" on-invalid="null" />
             <argument>null</argument><!-- Log levels map for enabled error levels -->
             <argument>null</argument>
diff --git a/src/Symfony/Component/Console/Helper/ProcessHelper.php b/src/Symfony/Component/Console/Helper/ProcessHelper.php
@@ -36,7 +36,7 @@ class ProcessHelper extends Helper
      *
      * @return Process The process that ran
      */
-    public function run(OutputInterface $output, $cmd, $error = null, $callback = null, $verbosity = OutputInterface::VERBOSITY_VERY_VERBOSE)
+    public function run(OutputInterface $output, $cmd, $error = null, callable $callback = null, $verbosity = OutputInterface::VERBOSITY_VERY_VERBOSE)
     {
         if ($output instanceof ConsoleOutputInterface) {
             $output = $output->getErrorOutput();
@@ -92,7 +92,7 @@ public function run(OutputInterface $output, $cmd, $error = null, $callback = nu
      *
      * @see run()
      */
-    public function mustRun(OutputInterface $output, $cmd, $error = null, $callback = null)
+    public function mustRun(OutputInterface $output, $cmd, $error = null, callable $callback = null)
     {
         $process = $this->run($output, $cmd, $error, $callback);
 
@@ -112,7 +112,7 @@ public function mustRun(OutputInterface $output, $cmd, $error = null, $callback
      *
      * @return callable
      */
-    public function wrapCallback(OutputInterface $output, Process $process, $callback = null)
+    public function wrapCallback(OutputInterface $output, Process $process, callable $callback = null)
     {
         if ($output instanceof ConsoleOutputInterface) {
             $output = $output->getErrorOutput();
diff --git a/src/Symfony/Component/Console/Helper/ProgressBar.php b/src/Symfony/Component/Console/Helper/ProgressBar.php
@@ -86,7 +86,7 @@ public function __construct(OutputInterface $output, $max = 0)
      * @param string   $name     The placeholder name (including the delimiter char like %)
      * @param callable $callable A PHP callable
      */
-    public static function setPlaceholderFormatterDefinition($name, $callable)
+    public static function setPlaceholderFormatterDefinition($name, callable $callable)
     {
         if (!self::$formatters) {
             self::$formatters = self::initPlaceholderFormatters();
diff --git a/src/Symfony/Component/Console/Helper/QuestionHelper.php b/src/Symfony/Component/Console/Helper/QuestionHelper.php
@@ -377,7 +377,7 @@ private function getHiddenResponse(OutputInterface $output, $inputStream)
      *
      * @throws \Exception In case the max number of attempts has been reached and no valid response has been given
      */
-    private function validateAttempts($interviewer, OutputInterface $output, Question $question)
+    private function validateAttempts(callable $interviewer, OutputInterface $output, Question $question)
     {
         $error = null;
         $attempts = $question->getMaxAttempts();
diff --git a/src/Symfony/Component/Console/Question/Question.php b/src/Symfony/Component/Console/Question/Question.php
@@ -164,7 +164,7 @@ public function setAutocompleterValues($values)
      *
      * @return Question The current instance
      */
-    public function setValidator($validator)
+    public function setValidator(callable $validator = null)
     {
         $this->validator = $validator;
 
@@ -220,11 +220,11 @@ public function getMaxAttempts()
      *
      * The normalizer can be a callable (a string), a closure or a class implementing __invoke.
      *
-     * @param string|\Closure $normalizer
+     * @param callable $normalizer
      *
      * @return Question The current instance
      */
-    public function setNormalizer($normalizer)
+    public function setNormalizer(callable $normalizer)
     {
         $this->normalizer = $normalizer;
 
@@ -236,7 +236,7 @@ public function setNormalizer($normalizer)
      *
      * The normalizer can ba a callable (a string), a closure or a class implementing __invoke.
      *
-     * @return string|\Closure
+     * @return callable
      */
     public function getNormalizer()
     {
diff --git a/src/Symfony/Component/ExpressionLanguage/ExpressionFunction.php b/src/Symfony/Component/ExpressionLanguage/ExpressionFunction.php
@@ -41,7 +41,7 @@ class ExpressionFunction
      * @param callable $compiler  A callable able to compile the function
      * @param callable $evaluator A callable able to evaluate the function
      */
-    public function __construct($name, $compiler, $evaluator)
+    public function __construct($name, callable $compiler, callable $evaluator)
     {
         $this->name = $name;
         $this->compiler = $compiler;
diff --git a/src/Symfony/Component/ExpressionLanguage/ExpressionLanguage.php b/src/Symfony/Component/ExpressionLanguage/ExpressionLanguage.php
@@ -112,7 +112,7 @@ public function parse($expression, $names)
      *
      * @see ExpressionFunction
      */
-    public function register($name, $compiler, $evaluator)
+    public function register($name, callable $compiler, callable $evaluator)
     {
         $this->functions[$name] = array('compiler' => $compiler, 'evaluator' => $evaluator);
     }
diff --git a/src/Symfony/Component/Finder/Iterator/CustomFilterIterator.php b/src/Symfony/Component/Finder/Iterator/CustomFilterIterator.php
@@ -26,8 +26,8 @@ class CustomFilterIterator extends FilterIterator
     /**
      * Constructor.
      *
-     * @param \Iterator $iterator The Iterator to filter
-     * @param array     $filters  An array of PHP callbacks
+     * @param \Iterator  $iterator The Iterator to filter
+     * @param callable[] $filters  An array of PHP callbacks
      *
      * @throws \InvalidArgumentException
      */
diff --git a/src/Symfony/Component/Form/ChoiceList/ArrayKeyChoiceList.php b/src/Symfony/Component/Form/ChoiceList/ArrayKeyChoiceList.php
@@ -101,7 +101,7 @@ public static function toArrayKey($choice)
      *                                  the keys of the values or if any of the
      *                                  choices is not scalar
      */
-    public function __construct($choices, $value = null)
+    public function __construct($choices, callable $value = null)
     {
         // If no values are given, use the choices as values
         // Since the choices are stored in the collection keys, i.e. they are
diff --git a/src/Symfony/Component/Form/ChoiceList/LazyChoiceList.php b/src/Symfony/Component/Form/ChoiceList/LazyChoiceList.php
@@ -59,7 +59,7 @@ class LazyChoiceList implements ChoiceListInterface
      * @param null|callable         $value  The callable generating the choice
      *                                      values
      */
-    public function __construct(ChoiceLoaderInterface $loader, $value = null)
+    public function __construct(ChoiceLoaderInterface $loader, callable $value = null)
     {
         $this->loader = $loader;
         $this->value = $value;
diff --git a/src/Symfony/Component/HttpFoundation/StreamedResponse.php b/src/Symfony/Component/HttpFoundation/StreamedResponse.php
@@ -36,7 +36,7 @@ class StreamedResponse extends Response
      * @param int           $status   The response status code
      * @param array         $headers  An array of response headers
      */
-    public function __construct($callback = null, $status = 200, $headers = array())
+    public function __construct(callable $callback = null, $status = 200, $headers = array())
     {
         parent::__construct(null, $status, $headers);
 
diff --git a/src/Symfony/Component/HttpKernel/Controller/ControllerResolver.php b/src/Symfony/Component/HttpKernel/Controller/ControllerResolver.php
@@ -131,7 +131,7 @@ protected function doGetArguments(Request $request, $controller, array $paramete
      *
      * @param string $controller A Controller string
      *
-     * @return mixed A PHP callable
+     * @return callable A PHP callable
      *
      * @throws \InvalidArgumentException
      */
diff --git a/src/Symfony/Component/HttpKernel/Event/FilterControllerEvent.php b/src/Symfony/Component/HttpKernel/Event/FilterControllerEvent.php
@@ -29,12 +29,10 @@ class FilterControllerEvent extends KernelEvent
 {
     /**
      * The current controller.
-     *
-     * @var callable
      */
     private $controller;
 
-    public function __construct(HttpKernelInterface $kernel, $controller, Request $request, $requestType)
+    public function __construct(HttpKernelInterface $kernel, callable $controller, Request $request, $requestType)
     {
         parent::__construct($kernel, $request, $requestType);
 
diff --git a/src/Symfony/Component/HttpKernel/EventListener/DebugHandlersListener.php b/src/Symfony/Component/HttpKernel/EventListener/DebugHandlersListener.php
@@ -45,7 +45,7 @@ class DebugHandlersListener implements EventSubscriberInterface
      * @param bool                 $scream           Enables/disables screaming mode, where even silenced errors are logged
      * @param string               $fileLinkFormat   The format for links to source files
      */
-    public function __construct($exceptionHandler, LoggerInterface $logger = null, $levels = null, $throwAt = -1, $scream = true, $fileLinkFormat = null)
+    public function __construct(callable $exceptionHandler = null, LoggerInterface $logger = null, $levels = null, $throwAt = -1, $scream = true, $fileLinkFormat = null)
     {
         $this->exceptionHandler = $exceptionHandler;
         $this->logger = $logger;
diff --git a/src/Symfony/Component/HttpKernel/Tests/HttpKernelTest.php b/src/Symfony/Component/HttpKernel/Tests/HttpKernelTest.php
@@ -154,17 +154,6 @@ public function testHandleWhenNoControllerIsFound()
         $kernel->handle(new Request());
     }
 
-    /**
-     * @expectedException \LogicException
-     */
-    public function testHandleWhenTheControllerIsNotACallable()
-    {
-        $dispatcher = new EventDispatcher();
-        $kernel = new HttpKernel($dispatcher, $this->getResolver('foobar'));
-
-        $kernel->handle(new Request());
-    }
-
     public function testHandleWhenTheControllerIsAClosure()
     {
         $response = new Response('foo');
diff --git a/src/Symfony/Component/Process/PhpProcess.php b/src/Symfony/Component/Process/PhpProcess.php
@@ -54,7 +54,7 @@ public function setPhpBinary($php)
     /**
      * {@inheritdoc}
      */
-    public function start($callback = null)
+    public function start(callable $callback = null)
     {
         if (null === $this->getCommandLine()) {
             throw new RuntimeException('Unable to find the PHP executable.');
diff --git a/src/Symfony/Component/Process/Process.php b/src/Symfony/Component/Process/Process.php
@@ -217,7 +217,7 @@ public function run($callback = null)
      * @throws RuntimeException       if PHP was compiled with --enable-sigchild and the enhanced sigchild compatibility mode is not enabled
      * @throws ProcessFailedException if the process didn't terminate successfully
      */
-    public function mustRun($callback = null)
+    public function mustRun(callable $callback = null)
     {
         if ($this->isSigchildEnabled() && !$this->enhanceSigchildCompatibility) {
             throw new RuntimeException('This PHP has been compiled with --enable-sigchild. You must use setEnhanceSigchildCompatibility() to use this method.');
@@ -252,7 +252,7 @@ public function mustRun($callback = null)
      * @throws RuntimeException When process is already running
      * @throws LogicException   In case a callback is provided and output has been disabled
      */
-    public function start($callback = null)
+    public function start(callable $callback = null)
     {
         if ($this->isRunning()) {
             throw new RuntimeException('Process is already running');
@@ -310,7 +310,7 @@ public function start($callback = null)
      *
      * @see start()
      */
-    public function restart($callback = null)
+    public function restart(callable $callback = null)
     {
         if ($this->isRunning()) {
             throw new RuntimeException('Process is already running');
@@ -337,7 +337,7 @@ public function restart($callback = null)
      * @throws RuntimeException When process stopped after receiving signal
      * @throws LogicException   When process is not yet started
      */
-    public function wait($callback = null)
+    public function wait(callable $callback = null)
     {
         $this->requireProcessIsStarted(__FUNCTION__);
 
@@ -1232,7 +1232,7 @@ private function getDescriptors()
      *
      * @param callable|null $callback The user defined PHP callback
      *
-     * @return callable A PHP callable
+     * @return \Closure A PHP closure
      */
     protected function buildCallback($callback)
     {
diff --git a/src/Symfony/Component/Serializer/Normalizer/AbstractNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/AbstractNormalizer.php
@@ -97,7 +97,7 @@ public function setCircularReferenceHandler(callable $circularReferenceHandler)
     /**
      * Set normalization callbacks.
      *
-     * @param array $callbacks help normalize the result
+     * @param callable[] $callbacks help normalize the result
      *
      * @return self
      *
diff --git a/src/Symfony/Component/Templating/PhpEngine.php b/src/Symfony/Component/Templating/PhpEngine.php
@@ -350,10 +350,10 @@ public function getCharset()
     /**
      * Adds an escaper for the given context.
      *
-     * @param string $context The escaper context (html, js, ...)
-     * @param mixed  $escaper A PHP callable
+     * @param string   $context The escaper context (html, js, ...)
+     * @param callable $escaper A PHP callable
      */
-    public function setEscaper($context, $escaper)
+    public function setEscaper($context, callable $escaper)
     {
         $this->escapers[$context] = $escaper;
         self::$escaperCache[$context] = array();
@@ -364,7 +364,7 @@ public function setEscaper($context, $escaper)
      *
      * @param string $context The context name
      *
-     * @return mixed $escaper A PHP callable
+     * @return callable $escaper A PHP callable
      *
      * @throws \InvalidArgumentException
      */
diff --git a/src/Symfony/Component/VarDumper/Cloner/AbstractCloner.php b/src/Symfony/Component/VarDumper/Cloner/AbstractCloner.php
@@ -304,7 +304,7 @@ private function callCaster($callback, $obj, $a, $stub, $isNested)
                 $a = $cast;
             }
         } catch (\Exception $e) {
-            $a[(Stub::TYPE_OBJECT === $stub->type ? Caster::PREFIX_VIRTUAL : '').'⚠'] = new ThrowingCasterException($callback, $e);
+            $a[(Stub::TYPE_OBJECT === $stub->type ? Caster::PREFIX_VIRTUAL : '').'⚠'] = new ThrowingCasterException($e);
         }
 
         return $a;
diff --git a/src/Symfony/Component/VarDumper/Exception/ThrowingCasterException.php b/src/Symfony/Component/VarDumper/Exception/ThrowingCasterException.php
@@ -17,10 +17,9 @@
 class ThrowingCasterException extends \Exception
 {
     /**
-     * @param callable   $caster The failing caster
-     * @param \Exception $prev   The exception thrown from the caster
+     * @param \Exception $prev The exception thrown from the caster
      */
-    public function __construct($caster, \Exception $prev)
+    public function __construct(\Exception $prev)
     {
         parent::__construct('Unexpected '.get_class($prev).' thrown from a caster: '.$prev->getMessage(), 0, $prev);
     }
diff --git a/src/Symfony/Component/VarDumper/VarDumper.php b/src/Symfony/Component/VarDumper/VarDumper.php
@@ -38,12 +38,8 @@ public static function dump($var)
         return call_user_func(self::$handler, $var);
     }
 
-    public static function setHandler($callable)
+    public static function setHandler(callable $callable = null)
     {
-        if (null !== $callable && !is_callable($callable, true)) {
-            throw new \InvalidArgumentException('Invalid PHP callback.');
-        }
-
         $prevHandler = self::$handler;
         self::$handler = $callable;
 

Original file line number	Diff line number	Diff line change
`@@ -149,7 +149,7 @@ private function getMetadata($type, $entity)`
`149`	`149`	`return;`
`150`	`150`	`}`
`151`	`151`	`$refl = new \ReflectionMethod($cb[0], $cb[1]);`
`152`		`- } elseif (is_object($cb) && is_callable($cb)) {`
	`152`	`+ } elseif (is_object($cb) && method_exists($cb, '__invoke')) {`
`153`	`153`	`$refl = new \ReflectionMethod($cb, '__invoke');`
`154`	`154`	`} elseif (function_exists($cb)) {`
`155`	`155`	`$refl = new \ReflectionFunction($cb);`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ class ProcessHelper extends Helper`
`36`	`36`	`*`
`37`	`37`	`* @return Process The process that ran`
`38`	`38`	`*/`
`39`		`- public function run(OutputInterface $output, $cmd, $error = null, $callback = null, $verbosity = OutputInterface::VERBOSITY_VERY_VERBOSE)`
	`39`	`+ public function run(OutputInterface $output, $cmd, $error = null, callable $callback = null, $verbosity = OutputInterface::VERBOSITY_VERY_VERBOSE)`
`40`	`40`	`{`
`41`	`41`	`if ($output instanceof ConsoleOutputInterface) {`
`42`	`42`	`$output = $output->getErrorOutput();`
`@@ -92,7 +92,7 @@ public function run(OutputInterface $output, $cmd, $error = null, $callback = nu`
`92`	`92`	`*`
`93`	`93`	`* @see run()`
`94`	`94`	`*/`
`95`		`- public function mustRun(OutputInterface $output, $cmd, $error = null, $callback = null)`
	`95`	`+ public function mustRun(OutputInterface $output, $cmd, $error = null, callable $callback = null)`
`96`	`96`	`{`
`97`	`97`	`$process = $this->run($output, $cmd, $error, $callback);`
`98`	`98`
`@@ -112,7 +112,7 @@ public function mustRun(OutputInterface $output, $cmd, $error = null, $callback`
`112`	`112`	`*`
`113`	`113`	`* @return callable`
`114`	`114`	`*/`
`115`		`- public function wrapCallback(OutputInterface $output, Process $process, $callback = null)`
	`115`	`+ public function wrapCallback(OutputInterface $output, Process $process, callable $callback = null)`
`116`	`116`	`{`
`117`	`117`	`if ($output instanceof ConsoleOutputInterface) {`
`118`	`118`	`$output = $output->getErrorOutput();`
Original file line number	Diff line number	Diff line change
`@@ -86,7 +86,7 @@ public function __construct(OutputInterface $output, $max = 0)`
`86`	`86`	`* @param string $name The placeholder name (including the delimiter char like %)`
`87`	`87`	`* @param callable $callable A PHP callable`
`88`	`88`	`*/`
`89`		`- public static function setPlaceholderFormatterDefinition($name, $callable)`
	`89`	`+ public static function setPlaceholderFormatterDefinition($name, callable $callable)`
`90`	`90`	`{`
`91`	`91`	`if (!self::$formatters) {`
`92`	`92`	`self::$formatters = self::initPlaceholderFormatters();`
Original file line number	Diff line number	Diff line change
`@@ -377,7 +377,7 @@ private function getHiddenResponse(OutputInterface $output, $inputStream)`
`377`	`377`	`*`
`378`	`378`	`* @throws \Exception In case the max number of attempts has been reached and no valid response has been given`
`379`	`379`	`*/`
`380`		`- private function validateAttempts($interviewer, OutputInterface $output, Question $question)`
	`380`	`+ private function validateAttempts(callable $interviewer, OutputInterface $output, Question $question)`
`381`	`381`	`{`
`382`	`382`	`$error = null;`
`383`	`383`	`$attempts = $question->getMaxAttempts();`
Original file line number	Diff line number	Diff line change
`@@ -164,7 +164,7 @@ public function setAutocompleterValues($values)`
`164`	`164`	`*`
`165`	`165`	`* @return Question The current instance`
`166`	`166`	`*/`
`167`		`- public function setValidator($validator)`
	`167`	`+ public function setValidator(callable $validator = null)`
`168`	`168`	`{`
`169`	`169`	`$this->validator = $validator;`
`170`	`170`
`@@ -220,11 +220,11 @@ public function getMaxAttempts()`
`220`	`220`	`*`
`221`	`221`	`* The normalizer can be a callable (a string), a closure or a class implementing __invoke.`
`222`	`222`	`*`
`223`		`- * @param string\|\Closure $normalizer`
	`223`	`+ * @param callable $normalizer`
`224`	`224`	`*`
`225`	`225`	`* @return Question The current instance`
`226`	`226`	`*/`
`227`		`- public function setNormalizer($normalizer)`
	`227`	`+ public function setNormalizer(callable $normalizer)`
`228`	`228`	`{`
`229`	`229`	`$this->normalizer = $normalizer;`
`230`	`230`
`@@ -236,7 +236,7 @@ public function setNormalizer($normalizer)`
`236`	`236`	`*`
`237`	`237`	`* The normalizer can ba a callable (a string), a closure or a class implementing __invoke.`
`238`	`238`	`*`
`239`		`- * @return string\|\Closure`
	`239`	`+ * @return callable`
`240`	`240`	`*/`
`241`	`241`	`public function getNormalizer()`
`242`	`242`	`{`
Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ class ExpressionFunction`
`41`	`41`	`* @param callable $compiler A callable able to compile the function`
`42`	`42`	`* @param callable $evaluator A callable able to evaluate the function`
`43`	`43`	`*/`
`44`		`- public function __construct($name, $compiler, $evaluator)`
	`44`	`+ public function __construct($name, callable $compiler, callable $evaluator)`
`45`	`45`	`{`
`46`	`46`	`$this->name = $name;`
`47`	`47`	`$this->compiler = $compiler;`
Original file line number	Diff line number	Diff line change
`@@ -112,7 +112,7 @@ public function parse($expression, $names)`
`112`	`112`	`*`
`113`	`113`	`* @see ExpressionFunction`
`114`	`114`	`*/`
`115`		`- public function register($name, $compiler, $evaluator)`
	`115`	`+ public function register($name, callable $compiler, callable $evaluator)`
`116`	`116`	`{`
`117`	`117`	`$this->functions[$name] = array('compiler' => $compiler, 'evaluator' => $evaluator);`
`118`	`118`	`}`
Original file line number	Diff line number	Diff line change
`@@ -26,8 +26,8 @@ class CustomFilterIterator extends FilterIterator`
`26`	`26`	`/**`
`27`	`27`	`* Constructor.`
`28`	`28`	`*`
`29`		`- * @param \Iterator $iterator The Iterator to filter`
`30`		`- * @param array $filters An array of PHP callbacks`
	`29`	`+ * @param \Iterator $iterator The Iterator to filter`
	`30`	`+ * @param callable[] $filters An array of PHP callbacks`
`31`	`31`	`*`
`32`	`32`	`* @throws \InvalidArgumentException`
`33`	`33`	`*/`
Original file line number	Diff line number	Diff line change
`@@ -101,7 +101,7 @@ public static function toArrayKey($choice)`
`101`	`101`	`* the keys of the values or if any of the`
`102`	`102`	`* choices is not scalar`
`103`	`103`	`*/`
`104`		`- public function __construct($choices, $value = null)`
	`104`	`+ public function __construct($choices, callable $value = null)`
`105`	`105`	`{`
`106`	`106`	`// If no values are given, use the choices as values`
`107`	`107`	`// Since the choices are stored in the collection keys, i.e. they are`