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.4.x up into 4.0.x #11689

Merged
merged 9 commits into from
Oct 17, 2024
Merged

Merge 3.4.x up into 4.0.x #11689

merged 9 commits into from
Oct 17, 2024

Commits on May 20, 2024

  1. allow classname in 'value' attribute of xml discriminator-mapping field

    @MatteoFeltrin
    MatteoFeltrin committed May 20, 2024
    Configuration menu
    Copy the full SHA
    73e30df View commit details
    Browse the repository at this point in the history

Commits on Oct 16, 2024

  1. Merge pull request #11453 from MatteoFeltrin/allow-fqcn-in-value-attr… 

    …ibute-of-discriminator-mapping

Allow classname in 'value' attribute of xml discriminator-mapping field
    @greg0ire
    greg0ire authored Oct 16, 2024
    Configuration menu
    Copy the full SHA
    9e884cc View commit details
    Browse the repository at this point in the history

  2. Remove leftovers from Sphinx (#11683) 

    We use phpDocumentor/guides now, no need for this.
    @greg0ire
    greg0ire authored Oct 16, 2024
    Configuration menu
    Copy the full SHA
    e47398e View commit details
    Browse the repository at this point in the history

  3. Remove YAML doc example 

    It was wrongly added during a merge up
    @greg0ire
    greg0ire committed Oct 16, 2024
    Configuration menu
    Copy the full SHA
    0893d85 View commit details
    Browse the repository at this point in the history

  4. Fix copy/paste/adapt mistake (#11684) 

    The last step was missing.
    @greg0ire
    greg0ire authored Oct 16, 2024
    Configuration menu
    Copy the full SHA
    182469b View commit details
    Browse the repository at this point in the history

  5. Merge pull request #11685 from greg0ire/fix-merge-up 

    Remove YAML doc example
    @greg0ire
    greg0ire authored Oct 16, 2024
    Configuration menu
    Copy the full SHA
    5aad44c View commit details
    Browse the repository at this point in the history

  6. Merge remote-tracking branch 'origin/2.20.x' into 3.3.x

    @greg0ire
    greg0ire committed Oct 16, 2024
    Configuration menu
    Copy the full SHA
    94702d1 View commit details
    Browse the repository at this point in the history

  7. Merge pull request #11686 from greg0ire/3.3.x 

    Merge 2.20.x up into 3.3.x
    @greg0ire
    greg0ire authored Oct 16, 2024
    Configuration menu
    Copy the full SHA
    9c0e62a View commit details
    Browse the repository at this point in the history

  8. Merge pull request #11688 from doctrine/3.3.x 

    Merge 3.3.x up into 3.4.x
    @greg0ire
    greg0ire authored Oct 16, 2024
    Configuration menu
    Copy the full SHA
    74155c8 View commit details
    Browse the repository at this point in the history