diff --git a/CHANGELOG.md b/CHANGELOG.md index 902c1569a..05fa84d60 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,13 @@ # Change Log +## 1.6.2 (2023-06-07) + +* [#1276: Add `IsEqual` Argument Matcher](https://github.com/mockery/mockery/pull/1276) +* [#1275: Add `IsSame` Argument Matcher](https://github.com/mockery/mockery/pull/1275) +* [#1274: Update composer branch alias](https://github.com/mockery/mockery/pull/1274) +* [#1271: Support PHP 8.2 `true` Literal Type](https://github.com/mockery/mockery/pull/1271) +* [#1270: Support PHP 8.0 `false` Literal Type](https://github.com/mockery/mockery/pull/1270) + ## 1.6.1 (2023-06-05) * [#1267 Drops support for PHP <7.4](https://github.com/mockery/mockery/pull/1267) diff --git a/psalm-baseline.xml b/psalm-baseline.xml index 5f7bbda32..04a127112 100644 --- a/psalm-baseline.xml +++ b/psalm-baseline.xml @@ -1,5 +1,5 @@ - + $expectation @@ -56,6 +56,7 @@ $fileName $formatter($object, $nesting) $fqn + $fqn $n $nesting $object @@ -1093,6 +1094,7 @@ $alias getMethods()]]> $className + $className getName()]]> getName()]]> $methods @@ -1544,6 +1546,7 @@ $param + $param getName @@ -1631,9 +1634,6 @@ $lastBrace - - - @@ -2377,6 +2377,14 @@ $declaringClass + + $typeHint, + 'isPrimitive' => in_array($typeHint, ['array', 'bool', 'int', 'float', 'null', 'object', 'string']), + ], + ]]]> + string|null @@ -2389,15 +2397,9 @@ $typeHint - - $typeHint, - 'isPrimitive' => in_array($typeHint, ['array', 'bool', 'int', 'float', 'null', 'object', 'string']), - ], - ]]]> + ]]> - + $declaringClass $typeHint