Commit graph

31466 commits

Author SHA1 Message Date
Jacob Tobiasz
6fc2880870
[UPMERGE] 1.13 -> 2.0 (#15673)
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 
git merge upstream/2.0 --no-commit
```

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.13 and 2.0
```
2023-12-24 09:09:04 +01:00
Jacob Tobiasz
8f5a40215a
Resolve conflicts between 1.13 and 2.0 2023-12-24 08:39:59 +01:00
Jacob Tobiasz
520d030fba
[UPMERGE] 1.12 -> 1.13 (#15671)
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 
git merge upstream/1.13 --no-commit
```

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
```
2023-12-22 16:37:59 +01:00
Jacob Tobiasz
d76c641b85
Replace @javascript with @mink:chromedriver in failing scenarios 2023-12-22 15:29:21 +01:00
Jacob Tobiasz
e63fea8f2f
Update product associations feature test tag 2023-12-22 15:21:23 +01:00
Jacob Tobiasz
7c55c4a69f
[UPMERGE] 1.13 -> 2.0 (#15670)
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 
git merge upstream/2.0 --no-commit
```

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.13 and 2.0
```
2023-12-22 15:18:43 +01:00
Jacob Tobiasz
17ca7e0756
Remove non-existing Sylius\Calendar\Tests\Behat\Context\Setup\CalendarContext entry 2023-12-22 14:52:20 +01:00
Jacob Tobiasz
de0eaf8442
Resolve conflicts between 1.13 and 2.0 2023-12-22 14:33:57 +01:00
Jacob Tobiasz
cd207b6eb4
Remove duplicated translation entries 2023-12-22 14:20:23 +01:00
Jacob Tobiasz
9dccd3cfe4
Allow to install lower version of stripe/stripe-php 2023-12-22 13:57:22 +01:00
Jacob Tobiasz
66d6a047d8
Resolve conflicts between 1.12 and 1.13 2023-12-22 13:53:00 +01:00
Jan Góralski
57ef590dce
minor #15664 Move validation groups parameters to appropriate bundle configs (TheMilek)
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
-->
To make it load by default we should add it to our bundle config files instead of _sylius file itself

Commits
-------
  Move validation groups parameters to appropriate bundle configs
  Adjust gateway config validation groups parameter definition to changes
  Improve the new CHANGELOG.md entry
2023-12-22 13:02:57 +01:00
Jacob Tobiasz
d0b82fd975
[UPMERGE] 1.13 -> 2.0 (#15666)
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 
git merge upstream/2.0 --no-commit
```

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.13 and 2.0
```
2023-12-21 19:12:36 +01:00
Jacob Tobiasz
5e714820e8
Replace the DateTimeProvider with the Clock 2023-12-21 18:35:58 +01:00
Jacob Tobiasz
c49e3682c7
Improve the new CHANGELOG.md entry
Co-authored-by: Jan Góralski <jan.wojciech.goralski@gmail.com>
2023-12-21 18:03:10 +01:00
Jan Góralski
61923954bb
minor #15617 Switch JS session Behat driver to the Symfony Panther (jakubtobiasz)
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 | reactivated #13796
| License         | MIT


Commits
-------
  Add a support for Symfony Panther in the JS-based Behats
  Fix PHPSpec scenario
  Add support for Panther to CookieSetter service
  Run failing scenarios on Panther with using chromedriver
  Bring back the "chrome_headless_second_session" mink session
2023-12-21 15:21:57 +01:00
Jan Goralski
dc300fb0da [Documentation] Update mailer configuration 2023-12-21 15:14:16 +01:00
arti0090
dbbea4689f PR comment fix 2023-12-21 15:14:16 +01:00
arti0090
e4fdf671de [WIP][DOCS] Add info about mailer to 1.12 2023-12-21 15:14:16 +01:00
Jacob Tobiasz
c9c1ec8291
Bring back the "chrome_headless_second_session" mink session 2023-12-21 14:51:22 +01:00
Jacob Tobiasz
1d48c06ff5
Run failing scenarios on Panther with using chromedriver 2023-12-21 14:23:41 +01:00
Alexis DUMAS
ec9f4f53a1 Update themes.rst 2023-12-21 11:33:07 +01:00
Kamil Grygierzec
ea50847309
Adjust gateway config validation groups parameter definition to changes 2023-12-21 10:36:42 +01:00
Kamil Grygierzec
6235621ac2
Move validation groups parameters to appropriate bundle configs 2023-12-21 10:30:03 +01:00
Kamil Grygierzec
db8a38ff40
Add parameter for order state to filter out and fix the OrdrerExtension logic 2023-12-21 10:15:28 +01:00
Kamil Grygierzec
01884e28a5
Rename fulfilled_order file to fulfilled 2023-12-21 10:15:28 +01:00
Kamil Grygierzec
6b57260f9a
Move applyToCollection logic to private method and use in both cases 2023-12-21 10:15:28 +01:00
Kamil Grygierzec
b90c7872ee
Use SectionProvider in OrderExtension 2023-12-21 10:15:28 +01:00
Kamil Grygierzec
40676795b3
Remove no more valid scenarios 2023-12-21 10:15:28 +01:00
Kamil Grygierzec
d6b36dafc9
Cover preventing to view customers cart from the orders resource 2023-12-21 10:15:28 +01:00
Kamil Grygierzec
b090f472c6
Cover accessing order from payments and shipments 2023-12-21 10:15:28 +01:00
Kamil Grygierzec
8cf586d08a
Cover handling order shipment 2023-12-21 10:15:28 +01:00
Wojdylak
cfdfe2c610
[Behat] Update step names in scenarios after changing name of steps 2023-12-21 10:15:28 +01:00
Jan Goralski
882d7359d3
[API] Cover viewing details of a product 2023-12-21 10:15:28 +01:00
Jan Goralski
07a954e6ef
Cleanup
[API] Unify position sorting
2023-12-21 10:15:26 +01:00
Jan Goralski
e86dd2fdcc
[API][Admin] Cover managing product associations 2023-12-21 10:15:18 +01:00
Jan Goralski
237eb2ebc1
[API] Finish covering viewing product attributes 2023-12-21 10:15:18 +01:00
Jan Goralski
d42453e58d
[API][Admin] Refactor viewing product suite split 2023-12-21 10:15:18 +01:00
Jan Goralski
cd94d7a6b5
[API][Admin] Cover seeing applied promotions on variants 2023-12-21 10:15:18 +01:00
Jan Goralski
3b4163b0cd
[API][Admin] More product related scenarios marked no-api 2023-12-21 10:15:18 +01:00
Jan Goralski
139cd83026
[API][Admin] Finish covering product and product taxon sorting 2023-12-21 10:15:18 +01:00
Jan Goralski
03b11686df
[API][Admin] Finish covering product filtering 2023-12-21 10:15:16 +01:00
Kamil Grygierzec
1df06bf7e0
move validation groups parameters to shipping config 2023-12-21 10:15:06 +01:00
Kamil Grygierzec
88feadb383
Add comments fixes 2023-12-21 10:15:06 +01:00
Kamil Grygierzec
c8b9ae343f
Change shipping validation groups parameters 2023-12-21 10:15:06 +01:00
Kamil Grygierzec
cc5e95560d
Cover contract tests 2023-12-21 10:14:59 +01:00
Kamil Grygierzec
387e59a5f7
Add parameter for shipping method rule and calculator validation groups 2023-12-21 10:14:59 +01:00
Kamil Grygierzec
19c04d301f
[Behat] Cover shipping method management 2023-12-21 10:14:59 +01:00
Kamil Grygierzec
cc77a334a1
Validate shipping method rules and calculators 2023-12-21 10:14:59 +01:00
Kamil Grygierzec
a903bc077d
[API] Add missing shipping method serialization and resources 2023-12-21 10:14:59 +01:00