Upgrade to PHPStan v0.12 #3799

lcobucci · 2019-12-30T11:55:14Z

Q	A
Type	dev improvement
BC Break	no

Summary

Allowing us to use more advanced checks and have full generic support.

~~This also adds a baseline file, since we have new violations being reported but don't want to address them right now.~~

Adding to 2.10.x because it doesn't influence production code and help us on #3762

morozov · 2019-12-30T15:20:22Z

[…] but don't want to address them right now.

What's the point in using advanced checks and not taking them into account? How exactly is it related to #3762?

lcobucci · 2019-12-30T15:37:46Z

What's the point in using advanced checks and not taking them into account?

@morozov we're taking them into account, just not solving every little thing now - which is the use case of the baseline.

How exactly is it related to #3762?

v0.12 adds generics support, #3762 has a failure related to it (incompatibility of array<Doctrine\DBAL\Schema\Table> and array<object>).

morozov · 2019-12-30T15:39:53Z

Then can we just report/address this issue by using the new tool locally without an update?

lcobucci · 2019-12-30T15:41:38Z

Then can we just report/address this issue by using the new tool locally without an update?

I don't follow... not updating won't allow us to use the features.

morozov · 2019-12-30T15:49:59Z

I don't follow either. By just baselining all reported errors we're not using it either. It's fine that the new version found an issue in an open PR but it doesn't mean we need to upgrade immediately and ignore all existing issues.

We should fix the ones fixing which won't cause a BC break as we have been always doing.

lcobucci · 2019-12-30T16:18:55Z

The point of ignoring current errors that were discovered by the new version is to allow us to use the generics to unblock #3762 while fixing the issues that won't cause a BC-break in a separate PR (and we'd also prevent new issues from being merged).

We could wait for the fix, sure. I just won't have the time to them today and think that there's no point in waiting for getting help from a smarter static analysis.

morozov · 2019-12-30T17:54:31Z

I just won't have the time to them today […]

As far as I can tell, #3762 isn't that close to being done to consider the error reported by PHPStan 0.11 a blocker. It can be added to the whitelist and get the future work unblocked. It'd be a much smaller change.

[…] and think that there's no point in waiting for getting help from a smarter static analysis.

As I said, this way we're not getting help from the new PHPStan version by ignoring its input.

lcobucci · 2019-12-30T18:38:35Z

As I said, this way we're not getting help from the new PHPStan version by ignoring its input.

We would, new PRs would be validated using the new version and new issues would be prevented...

morozov · 2019-12-30T18:41:08Z

We would, new PRs would be validated using the new version and new issues would be prevented...

Yeah. But it's not that urgent that we need to rush and ignore all existing issues.

phpstan-baseline.neon

lcobucci · 2020-01-02T09:44:30Z

@morozov I'm (slowly) addressing the issues to solve your concerns, new commits are coming (eventually 😅).

lib/Doctrine/DBAL/Connections/MasterSlaveConnection.php

lib/Doctrine/DBAL/Platforms/SqlitePlatform.php

lib/Doctrine/DBAL/Driver/DrizzlePDOMySql/Connection.php

lib/Doctrine/DBAL/Driver/IBMDB2/DB2Connection.php

lib/Doctrine/DBAL/Driver/PDOStatement.php

lib/Doctrine/DBAL/Platforms/DrizzlePlatform.php

lib/Doctrine/DBAL/Platforms/OraclePlatform.php

morozov · 2020-03-18T18:13:52Z

@greg0ire could you please reopen this PR? It'll probably take creating 2.10 from 2.10.x, pushing it upstream, reopening the PR, retargeting it to 2.10.x and deleting 2.10 back. IIRC, you did something like this for other accidentally closed ones.

morozov · 2020-03-18T18:19:23Z

FWIW, it is important to upgrade PHPStan sooner than later. The reason is that phpstan/phpstan 0.11 requires phpstan/phpdoc-parser ^0.3.5 while slevomat/coding-standard 6.2 (currently, dev-master) will require phpstan/phpdoc-parser ^0.4, so we won't be able to upgrade due to the dependency conflict.

morozov · 2020-03-29T23:28:25Z

I've addressed all remaining issues and filed a couple of PHPStan bugs. Going to address the issues in @lcobucci's commits that I pointed out to earlier.

By either defining their types or renaming to match parent class (or interface).

…ring

Additionally, set the new value and get the old one in one ini_set() call.

lib/Doctrine/DBAL/Connection.php

morozov · 2020-03-30T21:55:40Z

Thanks @lcobucci.

lcobucci · 2020-03-31T19:55:58Z

No, thank YOU @morozov ❤️
You're doing a fantastic job and I'm sorry for not being able to help you more nowadays. Keep on rockin' 🤘

@greg0ire

Release [2.10.2](https://github.com/doctrine/dbal/milestone/75) 2.10.2 ====== - Total issues resolved: **4** - Total pull requests resolved: **19** - Total contributors: **10** Improvement,Static Analysis --------------------------- - [3964: Mark every exception as immutable](doctrine#3964) thanks to @greg0ire CI,Improvement,Static Analysis ------------------------------ - [3961: Stop relying on the master version of Psalm](doctrine#3961) thanks to @greg0ire - [3951: Setup static analysis with Psalm](doctrine#3951) thanks to @greg0ire - [3799: Upgrade to PHPStan v0.12](doctrine#3799) thanks to @lcobucci Improvement,Logging,Test Suite ------------------------------ - [3957: Reworked LoggingTest to be able to test Statement::executeUpdate()](doctrine#3957) thanks to @morozov CI,Code Style,Improvement,Strict Typing --------------------------------------- - [3955: Remove baseline](doctrine#3955) thanks to @greg0ire Bug,SQLite,Schema Introspection,Schema Managers ----------------------------------------------- - [3937: Column comment incorrectly introspected on SQLite](doctrine#3937) thanks to @morozov Bug,Documentation,Prepared Statements,Query ------------------------------------------- - [3896: Updated documentation for QueryBuilder::execute() return value type](doctrine#3896) thanks to @morozov Bug,Prepared Statements ----------------------- - [3894: Make sure that the $types array has the same keys $params](doctrine#3894) thanks to @morozov - [3893: Ensure the constructor arguments are passed to custom classes](doctrine#3893) thanks to @duncan3dc - [3843: Fix unquoted stmt fragments backslash escaping](doctrine#3843) thanks to @morozov Documentation,Improvement ------------------------- - [3886: Update readme](doctrine#3886) thanks to @greg0ire - [3834: Fix docblock typos in DriverManager docs](doctrine#3834) thanks to @CHItA CI,Improvement,MariaDB,MySQL ---------------------------- - [3884: Use Docker consistently](doctrine#3884) thanks to @greg0ire - [3478: Improve readiness probe stability for containerized databases on CI](doctrine#3478) thanks to @morozov - [3883: Fix broken build](doctrine#3883) thanks to @greg0ire Bug,Documentation,Query,Query Limit/Offset Modification ------------------------------------------------------- - [3842: Fixed the QueryBuilder::setMaxResults() signature to accept NULL](doctrine#3842) thanks to @morozov Bug,Query --------- - [3832: Fix JOIN with no condition bug](doctrine#3832) thanks to @BenMorel Bug,PostgreSQL,Schema Introspection ----------------------------------- - [3821: &doctrine#91;pg&doctrine#93; fix getting table information if search&doctrine#95;path contains escaped schema name](doctrine#3821) thanks to @linniksa Documentation,Improvement,Logging --------------------------------- - [3812: Fix DebugStack#queries docblock type](doctrine#3812) thanks to @ostrolucky Bug,Regression,Schema --------------------- - [3790: fixed unqualified table name of fk constraints when using schemas](doctrine#3790) thanks to @stlrnz and @Alarich # gpg: Signature made Mon Apr 20 19:59:36 2020 # gpg: using DSA key 2C3A645671828132 # gpg: Can't check signature: public key not found # Conflicts: # README.md

lcobucci added Improvement CI labels Dec 30, 2019

lcobucci requested review from beberlei and morozov December 30, 2019 11:55

lcobucci self-assigned this Dec 30, 2019

beberlei previously approved these changes Dec 31, 2019

View reviewed changes

morozov requested changes Dec 31, 2019

View reviewed changes

phpstan-baseline.neon Outdated Show resolved Hide resolved

lcobucci dismissed beberlei’s stale review via 566e2cb January 2, 2020 09:40

lcobucci force-pushed the upgrade-phpstan branch from 566e2cb to dfb2e18 Compare January 2, 2020 09:43

lcobucci commented Jan 2, 2020

View reviewed changes

lib/Doctrine/DBAL/Connections/MasterSlaveConnection.php Show resolved Hide resolved

lcobucci commented Jan 2, 2020

View reviewed changes

lib/Doctrine/DBAL/Platforms/SqlitePlatform.php Outdated Show resolved Hide resolved

morozov reviewed Jan 22, 2020

View reviewed changes

lib/Doctrine/DBAL/Driver/DrizzlePDOMySql/Connection.php Outdated Show resolved Hide resolved

morozov reviewed Jan 22, 2020

View reviewed changes

lib/Doctrine/DBAL/Driver/IBMDB2/DB2Connection.php Outdated Show resolved Hide resolved

morozov reviewed Jan 22, 2020

View reviewed changes

This was referenced Jan 22, 2020

Fix docblock typos in DriverManager docs #3834

Merged

Introduce properties for SQL parts in QueryBuilder #3836

Merged

greg0ire closed this Feb 29, 2020

morozov added this to the 2.10.2 milestone Mar 18, 2020

morozov force-pushed the upgrade-phpstan branch 2 times, most recently from 05912fe to 9215c9d Compare March 29, 2020 22:55

lcobucci added 2 commits March 29, 2020 16:58

Respect interface's return type in methods

f440d92

Declare return types in a BC compatible manner

35beaca

morozov force-pushed the upgrade-phpstan branch from 9215c9d to 8f32f94 Compare March 30, 2020 00:05

lcobucci and others added 9 commits March 29, 2020 17:20

Fix argument type declaration

2649ae6

By either defining their types or renaming to match parent class (or interface).

Do not ignore the result of array_change_key_case()

d267775

Assert that the value fetched from the database is always an integer

e6bfcad

Removed redundant break statements

e5068b4

AbstractPlatform::_getTransactionIsolationLevelSQL() must return a st…

4650d9c

…ring

Make sure that the options row was fetched successfully

c9ec618

ForeignKeyConstraint::onEvent() must return null as an empty action

e247a10

Use strings to work with ini_get() and ini_set()

a56eeee

Additionally, set the new value and get the old one in one ini_set() call.

Disabled some options and whitelisted false-positives

0d36ac8

morozov force-pushed the upgrade-phpstan branch from 8f32f94 to 0d36ac8 Compare March 30, 2020 00:20

morozov approved these changes Mar 30, 2020

View reviewed changes

morozov requested a review from greg0ire March 30, 2020 00:56

greg0ire reviewed Mar 30, 2020

View reviewed changes

lib/Doctrine/DBAL/Connection.php Show resolved Hide resolved

morozov merged commit 86e563a into doctrine:2.10.x Mar 30, 2020

lcobucci deleted the upgrade-phpstan branch March 31, 2020 19:54

morozov mentioned this pull request Apr 2, 2020

Manually merge 3.0.x into master #3931

Merged

ondrejmirtes mentioned this pull request Apr 15, 2020

Setup static analysis with Psalm #3951

Merged

morozov added the Static Analysis label Apr 20, 2020

doctrinebot mentioned this pull request Apr 20, 2020

Merge release 2.10.2 into 2.11.x #3968

Merged

morozov mentioned this pull request Aug 24, 2020

PHPStan mistakenly assumes that an array can pass the is_numeric() test phpstan/phpstan#3133

Closed

github-actions bot locked as resolved and limited conversation to collaborators Jul 30, 2022

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Upgrade to PHPStan v0.12 #3799

Upgrade to PHPStan v0.12 #3799

lcobucci commented Dec 30, 2019 •

edited by morozov

Loading

morozov commented Dec 30, 2019

lcobucci commented Dec 30, 2019 •

edited

Loading

morozov commented Dec 30, 2019

lcobucci commented Dec 30, 2019

morozov commented Dec 30, 2019

lcobucci commented Dec 30, 2019

morozov commented Dec 30, 2019

lcobucci commented Dec 30, 2019

morozov commented Dec 30, 2019

lcobucci commented Jan 2, 2020

morozov commented Mar 18, 2020

morozov commented Mar 18, 2020

morozov commented Mar 29, 2020 •

edited

Loading

morozov commented Mar 30, 2020

lcobucci commented Mar 31, 2020

Upgrade to PHPStan v0.12 #3799

Upgrade to PHPStan v0.12 #3799

Conversation

lcobucci commented Dec 30, 2019 • edited by morozov Loading

Summary

morozov commented Dec 30, 2019

lcobucci commented Dec 30, 2019 • edited Loading

morozov commented Dec 30, 2019

lcobucci commented Dec 30, 2019

morozov commented Dec 30, 2019

lcobucci commented Dec 30, 2019

morozov commented Dec 30, 2019

lcobucci commented Dec 30, 2019

morozov commented Dec 30, 2019

lcobucci commented Jan 2, 2020

morozov commented Mar 18, 2020

morozov commented Mar 18, 2020

morozov commented Mar 29, 2020 • edited Loading

morozov commented Mar 30, 2020

lcobucci commented Mar 31, 2020

lcobucci commented Dec 30, 2019 •

edited by morozov

Loading

lcobucci commented Dec 30, 2019 •

edited

Loading

morozov commented Mar 29, 2020 •

edited

Loading