Merge pull request #7220 from weirdan/upstream-master

vimeo · Dec 26, 2021 · aa7e400 · aa7e400
2 parents aea1cba + b664d58
commit aa7e400
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 7 deletions.
diff --git a/bin/test-with-real-projects.sh b/bin/test-with-real-projects.sh
@@ -22,8 +22,8 @@ phpunit)
 	;;
 
 collections)
-	git clone --depth=1 git@github.com:muglug/collections.git
-	cd collections
+	git clone --depth=1 git@github.com:psalm/endtoend-test-collections.git
+	cd endtoend-test-collections
 	composer install
 	"$PSALM" --monochrome --show-info=false
 	;;
@@ -38,12 +38,12 @@ psl)
 	;;
 
 laravel)
-	git clone --depth=1 git@github.com:muglug/framework.git
-	cd framework
+	git clone --depth=1 git@github.com:psalm/endtoend-test-laravel.git
+	cd endtoend-test-laravel
 	composer install
 	"$PSALM" --monochrome
 	;;
 *)
-	echo "Usage: test-with-real-projects.sh {phpunit|collections|proxymanager|laravel|psl}"
+	echo "Usage: test-with-real-projects.sh {phpunit|collections|laravel|psl}"
 	exit 1
 esac
diff --git 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]);
             }
         }

diff --git a/vendor-bin/box/composer.json b/vendor-bin/box/composer.json
@@ -3,5 +3,10 @@
 	"prefer-stable": true,
 	"require": {
 		"humbug/box": "3.10.*"
+	},
+	"config": {
+		"allow-plugins": {
+			"composer/package-versions-deprecated": true
+		}
 	}
 }