[PR #12306] [CLOSED] Merge 3.5.x into 3.6.x #13677

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

📋 Pull Request Information

Original PR: https://github.com/doctrine/orm/pull/12306
Author: @derrabus
Created: 11/29/2025
Status: Closed

Base: 3.6.xHead: 3.6.x


📝 Commits (10+)

  • c142503 Bump actions/checkout from 5 to 6 (#12292)
  • 6de5684 Bump doctrine/.github/.github/workflows/release-on-milestone-closed.yml (#12291)
  • 9814078 Bump doctrine/.github/.github/workflows/coding-standards.yml (#12290)
  • 3924c38 Bump doctrine/.github/.github/workflows/documentation.yml (#12289)
  • ab148d3 Bump doctrine/.github/.github/workflows/composer-lint.yml (#12288)
  • 87f1ba7 Support Symfony Console 8 (#12300)
  • 9d11fdd Fix PHPStan and test errors after DBAL 4.4 and Symfony 7.4 releases (#12301)
  • 152b0e3 Removes Guides from our dependencies (#12303)
  • 2e75a7f Merge branch '2.20.x' into 3.5.x
  • ccb35f9 Merge branch '3.5.x' into 3.6.x

📊 Changes

15 files changed (+29 additions, -34 deletions)

View changed files

📝 .github/workflows/coding-standards.yml (+1 -1)
📝 .github/workflows/composer-lint.yml (+1 -1)
📝 .github/workflows/continuous-integration.yml (+5 -5)
📝 .github/workflows/documentation.yml (+1 -1)
📝 .github/workflows/phpbench.yml (+1 -1)
📝 .github/workflows/release-on-milestone-closed.yml (+1 -1)
📝 .github/workflows/static-analysis.yml (+1 -1)
📝 composer.json (+0 -1)
📝 phpstan-baseline.neon (+0 -6)
📝 phpstan-dbal3.neon (+11 -5)
📝 phpstan.neon (+0 -5)
📝 src/Proxy/ProxyFactory.php (+2 -1)
📝 src/Tools/Console/ApplicationCompatibility.php (+2 -1)
📝 src/Tools/SchemaTool.php (+1 -4)
📝 tests/Tests/ORM/Functional/SchemaTool/MySqlSchemaToolTest.php (+2 -0)

📄 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/12306 **Author:** [@derrabus](https://github.com/derrabus) **Created:** 11/29/2025 **Status:** ❌ Closed **Base:** `3.6.x` ← **Head:** `3.6.x` --- ### 📝 Commits (10+) - [`c142503`](https://github.com/doctrine/orm/commit/c142503a5280fd5159afbe46be8586fb27936e8e) Bump actions/checkout from 5 to 6 (#12292) - [`6de5684`](https://github.com/doctrine/orm/commit/6de5684fd97c984c2fbc404d3cedd9ec36c47804) Bump doctrine/.github/.github/workflows/release-on-milestone-closed.yml (#12291) - [`9814078`](https://github.com/doctrine/orm/commit/9814078a2ccce5029e916ffcfb522878e0786003) Bump doctrine/.github/.github/workflows/coding-standards.yml (#12290) - [`3924c38`](https://github.com/doctrine/orm/commit/3924c38fabe8a03a5d80020ee31fc724127ebbca) Bump doctrine/.github/.github/workflows/documentation.yml (#12289) - [`ab148d3`](https://github.com/doctrine/orm/commit/ab148d3d9d54f22e4ba55d4858c587929317f10a) Bump doctrine/.github/.github/workflows/composer-lint.yml (#12288) - [`87f1ba7`](https://github.com/doctrine/orm/commit/87f1ba74e04c8694ca00099f3c64706ebac0b114) Support Symfony Console 8 (#12300) - [`9d11fdd`](https://github.com/doctrine/orm/commit/9d11fdd3da9ffb78f4ed703421accbd443366f16) Fix PHPStan and test errors after DBAL 4.4 and Symfony 7.4 releases (#12301) - [`152b0e3`](https://github.com/doctrine/orm/commit/152b0e3d65a48b887a9ee7d5d3d0ae3e0e794f86) Removes Guides from our dependencies (#12303) - [`2e75a7f`](https://github.com/doctrine/orm/commit/2e75a7f1c19540b802cebcd1ca8bf3c22cf8bdfe) Merge branch '2.20.x' into 3.5.x - [`ccb35f9`](https://github.com/doctrine/orm/commit/ccb35f9be423e35b9c2d32f0ba4fb5d9cf032952) Merge branch '3.5.x' into 3.6.x ### 📊 Changes **15 files changed** (+29 additions, -34 deletions) <details> <summary>View changed files</summary> 📝 `.github/workflows/coding-standards.yml` (+1 -1) 📝 `.github/workflows/composer-lint.yml` (+1 -1) 📝 `.github/workflows/continuous-integration.yml` (+5 -5) 📝 `.github/workflows/documentation.yml` (+1 -1) 📝 `.github/workflows/phpbench.yml` (+1 -1) 📝 `.github/workflows/release-on-milestone-closed.yml` (+1 -1) 📝 `.github/workflows/static-analysis.yml` (+1 -1) 📝 `composer.json` (+0 -1) 📝 `phpstan-baseline.neon` (+0 -6) 📝 `phpstan-dbal3.neon` (+11 -5) 📝 `phpstan.neon` (+0 -5) 📝 `src/Proxy/ProxyFactory.php` (+2 -1) 📝 `src/Tools/Console/ApplicationCompatibility.php` (+2 -1) 📝 `src/Tools/SchemaTool.php` (+1 -4) 📝 `tests/Tests/ORM/Functional/SchemaTool/MySqlSchemaToolTest.php` (+2 -0) </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:18:05 +01:00
admin closed this issue 2026-01-22 16:18:05 +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#13677