From 93879424634ae864c38a9c0652055842263c62f8 Mon Sep 17 00:00:00 2001 From: Bruce Weirdan Date: Sun, 26 Dec 2021 09:22:39 +0200 Subject: [PATCH] Use `strpos` instead of `str_contains` Fixes vimeo/psalm#7219 (str_contains was added in PHP 8) --- .../Provider/ReturnTypeProvider/ArrayMapReturnTypeProvider.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/Psalm/Internal/Provider/ReturnTypeProvider/ArrayMapReturnTypeProvider.php b/src/Psalm/Internal/Provider/ReturnTypeProvider/ArrayMapReturnTypeProvider.php index 4437ff4627f..8f4ab9dde15 100644 --- a/src/Psalm/Internal/Provider/ReturnTypeProvider/ArrayMapReturnTypeProvider.php +++ b/src/Psalm/Internal/Provider/ReturnTypeProvider/ArrayMapReturnTypeProvider.php @@ -41,7 +41,6 @@ use function in_array; use function mt_rand; use function reset; -use function str_contains; use function strpos; use function substr; @@ -505,7 +504,7 @@ public static function getReturnTypeFromMappingIds( public static function cleanContext(Context $context, int $fake_var_discriminator): void { foreach ($context->vars_in_scope as $var_in_scope => $_) { - if (str_contains($var_in_scope, "__fake_{$fake_var_discriminator}_")) { + if (strpos($var_in_scope, "__fake_{$fake_var_discriminator}_") !== false) { unset($context->vars_in_scope[$var_in_scope]); } }