minor #16131 [2.7] Fix docblocks about callables (nicolas-grekas)

fabpot · fabpot · commit 380e2ba103e2 · 2015-10-06T17:07:22.000+02:00
This PR was merged into the 2.7 branch. Discussion ---------- [2.7] Fix docblocks about callables | Q | A | ------------- | --- | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | - | License | MIT | Doc PR | - Commits ------- 7b12fe9 [2.7] Fix docblocks about callables
diff --git a/src/Symfony/Bridge/Twig/Command/DebugCommand.php b/src/Symfony/Bridge/Twig/Command/DebugCommand.php
@@ -150,7 +150,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
@@ -14,7 +14,7 @@
         <service id="debug.debug_handlers_listener" class="%debug.debug_handlers_listener.class%">
             <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/Question/Question.php b/src/Symfony/Component/Console/Question/Question.php
@@ -217,7 +217,7 @@ 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
      */
@@ -233,7 +233,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/Serializer/Normalizer/AbstractNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/AbstractNormalizer.php
@@ -105,7 +105,7 @@ public function setCircularReferenceHandler($circularReferenceHandler)
     /**
      * Set normalization callbacks.
      *
-     * @param array $callbacks help normalize the result
+     * @param callable[] $callbacks help normalize the result
      *
      * @return self
      *

Original file line number	Diff line number	Diff line change
`@@ -150,7 +150,7 @@ private function getMetadata($type, $entity)`
`150`	`150`	`return;`
`151`	`151`	`}`
`152`	`152`	`$refl = new \ReflectionMethod($cb[0], $cb[1]);`
`153`		`- } elseif (is_object($cb) && is_callable($cb)) {`
	`153`	`+ } elseif (is_object($cb) && method_exists($cb, '__invoke')) {`
`154`	`154`	`$refl = new \ReflectionMethod($cb, '__invoke');`
`155`	`155`	`} elseif (function_exists($cb)) {`
`156`	`156`	`$refl = new \ReflectionFunction($cb);`
Original file line number	Diff line number	Diff line change
`@@ -217,7 +217,7 @@ public function getMaxAttempts()`
`217`	`217`	`*`
`218`	`218`	`* The normalizer can be a callable (a string), a closure or a class implementing __invoke.`
`219`	`219`	`*`
`220`		`- * @param string\|\Closure $normalizer`
	`220`	`+ * @param callable $normalizer`
`221`	`221`	`*`
`222`	`222`	`* @return Question The current instance`
`223`	`223`	`*/`
`@@ -233,7 +233,7 @@ public function setNormalizer($normalizer)`
`233`	`233`	`*`
`234`	`234`	`* The normalizer can ba a callable (a string), a closure or a class implementing __invoke.`
`235`	`235`	`*`
`236`		`- * @return string\|\Closure`
	`236`	`+ * @return callable`
`237`	`237`	`*/`
`238`	`238`	`public function getNormalizer()`
`239`	`239`	`{`
Original file line number	Diff line number	Diff line change
`@@ -105,7 +105,7 @@ public function setCircularReferenceHandler($circularReferenceHandler)`
`105`	`105`	`/**`
`106`	`106`	`* Set normalization callbacks.`
`107`	`107`	`*`
`108`		`- * @param array $callbacks help normalize the result`
	`108`	`+ * @param callable[] $callbacks help normalize the result`
`109`	`109`	`*`
`110`	`110`	`* @return self`
`111`	`111`	`*`