Do not override correct triggering file for return type deprecations

wouterj · fabpot · commit b02024932def · 2021-09-29T18:22:46.000+02:00
diff --git a/DeprecationErrorHandler/Deprecation.php b/DeprecationErrorHandler/Deprecation.php
@@ -87,7 +87,7 @@ public function __construct($message, array $trace, $file)
                     $this->getOriginalFilesStack();
                     array_splice($this->originalFilesStack, 0, $j, [$this->triggeringFile]);
 
-                    if (preg_match('/(?|"([^"]++)" that is deprecated|should implement method "(?:static )?([^:]++))/', $message, $m) || preg_match('/^(?:The|Method) "([^":]++)/', $message, $m)) {
+                    if (preg_match('/(?|"([^"]++)" that is deprecated|should implement method "(?:static )?([^:]++))/', $message, $m) || (false === strpos($message, 'native return type declaration') && preg_match('/^(?:The|Method) "([^":]++)/', $message, $m))) {
                         $this->triggeringFile = (new \ReflectionClass($m[1]))->getFileName();
                         array_unshift($this->originalFilesStack, $this->triggeringFile);
                     }

Original file line number	Diff line number	Diff line change
`@@ -87,7 +87,7 @@ public function __construct($message, array $trace, $file)`
`87`	`87`	`$this->getOriginalFilesStack();`
`88`	`88`	`array_splice($this->originalFilesStack, 0, $j, [$this->triggeringFile]);`
`89`	`89`
`90`		`- if (preg_match('/(?\|"([^"]++)" that is deprecated\|should implement method "(?:static )?([^:]++))/', $message, $m) \|\| preg_match('/^(?:The\|Method) "([^":]++)/', $message, $m)) {`
	`90`	`+ if (preg_match('/(?\|"([^"]++)" that is deprecated\|should implement method "(?:static )?([^:]++))/', $message, $m) \|\| (false === strpos($message, 'native return type declaration') && preg_match('/^(?:The\|Method) "([^":]++)/', $message, $m))) {`
`91`	`91`	`$this->triggeringFile = (new \ReflectionClass($m[1]))->getFileName();`
`92`	`92`	`array_unshift($this->originalFilesStack, $this->triggeringFile);`
`93`	`93`	`}`