Skip to content

merge 2.x up to 3.x - #1653

Open
dbu wants to merge 52 commits into
3.xfrom
2-to-3
Open

dbu wants to merge 52 commits into
3.xfrom
2-to-3

Conversation

@dbu

@dbu dbu commented Mar 19, 2026

Copy link
Copy Markdown
Collaborator

there were a bunch of conflicts.

deguif and others added 30 commits August 26, 2025 10:57
use ubuntu-latest to build, 20.04 has been discontinued
Review default value configuration for s3 cache
Enable autowiring for filter service
Add ability to inject a custom S3 client on aws s3 resolver
Support disabled acls on s3 buckets
dmaicher/fix_issue_1635
drop support for unmaintained Symfony versions
Start moving Symfony DI config from XML to PHP format
Migrate `imagine.xml` config to php format
Migrate remaining xml config files to php
@Amoifr

Amoifr commented Nov 2, 2026

Copy link
Copy Markdown
Contributor

Hi @dbu! I'd be happy to help get this upmerge green, so that the resolver fix of #1652 finally reaches 3.x.

Before I start, how would you like to receive the fixes?

  1. PRs against the 2-to-3 branch, fixing the drift that didn't show as conflicts (mostly the service definitions rewritten from XML to PHP, compared one by one with 2.x), then phpstan and the test jobs.
  2. Or a fresh branch from 3.x with the current 2.x merged in: 2.x has moved 25 commits past 2-to-3 since March, so this would avoid a second round of conflicts later.

I'd go with 1 and merge the latest 2.x into it at the end, unless you prefer otherwise. And if you already have local progress on this, no worries, I'll leave it to you.

@dbu

dbu commented Nov 8, 2026

Copy link
Copy Markdown
Collaborator Author

hi, thanks for looking into this. this got quite messy. glad if you are motivated to pick it up. a pull request against this branch to fix its issues sounds good. when its all green and fine, i can merge it to 3.x and then you could do another round of upgrade 3.x from 2.x, solving the new conflicts.

3.x has stalled quite heavily - i would love to radically rebuild the bundle to make the naming better and get rid of the built-in storage things in favor of a tiny abstraction over flysystem so that we don't have s3 and whatnot code in here... are you actively using 3.x?
maybe we should instead release 3.x soonish once you upgraded from 2.x and if i actually ever do that big refactoring, it can be 4.x.

@Amoifr

Amoifr commented Nov 8, 2026

Copy link
Copy Markdown
Contributor

Thanks @dbu, sounds like a plan! I'll open a PR against 2-to-3 to get it green, then do the second 2.x to 3.x round once it's merged.

To answer your question: no, I'm on 2.x in production. My motivation is mostly to have fixes like #1652 reach 3.x. Releasing 3.x soonish and keeping the big flysystem refactoring for 4.x sounds very reasonable to me: a release with a clean upgrade path beats a perfect one that never ships. 😄

The merge of 2.x only updated files that already existed in the 3.x
layout, so the files added on 2.x after the move to src/ and tests/
were left out or kept at their old place:

- AssetMapperLocator and AssetMapperLoaderFactory, with their tests
  and documentation (the bundle class and the service config already
  referenced them). The factory gets the typed 3.x signatures.
- doc/events.rst, still listed in the documentation index.
- the console used by the lint:container CI step, moved from
  Tests/Functional/app/bin to tests/Functional/app/bin.
2.x converted the service definitions from XML to PHP, and the merge
took the 2.x files, dropping what 3.x had changed in imagine.xml:

- the mime type and extension guessers use symfony/mime MimeTypes
  again instead of the HttpFoundation guessers removed in Symfony 5
- remove the deprecated paste and watermark filter loaders using
  %kernel.root_dir%
- remove the prototype of the CacheResolver removed in 3.x
The merged workflow tested Symfony 7.0, which composer.json no longer
allows, kept a minimum-stability step whose matrix value was removed,
and lost the step adding symfony/asset-mapper. Take the 2.x workflow,
without the enqueue step (Enqueue support is removed in 3.x), with the
3.x branch trigger and the console path in tests/.
- drop the "?? ''" on $acl, which is a non-nullable string in 3.x
- call expectExceptionMessageMatches(), the BC helper of 2.x does not
  exist in 3.x
phpstan-symfony 1.x reports every call on the generic NodeBuilder and
ExprBuilder types of symfony/config 7.4 as a call on an unknown class.
These errors are gone with phpstan 2 and phpstan-symfony 2.
Amoifr and others added 3 commits November 15, 2026 10:43
It has no effect since PHP 8.1, the minimum version of the bundle, and
the PHP 8.5 jobs fail on the self deprecation notice it triggers.
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