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.
<!-- This is an auto-generated comment: release notes by coderabbit.ai
-->
## Summary by CodeRabbit
* **Chores**
* Removed an unused import and broadened PSR HTTP Message compatibility
in project manifests.
* **Tests**
* Minor formatting adjustments in test files; no behavioral changes.
<sub>✏️ Tip: You can customize this high-level summary in your review
settings.</sub>
<!-- end of auto-generated comment: release notes by coderabbit.ai -->
| Q | A
|-----------------|-----
| Branch? | 2.2 <!-- see the comment below -->
| Bug fix? | no
| New feature? | no
| BC breaks? | no
| License | MIT
<!--
- Bug fixes must be submitted against the 1.14 or 2.1 branch
- Features and deprecations must be submitted against the 2.2 branch
- Make sure that the correct base branch is set
To be sure you are not breaking any Backward Compatibilities, check the
documentation:
https://docs.sylius.com/en/latest/book/organization/backward-compatibility-promise.html
-->
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.1 -m "Resolve conflicts between 1.14 and 2.1"
```
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.
Remove legacy twig/twig version conflicts:
- Remove ^3.0 conflict (added in 2019, already removed in Sylius 2.0+)
- Remove ^1.0 conflict (Twig 1.x reached EOL years ago)
Keep twig/twig:3.9.0 conflict as it's a specific buggy version
documented in CONFLICTS.md.
Since Twig 2.x reached EOL in December 2023, these conflicts blocked
users of standalone bundles from upgrading to Twig 3.x.
Closes#18700
Adding this to 1.14 for better flexibility when upgrading projects. This
is not a BC break - it only extends the allowed versions without forcing
any changes.
Many modern libraries now require `psr/http-message: ^2.0` exclusively.
Sylius only uses the interfaces as type hints without implementing them,
so supporting both versions is safe. Backporting to 1.14 benefits end
applications that want to upgrade their dependencies.
Ref: https://github.com/Sylius/Sylius/issues/18698
Standardizes `timeout-minutes` across all CI workflow files to 15
minutes. Previously values ranged from 5 to 45 minutes.
Affected workflows:
- `ci__full_*.yaml` - notification jobs (5 -> 15)
- `ci_e2e-*.yaml` - e2e tests (45 -> 15)
- `ci_js.yaml` - JS tests (10 -> 15)
- `ci_packages*.yaml` - package tests (25 -> 15)
- `refactor.yaml`, `upmerge_pr.yaml` - utility jobs (5 -> 15)
<!-- This is an auto-generated comment: release notes by coderabbit.ai
-->
## Summary by CodeRabbit
* **Chores**
* Adjusted CI/CD pipeline job timeout configurations across multiple
workflows to better align with actual execution requirements, with some
jobs having increased timeouts and others optimized to reduced
durations.
<sub>✏️ Tip: You can customize this high-level summary in your review
settings.</sub>
<!-- end of auto-generated comment: release notes by coderabbit.ai -->
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.
<!-- This is an auto-generated comment: release notes by coderabbit.ai
-->
## Summary by CodeRabbit
* **New Features**
* Added telemetry collection for enabled countries per channel
* Added metrics tracking for virtual product variants and active
channels count
* Added enabled/disabled status tracking for payment and shipping
methods
* **Bug Fixes**
* Improved API Platform version detection with fallback mechanism
* Enhanced channel filtering to only include enabled channels in
telemetry data
* **Tests**
* Expanded test coverage for new data providers and schema generation
behavior
<sub>✏️ Tip: You can customize this high-level summary in your review
settings.</sub>
<!-- end of auto-generated comment: release notes by coderabbit.ai -->
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.1 -m "Resolve conflicts between 1.14 and 2.1"
```
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.
| Q | A
|-----------------|-----
| Branch? | 1.14 <!-- see the comment below -->
| Bug fix? | partially
| New feature? | no
| License | MIT
Bug Fixes
- Fixed hostname resolving in telemetry components
- Fixed orders count retrieving in telemetry data collection
New Data Collection
- Added virtual product variants count to metrics
- Added enabled channels count to metrics
- Added countries data collection
- Improved data structure for payment and shipping providers
Technical Improvements
- Added listener to skip optional telemetry index from schema validation
- Added fallback check for API Platform version detection
- Bumped telemetry schema version
<!--
- Bug fixes must be submitted against the 1.14 or 2.1 branch
- Features and deprecations must be submitted against the 2.2 branch
- Make sure that the correct base branch is set
To be sure you are not breaking any Backward Compatibilities, check the
documentation:
https://docs.sylius.com/en/latest/book/organization/backward-compatibility-promise.html
-->
