Try to provide literal int types when possible (fixes #6966) #7071

ricardoboss · 2021-12-05T15:59:42Z

This PR fixes #6966.

I added a return type provider for the round function, which will now try to return a literal float, which can then be used for further analysis.
The second change involves modifying the CastAnalyzer to also return a literal int when possible. I also tried to simplify the code a bit.

orklah · 2021-12-05T16:11:35Z

Thanks!

You have to enable the return type provider in FunctionReturnTypeProvider first

orklah · 2021-12-05T16:17:29Z

I made an error in my explanation. round only returns floats:

https://3v4l.org/ETvDv

That shouldn't be an issue however, what you have to do to fix #6966 is check if you have a TLiteralInt or a TLiteralFloat in the num_arg. If it is, you should return a TLiteralFloat with the rounded value of what was in num_arg.

ricardoboss · 2021-12-05T16:38:25Z

I need to implement the CastAnalyzer too. So this is should really be a draft PR.

ricardoboss · 2021-12-05T17:34:51Z

I'm struggling to get the actual values with which the round method was called. As you can see, I'm trying to get them with $call_args[1]->value, which gives a PhpParser\Node\Expr. How do I get the actual value?

orklah · 2021-12-05T18:18:42Z

try a $statements_analyzer->node_data->getType(...) on that. It may be a complex expression but Psalm should already have inferred it

weirdan · 2021-12-05T18:21:21Z

E.g.

psalm/src/Psalm/Internal/Provider/ReturnTypeProvider/ArrayFillReturnTypeProvider.php

Lines 27 to 30 in 25614ec

    
           $first_arg_type = isset($call_args[0]) ? $statements_source->node_data->getType($call_args[0]->value) : null; 
        
           $second_arg_type = isset($call_args[1]) ? $statements_source->node_data->getType($call_args[1]->value) : null; 
        
           $third_arg_type = isset($call_args[2]) ? $statements_source->node_data->getType($call_args[2]->value) : null;

orklah · 2021-12-08T21:39:17Z

@ricardoboss is this ready for review?

ricardoboss · 2021-12-08T21:41:07Z

Yes! Sorry I didn't notify you...

orklah · 2021-12-08T21:44:18Z

No worries, we'll check that :)

src/Psalm/Internal/Analyzer/Statements/Expression/CastAnalyzer.php

ricardoboss · 2021-12-09T23:41:36Z

@orklah can you take a look again?

orklah

See comment above. Can you add some tests too?

orklah · 2021-12-29T21:43:50Z

@ricardoboss do you need some help to design the tests?

Could you also rebase to solve the conflicts?

ricardoboss · 2021-12-30T09:35:56Z

Will do a rebase! I haven't had time to write tests yet. Haven't forgot it either.

orklah · 2022-01-15T10:44:47Z

Sorry for not coming back to this earlier, I don't get notifications for commits so I didn't see this change. I'll take a look. Don't hesitate to ping me or leave a comment when you change things

orklah · 2022-01-15T10:47:49Z

Seems fine. Can you rebase and fix the Code Style error please?

ricardoboss · 2022-01-15T18:59:18Z

Can you write a test for this? I would like to see how you test this behavior.

I will do a rebase when I get time to do so

orklah · 2022-01-15T19:15:09Z

For the cast one, you can add a test in ValueTest.php in providerValidCodeParse with the code: $a = (int)'5'; and in the assertions you can check $a=== => '5'

For the round one, you can add a test in FunctionCallTest.php in providerValidCodeParse with the code $a = round(5.111, 2); and in the assertions you can check $a=== => 'float(5.11)'

…eeded test

…iteral ints

orklah · 2022-01-16T20:32:58Z

Thanks!

kkmuffme · 2022-09-09T03:11:01Z

The missing cast analyzer things are added in this PR now #8366 and this PR is cherry-picked to 4.x

…meo#6966) (vimeo#7071) * Fixed vimeo#6966 * Only accept >= 0 values for mode argument in round() * Made round() only return float or literal float values and remove unneeded test * Registered RoundReturnTypeProvider * Updated cast analyzer to handle single string literal int values as literal ints * Fixed psalm errors * Fix invalid property accesses * Addressed comments * Added Tests * Marked RoundReturnTypeProvider as internal * Fixed CS

ricardoboss changed the title ~~Fixed vimeo/psalm#6966~~ WIP: Fix vimeo/psalm#6966 Dec 5, 2021

ricardoboss changed the title ~~WIP: Fix vimeo/psalm#6966~~ Try to provide literal int types when possible (fixes #6966) Dec 5, 2021

ricardoboss force-pushed the issue-6966-argumenttypecoercion_for_typecasted_vars branch from 5872f66 to 415eb81 Compare December 6, 2021 01:01

orklah reviewed Dec 8, 2021

View reviewed changes

src/Psalm/Internal/Analyzer/Statements/Expression/CastAnalyzer.php Outdated Show resolved Hide resolved

orklah reviewed Dec 8, 2021

View reviewed changes

src/Psalm/Internal/Analyzer/Statements/Expression/CastAnalyzer.php Outdated Show resolved Hide resolved

orklah reviewed Dec 8, 2021

View reviewed changes

src/Psalm/Internal/Analyzer/Statements/Expression/CastAnalyzer.php Outdated Show resolved Hide resolved

orklah requested changes Dec 9, 2021

View reviewed changes

orklah marked this pull request as draft December 14, 2021 23:53

ricardoboss force-pushed the issue-6966-argumenttypecoercion_for_typecasted_vars branch from 34ac2e7 to d3fc5b6 Compare January 2, 2022 17:52

orklah added the release:feature The PR will be included in 'Features' section of the release notes label Jan 15, 2022

orklah marked this pull request as ready for review January 15, 2022 10:47

orklah approved these changes Jan 15, 2022

View reviewed changes

ricardoboss added 2 commits January 16, 2022 21:10

Fixed #6966

2585404

Only accept >= 0 values for mode argument in round()

0a75db8

ricardoboss added 6 commits January 16, 2022 21:10

Made round() only return float or literal float values and remove unn…

d72a702

…eeded test

Registered RoundReturnTypeProvider

289d81f

Updated cast analyzer to handle single string literal int values as l…

59f1d84

…iteral ints

Fixed psalm errors

96a9816

Fix invalid property accesses

9bc74bd

Addressed comments

62a0923

ricardoboss force-pushed the issue-6966-argumenttypecoercion_for_typecasted_vars branch from d3fc5b6 to 62a0923 Compare January 16, 2022 20:10

ricardoboss added 3 commits January 16, 2022 21:17

Added Tests

ffe6312

Marked RoundReturnTypeProvider as internal

edb72f7

Fixed CS

7ce9933

orklah merged commit 26dd4c5 into vimeo:master Jan 16, 2022

ricardoboss deleted the issue-6966-argumenttypecoercion_for_typecasted_vars branch January 16, 2022 20:34

Try to provide literal int types when possible (fixes #6966) #7071

Try to provide literal int types when possible (fixes #6966) #7071

Uh oh!

Conversation

ricardoboss commented Dec 5, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

orklah commented Dec 5, 2021

Uh oh!

orklah commented Dec 5, 2021

Uh oh!

ricardoboss commented Dec 5, 2021

Uh oh!

ricardoboss commented Dec 5, 2021

Uh oh!

orklah commented Dec 5, 2021

Uh oh!

weirdan commented Dec 5, 2021

Uh oh!

orklah commented Dec 8, 2021

Uh oh!

ricardoboss commented Dec 8, 2021

Uh oh!

orklah commented Dec 8, 2021

Uh oh!

Uh oh!

Uh oh!

Uh oh!

ricardoboss commented Dec 9, 2021

Uh oh!

orklah left a comment

Choose a reason for hiding this comment

Uh oh!

orklah commented Dec 29, 2021

Uh oh!

ricardoboss commented Dec 30, 2021

Uh oh!

orklah commented Jan 15, 2022

Uh oh!

orklah commented Jan 15, 2022

Uh oh!

ricardoboss commented Jan 15, 2022

Uh oh!

orklah commented Jan 15, 2022

Uh oh!

orklah commented Jan 16, 2022

Uh oh!

kkmuffme commented Sep 9, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

ricardoboss commented Dec 5, 2021 •

edited

Loading

kkmuffme commented Sep 9, 2022 •

edited

Loading