PhilETaylor
diff --git a/‎DebugClassLoader.php
Copy file name to clipboardExpand all lines: DebugClassLoader.php
+2-2Lines changed: 2 additions & 2 deletions b/‎DebugClassLoader.php
Copy file name to clipboardExpand all lines: DebugClassLoader.php
+2-2Lines changed: 2 additions & 2 deletions
@@ -535,7 +535,7 @@ public function checkAnnotations(\ReflectionClass $refl, string $class): array
             if (null !== (self::INTERNAL_TYPES[$use] ?? null)) {
                 foreach (self::INTERNAL_TYPES[$use] as $method => $returnType) {
                     if ('void' !== $returnType) {
-                        self::$returnTypes[$class] += [$method => [$returnType, $returnType, $class, '']];
+                        self::$returnTypes[$class] += [$method => [$returnType, $returnType, $use, '']];
                     }
                 }
             }
@@ -612,7 +612,7 @@ public function checkAnnotations(\ReflectionClass $refl, string $class): array
                     $this->patchMethod($method, $returnType, $declaringFile, $normalizedType);
                 }
 
-                if (strncmp($ns, $declaringClass, $len)) {
+                if (false === strpos($doc, '@deprecated') && strncmp($ns, $declaringClass, $len)) {
                     if ($canAddReturnType && 'docblock' === $this->patchTypes['force'] && false === strpos($method->getFileName(), \DIRECTORY_SEPARATOR.'vendor'.\DIRECTORY_SEPARATOR)) {
                         $this->patchMethod($method, $returnType, $declaringFile, $normalizedType);
                     } elseif ('' !== $declaringClass && $this->patchTypes['deprecations']) {
Original file line number	Diff line number	Diff line change
`@@ -535,7 +535,7 @@ public function checkAnnotations(\ReflectionClass $refl, string $class): array`
`535`	`535`	`if (null !== (self::INTERNAL_TYPES[$use] ?? null)) {`
`536`	`536`	`foreach (self::INTERNAL_TYPES[$use] as $method => $returnType) {`
`537`	`537`	`if ('void' !== $returnType) {`
`538`		`- self::$returnTypes[$class] += [$method => [$returnType, $returnType, $class, '']];`
	`538`	`+ self::$returnTypes[$class] += [$method => [$returnType, $returnType, $use, '']];`
`539`	`539`	`}`
`540`	`540`	`}`
`541`	`541`	`}`
`@@ -612,7 +612,7 @@ public function checkAnnotations(\ReflectionClass $refl, string $class): array`
`612`	`612`	`$this->patchMethod($method, $returnType, $declaringFile, $normalizedType);`
`613`	`613`	`}`
`614`	`614`
`615`		`- if (strncmp($ns, $declaringClass, $len)) {`
	`615`	`+ if (false === strpos($doc, '@deprecated') && strncmp($ns, $declaringClass, $len)) {`
`616`	`616`	`if ($canAddReturnType && 'docblock' === $this->patchTypes['force'] && false === strpos($method->getFileName(), \DIRECTORY_SEPARATOR.'vendor'.\DIRECTORY_SEPARATOR)) {`
`617`	`617`	`$this->patchMethod($method, $returnType, $declaringFile, $normalizedType);`
`618`	`618`	`} elseif ('' !== $declaringClass && $this->patchTypes['deprecations']) {`