Merge branch '8.5' into 9.6

Author: sebastianbergmann

src/Framework/Constraint/Constraint.php

@@ -93,9 +93,8 @@ protected function matches($other): bool
     /**
      * Throws an exception for the given compared value and test description.
      *
-     * @param mixed             $other             evaluated value or object
-     * @param string            $description       Additional information about the test
-     * @param ComparisonFailure $comparisonFailure
+     * @param mixed  $other       evaluated value or object
+     * @param string $description Additional information about the test
      *
      * @throws \SebastianBergmann\RecursionContext\InvalidArgumentException
      * @throws ExpectationFailedException

src/Framework/Constraint/Equality/IsEqual.php

@@ -61,8 +61,6 @@ public function __construct($value, float $delta = 0.0, bool $canonicalize = fal
      * failure.
      *
      * @throws ExpectationFailedException
-     *
-     * @return bool
      */
     public function evaluate($other, string $description = '', bool $returnResult = false): ?bool
     {

src/Framework/Constraint/JsonMatches.php

@@ -69,9 +69,8 @@ protected function matches($other): bool
     /**
      * Throws an exception for the given compared value and test description.
      *
-     * @param mixed             $other             evaluated value or object
-     * @param string            $description       Additional information about the test
-     * @param ComparisonFailure $comparisonFailure
+     * @param mixed  $other       evaluated value or object
+     * @param string $description Additional information about the test
      *
      * @throws \PHPUnit\Framework\Exception
      * @throws \SebastianBergmann\RecursionContext\InvalidArgumentException