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

Manually merge 3.0.x into master #3931

Merged
merged 27 commits into from
Apr 2, 2020
Merged

Manually merge 3.0.x into master #3931

merged 27 commits into from
Apr 2, 2020

Commits on Mar 10, 2020

  1. Ensure the constructor arguments are passed to custom classes

    @duncan3dc
    duncan3dc committed Mar 10, 2020
    Configuration menu
    Copy the full SHA
    24cefe5 View commit details
    Browse the repository at this point in the history

Commits on Mar 27, 2020

  1. Merge pull request doctrine#3893 from duncan3dc/pdo-custom-class-cons… 

    …tructor

Ensure the constructor arguments are passed to custom classes
    @morozov
    morozov authored Mar 27, 2020
    Configuration menu
    Copy the full SHA
    ced5d1a View commit details
    Browse the repository at this point in the history

Commits on Mar 28, 2020

  1. Removed performance tests

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

  2. Actualize the content of the .gitattributes file 

    1. Removed no longer existing entries
2. Added new entries
3. Sorted using `sort` (ignores case and the leading dot, same as `ls`)
    @morozov
    morozov committed Mar 28, 2020
    Configuration menu
    Copy the full SHA
    fcf472a View commit details
    Browse the repository at this point in the history

  3. Merge pull request doctrine#3923 from morozov/remove-performance-tests 

    Removed performance tests
    @morozov
    morozov authored Mar 28, 2020
    Configuration menu
    Copy the full SHA
    715b589 View commit details
    Browse the repository at this point in the history

  4. Merge pull request doctrine#3924 from morozov/actualize-gitattributes 

    Actualize the content of the .gitattributes file
    @morozov
    morozov authored Mar 28, 2020
    Configuration menu
    Copy the full SHA
    cfd1c02 View commit details
    Browse the repository at this point in the history

Commits on Mar 29, 2020

  1. Upgrade to PHPStan v0.12 

    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.
    @lcobucci @morozov
    lcobucci authored and morozov committed Mar 29, 2020
    Configuration menu
    Copy the full SHA
    ab88b96 View commit details
    Browse the repository at this point in the history

  2. Respect interface's return type in methods

    @lcobucci @morozov
    lcobucci authored and morozov committed Mar 29, 2020
    Configuration menu
    Copy the full SHA
    f440d92 View commit details
    Browse the repository at this point in the history

  3. Declare return types in a BC compatible manner

    @lcobucci @morozov
    lcobucci authored and morozov committed Mar 29, 2020
    Configuration menu
    Copy the full SHA
    35beaca View commit details
    Browse the repository at this point in the history

Commits on Mar 30, 2020

  1. Fix argument type declaration 

    By either defining their types or renaming to match parent class (or
interface).
    @lcobucci @morozov
    lcobucci authored and morozov committed Mar 30, 2020
    Configuration menu
    Copy the full SHA
    2649ae6 View commit details
    Browse the repository at this point in the history

  2. Do not ignore the result of array_change_key_case()

    @morozov
    morozov committed Mar 30, 2020
    Configuration menu
    Copy the full SHA
    d267775 View commit details
    Browse the repository at this point in the history

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

    @morozov
    morozov committed Mar 30, 2020
    Configuration menu
    Copy the full SHA
    e6bfcad View commit details
    Browse the repository at this point in the history

  4. Removed redundant break statements

    @morozov
    morozov committed Mar 30, 2020
    Configuration menu
    Copy the full SHA
    e5068b4 View commit details
    Browse the repository at this point in the history

  5. AbstractPlatform::_getTransactionIsolationLevelSQL() must return a st… 

    …ring
    @morozov
    morozov committed Mar 30, 2020
    Configuration menu
    Copy the full SHA
    4650d9c View commit details
    Browse the repository at this point in the history

  6. Make sure that the options row was fetched successfully

    @morozov
    morozov committed Mar 30, 2020
    Configuration menu
    Copy the full SHA
    c9ec618 View commit details
    Browse the repository at this point in the history

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

    @morozov
    morozov committed Mar 30, 2020
    Configuration menu
    Copy the full SHA
    e247a10 View commit details
    Browse the repository at this point in the history

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

    Additionally, set the new value and get the old one in one ini_set() call.
    @morozov
    morozov committed Mar 30, 2020
    Configuration menu
    Copy the full SHA
    a56eeee View commit details
    Browse the repository at this point in the history

  9. Disabled some options and whitelisted false-positives

    @morozov
    morozov committed Mar 30, 2020
    Configuration menu
    Copy the full SHA
    0d36ac8 View commit details
    Browse the repository at this point in the history

  10. Merge pull request doctrine#3799 from lcobucci/upgrade-phpstan 

    Upgrade to PHPStan v0.12
    @morozov
    morozov authored Mar 30, 2020
    Configuration menu
    Copy the full SHA
    86e563a View commit details
    Browse the repository at this point in the history

  11. Added missing parameter types to CompositeExpression::(and|or)()

    @morozov
    morozov committed Mar 30, 2020
    Configuration menu
    Copy the full SHA
    32aac3b View commit details
    Browse the repository at this point in the history

  12. Merge branch '2.10.x' into 2.11.x

    @morozov
    morozov committed Mar 30, 2020
    Configuration menu
    Copy the full SHA
    239d3fb View commit details
    Browse the repository at this point in the history

Commits on Mar 31, 2020

  1. Merge branch '2.11.x' into 3.0.x

    @morozov
    morozov committed Mar 31, 2020
    Configuration menu
    Copy the full SHA
    8be6d16 View commit details
    Browse the repository at this point in the history

Commits on Apr 2, 2020

  1. Added argument type declaration to MasterSlaveConnection::connect()

    @morozov
    morozov committed Apr 2, 2020
    Configuration menu
    Copy the full SHA
    556c71d View commit details
    Browse the repository at this point in the history

  2. Removed never-reached code in tests

    @morozov
    morozov committed Apr 2, 2020
    Configuration menu
    Copy the full SHA
    2f5a345 View commit details
    Browse the repository at this point in the history

  3. Reworked unconditionally skipped tests

    @morozov
    morozov committed Apr 2, 2020
    Configuration menu
    Copy the full SHA
    754d604 View commit details
    Browse the repository at this point in the history

  4. Assert that the value is an array before accessing its elements

    @morozov
    morozov committed Apr 2, 2020
    Configuration menu
    Copy the full SHA
    d3a3e01 View commit details
    Browse the repository at this point in the history

  5. Merge branch '3.0.x'

    @morozov
    morozov committed Apr 2, 2020
    Configuration menu
    Copy the full SHA
    ac0e13a View commit details
    Browse the repository at this point in the history