Commit graph

166 commits

Author SHA1 Message Date
Grzegorz Sadowski
64d6b9d526
Resolve conflicts between 2.0 and payment-request 2024-09-25 07:34:26 +02:00
Grzegorz Sadowski
cca95b5a33
Merge Symfony 7 into 2.0 (#16351)
| Q               | A
|-----------------|-----
| Branch?         | 2.0 
| Bug fix?        | no
| New feature?    | no
| BC breaks?      | no
| Deprecations?   | no
| Related tickets |
| License         | MIT

<!--
 - Bug fixes must be submitted against the 1.12 or 1.13 branches
 - Features and deprecations must be submitted against the 1.14 branch
- Features, removing deprecations and BC breaks must be submitted
against the 2.0 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
-->
2024-09-24 12:09:21 +02:00
Michał Pysiak
93528d2062
Remove unused urls from security 2024-09-24 07:37:06 +02:00
Michał Pysiak
d3a62673fd Fix behat errors 2024-09-16 14:22:00 +02:00
Grzegorz Sadowski
108fbf7b5d [SF7] Update configs 2024-09-16 14:22:00 +02:00
Loïc Frémont
c63a42b82d [SF7] Add Symfony 7 support for User bundle 2024-08-23 14:45:44 +02:00
Jacob Tobiasz
81089b1f9c
Rename the test_cached_payumless environment to test_cached_payum 2024-08-06 13:53:41 +02:00
Jacob Tobiasz
1d2f327c74
Create an environment for payumless tests 2024-08-06 13:40:48 +02:00
Francis Hilaire
873b4f3c42
Lower down default uuid version to 6 for Sf 5.4 2024-08-06 13:38:52 +02:00
Francis Hilaire
475250ca15
Switch to Symfony uid 2024-08-06 13:38:49 +02:00
Jan Goralski
7732964a01
[Admin][Order] Updated history view styling 2024-05-02 16:24:39 +02:00
Jacob Tobiasz
16c6701649
[UPMERGE] 2.0 -> bootstrap-admin-panel (#16108)
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/bootstrap-admin-panel -m "Resolve conflicts between 2.0 and bootstrap-admin-panel"
```

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.
2024-04-10 08:43:02 +02:00
Jacob Tobiasz
906187827d
[UPMERGE] 1.13 -> 2.0 (#16101)
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/2.0 -m "Resolve conflicts between 1.13 and 2.0"
```

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.
2024-04-09 10:20:23 +02:00
Wojdylak
f62a814d48
[Maintenance] Add image firewall 2024-04-08 12:44:29 +02:00
Jacob Tobiasz
bc775d80f3
Resolve conflicts between 2.0 and bootstrap-admin-panel 2024-03-14 09:40:38 +01:00
Rafikooo
d28e33369a
Resolve conflicts between 1.13 and 2.0 2024-03-13 10:22:00 +01:00
Rafikooo
9fdc244a35
[API] Change endpoint for administrator reset password 2024-03-11 17:00:08 +01:00
Rafikooo
05ff93ffb0
[API] Change endpoint for requesting customer authentication token 2024-03-11 17:00:08 +01:00
Rafikooo
b0e1c284e8
[API] Change endpoint for requesting admin authentication token 2024-03-11 17:00:08 +01:00
Jacob Tobiasz
83bb8a1b7d
Resolve conflicts between 2.0 and bootstrap-admin-panel 2024-02-25 13:19:22 +01:00
Jacob Tobiasz
544b0766d1
Resolve conflicts between 1.13 and 2.0 2024-02-01 08:22:59 +01:00
Jan Góralski
e688d18fec
minor #15738 Use the new State Machine abstraction (jakubtobiasz)
This PR was merged into the 1.13 branch.

Discussion
----------

| Q               | A                                                            |
|-----------------|--------------------------------------------------------------|
| Branch?         | 1.13
| Bug fix?        | no
| New feature?    | kinda
| BC breaks?      | no
| Deprecations?   | no
| Related tickets | based on the #15729
| License         | MIT



Commits
-------
  Use the new State Machine abstraction
  Fix invalid workflow event names
  Fix retrieving the checkout state in the validator
  Reverse the sign next to the Symfony Workflow events listeners priorities
  Remove the non-existing config key
  Fix the StateMachine-related tests
  Fix CI
  Remove a reference to Sylius Resource
  Fix handling transitions inside the WinzouStateMachine
  Add testing the state machine adapter in the CI
  Fix the deprecation trigger descriptions
  Remove redundant phpdocs about thrown exception
  Remove redundant sm.configs parameter passed to the winzou adapter
2024-01-31 21:05:51 +01:00
Jacob Tobiasz
ab217352ee
Add testing the state machine adapter in the CI 2024-01-26 14:48:56 +01:00
Kamil Grygierzec
a3dc54aa91
Add default locale parameter to core 2024-01-26 13:15:46 +01:00
Jacob Tobiasz
3bccc3ee7d
Resolve conflicts between 2.0 and bootstrap-admin-panel 2024-01-04 16:23:43 +01:00
Jacob Tobiasz
8f5a40215a
Resolve conflicts between 1.13 and 2.0 2023-12-24 08:39:59 +01:00
Kamil Grygierzec
6235621ac2
Move validation groups parameters to appropriate bundle configs 2023-12-21 10:30:03 +01:00
Grzegorz Sadowski
fe77e9782d
Merge branch '1.13' into 2.0
* 1.13:
  [PromotionBundle] Add prefix to validation groups for promotion action/rule
  [PromotionBundle][PromotionRule] Add available type to validation message
  [PromotionBundle][PromotionAction] Add available type to validation message
  Update upgrade file
  [PromotionBundle] Split PromotionRuleValidator to PromotionRuleGroupValidator and PromotionRuleTypeValidator
  [PromotionBundle] Split PromotionActionValidator to PromotionActionGroupValidator and PromotionActionTypeValidator
  Add prefix sylius_ to validation groups
  Update upgrade file
  [PromotionBundle] Remove constraints from FormType to avoid double constraints
  [PromotionBundle] Move logic from PromotionRuleGroupValidator to PromotionRuleValidator
  [PromotionBundle] Move logic from PromotionActionGroupValidator to PromotionActionValidator
  [PromotionBundle] Add parameters validation groups for promotion action and promotion rule
2023-12-15 14:10:11 +01:00
Wojdylak
1494fce8fe
[PromotionBundle] Add prefix to validation groups for promotion action/rule 2023-12-14 10:05:45 +01:00
Wojdylak
c021e3e3a1
Add prefix sylius_ to validation groups 2023-12-14 08:49:46 +01:00
Wojdylak
e530c7d9ca
[PromotionBundle] Add parameters validation groups for promotion action and promotion rule 2023-12-14 08:49:44 +01:00
Jacob Tobiasz
e2cec8b0a0
Resolve conflicts between 1.13 and 2.0 2023-12-06 17:42:41 +01:00
Kamil Grygierzec
ae860bde19
Define gateway config validation groups by parameters 2023-12-06 13:21:27 +01:00
Rafikooo
567b599a40
Upmerge 1.13 into 2.0 2023-09-25 23:31:01 +02:00
Jacob Tobiasz
430158aeef
Fix action buttons on the index page 2023-09-25 08:51:36 +02:00
Jacob Tobiasz
1ee39efc70
Remove the redundant liip_imagine.yaml 2023-09-21 07:52:58 +02:00
Mateusz Zalewski
e9100a4de3
Change default Liip loader and resolver names 2023-09-21 07:52:42 +02:00
Jacob Tobiasz
d55679c1ec
Add a missing configuration for the test Sylius app 2023-09-17 09:04:26 +02:00
Jacob Tobiasz
dabc35123d
Install the symfony/workflow package 2023-09-16 08:51:47 +02:00
Grzegorz Sadowski
7aecb72d66
Merge branch '1.12' into 1.13
* 1.12:
  Cart promotion Action Update
  Enable Sylius API for app environments
  [Maintenance] Update dev symfony version to 5.4.*
  Provide post-CR fixes
  Remove redundant TaxonPositioner service
  Cover "jumping" taxons while moving with Behat scenarios
  Revert bc promise breaking changes
  Leave only bug-related code and extract the position-related logic
  Added: Move taxon to the top/end buttons at admin
  Fixed: Moving taxons up and down at admin
2023-09-14 09:24:15 +02:00
Jacob Tobiasz
0cfddccda6 Enable Sylius API for app environments 2023-09-13 19:13:28 +02:00
Aris Buzachis
1a5b08e8c8
[Bunnyshell] Adjust the workflows for Fork PRs
Signed-off-by: Aris Buzachis <aris.buzachis@bunnyshell.com>
2023-07-06 09:19:45 +02:00
Aris Buzachis
d127ae15dc [Bunnyshell] Adjust the workflows for Fork PRs
Signed-off-by: Aris Buzachis <aris.buzachis@bunnyshell.com>
2023-06-30 12:42:49 +03:00
Jakub Tobiasz
85a94c9f41
Revert "Add support for Bunnyshell (#15134)"
This reverts commit 8ad42c9a1b.
2023-06-30 09:20:08 +02:00
Jacob Tobiasz
8ad42c9a1b
Add support for Bunnyshell (#15134)
Co-authored-by: Aris Buzachis <aris.buzachis@bunnyshell.com>
Co-authored-by: Aris Buzachis <114920449+aris-bunnyshell@users.noreply.github.com>
Co-authored-by: Mihai Chitic <m.chitic+github@gmail.com>
2023-06-29 09:20:06 +02:00
Kevin Kaniaburka
b15cd4c1db
Use Http\Client\HttpClient service instead of HttplugClient explicitly 2023-04-27 13:36:05 +02:00
Jakub Tobiasz
88b6e15af0
Refactor CI 2023-01-24 15:32:06 +01:00
Jakub Tobiasz
e2edcb2c5e
Refactor CI 2023-01-16 09:50:19 +01:00
Kevin Kaniaburka
64559bf109
[DX] Store passwords in plaintext in test environment 2022-12-23 11:31:03 +01:00
Grzegorz Sadowski
fc50b8bb3f
bug #14468 Lower hashing alogirthm memory cost in test (Zales0123)
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                                                          |

`plaintext` does not work for some reason 🤨 but lowering this configuration already results in a huge boost (35min vs 23-25min 😱), which seems like we come back to the time we had before 🖖 

Commits
-------

7f796f1448 Lower hashing alogirthm memory cost in test
2022-10-21 14:11:32 +02:00