diff --git a/lib/Doctrine/ORM/Internal/Hydration/HydrationException.php b/lib/Doctrine/ORM/Internal/Hydration/HydrationException.php index a50753e85e..d807c0eca2 100644 --- a/lib/Doctrine/ORM/Internal/Hydration/HydrationException.php +++ b/lib/Doctrine/ORM/Internal/Hydration/HydrationException.php @@ -84,17 +84,17 @@ public static function missingDiscriminatorMetaMappingColumn($entityName, $discr /** * @param string $discrValue - * @param string[] $discrMap - * @psalm-param array $discrMap + * @param string[] $discrValues + * @psalm-param list $discrValues * * @return HydrationException */ - public static function invalidDiscriminatorValue($discrValue, $discrMap) + public static function invalidDiscriminatorValue($discrValue, $discrValues) { return new self(sprintf( 'The discriminator value "%s" is invalid. It must be one of "%s".', $discrValue, - implode('", "', $discrMap) + implode('", "', $discrValues) )); } } diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon index f8422b1f0c..0cb7f7c0e1 100644 --- a/phpstan-baseline.neon +++ b/phpstan-baseline.neon @@ -170,16 +170,6 @@ parameters: count: 1 path: lib/Doctrine/ORM/Id/TableGenerator.php - - - message: "#^Parameter \\#2 \\$discrMap of static method Doctrine\\\\ORM\\\\Internal\\\\Hydration\\\\HydrationException\\:\\:invalidDiscriminatorValue\\(\\) expects array\\, array\\ given\\.$#" - count: 1 - path: lib/Doctrine/ORM/Internal/Hydration/ObjectHydrator.php - - - - message: "#^Parameter \\#2 \\$discrMap of static method Doctrine\\\\ORM\\\\Internal\\\\Hydration\\\\HydrationException\\:\\:invalidDiscriminatorValue\\(\\) expects array\\, array\\ given\\.$#" - count: 1 - path: lib/Doctrine/ORM/Internal/Hydration/SimpleObjectHydrator.php - - message: "#^Offset 'indexes' on array\\{name\\: string, schema\\: string, indexes\\: array, uniqueConstraints\\: array, options\\: array\\, quoted\\?\\: bool\\} in isset\\(\\) always exists and is not nullable\\.$#" count: 1 diff --git a/psalm-baseline.xml b/psalm-baseline.xml index 1a5ef25ad7..d983c41dee 100644 --- a/psalm-baseline.xml +++ b/psalm-baseline.xml @@ -421,9 +421,6 @@ - - array_keys($discrMap) - $index @@ -452,9 +449,6 @@ - - array_keys($discrMap) - $class