This PR has been generated automatically.
For more details see
[upmerge_pr.yaml](/Sylius/Sylius/blob/1.13/.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/1.13 -m "Resolve conflicts between 1.12 and 1.13"
```
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
change the commit title to
```
Resolve conflicts between 1.12 and 1.13
```
This PR has been generated automatically.
For more details see
[upmerge_pr.yaml](/Sylius/Sylius/blob/1.13/.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/1.13 -m "Resolve conflicts between 1.12 and 1.13"
```
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
change the commit title to
```
Resolve conflicts between 1.12 and 1.13
```
This PR was merged into the 1.12 branch.
Discussion
----------
| Q | A |
|-----------------|--------------------------------------------------------------|
| Branch? | 1.12 |
| Bug fix? | yes |
| New feature? | no |
| BC breaks? | no |
| Deprecations? | no |
| Related tickets | fixes#15668, #12330 |
| License | MIT |
Commits
-------
[Admin] Do not disable channel base currency when none set
This PR was merged into the 1.12 branch.
Discussion
----------
| Q | A |
|-----------------|--------------------------------------------------------------|
| Branch? | 1.12. |
| Bug fix? | yes. |
| New feature? | no. |
| BC breaks? | no. |
| Deprecations? | no. |
| Related tickets | #15938 |
| License | MIT |
<!--
- Bug fixes must be submitted against the 1.12 branch
- Features and deprecations must be submitted against the 1.13 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
-->
**Description**
As described in: #15938
When you upload a file in the image widget the uploaded image has no spacing between the choose file button. Therfore it looks a bit squeezed which doesent look very nice.
To make it look consistent i added a CSS class arround the button with a `margin-bottom` that has the same spacing as between the Type input, and the choose file button.
<img width="421" alt="before_and_after" src="https://github.com/Sylius/Sylius/assets/39345336/4ec1fcf4-fccb-4ed3-9124-075401815c51">
Commits
-------
BUGFIX: #15938 add spacing between choose file button and uploaded image in image_widget
TASK: adjust naming of css class
This PR was merged into the 1.12 branch.
Discussion
----------
| Q | A |
|-----------------|--------------------------------------------------------------|
| Branch? | 1.12 |
| Bug fix? | yes |
| New feature? | no |
| BC breaks? | no |
| Deprecations? | no |
| Related tickets | |
| License | MIT |
Moving information about GUS to a more appropriate place.
Commits
-------
e41d1081b1 [Docs] refactor information about GUS
This PR was merged into the 1.13 branch.
Discussion
----------
| Q | A |
|-----------------|--------------------------------------------------------------|
| Branch? | 1.13 |
| Bug fix? | kinda |
| New feature? | no |
| BC breaks? | no |
| Deprecations? | no |
| Related tickets | - |
| License | MIT |
Rationale:
1. The argument is only present in the implementation's signature
2. If someone overwritten the method, nothing changes
3. If someone implemented the interface on their own, nothing changes since the interface doesn't have this argument
4. If someone uses the method w/ 3 arguments, nothing changes since it's not used in the method itself and PHP allows passing more than declared arguments to a method
Commits
-------
[Order] Remove dead argument from OrderRepository::countByCustomerAndCoupon
This PR was merged into the 1.13 branch.
Discussion
----------
| Q | A |
|-----------------|--------------------------------------------------------------|
| Branch? | 1.13|
| Bug fix? | no |
| New feature? | no |
| BC breaks? | no |
| Deprecations? | no<!-- don't forget to update the UPGRADE-*.md file --> |
| Related tickets | |
| License | MIT |
<!--
- Bug fixes must be submitted against the 1.12 branch
- Features and deprecations must be submitted against the 1.13 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
-->
Commits
-------
[API] Remove experimental tag
[API] Remove experimental note from Swagger + remove unneeded template
This PR has been generated automatically.
For more details see
[upmerge_pr.yaml](/Sylius/Sylius/blob/1.13/.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/1.13 -m "Resolve conflicts between 1.12 and 1.13"
```
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
change the commit title to
```
Resolve conflicts between 1.12 and 1.13
```
This PR was merged into the 1.12 branch.
Discussion
----------
| Q | A |
|-----------------|--------------------------------------------------------------|
| Branch? | 1.12|
| Bug fix? | no |
| New feature? | no |
| BC breaks? | no |
| Deprecations? | no<!-- don't forget to update the UPGRADE-*.md file --> |
| Related tickets | #15956 and #15957 |
| License | MIT |
<!--
- Bug fixes must be submitted against the 1.12 branch
- Features and deprecations must be submitted against the 1.13 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
-->
Commits
-------
[Admin] Remove info about forum from Admin panel
[Documentation] Remove remaining info about forum
This PR was merged into the 1.13 branch.
Discussion
----------
| Q | A |
|-----------------|--------------------------------------------------------------|
| Branch? | 1.13 |
| Bug fix? | no |
| New feature? | no |
| BC breaks? | no |
| Deprecations? | no |
| Related tickets | - |
| License | MIT |
Commits
-------
[Maintenance] Update GHA
This PR has been generated automatically.
For more details see
[upmerge_pr.yaml](/Sylius/Sylius/blob/1.13/.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/1.13 -m "Resolve conflicts between 1.12 and 1.13"
```
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
change the commit title to
```
Resolve conflicts between 1.12 and 1.13
```
This PR was merged into the 1.12 branch.
Discussion
----------
| Q | A |
|-----------------|--------------------------------------------------------------|
| Branch? | 1.12 |
| Bug fix? | no |
| New feature? | no |
| BC breaks? | no |
| Deprecations? | no |
| Related tickets | |
| License | MIT |
Sylius Forum is no longer alive
Commits
-------
319acfde7f Update README.md remove info about forum
This PR was merged into the 1.12 branch.
Discussion
----------
| Q | A |
|-----------------|--------------------------------------------------------------|
| Branch? | 1.12 |
| Bug fix? | yes |
| New feature? | no |
| BC breaks? | no |
| Deprecations? | no |
| Related tickets | |
| License | MIT |
Sylius Forum is no longer alive, it should not be mentioned in the docs anymore.
Commits
-------
Forum has retired
This PR was merged into the 1.13 branch.
Discussion
----------
| Q | A |
|-----------------|--------------------------------------------------------------|
| Branch? | 1.13
| Bug fix? | kinda
| New feature? | no
| BC breaks? | no
| Deprecations? | no
| Related tickets | improved #15493
| License | MIT
`~250` attributes, higher numbers were hanging edit page when the execution limit is set to `30s`.
I was wondering against which version this PR should be opened, but I decided it better fits for the `1.13`, as it isn't a bug fix, it's a performance improvement. With so broad definition of bug, we could define almost anything as a bug.
Comparing to the original PR:
- Already present hydration mechanism has been used.
- No need to open anything against Sylius Resource repository, the custom `LocaleToCodeTransformer` has been created (thanks @NoResponseMate for the suggestion).
- Symonfy's cache mechanism has been leveraged.
Commits
-------
Create a service providing a cached collection of locales
Replace default resource's ResourceToIdentifierTransformer with a custom LocaleToCodeTransformer
Use hydration while displaying the product's show page
Adjust deprecation triggers
Apply PHPStan fixes
Add locales cache removing on Locale create/updated/remove operation
Improve error handling
Add "symfony/cache-contracts": "^2.5 || ^3.0" as a dependency
Make LocaleCollectionProvider returning an array of locales with a locale's code as a key
Return null when try to transform a value not being an instance of LocaleInterface
[Behat] Add CacheContext
[Behat] Add sylius.behat.context.hook.cache to suites
This PR was merged into the 1.13 branch.
Discussion
----------
| Q | A |
|-----------------|--------------------------------------------------------------|
| Branch? | 1.13 |
| Bug fix? | somewhat |
| New feature? | no |
| BC breaks? | no |
| Deprecations? | no |
| Related tickets | - |
| License | MIT |
Commits
-------
[API][Maintenance] Fix field name in AddressLogEntry serialization
This PR was merged into the 1.13 branch.
Discussion
----------
| Q | A |
|-----------------|--------------------------------------------------------------|
| Branch? | 1.13 <!-- see the comment below --> |
| Bug fix? | no |
| New feature? | no |
| BC breaks? | no |
| Deprecations? | no<!-- don't forget to update the UPGRADE-*.md file --> |
| License | MIT |
Commits
-------
[Unit][Admin] Add creating customer with already taken email test
[Unit][Admin] Add removing shop user test
This PR was merged into the 1.13 branch.
Discussion
----------
| Q | A |
|-----------------|--------------------------------------------------------------|
| Branch? | 1.13 <!-- see the comment below --> |
| Bug fix? | no |
| New feature? | no |
| BC breaks? | no |
| Deprecations? | no<!-- don't forget to update the UPGRADE-*.md file --> |
| License | MIT |
<!--
- Bug fixes must be submitted against the 1.12 branch
- Features and deprecations must be submitted against the 1.13 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
-->
Commits
-------
[Unit][Admin] Add removing exchange-rate test
