Merge branch '8.5' into 9.6

Author: sebastianbergmann

.phive/phars.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phive xmlns="https://phar.io/phive">
   <phar name="phpab" version="^1.25" installed="1.29.0" location="./tools/phpab" copy="true"/>
-  <phar name="php-cs-fixer" version="^3.0" installed="3.49.0" location="./tools/php-cs-fixer" copy="true"/>
-  <phar name="psalm" version="^5.0" installed="5.22.0" location="./tools/psalm" copy="true"/>
+  <phar name="php-cs-fixer" version="^3.0" installed="3.50.0" location="./tools/php-cs-fixer" copy="true"/>
+  <phar name="psalm" version="^5.0" installed="5.22.2" location="./tools/psalm" copy="true"/>
   <phar name="humbug/php-scoper" version="^0.18" installed="0.18.11" location="./tools/php-scoper" copy="true"/>
   <phar name="composer" version="^2.0.3" installed="2.7.1" location="./tools/composer" copy="true"/>
 </phive>

tests/unit/Framework/MockObject/Builder/InvocationMockerTest.php

@@ -152,7 +152,7 @@ public function testWillReturnFailsWhenTryingToReturnSingleIncompatibleClass():
 
     public function testWillReturnAllowsMatchersForMultipleMethodsWithDifferentReturnTypes(): void
     {
-        /** @var ClassWithAllPossibleReturnTypes|\PHPUnit\Framework\MockObject\MockObject $mock */
+        /** @var ClassWithAllPossibleReturnTypes|MockObject $mock */
         $mock = $this->getMockBuilder(ClassWithAllPossibleReturnTypes::class)
             ->getMock();
 
@@ -201,7 +201,7 @@ public function testWillReturnValidTypeForLowercaseMethod(): void
      */
     public function testWillReturnFailsWhenTryingToReturnValueFromVoidMethod(): void
     {
-        /** @var ClassWithAllPossibleReturnTypes|\PHPUnit\Framework\MockObject\MockObject $out */
+        /** @var ClassWithAllPossibleReturnTypes|MockObject $out */
         $out    = $this->createMock(ClassWithAllPossibleReturnTypes::class);
         $method = $out->method('methodWithVoidReturnTypeDeclaration');