Code

Merge 2.18.x up into 3.0.x#11202

Code

Merged

greg0ire merged 12 commits intodoctrine:3.0.xdoctrine/orm:3.0.xfrom mpdude:mergeup-2.18.x-3.0.xmpdude/doctrine2:mergeup-2.18.x-3.0.xCopy head branch name to clipboardFeb 1, 2024

+93-250

Commits

Commits on Jan 29, 2024

• Use a more specific type for getSqlStatements()

  Show description for e110941
  greg0ire

  committed
  e110941

  Copy full SHA for e110941

Commits on Jan 30, 2024

• Merge pull request doctrine#11195 from greg0ire/more-specific-type

  Show description for 8845b6d
  greg0ire

  authored
  8845b6d

  Copy full SHA for 8845b6d

• Cover limit/offset values in LimitSubqueryOutputWalkerTest

  Show description for 152ebd7
  mpdude

  committed
  152ebd7

  Copy full SHA for 152ebd7

• Merge pull request doctrine#11197 from mpdude/update-limit-subquery-output-walker-test

  Show description for 12c4560
  greg0ire

  authored
  12c4560

  Copy full SHA for 12c4560

• Fix calls to removed lock methods (doctrine#11061)

  

  derrabus

  authored and

  jwage

  committed
  79c7c50

  Copy full SHA for 79c7c50

Commits on Jan 31, 2024

• Merge pull request doctrine#11198 from jwage/port-lock-sql-changes

  Show description for f58984c
  greg0ire

  authored
  f58984c

  Copy full SHA for f58984c

• Merge remote-tracking branch 'origin/2.17.x' into 2.18.x

  mpdude

  committed
  9a6ff66

  Copy full SHA for 9a6ff66

• Merge pull request doctrine#11201 from mpdude/merge-up-217-218

  Show description for f2176a9
  greg0ire

  authored
  f2176a9

  Copy full SHA for f2176a9

• Merge remote-tracking branch 'origin/2.18.x' into 3.0.x

  Show description for da6c6f7
  mpdude

  committed
  da6c6f7

  Copy full SHA for da6c6f7

• Fix CS after merge-up

  mpdude

  committed
  09f0966

  Copy full SHA for 09f0966

Commits on Feb 1, 2024

• Write LimitSubqueryOutputWalkerTest in a way that is portable between DBAL 3 and 4

  mpdude

  committed
  1df03f2

  Copy full SHA for 1df03f2

• Fix Psalm complaints after merge-up

  mpdude

  committed
  c7a91a4

  Copy full SHA for c7a91a4