diff --git a/composer.json b/composer.json index 74830a5a0f1..1314b2699e6 100644 --- a/composer.json +++ b/composer.json @@ -36,8 +36,7 @@ "sebastian/diff": "^4.0", "spatie/array-to-xml": "^2.17.0", "symfony/console": "^4.1.6 || ^5.0 || ^6.0", - "symfony/filesystem": "^5.4 || ^6.0", - "symfony/polyfill-php80": "^1.25" + "symfony/filesystem": "^5.4 || ^6.0" }, "provide": { "psalm/psalm": "self.version" diff --git a/src/Psalm/Internal/CliUtils.php b/src/Psalm/Internal/CliUtils.php index 08cdc4c2b5f..fc1f979feb6 100644 --- a/src/Psalm/Internal/CliUtils.php +++ b/src/Psalm/Internal/CliUtils.php @@ -71,11 +71,6 @@ public static function requireAutoloaders( $in_phar = Phar::running() || strpos(__NAMESPACE__, 'HumbugBox'); if ($in_phar) { - // require this before anything else - $stringable_path = __DIR__ . '/../../../vendor/symfony/polyfill-php80/Resources/stubs/Stringable.php'; - if (file_exists($stringable_path)) { - require_once $stringable_path; - } require_once __DIR__ . '/../../../vendor/autoload.php'; // hack required for JsonMapper diff --git a/src/Psalm/Type/MutableUnion.php b/src/Psalm/Type/MutableUnion.php index e23576b4635..d22059efcab 100644 --- a/src/Psalm/Type/MutableUnion.php +++ b/src/Psalm/Type/MutableUnion.php @@ -22,14 +22,13 @@ use Psalm\Type\Atomic\TString; use Psalm\Type\Atomic\TTemplateParamClass; use Psalm\Type\Atomic\TTrue; -use Stringable; use function count; use function get_class; use function get_object_vars; use function strpos; -final class MutableUnion implements TypeNode, Stringable +final class MutableUnion implements TypeNode { use UnionTrait; diff --git a/src/Psalm/Type/Union.php b/src/Psalm/Type/Union.php index 03dea469914..90a891917b1 100644 --- a/src/Psalm/Type/Union.php +++ b/src/Psalm/Type/Union.php @@ -9,7 +9,6 @@ use Psalm\Type\Atomic\TLiteralFloat; use Psalm\Type\Atomic\TLiteralInt; use Psalm\Type\Atomic\TLiteralString; -use Stringable; use function get_object_vars; @@ -40,7 +39,7 @@ * parent_nodes?: array * } */ -final class Union implements TypeNode, Stringable +final class Union implements TypeNode { use ImmutableNonCloneableTrait; use UnionTrait;