[UPMERGE] 2.1 -> 2.2 (#18486)

This PR has been generated automatically.
For more details see
[upmerge_pr.yaml](/Sylius/Sylius/blob/2.1/.github/workflows/upmerge_pr.yaml).

**Remember!** The upmerge should always be merged with using `Merge pull
request` button.

In case of conflicts, please resolve them manually with usign the
following commands:
```
git fetch upstream
gh pr checkout <this-pr-number>
git merge upstream/2.2 -m "Resolve conflicts between 2.1 and 2.2"
```

If you use other name for the upstream remote, please replace `upstream`
with the name of your remote pointing to the `Sylius/Sylius` repository.

Once the conflicts are resolved, please run `git merge --continue` and
push the changes to this PR.

CONFLICTS.md

@@ -6,3 +6,10 @@ This document explains why certain conflicts were added to `composer.json` and r
 
   The versions 2.28.0 and 2.28.1 throws a MethodNotAllowedException during using live components.
   Since the version 2.29 the behavior of UrlFactory::createFromPreviousAndProps method has been changed that unmatches the previous one.
+
+- `doctrine/orm:2.20.7||3.5.3`:
+
+  These versions contain a regression that breaks queries with empty arrays, causing SQL syntax errors when methods like `EntityRepository::findById([])` are called with an empty array.
+  This leads to invalid SQL queries like `WHERE t0.id IN ()`.
+
+  References: https://github.com/doctrine/orm/issues/12245

composer.json

@@ -242,6 +242,7 @@
         "winzou/state-machine-bundle": "If you want to use Winzou State Machine (^0.6)"
     },
     "conflict": {
+        "doctrine/orm": "2.20.7 || 3.5.3",
         "symfony/ux-live-component": "2.28.0 || 2.28.1"
     },
     "config": {