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.

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

[BUGFIX] Continue processing psalm-flow graph after first taint sink #5832

Merged
merged 1 commit into from
May 26, 2021

Conversation

ohader
Copy link
Contributor

@ohader ohader commented May 26, 2021

Related: #5830

/** @var \Psalm\Internal\Analyzer\ProjectAnalyzer */
protected $project_analyzer;

public static function setUpBeforeClass() : void
{
self::$config = new TestConfig();
new TestConfig();
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks like an unrelated bunch of changes slipped in.

Copy link
Contributor Author

@ohader ohader May 26, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nope, since everything inherits from TestCase and there's now an instance property protected $config; (non-static), these changes were necessary.
new TestConfig() in the parts you pointed out was used to initialize their internal static state - self:$config basically had no meaning at all and was never used/retrieved.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

However, I could have created a separate clean-up commit to make that more explicit.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'll revert those changes and introduce a new protected TestCase::$testConfig variable instead...

@ohader
Copy link
Contributor Author

ohader commented May 26, 2021

Alright, now it's more tailored for the actual change...

@muglug muglug merged commit b259296 into vimeo:master May 26, 2021
@muglug
Copy link
Collaborator

muglug commented May 26, 2021

Thanks!

@ohader ohader deleted the taint-sink-flow branch May 26, 2021 20:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants