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

Manual merge of 2.11.x into 3.0.x #4025

Closed
wants to merge 42 commits into from
Closed

Manual merge of 2.11.x into 3.0.x #4025

wants to merge 42 commits into from

Commits on May 27, 2020

  1. Ignore all violations of the LowercasePHPFunctions sniff in SQLSrvSta… 

    …tement
    @morozov
    morozov committed May 27, 2020
    Configuration menu
    Copy the full SHA
    41fb43e View commit details
    Browse the repository at this point in the history

  2. Merge pull request doctrine#4031 from morozov/ignore-sqlsrv-case 

    Ignore all violations of the LowercasePHPFunctions sniff in SQLSrvStatement
    @morozov
    morozov authored May 27, 2020
    Configuration menu
    Copy the full SHA
    2348831 View commit details
    Browse the repository at this point in the history

  3. Document actual types

    @greg0ire
    greg0ire committed May 27, 2020
    Configuration menu
    Copy the full SHA
    f4c43d5 View commit details
    Browse the repository at this point in the history

  4. Install phpunit plugin for Psalm

    @greg0ire
    greg0ire committed May 27, 2020
    Configuration menu
    Copy the full SHA
    9a617ed View commit details
    Browse the repository at this point in the history

  5. Make return type verified and accurate

    @greg0ire
    greg0ire committed May 27, 2020
    Configuration menu
    Copy the full SHA
    96d5bcc View commit details
    Browse the repository at this point in the history

  6. Update phpunit 

    The latest version is easier to understand for static analyzers.
    @greg0ire
    greg0ire committed May 27, 2020
    Configuration menu
    Copy the full SHA
    a8c772d View commit details
    Browse the repository at this point in the history

  7. Improve phpdoc

    @greg0ire
    greg0ire committed May 27, 2020
    Configuration menu
    Copy the full SHA
    befc59a View commit details
    Browse the repository at this point in the history

  8. Remove uneeded key

    @greg0ire
    greg0ire committed May 27, 2020
    Configuration menu
    Copy the full SHA
    69cf6c4 View commit details
    Browse the repository at this point in the history

  9. Use list 

    It is more simple and more accurate
    @greg0ire
    greg0ire committed May 27, 2020
    Configuration menu
    Copy the full SHA
    8f7ea52 View commit details
    Browse the repository at this point in the history

  10. Use shortcut

    @greg0ire
    greg0ire committed May 27, 2020
    Configuration menu
    Copy the full SHA
    99b542a View commit details
    Browse the repository at this point in the history

  11. Suppress deliberate error 

    We are testing what happens when providing the wrong type.
    @greg0ire
    greg0ire committed May 27, 2020
    Configuration menu
    Copy the full SHA
    633f9e3 View commit details
    Browse the repository at this point in the history

  12. Use TrimMode::UNSPECIFIED over null 

    The method signature does not allow null.
    @greg0ire
    greg0ire committed May 27, 2020
    Configuration menu
    Copy the full SHA
    f2a0ab7 View commit details
    Browse the repository at this point in the history

  13. Pass the right type of argument

    @greg0ire
    greg0ire committed May 27, 2020
    Configuration menu
    Copy the full SHA
    014ac9c View commit details
    Browse the repository at this point in the history

  14. Ignore issues when testing with deliberate

    @greg0ire
    greg0ire committed May 27, 2020
    Configuration menu
    Copy the full SHA
    cede6ec View commit details
    Browse the repository at this point in the history

  15. Make sure to pass in a string 

    Not all RDBMS have a concept of database, apparently (see SQLAnywhere).
Those who do not should pass in a string to stay compatible with the
signature.
    @greg0ire
    greg0ire committed May 27, 2020
    Configuration menu
    Copy the full SHA
    76fc010 View commit details
    Browse the repository at this point in the history

  16. Document platform

    @greg0ire
    greg0ire committed May 27, 2020
    Configuration menu
    Copy the full SHA
    7c0e1ba View commit details
    Browse the repository at this point in the history

  17. Add missing return type declarations

    @greg0ire
    greg0ire committed May 27, 2020
    Configuration menu
    Copy the full SHA
    dc8d2f3 View commit details
    Browse the repository at this point in the history

  18. Document null as a possible type

    @greg0ire
    greg0ire committed May 27, 2020
    Configuration menu
    Copy the full SHA
    05fcd8c View commit details
    Browse the repository at this point in the history

  19. Update PHPStorm stubs 

    That alone fixes 6 issues found by Psalm
    @greg0ire
    greg0ire committed May 27, 2020
    Configuration menu
    Copy the full SHA
    464f150 View commit details
    Browse the repository at this point in the history

  20. Use the appropriate notation for generators

    @greg0ire
    greg0ire committed May 27, 2020
    Configuration menu
    Copy the full SHA
    3a86a6b View commit details
    Browse the repository at this point in the history

  21. Document property

    @greg0ire
    greg0ire committed May 27, 2020
    Configuration menu
    Copy the full SHA
    49bd008 View commit details
    Browse the repository at this point in the history

  22. Address deprecation

    @greg0ire
    greg0ire committed May 27, 2020
    Configuration menu
    Copy the full SHA
    a6af579 View commit details
    Browse the repository at this point in the history

  23. Account for columnar expected result 

    This is what is expected with FETCH_COLUMN
    @greg0ire
    greg0ire committed May 27, 2020
    Configuration menu
    Copy the full SHA
    ca5aceb View commit details
    Browse the repository at this point in the history

  24. Fix wrong phpdoc

    @greg0ire
    greg0ire committed May 27, 2020
    Configuration menu
    Copy the full SHA
    580d139 View commit details
    Browse the repository at this point in the history

  25. Suppress InvalidArgument error 

    This is precisely what we are testing here.
    @greg0ire
    greg0ire committed May 27, 2020
    Configuration menu
    Copy the full SHA
    682012f View commit details
    Browse the repository at this point in the history

  26. Use an empty string instead of null 

    See vimeo/psalm#3224
    @greg0ire
    greg0ire committed May 27, 2020
    Configuration menu
    Copy the full SHA
    fa71f7f View commit details
    Browse the repository at this point in the history

  27. Use level 6

    @greg0ire
    greg0ire committed May 27, 2020
    Configuration menu
    Copy the full SHA
    7fc2268 View commit details
    Browse the repository at this point in the history

  28. Address warning from PHPUnit 

    This hack is temporary and should be removed on 3.0.x
    @greg0ire
    greg0ire committed May 27, 2020
    Configuration menu
    Copy the full SHA
    9d73084 View commit details
    Browse the repository at this point in the history

  29. Describe return type accurately 

    This return type is conditional to $params['wrapperClass']. Luckily,
recent versions of Psalm allow documenting it properly.
See vimeo/psalm#3277

Note that phpstan is not able to understand this yet, but still attempts
to, hence the extra ignore rules.
    @greg0ire
    greg0ire committed May 27, 2020
    Configuration menu
    Copy the full SHA
    487b00f View commit details
    Browse the repository at this point in the history

  30. Add contract for createPlatform()'s return type

    @greg0ire
    greg0ire committed May 27, 2020
    Configuration menu
    Copy the full SHA
    1a4f23f View commit details
    Browse the repository at this point in the history

  31. Add missing use statement

    @greg0ire
    greg0ire committed May 27, 2020
    Configuration menu
    Copy the full SHA
    3fa5b3e View commit details
    Browse the repository at this point in the history

  32. Use valid arguments

    @greg0ire
    greg0ire committed May 27, 2020
    Configuration menu
    Copy the full SHA
    b0523e0 View commit details
    Browse the repository at this point in the history

  33. Update psalm

    @greg0ire
    greg0ire committed May 27, 2020
    Configuration menu
    Copy the full SHA
    b00a2e3 View commit details
    Browse the repository at this point in the history

  34. Avoid mocking inexistent classes 

    It confuses both Psalm and PHPStan, and involves complicated mocking.
    @greg0ire
    greg0ire committed May 27, 2020
    Configuration menu
    Copy the full SHA
    9f9629c View commit details
    Browse the repository at this point in the history

  35. Ignore error about Connection::lastInsertId() 

    The php docs are not very clear about that one.
    @greg0ire
    greg0ire committed May 27, 2020
    Configuration menu
    Copy the full SHA
    1bc66b3 View commit details
    Browse the repository at this point in the history

  36. Merge pull request doctrine#3977 from greg0ire/psalm-6 

    Psalm 6
    @greg0ire
    greg0ire authored May 27, 2020
    Configuration menu
    Copy the full SHA
    9f2e25c View commit details
    Browse the repository at this point in the history

  37. Merge remote-tracking branch 'origin/2.10.x' into 2.11.x

    @greg0ire
    greg0ire committed May 27, 2020
    Configuration menu
    Copy the full SHA
    ce21834 View commit details
    Browse the repository at this point in the history

Commits on May 28, 2020

  1. Moved rowCount() from Statement to ResultStatement

    @morozov
    morozov committed May 28, 2020
    Configuration menu
    Copy the full SHA
    5df51cb View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'origin/2.11.x' into 3.0.x

    @greg0ire
    greg0ire committed May 28, 2020
    Configuration menu
    Copy the full SHA
    a04c608 View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'origin/3.0.x' into 3.0.x

    @greg0ire
    greg0ire committed May 28, 2020
    Configuration menu
    Copy the full SHA
    b0ca943 View commit details
    Browse the repository at this point in the history

  4. Merge pull request doctrine#4035 from morozov/row-count 

    Moved rowCount() from Statement to ResultStatement
    @morozov
    morozov authored May 28, 2020
    Configuration menu
    Copy the full SHA
    74eca6b View commit details
    Browse the repository at this point in the history

  5. Merge remote-tracking branch 'origin/3.0.x' into 3.0.x

    @greg0ire
    greg0ire committed May 28, 2020
    Configuration menu
    Copy the full SHA
    9d22f7b View commit details
    Browse the repository at this point in the history