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

Merge 3.7.x into 4.0.x #6121

Merged
merged 11 commits into from
Aug 8, 2023
Merged

Merge 3.7.x into 4.0.x #6121

merged 11 commits into from
Aug 8, 2023

Commits on Jul 25, 2023

  1. Pin Slevomat Coding Standard

    @derrabus
    derrabus committed Jul 25, 2023
    Configuration menu
    Copy the full SHA
    23ec253 View commit details
    Browse the repository at this point in the history

  2. Merge pull request doctrine#6111 from derrabus/bugfix/pin-cs 

    Pin Slevomat Coding Standard
    @greg0ire
    greg0ire authored Jul 25, 2023
    Configuration menu
    Copy the full SHA
    62cce0a View commit details
    Browse the repository at this point in the history

  3. Merge pull request doctrine#6112 from doctrine/3.6.x 

    Merge 3.6.x up into 3.7.x
    @greg0ire
    greg0ire authored Jul 25, 2023
    Configuration menu
    Copy the full SHA
    be8451a View commit details
    Browse the repository at this point in the history

  4. Fix self deprecation

    @VincentLanglet
    VincentLanglet committed Jul 25, 2023
    Configuration menu
    Copy the full SHA
    90ea2ec View commit details
    Browse the repository at this point in the history

Commits on Jul 26, 2023

  1. Merge pull request doctrine#6113 from VincentLanglet/fixDeprecation 

    Fix self deprecation from getCustomSchemaOptions
    @greg0ire
    greg0ire authored Jul 26, 2023
    Configuration menu
    Copy the full SHA
    f94be5b View commit details
    Browse the repository at this point in the history

Commits on Jul 27, 2023

  1. PHPStan 1.10.26 (doctrine#6116) 

    |      Q       |   A
|------------- | -----------
| Type         | improvement
| Fixed issues | N/A

#### Summary

Apparently, the stubs for `db2_num_rows()` were changed upstream. I'm
ignoring the error for now, maybe we can fix it on 3.7.x if we feel like
it's worth doing.
    @derrabus
    derrabus authored Jul 27, 2023
    Configuration menu
    Copy the full SHA
    195aad3 View commit details
    Browse the repository at this point in the history

Commits on Aug 4, 2023

  1. Fix a typo and a space (doctrine#6119) 

    #### Summary

A typo fix and a space fix
    @williamdes
    williamdes authored Aug 4, 2023
    Configuration menu
    Copy the full SHA
    c1d265f View commit details
    Browse the repository at this point in the history

  2. Sync MariaDB support strategy with upstream (doctrine#6110)

    @derrabus
    derrabus authored Aug 4, 2023
    Configuration menu
    Copy the full SHA
    2f1e19e View commit details
    Browse the repository at this point in the history

  3. Run tests with MySQL 8.1 (doctrine#6118)

    @derrabus
    derrabus authored Aug 4, 2023
    Configuration menu
    Copy the full SHA
    17d7baf View commit details
    Browse the repository at this point in the history

Commits on Aug 8, 2023

  1. Merge branch '3.6.x' into 3.7.x 

    * 3.6.x:
  Run tests with MySQL 8.1 (doctrine#6118)
  Fix a typo and a space (doctrine#6119)
  PHPStan 1.10.26 (doctrine#6116)
  Fix self deprecation
    @derrabus
    derrabus committed Aug 8, 2023
    Configuration menu
    Copy the full SHA
    1800cc4 View commit details
    Browse the repository at this point in the history

  2. Merge branch '3.7.x' into 4.0.x 

    * 3.7.x:
  Run tests with MySQL 8.1 (doctrine#6118)
  Sync MariaDB support strategy with upstream (doctrine#6110)
  Fix a typo and a space (doctrine#6119)
  PHPStan 1.10.26 (doctrine#6116)
  Fix self deprecation
  Pin Slevomat Coding Standard
    @derrabus
    derrabus committed Aug 8, 2023
    Configuration menu
    Copy the full SHA
    6b76e92 View commit details
    Browse the repository at this point in the history