Commit graph

27807 commits

Author SHA1 Message Date
Ernest Warwas
7f6cc66e7b
Fix for failing scenario when customer changing email
Revert lexik guard for api

Commented scenario for test purposes

Test if set token to null fixes the scenario

spec fix
2022-09-15 15:05:23 +02:00
Loïc Frémont
a47aad3e1a
Fix token based user context when user from token is null 2022-09-15 15:05:22 +02:00
Loïc Frémont
1b6ab8abe7
Trying to fix Unique reviewer email validator 2022-09-15 15:05:22 +02:00
Loïc Frémont
5f2ab45399
Enable authenticator manager 2022-09-15 15:05:22 +02:00
Grzegorz Sadowski
f459ac53a2
Merge branch '1.11' into 1.12
* 1.11:
  [Maintenance] Conflict api-platform/core 2.7.0 documented
  Conflict api-platform/core 2.7.0
2022-09-15 15:00:27 +02:00
Grzegorz Sadowski
4a103fc128
bug #14309 Conflict api-platform/core 2.7.0 (loic425, Rafikooo)
This PR was merged into the 1.11 branch.

Discussion
----------

| Q               | A                                                            |
|-----------------|--------------------------------------------------------------|
| Branch?         | 1.11                  |
| Bug fix?        | yes                                                       |
| New feature?    | no                                                       |
| BC breaks?      | no                                                       |
| Deprecations?   | no |
| Related tickets |                    |
| License         | MIT                                                          |

<!--
 - Bug fixes must be submitted against the 1.11 branch
 - Features and deprecations must be submitted against the 1.12 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
-->
![Capture d’écran du 2022-09-15 09-43-43](https://user-images.githubusercontent.com/8329789/190356736-9984f9f9-4540-45af-bf04-93295a0f86fb.png)

![Capture d’écran du 2022-09-15 10-00-06](https://user-images.githubusercontent.com/8329789/190356706-b3c0689d-d8a0-413e-81c9-8363f5cf5b77.png)


Commits
-------

19cf964ac3 Conflict api-platform/core 2.7.0
a7ae947522 [Maintenance] Conflict api-platform/core 2.7.0 documented
2022-09-15 14:57:44 +02:00
Rafikooo
a7ae947522
[Maintenance] Conflict api-platform/core 2.7.0 documented 2022-09-15 13:19:17 +02:00
Loïc Frémont
19cf964ac3 Conflict api-platform/core 2.7.0 2022-09-15 10:35:48 +02:00
Grzegorz Sadowski
f517e29d0b
feature #14270 [CatalogPromotions][API] Removal of catalog promotions (Rafikooo)
This PR was merged into the 1.12 branch.

Discussion
----------

| Q               | A                                                            |
|-----------------|--------------------------------------------------------------|
| Branch?         | 1.12 <!-- see the comment below -->                  |
| Bug fix?        | no                                                 |
| New feature?    | yes                                                       |
| BC breaks?      | no                                                       |
| Deprecations?   | no <!-- don't forget to update the UPGRADE-*.md file --> |
| License         | MIT                                                          |

This PR introduced a way to remove catalog promotions. As this operation may have an impact on the prices of the products, it is divided into two parts. First, ( if catalog promotion is eligible ) disabling considered promotion, and second, actually remove it. We can take advantage of Symfony messenger and the prepared configuration of three transports ( failed included ) or perform it without the messenger - synchronously.

<img width="860" alt="image" src="https://user-images.githubusercontent.com/40125720/187917517-9d6de750-f94c-470b-89fc-5acdfd3ed98b.png">

Configuration of transports:
<img width="566" alt="image" src="https://user-images.githubusercontent.com/40125720/190244016-0f251cc6-8a0f-4255-8fbb-90308e1acb64.png">



Commits
-------

f4d0ad7317 [CatalogPromotions][Behat] Implementation of scenarios
1f7a967880 [CatalogPromotions][API] Endpoint and controller for removing catalog promotion resource
cddde135bf [CatalogPromotions] CatalogPromotionRemovalProcessor introduced
cff41d9b8f [CatalogPromotions] RemoveInactiveCatalogPromotionHandler introduced
f6f4cf0824 [CatalogPromotions] New exception classes introduced
83edf53795 [CatalogPromotions][Messenger] New transport configuration introduced
2022-09-15 09:05:47 +02:00
Grzegorz Sadowski
6e38d16473
Merge branch '1.11' into 1.12
* 1.11:
  [Behat][Fix] Check notification expectation in JavaScriptTestHelper
2022-09-15 08:47:39 +02:00
Grzegorz Sadowski
dce55b83cb
bug #14301 [Behat][Fix] Check notification expectation in JavaScriptTestHelper (Rafikooo)
This PR was merged into the 1.11 branch.

Discussion
----------

| Q               | A                                                            |
|-----------------|--------------------------------------------------------------|
| Branch?         | 1.11 <!-- see the comment below -->                  |
| Bug fix?        | yes                                                       |
| New feature?    | no                                                       |
| BC breaks?      | no                                                       |
| Deprecations?   | no <!-- don't forget to update the UPGRADE-*.md file --> |
| License         | MIT                                                          |

Fixes:
<img width="853" alt="image" src="https://user-images.githubusercontent.com/40125720/190143519-a8030a24-3fa5-4075-8fe2-ab74c0c0409a.png">

Before:
<img width="714" alt="image" src="https://user-images.githubusercontent.com/40125720/190143668-e7ebd093-623c-48cc-8cbd-d55d0365bd87.png">

After:
<img width="1431" alt="image" src="https://user-images.githubusercontent.com/40125720/190143782-b4e07141-61f7-4e07-95a4-6bfe9fd6c041.png">



Mentioned here: https://github.com/Sylius/Sylius/pull/14291#discussion_r967015384

Commits
-------

4769726564 [Behat][Fix] Check notification expectation in JavaScriptTestHelper
2022-09-15 08:47:20 +02:00
Grzegorz Sadowski
9ccefb7227
bug #14274 [AdminPasswordReset][Behat] Missed steps implementation (Rafikooo)
This PR was merged into the 1.12 branch.

Discussion
----------

| Q               | A                                                            |
|-----------------|--------------------------------------------------------------|
| Branch?         | 1.12 <!-- see the comment below -->                  |
| Bug fix?        | yes                                                       |
| New feature?    | no                                                       |
| BC breaks?      | no                                                      |
| Deprecations?   | no<!-- don't forget to update the UPGRADE-*.md file --> |
| License         | MIT                                                          |

The build didn't inform us about missed step implementations
<img width="366" alt="image" src="https://user-images.githubusercontent.com/40125720/188436731-e942e7fd-93d0-41f7-bea5-c9035e82961a.png">
<img width="1029" alt="image" src="https://user-images.githubusercontent.com/40125720/188436786-0a59234b-3039-4d60-bf5e-4ba397e95b66.png">
<img width="649" alt="image" src="https://user-images.githubusercontent.com/40125720/188436847-946a93e7-9966-4e6f-bde9-72efe40fbe8a.png">
<img width="1026" alt="image" src="https://user-images.githubusercontent.com/40125720/188436872-09345a67-68dd-48a9-98b7-8cf562f63a4f.png">

Related PR's:
https://github.com/Sylius/Sylius/pull/14124
https://github.com/Sylius/Sylius/pull/14139



Commits
-------

a201807026 [AdminPasswordReset][Behat] Missed steps implementation
2022-09-15 08:43:30 +02:00
Rafikooo
83edf53795
[CatalogPromotions][Messenger] New transport configuration introduced 2022-09-14 20:37:04 +02:00
Rafikooo
f6f4cf0824
[CatalogPromotions] New exception classes introduced 2022-09-14 20:11:29 +02:00
Rafikooo
cff41d9b8f
[CatalogPromotions] RemoveInactiveCatalogPromotionHandler introduced 2022-09-14 20:11:29 +02:00
Rafikooo
cddde135bf
[CatalogPromotions] CatalogPromotionRemovalProcessor introduced 2022-09-14 20:11:29 +02:00
Rafikooo
1f7a967880
[CatalogPromotions][API] Endpoint and controller for removing catalog promotion resource 2022-09-14 20:11:29 +02:00
Rafikooo
4769726564
[Behat][Fix] Check notification expectation in JavaScriptTestHelper 2022-09-14 16:58:14 +02:00
Rafikooo
f4d0ad7317
[CatalogPromotions][Behat] Implementation of scenarios 2022-09-14 10:51:56 +02:00
Grzegorz Sadowski
d483c56e5d
bug #14297 [Catalog Promotions][Fixtures] Fix setting state in CatalogPromotionExecutorListener (coldic3)
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 https://github.com/Sylius/Sylius/pull/14290                      |
| License         | MIT                                                          |

Before:
![image](https://user-images.githubusercontent.com/13316080/190080201-8e259dd3-95ac-4c81-9109-044120e23194.png)

After:
![image](https://user-images.githubusercontent.com/13316080/190080249-25684a2c-a091-4aca-898a-924d82d9d92f.png)


Commits
-------

a1762da7ca [Catalog Promotions][Fixtures] Fix setting state in CatalogPromotionExecutorListener
2022-09-14 10:44:56 +02:00
Kevin Kaniaburka
a1762da7ca
[Catalog Promotions][Fixtures] Fix setting state in CatalogPromotionExecutorListener 2022-09-14 08:44:19 +02:00
Grzegorz Sadowski
499c769dbf
feature #14290 [Catalog Promotions] Introduce the "processing" state and drop the unused "failed" step (coldic3)
This PR was merged into the 1.12 branch.

Discussion
----------

| Q               | A                                                            |
|-----------------|--------------------------------------------------------------|
| Branch?         | 1.12                  |
| Bug fix?        | no                                                       |
| New feature?    | yes                                                       |
| BC breaks?      | no                                                       |
| Deprecations?   | no |
| Related tickets |                       |
| License         | MIT                                                          |

![image](https://user-images.githubusercontent.com/13316080/189284813-a8724b71-e584-4b1e-abd4-30739194dcd6.png)
![image](https://user-images.githubusercontent.com/13316080/189284922-e84bc9f9-d305-4fd1-9a0f-4ecb72eb968b.png)


Commits
-------

fcbe70edbc [Catalog Promotions] Drop unused CatalogPromotionFailedListener
ee2ccabbdc [Catalog Promotions][Behat] Unable to edit catalog promotion if it is currently being processed
ee13c84171 [Catalog Promotions] Drop unused "failed" state and add "processing" state to the state processor
8f519be7c0 [Catalog Promotions] Set "processing" state in CatalogPromotionAnnouncer
c0cca1e0ff [Maintenance] Update UPGRADE-1.12.md
8867a6fbc2 [Catalog Promotions] Set processing state in listeners instead of in announcer
2022-09-13 14:54:49 +02:00
Grzegorz Sadowski
5856e20d2a
minor #14126 [API] Fix TaxonFilter default order behavior (coldic3)
This PR was merged into the 1.12 branch.

Discussion
----------

| Q               | A                                                            |
|-----------------|--------------------------------------------------------------|
| Branch?         | master         |
| Bug fix?        | no                                                      |
| New feature?    | no                                                      |
| BC breaks?      | no                                                      |
| Deprecations?   | no |
| Related tickets |                     |
| License         | MIT                                                          |

To be consistent with what spec methods describe:
 - `it_does_not_add_the_default_order_by_taxon_position_if_taxon_does_not_exist`
 - `it_does_not_add_the_default_order_by_taxon_position_if_taxon_is_given_with_wrong_format`

Commits
-------

be02d10792 [API] Fix TaxonFilter default order behavior
2022-09-13 11:50:24 +02:00
Grzegorz Sadowski
1c678bbb71
Merge branch '1.11' into 1.12
* 1.11:
  Update docs/cookbook/deployment/cron-jobs.rst
  [docs]Recommend cron jobs values
  [API] Remove mapping path from configuration
2022-09-13 11:49:47 +02:00
Grzegorz Sadowski
4b6706cf4a
bug #14236 [API] Remove problematic mapping path (coldic3)
This PR was merged into the 1.11 branch.

Discussion
----------

| Q               | A                                                            |
|-----------------|--------------------------------------------------------------|
| Branch?         | 1.11                 |
| Bug fix?        | yes                                                       |
| New feature?    | no                                                      |
| BC breaks?      | no                                                       |
| Deprecations?   | no |
| Related tickets | fixes https://github.com/Sylius/Sylius/issues/14268                     |
| License         | MIT                                                          |

This PR removes the `%kernel.project_dir%/config/api_platform` mapping path that was introduced in https://github.com/Sylius/Sylius/pull/12693. In API Platform 2.6 users' mapping configuration is overwritten with bundles' mapping. Because of it, developers cannot override resources in `config/api_platform` as Sylius overrides users' resources placed in `config/api_platform`. It's already fixed in APIP 2.7 but for now, this configuration doesn't work as intended.
We haven't noticed in unit tests that it breaks resource overriding because we have a distinction between `config/api_platform` and `config/api_resource`, where `api_resource` can override resources while `api_platform` can't. This distinction is something reasonable but for testing purposes, we should keep everything in one directory because it makes possible to test this bug.

Commits
-------

fe1d660e10 [API] Remove mapping path from configuration
2022-09-13 11:49:25 +02:00
Kevin Kaniaburka
be02d10792
[API] Fix TaxonFilter default order behavior 2022-09-13 09:56:47 +02:00
Grzegorz Sadowski
5184843363
bug #14294 [Maintenance] Add conflict with jms/serializer-bundle 4.1.0 (coldic3)
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                                                          |

See https://github.com/Sylius/Sylius/runs/8306007639?check_suite_focus=true and https://github.com/schmittjoh/JMSSerializerBundle/releases/tag/4.1.0

Commits
-------

8735b6c969 [Maintenance] Add conflict with jms/serializer-bundle 4.1.0
2022-09-13 09:03:14 +02:00
Kevin Kaniaburka
8735b6c969
[Maintenance] Add conflict with jms/serializer-bundle 4.1.0 2022-09-13 08:26:11 +02:00
Łukasz Chruściel
5c7fbdfb87
feature #14250 [docs]Recommend cron jobs values (Ferror)
This PR was merged into the 1.11 branch.

Discussion
----------

<img width="816" alt="Screenshot 2022-08-22 at 18 15 44" src="https://user-images.githubusercontent.com/17534504/185969349-e77621fd-4485-467a-9183-1d54a8e8e6e4.png">


The https://docs.sylius.com/en/1.12/cookbook/deployment/cron-jobs.html site lacks default config values. Similar we put there: https://docs.sylius.com/en/1.12/cookbook/deployment/platform-sh.html#add-default-sylius-cronjobs

Commits
-------

98e3dfe854 [docs]Recommend cron jobs values
6da307cd32 Update docs/cookbook/deployment/cron-jobs.rst
2022-09-13 07:34:13 +02:00
Zbigniew Malcherczyk
6da307cd32
Update docs/cookbook/deployment/cron-jobs.rst
Co-authored-by: Kevin Kaniaburka <kevin.kaniaburka@gmail.com>
2022-09-13 07:20:11 +02:00
Ferror
98e3dfe854
[docs]Recommend cron jobs values 2022-09-13 07:20:10 +02:00
Grzegorz Sadowski
3ad6caea6d
Merge branch '1.11' into 1.12
* 1.11:
  [Config] Mark SenderInterface as excluded in psalm.xml
2022-09-13 07:17:10 +02:00
Grzegorz Sadowski
344937a823
bug #14295 [Config] Mark SenderInterface as excluded in psalm.xml (Rafikooo)
This PR was merged into the 1.11 branch.

Discussion
----------

| Q               | A                                                            |
|-----------------|--------------------------------------------------------------|
| Branch?         | 1.11 <!-- see the comment below -->                  |
| Bug fix?        | no                                                       |
| New feature?    | no                                                       |
| BC breaks?      | no                                                       |
| Deprecations?   | no <!-- don't forget to update the UPGRADE-*.md file --> |
| Related tickets | https://github.com/Sylius/Sylius/pull/14288                   |
| License         | MIT                                                          |


Commits
-------

80f7fe5a63 [Config] Mark SenderInterface as excluded in psalm.xml
2022-09-13 07:16:51 +02:00
Rafikooo
80f7fe5a63
[Config] Mark SenderInterface as excluded in psalm.xml 2022-09-12 18:53:38 +02:00
Grzegorz Sadowski
e6e8e2c12d
refactor #14292 Refactor customer provider (AdamKasp)
This PR was merged into the 1.12 branch.

Discussion
----------

| Q               | A                                                            |
|-----------------|--------------------------------------------------------------|
| Branch?         | 1.12                   |
| Bug fix?        | yes                                                       |
| New feature?    | no                                                   |
| BC breaks?      | yes                                                      |
| License         | MIT                                                          |

<!--
 - Bug fixes must be submitted against the 1.11 branch
 - Features and deprecations must be submitted against the 1.12 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
-------

bfeab8043a refactor customer provider
2022-09-12 10:53:17 +02:00
Rafikooo
a201807026
[AdminPasswordReset][Behat] Missed steps implementation 2022-09-12 09:13:09 +02:00
Grzegorz Sadowski
56fc5326dd
refactor #14234 [CS][DX] Refactor ()
This PR was merged into the 1.12 branch.

Discussion
----------

This PR has been generated automatically.
For more details see [refactor.yml](/Sylius/Sylius/blob/1.12/.github/workflows/refactor.yml).

Commits
-------

5ceaffae33 [CS][DX] Refactor
2022-09-12 07:17:33 +02:00
Grzegorz Sadowski
22c52fce0b
Merge branch '1.11' into 1.12
* 1.11:
  [CS][DX] Refactor
2022-09-12 07:14:29 +02:00
Grzegorz Sadowski
007106e235
refactor #14233 [CS][DX] Refactor ()
This PR was merged into the 1.11 branch.

Discussion
----------

This PR has been generated automatically.
For more details see [refactor.yml](/Sylius/Sylius/blob/1.12/.github/workflows/refactor.yml).

Commits
-------

abfca55214 [CS][DX] Refactor
2022-09-12 07:12:12 +02:00
Sylius Bot
abfca55214 [CS][DX] Refactor 2022-09-12 03:01:32 +00:00
Sylius Bot
5ceaffae33 [CS][DX] Refactor 2022-09-12 03:01:30 +00:00
Kevin Kaniaburka
8867a6fbc2
[Catalog Promotions] Set processing state in listeners instead of in announcer 2022-09-09 23:42:58 +02:00
Kevin Kaniaburka
c0cca1e0ff
[Maintenance] Update UPGRADE-1.12.md 2022-09-09 23:42:58 +02:00
Adam Kasperczak
bfeab8043a
refactor customer provider 2022-09-09 15:14:43 +02:00
Mateusz Zalewski
c24d7e7dee
bug #14288 [Config] Marked SenderInterface as excluded in psalm.xml (Rafikooo)
This PR was merged into the 1.12 branch.

Discussion
----------

| Q               | A                                                            |
|-----------------|--------------------------------------------------------------|
| Branch?         | 1.12 <!-- 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.11 branch
 - Features and deprecations must be submitted against the 1.12 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
-------

ac3d899195 [Config] Mark SenderInterface as excluded in psalm.xml
2022-09-09 13:09:16 +02:00
Kevin Kaniaburka
8f519be7c0
[Catalog Promotions] Set "processing" state in CatalogPromotionAnnouncer 2022-09-08 15:40:55 +02:00
Kevin Kaniaburka
ee13c84171
[Catalog Promotions] Drop unused "failed" state and add "processing" state to the state processor 2022-09-08 15:40:55 +02:00
Kevin Kaniaburka
ee2ccabbdc
[Catalog Promotions][Behat] Unable to edit catalog promotion if it is currently being processed 2022-09-08 11:13:51 +02:00
Kevin Kaniaburka
fcbe70edbc
[Catalog Promotions] Drop unused CatalogPromotionFailedListener 2022-09-08 11:08:54 +02:00
Rafikooo
ac3d899195
[Config] Mark SenderInterface as excluded in psalm.xml 2022-09-08 10:34:24 +02:00