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 2.12.x into 3.0.x #4381

Merged
merged 27 commits into from
Oct 22, 2020
Merged

Manually merge 2.12.x into 3.0.x #4381

merged 27 commits into from
Oct 22, 2020

Commits on Oct 19, 2020

  1. Release 2.11.2

    @morozov
    morozov committed Oct 19, 2020
    Configuration menu
    Copy the full SHA
    b88a45c View commit details
    Browse the repository at this point in the history

  2. Bump version to 2.11.3-DEV

    @morozov
    morozov committed Oct 19, 2020
    Configuration menu
    Copy the full SHA
    1f72f05 View commit details
    Browse the repository at this point in the history

  3. Bump version to 2.12.0-DEV

    @morozov
    morozov committed Oct 19, 2020
    Configuration menu
    Copy the full SHA
    a1f820e View commit details
    Browse the repository at this point in the history

  4. PHP 8 compatibility.

    @derrabus
    derrabus committed Oct 19, 2020
    Configuration menu
    Copy the full SHA
    a3135e2 View commit details
    Browse the repository at this point in the history

  5. Merge pull request doctrine#4347 from derrabus/bugfix/php8-compat 

    [2.12] PHP 8 compatibility
    @greg0ire
    greg0ire authored Oct 19, 2020
    Configuration menu
    Copy the full SHA
    b407f8b View commit details
    Browse the repository at this point in the history

  6. Use sqlsrv 5.9.0-preview1 

    It has support for PHP8.
    @greg0ire
    greg0ire committed Oct 19, 2020
    Configuration menu
    Copy the full SHA
    12b528d View commit details
    Browse the repository at this point in the history

  7. Skip test on PHP8 

    That test will get remove in next major release, and requires too much
maintenance.
    @greg0ire
    greg0ire committed Oct 19, 2020
    Configuration menu
    Copy the full SHA
    f3cd606 View commit details
    Browse the repository at this point in the history

Commits on Oct 20, 2020

  1. Move the logic out of the assertion

    @morozov
    morozov committed Oct 20, 2020
    Configuration menu
    Copy the full SHA
    eb34f48 View commit details
    Browse the repository at this point in the history

  2. Test all extensions with PHP8 

    Jobs that use other versions of PHP are temporarily removed so that it's
easier to focus and iterate.
    @greg0ire
    greg0ire committed Oct 20, 2020
    Configuration menu
    Copy the full SHA
    94c02cc View commit details
    Browse the repository at this point in the history

  3. Fail on extension / tool installation failure 

    This leverages a new feature of shivammathur/setup-php that allows to
fail the build if an extension or tool fails to install.
    @greg0ire
    greg0ire committed Oct 20, 2020
    Configuration menu
    Copy the full SHA
    bb3082c View commit details
    Browse the repository at this point in the history

  4. Merge pull request doctrine#4364 from morozov/issues/4359 

    Move the logic out of the assertion
    @morozov
    morozov authored Oct 20, 2020
    Configuration menu
    Copy the full SHA
    bc61ebe View commit details
    Browse the repository at this point in the history

  5. Release 2.11.3

    @morozov
    morozov committed Oct 20, 2020
    Configuration menu
    Copy the full SHA
    fb5d5f2 View commit details
    Browse the repository at this point in the history

  6. Merge pull request doctrine#4361 from greg0ire/test-all-extensions-wi… 

    …th-php8
    @greg0ire
    greg0ire authored Oct 20, 2020
    Configuration menu
    Copy the full SHA
    b85809c View commit details
    Browse the repository at this point in the history

  7. Bump version to 2.11.4-DEV

    @morozov
    morozov committed Oct 20, 2020
    Configuration menu
    Copy the full SHA
    b7fd778 View commit details
    Browse the repository at this point in the history

  8. Merge branch '2.11.x' into 2.12.x

    @morozov
    morozov committed Oct 20, 2020
    Configuration menu
    Copy the full SHA
    903334c View commit details
    Browse the repository at this point in the history

  9. Adds exception thrown by execute() method 

    My IDE was telling me I was trying to catch a non-existent exception, however it's clear by digging down a level that the Exception is throw by this class, so this simply annotates that.

Perhaps this should catch it and throw a QueryException?
    @toby-griffiths @greg0ire
    toby-griffiths authored and greg0ire committed Oct 20, 2020
    Configuration menu
    Copy the full SHA
    de9ce76 View commit details
    Browse the repository at this point in the history

  10. Psalm fails on release commits

    @morozov
    morozov committed Oct 20, 2020
    Configuration menu
    Copy the full SHA
    f259b59 View commit details
    Browse the repository at this point in the history

  11. Reduce number of build jobs 

    Test the newest version, the oldest version, and versions for which we
have version-specific code.
This is based on platform classes that have a version number in their
name.
    @greg0ire
    greg0ire committed Oct 20, 2020
    Configuration menu
    Copy the full SHA
    22e370a View commit details
    Browse the repository at this point in the history

Commits on Oct 21, 2020

  1. Merge pull request doctrine#4373 from morozov/issues/4367 

    Psalm fails on release commits
    @morozov
    morozov authored Oct 21, 2020
    Configuration menu
    Copy the full SHA
    1b303ba View commit details
    Browse the repository at this point in the history

  2. Merge pull request doctrine#4365 from greg0ire/fail-fast 

    Fail on extension / tool installation failure
    @greg0ire
    greg0ire authored Oct 21, 2020
    Configuration menu
    Copy the full SHA
    9350d2a View commit details
    Browse the repository at this point in the history

  3. Merge pull request doctrine#4362 from toby-griffiths/add-missing-exce… 

    …ption-annotation

Adds exception thrown by execute() method
    @greg0ire
    greg0ire authored Oct 21, 2020
    Configuration menu
    Copy the full SHA
    38989c2 View commit details
    Browse the repository at this point in the history

  4. Merge pull request doctrine#4374 from greg0ire/reduce-number-of-build… 

    …-jobs

Reduce number of build jobs
    @greg0ire
    greg0ire authored Oct 21, 2020
    Configuration menu
    Copy the full SHA
    7b5d241 View commit details
    Browse the repository at this point in the history

Commits on Oct 22, 2020

  1. Configuration should not be internal

    @BenMorel @greg0ire
    BenMorel authored and greg0ire committed Oct 22, 2020
    Configuration menu
    Copy the full SHA
    e5160b2 View commit details
    Browse the repository at this point in the history

  2. Merge pull request doctrine#4376 from BenMorel/internal 

    Configuration should not be internal
    @morozov
    morozov authored Oct 22, 2020
    Configuration menu
    Copy the full SHA
    a79c8c3 View commit details
    Browse the repository at this point in the history

  3. Release 2.12.0

    @greg0ire
    greg0ire committed Oct 22, 2020
    Configuration menu
    Copy the full SHA
    c6d37b4 View commit details
    Browse the repository at this point in the history

  4. Bump version to 2.12.1-DEV

    @greg0ire
    greg0ire committed Oct 22, 2020
    Configuration menu
    Copy the full SHA
    bdb7983 View commit details
    Browse the repository at this point in the history

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

    @greg0ire
    greg0ire committed Oct 22, 2020
    Configuration menu
    Copy the full SHA
    7a9306b View commit details
    Browse the repository at this point in the history