[PR #12143] [MERGED] Merge 2.20.x up into 3.5.x #13518

Closed
opened 2026-01-22 16:17:20 +01:00 by admin · 0 comments
Owner

📋 Pull Request Information

Original PR: https://github.com/doctrine/orm/pull/12143
Author: @greg0ire
Created: 8/19/2025
Status: Merged
Merged: 8/19/2025
Merged by: @greg0ire

Base: 3.5.xHead: 3.5.x


📝 Commits (10+)

  • d68c1dc chore: remove run-all.sh
  • 26af013 Bump actions/download-artifact from 4 to 5
  • 05760f9 Merge pull request #12127 from doctrine/dependabot/github_actions/2.20.x/actions/download-artifact-5
  • 1a2826d Merge pull request #12053 from alexislefebvre/chore-remove-run-all.sh
  • ae5e9c8 PHPStan 2.1.22
  • cf5503b PHPCS 3.13.2 (#12134)
  • 613f52d Bump actions/checkout from 4 to 5
  • ac37a87 Merge pull request #12139 from doctrine/dependabot/github_actions/2.20.x/actions/checkout-5
  • 397358c Merge pull request #12133 from greg0ire/update-phpstan
  • 0f229fb Merge remote-tracking branch 'origin/2.20.x' into 3.5.x

📊 Changes

8 files changed (+30 additions, -59 deletions)

View changed files

📝 .gitattributes (+0 -1)
📝 .github/workflows/continuous-integration.yml (+6 -6)
📝 .github/workflows/phpbench.yml (+1 -1)
📝 .github/workflows/static-analysis.yml (+1 -1)
📝 composer.json (+2 -2)
📝 phpstan-baseline.neon (+20 -26)
run-all.sh (+0 -21)
📝 src/Mapping/Driver/XmlDriver.php (+0 -1)

📄 Description

No description provided


🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.

## 📋 Pull Request Information **Original PR:** https://github.com/doctrine/orm/pull/12143 **Author:** [@greg0ire](https://github.com/greg0ire) **Created:** 8/19/2025 **Status:** ✅ Merged **Merged:** 8/19/2025 **Merged by:** [@greg0ire](https://github.com/greg0ire) **Base:** `3.5.x` ← **Head:** `3.5.x` --- ### 📝 Commits (10+) - [`d68c1dc`](https://github.com/doctrine/orm/commit/d68c1dcd6df4820724459c8a777eb18a675762bb) chore: remove run-all.sh - [`26af013`](https://github.com/doctrine/orm/commit/26af013842790446d05818aabba27220260e524f) Bump actions/download-artifact from 4 to 5 - [`05760f9`](https://github.com/doctrine/orm/commit/05760f9454892437b71774580b73cbf66abb4587) Merge pull request #12127 from doctrine/dependabot/github_actions/2.20.x/actions/download-artifact-5 - [`1a2826d`](https://github.com/doctrine/orm/commit/1a2826d1473ca200e531e49110c6f12a4790ef55) Merge pull request #12053 from alexislefebvre/chore-remove-run-all.sh - [`ae5e9c8`](https://github.com/doctrine/orm/commit/ae5e9c8c6cd2643ebad070d980d58a55698c7baf) PHPStan 2.1.22 - [`cf5503b`](https://github.com/doctrine/orm/commit/cf5503b0d84c490637d5d7df22f59ff9c97f942d) PHPCS 3.13.2 (#12134) - [`613f52d`](https://github.com/doctrine/orm/commit/613f52db5a8f963563761d29bdf60e965d521d29) Bump actions/checkout from 4 to 5 - [`ac37a87`](https://github.com/doctrine/orm/commit/ac37a87a3d26729387c548703120e3c8183cf4ec) Merge pull request #12139 from doctrine/dependabot/github_actions/2.20.x/actions/checkout-5 - [`397358c`](https://github.com/doctrine/orm/commit/397358c3087c65bb1907362465f7885e5d16ebae) Merge pull request #12133 from greg0ire/update-phpstan - [`0f229fb`](https://github.com/doctrine/orm/commit/0f229fbb4b8086d7994a2d9e58e0d0ac6d6d0d09) Merge remote-tracking branch 'origin/2.20.x' into 3.5.x ### 📊 Changes **8 files changed** (+30 additions, -59 deletions) <details> <summary>View changed files</summary> 📝 `.gitattributes` (+0 -1) 📝 `.github/workflows/continuous-integration.yml` (+6 -6) 📝 `.github/workflows/phpbench.yml` (+1 -1) 📝 `.github/workflows/static-analysis.yml` (+1 -1) 📝 `composer.json` (+2 -2) 📝 `phpstan-baseline.neon` (+20 -26) ➖ `run-all.sh` (+0 -21) 📝 `src/Mapping/Driver/XmlDriver.php` (+0 -1) </details> ### 📄 Description _No description provided_ --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>
admin added the pull-request label 2026-01-22 16:17:20 +01:00
admin closed this issue 2026-01-22 16:17:20 +01:00
Sign in to join this conversation.
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: doctrine/archived-orm#13518