Merge branch '4.4' into 5.2

nicolas-grekas · nicolas-grekas · commit f2f94fd78379 · 2021-03-23T21:42:04.000+01:00
* 4.4:
  fix reported class when deprecated method is static
diff --git a/DeprecationErrorHandler/Deprecation.php b/DeprecationErrorHandler/Deprecation.php
@@ -84,7 +84,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 "([^:]++))/', $message, $m) || preg_match('/^(?:The|Method) "([^":]++)/', $message, $m)) {
+                    if (preg_match('/(?|"([^"]++)" that is deprecated|should implement method "(?:static )?([^:]++))/', $message, $m) || 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
`@@ -84,7 +84,7 @@ public function __construct($message, array $trace, $file)`
`84`	`84`	`$this->getOriginalFilesStack();`
`85`	`85`	`array_splice($this->originalFilesStack, 0, $j, [$this->triggeringFile]);`
`86`	`86`
`87`		`- if (preg_match('/(?\|"([^"]++)" that is deprecated\|should implement method "([^:]++))/', $message, $m) \|\| preg_match('/^(?:The\|Method) "([^":]++)/', $message, $m)) {`
	`87`	`+ if (preg_match('/(?\|"([^"]++)" that is deprecated\|should implement method "(?:static )?([^:]++))/', $message, $m) \|\| preg_match('/^(?:The\|Method) "([^":]++)/', $message, $m)) {`
`88`	`88`	`$this->triggeringFile = (new \ReflectionClass($m[1]))->getFileName();`
`89`	`89`	`array_unshift($this->originalFilesStack, $this->triggeringFile);`
`90`	`90`	`}`