Merge branch '4.4' into 5.0

nicolas-grekas · nicolas-grekas · commit 86338f459313 · 2020-01-31T10:49:43.000+01:00
* 4.4:
  [DI] fix CheckTypeDeclarationsPass
diff --git a/Compiler/CheckTypeDeclarationsPass.php b/Compiler/CheckTypeDeclarationsPass.php
@@ -233,11 +233,11 @@ private function checkType(Definition $checkedDefinition, $value, \ReflectionPar
             return;
         }
 
-        if ('string' === $type && \is_callable([$class, '__toString'])) {
+        if ('string' === $type && method_exists($class, '__toString')) {
             return;
         }
 
-        if ('callable' === $type && (\Closure::class === $class || \is_callable([$class, '__invoke']))) {
+        if ('callable' === $type && (\Closure::class === $class || method_exists($class, '__invoke'))) {
             return;
         }
 

Original file line number	Diff line number	Diff line change
`@@ -233,11 +233,11 @@ private function checkType(Definition $checkedDefinition, $value, \ReflectionPar`
`233`	`233`	`return;`
`234`	`234`	`}`
`235`	`235`
`236`		`- if ('string' === $type && \is_callable([$class, '__toString'])) {`
	`236`	`+ if ('string' === $type && method_exists($class, '__toString')) {`
`237`	`237`	`return;`
`238`	`238`	`}`
`239`	`239`
`240`		`- if ('callable' === $type && (\Closure::class === $class \|\| \is_callable([$class, '__invoke']))) {`
	`240`	`+ if ('callable' === $type && (\Closure::class === $class \|\| method_exists($class, '__invoke'))) {`
`241`	`241`	`return;`
`242`	`242`	`}`
`243`	`243`