Merge 4.x #8591

danog · 2022-10-16T11:43:19Z

No description provided.

…multiple-psalm-instances use lock to fix race condition in cache

…rror-log use error_log instead of trigger_error

Fix GEOSGeometry stubs with default values

New "Count" Report Format

… static methods inside a different class differentiate between `static` defined in a class which CALLS a given static method, and `static` defined in the method which IS CALLED.

…Type() for non-object cases

…xistingAtomicStaticCallAnalyzer::getMethodReturnType()

Adds support for fixing missing throws doc block

…invalid")

Fix nullable return types for CallMap functions

Improve inferring the "final" `static` type when calling static methods inside a different class

Fix vimeo#8270

…fig-not-working fix triggerErrorExits not working

Fixed ini_set types for arg value

…eturn type false

…alsy

…-empty-strings Add additional checks for concat of non-empty strings to return non-falsy

…meimmutable-sub Correct return type of DateTimeImmutable sub method stub

danog · 2022-10-17T10:56:40Z

I reverted a change in the CastAnalyzer that caused the creation of disjoint integer ranges, which aren't properly supported by all of psalm right now.
I initially wanted to move the disjoint integer range merging logic from CastAnalyzer to TypeCombiner, but decided to postpone it for a future PR, marking as skipped related tests.

As usual, phpunit errors are caused by an outdated baseline, I think I'll just re-update the baseline on my immutability PR to include new errors.

kkmuffme · 2022-10-17T16:32:57Z

@danog what part of CastAnalyzer was reverted? (I guess it was part of my PR) Just asking, in case I can improve it to return a generic int in case we have disjoint ranges, instead of reverting that part.

danog · 2022-10-17T17:43:11Z

It was precisely this commit from master: 525a86e
The problem is that the new logic from 4.x creates an array of atomic types (including the TBool/TTrue/TFalse logic introduced on master separately) which are then combined with the TypeCombiner.

The TypeCombiner has a very generic logic which joins literals with integer ranges by always extending the lower/higher bound, even for non-adjacent values (ie 0 and int<3, max> => int<0, max>).

This should be fixed separately by improving the literal+range and range+range combining logic directly inside TypeCombiner to generate multiple distinct disjoint ranges and literals, and I actually started doing that, but then noticed that some parts of psalm like offset detection misbehaved with literal+range unions, so I postponed this for a later PR.

The current version contained in this PR properly casts booleans, but generates an overly large integer range.

orklah · 2022-10-17T18:16:45Z

Thanks a lot!

aszenz and others added 30 commits May 21, 2022 17:39

Adds support for fixing missing throws doc block

Unverified

This commit is not signed, but one or more authors requires that any commit attributed to them is signed.

Learn about vigilant mode

c6854cf

feat: fix ci + preserve existing throws

Unverified

This commit is not signed, but one or more authors requires that any commit attributed to them is signed.

Learn about vigilant mode

e28831d

chore: add another test

Unverified

This commit is not signed, but one or more authors requires that any commit attributed to them is signed.

Learn about vigilant mode

f94b7ab

refactor: use list<string>

Unverified

This commit is not signed, but one or more authors requires that any commit attributed to them is signed.

Learn about vigilant mode

e3f46d9

Update phpredis.phpstub

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.

GPG key ID: 4AEE18F83AFDEB23
Expired

Verified
Learn about vigilant mode

ffe1829

use lock to fix race condition

7742d8a

use error_log

a77f6fc

Count Report Format

Unverified

This commit is not signed, but one or more authors requires that any commit attributed to them is signed.

Learn about vigilant mode

3b76ac8

Fix GEOSGeometry stubs with default values

bcf3c51

Merge pull request vimeo#8244 from jack-worman/CountReport

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.

GPG key ID: 4AEE18F83AFDEB23
Expired

Verified
Learn about vigilant mode

7f3d55d

New "Count" Report Format

vimeo#8200 - improve inferring the "final" static type when calling…

470885e

… static methods inside a different class differentiate between `static` defined in a class which CALLS a given static method, and `static` defined in the method which IS CALLED.

vimeo#8200 - generalize ExistingAtomicStaticCallAnalyzer::hasStaticIn…

3a50540

…Type() for non-object cases

vimeo#8200 - flip logic of determining "source" of static type in E…

b3e673d

…xistingAtomicStaticCallAnalyzer::getMethodReturnType()

vimeo#8200 - move Issue8200Test to ClassTemplateTest

ecbceb1

vimeo#8200 - simplify ExistingAtomicStaticCallAnalyzer::hasStaticType()

931b3bb

vimeo#8200 - move tests to the correct provider ("valid" instead of "…

21a6dd9

…invalid")

Fix nullable return types for CallMap functions

f28ac73

vimeo#8200 - bikeshedding the tests

1e0b572

fix race conditions causing notices if directory does not exist

bb760a2

circle CI error for unrelated code?

233863d

fix triggerErrorExits not working

e1b0255

Fix vimeo#8270

Fixed ini_set types for arg value

8b59994

Merge pull request vimeo#8308 from honca/4.x

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.

GPG key ID: 4AEE18F83AFDEB23
Expired

Verified
Learn about vigilant mode

640d3b6

Fixed ini_set types for arg value

Greg Hargreaves and others added 17 commits October 14, 2022 00:49

Correct return type of DateTimeImmutable sub method stub

f573ef5

Remove link to php-src as was part of the documented reason for the r…

ef0d225

…eturn type false

Fix test for DateTimeImmutable sub method return type

8849e8c

Add additional checks for concat of non-empty strings to return non-f…

06581ce

…alsy

Remove duplicated numeric type declaration

b89ff32

Merge remote-tracking branch 'origin/4.x' into HEAD

748a74b

Merge remote-tracking branch 'origin/4.x' into merge_4.x

b79c43a

Fix

4912651

Merge branch 'master' into merge_4.x

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.

GPG key ID: 4AEE18F83AFDEB23
Expired

Verified
Learn about vigilant mode

cbd1a27

Fixes

34000ca

Fixes

8518372

Fix

f816c06

Fixes

53e3889

Fixes

8d4d0c0

Update

150be5c

danog force-pushed the merge_4.x branch from aaa9451 to 150be5c Compare October 17, 2022 09:38

Skip

1abade3

danog force-pushed the merge_4.x branch from 1e55256 to 1abade3 Compare October 17, 2022 10:14

danog added 3 commits October 17, 2022 12:40

Fix

15f5c59

Re-apply changes manually

5427835

Fix

56805ab

danog marked this pull request as ready for review October 17, 2022 10:55

orklah added the release:internal label Oct 17, 2022

orklah merged commit 212281d into vimeo:master Oct 17, 2022

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Merge 4.x #8591

Merge 4.x #8591

danog commented Oct 16, 2022

danog commented Oct 17, 2022 •

edited

Loading

kkmuffme commented Oct 17, 2022

danog commented Oct 17, 2022 •

edited

Loading

orklah commented Oct 17, 2022

Merge 4.x #8591

Merge 4.x #8591

Conversation

danog commented Oct 16, 2022

danog commented Oct 17, 2022 • edited Loading

kkmuffme commented Oct 17, 2022

danog commented Oct 17, 2022 • edited Loading

orklah commented Oct 17, 2022

danog commented Oct 17, 2022 •

edited

Loading

danog commented Oct 17, 2022 •

edited

Loading