Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Drop symfony/polyfill-php80 dependency #8988

Merged
merged 1 commit into from
Dec 22, 2022
Merged

Drop symfony/polyfill-php80 dependency #8988

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 1 addition & 2 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
5 changes: 0 additions & 5 deletions src/Psalm/Internal/CliUtils.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 1 addition & 2 deletions src/Psalm/Type/MutableUnion.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
3 changes: 1 addition & 2 deletions src/Psalm/Type/Union.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -40,7 +39,7 @@
* parent_nodes?: array<string, DataFlowNode>
* }
*/
final class Union implements TypeNode, Stringable
final class Union implements TypeNode
{
use ImmutableNonCloneableTrait;
use UnionTrait;
Expand Down