Skip to content

Merge 3.2.x into 3.3.x - #2255

Merged
derrabus merged 17 commits into
doctrine:3.3.xfrom
derrabus:3.3.x
Jul 22, 2026
Merged

Merge 3.2.x into 3.3.x#2255
derrabus merged 17 commits into
doctrine:3.3.xfrom
derrabus:3.3.x

Conversation

@derrabus

Copy link
Copy Markdown
Member

No description provided.

greg0ire and others added 15 commits June 9, 2026 21:38
The test suite fails because we are using symfony/event-dispatcher 8
with all other symfony components constrained to at most v7. If I recall
correctly, DoctrineBundle v2 will never support Symfony v8, so let's
downgrade this particular component.
In 964f2c4, I added a call to
mb_check_encoding(), making that extension required.
Bumps the doctrine group with 6 updates:

| Package | From | To |
| --- | --- | --- |
| [doctrine/.github/.github/workflows/coding-standards.yml](https://github.com/doctrine/.github) | `15.0.0` | `15.1.0` |
| [doctrine/.github/.github/workflows/composer-lint.yml](https://github.com/doctrine/.github) | `15.0.0` | `15.1.0` |
| [doctrine/.github/.github/workflows/documentation.yml](https://github.com/doctrine/.github) | `15.0.0` | `15.1.0` |
| [doctrine/.github/.github/workflows/release-on-milestone-closed.yml](https://github.com/doctrine/.github) | `15.0.0` | `15.1.0` |
| [doctrine/.github/.github/workflows/phpstan.yml](https://github.com/doctrine/.github) | `15.0.0` | `15.1.0` |
| [doctrine/.github/.github/workflows/website-schema.yml](https://github.com/doctrine/.github) | `15.0.0` | `15.1.0` |


Updates `doctrine/.github/.github/workflows/coding-standards.yml` from 15.0.0 to 15.1.0
- [Release notes](https://github.com/doctrine/.github/releases)
- [Commits](doctrine/.github@15.0.0...15.1.0)

Updates `doctrine/.github/.github/workflows/composer-lint.yml` from 15.0.0 to 15.1.0
- [Release notes](https://github.com/doctrine/.github/releases)
- [Commits](doctrine/.github@15.0.0...15.1.0)

Updates `doctrine/.github/.github/workflows/documentation.yml` from 15.0.0 to 15.1.0
- [Release notes](https://github.com/doctrine/.github/releases)
- [Commits](doctrine/.github@15.0.0...15.1.0)

Updates `doctrine/.github/.github/workflows/release-on-milestone-closed.yml` from 15.0.0 to 15.1.0
- [Release notes](https://github.com/doctrine/.github/releases)
- [Commits](doctrine/.github@15.0.0...15.1.0)

Updates `doctrine/.github/.github/workflows/phpstan.yml` from 15.0.0 to 15.1.0
- [Release notes](https://github.com/doctrine/.github/releases)
- [Commits](doctrine/.github@15.0.0...15.1.0)

Updates `doctrine/.github/.github/workflows/website-schema.yml` from 15.0.0 to 15.1.0
- [Release notes](https://github.com/doctrine/.github/releases)
- [Commits](doctrine/.github@15.0.0...15.1.0)

---
updated-dependencies:
- dependency-name: doctrine/.github/.github/workflows/coding-standards.yml
  dependency-version: 15.1.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: doctrine
- dependency-name: doctrine/.github/.github/workflows/composer-lint.yml
  dependency-version: 15.1.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: doctrine
- dependency-name: doctrine/.github/.github/workflows/documentation.yml
  dependency-version: 15.1.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: doctrine
- dependency-name: doctrine/.github/.github/workflows/release-on-milestone-closed.yml
  dependency-version: 15.1.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: doctrine
- dependency-name: doctrine/.github/.github/workflows/phpstan.yml
  dependency-version: 15.1.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: doctrine
- dependency-name: doctrine/.github/.github/workflows/website-schema.yml
  dependency-version: 15.1.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: doctrine
...

Signed-off-by: dependabot[bot] <support@github.com>
…ons/2.18.x/doctrine-3cce1735e3

Bump the doctrine group with 6 updates
Bumps [actions/checkout](https://github.com/actions/checkout) from 6 to 7.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](actions/checkout@v6...v7)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-version: '7'
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
…ons/2.18.x/actions/checkout-7

Bump actions/checkout from 6 to 7
…connections

getDatabasePlatform() triggers a connection to auto-detect the server version when
server_version is not configured. Since the target database does not exist yet at
this point, the connection fails. Switch to getDriver() which identifies the driver
type without opening any connection.
…connections

getDatabasePlatform() triggers a connection to auto-detect the server version when
server_version is not configured. Since the target database does not exist yet at
this point, the connection fails. Switch to getDriver() which identifies the driver
type without opening any connection.
# Conflicts:
#	.github/workflows/static-analysis.yml
#	composer.json
#	tests/Middleware/IdleConnectionMiddlewareTest.php
* 2.18.x:
  Fix dark theme time bar colors in the profiler
derrabus added 2 commits July 22, 2026 12:06
* 3.2.x:
  Revert EventDispatcher downgrade (doctrine#2256)
  Fix dark theme time bar colors in the profiler
  Fix doctrine:database:create failing without server_version for some connections
  Fix doctrine:database:create failing without server_version for some connections
  Add functional regression test for EntityValueResolver on primary-key routes (doctrine#2230)
  Bump actions/checkout from 6 to 7
  Bump the doctrine group with 6 updates
  Add missing dependency
  Apply latest coding standards
  Downgrade event-dispatcher
@derrabus
derrabus merged commit eb3ea68 into doctrine:3.3.x Jul 22, 2026
14 checks passed
@derrabus
derrabus deleted the 3.3.x branch July 22, 2026 10:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants