Code

Merge 3.3.x up into 3.4.x#11688

Code

Merged

greg0ire merged 8 commits into3.4.xdoctrine/orm:3.4.xfrom 3.3.xdoctrine/orm:3.3.xCopy head branch name to clipboardOct 16, 2024

+74-226

Commits

Commits on May 20, 2024

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

  MatteoFeltrin

  committed
  73e30df

  Copy full SHA for 73e30df

Commits on Oct 16, 2024

• Merge pull request #11453 from MatteoFeltrin/allow-fqcn-in-value-attribute-of-discriminator-mapping

  Show description for 9e884cc
  greg0ire

  authored
  9e884cc

  Copy full SHA for 9e884cc

• Remove leftovers from Sphinx (#11683)

  Show description for e47398e
  greg0ire

  authored
  e47398e

  Copy full SHA for e47398e

• Remove YAML doc example

  Show description for 0893d85
  greg0ire

  committed
  0893d85

  Copy full SHA for 0893d85

• Fix copy/paste/adapt mistake (#11684)

  Show description for 182469b
  greg0ire

  authored
  182469b

  Copy full SHA for 182469b

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

  Show description for 5aad44c
  greg0ire

  authored
  5aad44c

  Copy full SHA for 5aad44c

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

  greg0ire

  committed
  94702d1

  Copy full SHA for 94702d1

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

  Show description for 9c0e62a
  greg0ire

  authored
  9c0e62a

  Copy full SHA for 9c0e62a