Commit graph

654 commits

Author SHA1 Message Date
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
aef5c9c21d
Adjust the frontend build process CI to the 1.13 standard 2024-01-26 15:40:16 +01:00
Jacob Tobiasz
eca6d8c937
Resolve conflicts between 1.12 and 1.13 2024-01-26 15:37:35 +01:00
Jacob Tobiasz
ab217352ee
Add testing the state machine adapter in the CI 2024-01-26 14:48:56 +01:00
Jacob Tobiasz
cff037616f
Change the COMPOSER_ROOT_VERSION for the CI 2024-01-23 07:52:05 +01:00
Jacob Tobiasz
49e7b7325d
Add builds checking whether the frontend can be built with all supported nodejs versions
Co-authored-by: jaroslavtyc.com <mail@jaroslavtyc.com>
2024-01-20 17:11:39 +01:00
Jacob Tobiasz
9d6088fe0c
[UPMERGE] 1.13 -> 2.0 (#15683)
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-26 09:32:39 +01:00
Jacob Tobiasz
24bd5786a5 Define permissions for all workflows
Co-authored-by: nathannaveen <42319948+nathannaveen@users.noreply.github.com>
2023-12-25 12:29:13 +01:00
Jacob Tobiasz
8f5a40215a
Resolve conflicts between 1.13 and 2.0 2023-12-24 08:39:59 +01:00
Jacob Tobiasz
66d6a047d8
Resolve conflicts between 1.12 and 1.13 2023-12-22 13:53:00 +01:00
Jacob Tobiasz
1d48c06ff5
Run failing scenarios on Panther with using chromedriver 2023-12-21 14:23:41 +01:00
Jacob Tobiasz
46037d5521
Make automatic refactoring running every day 2023-12-21 10:14:59 +01:00
Jacob Tobiasz
3a723c0a69
Make automatic refactoring running every day 2023-12-20 10:26:29 +01:00
Grzegorz Sadowski
e09302a19b
[CI] Fix matrix after upmerge 2023-12-15 14:48:37 +01:00
Grzegorz Sadowski
ae9ba0fe30
Merge branch '2.0' into api-platform-3
* 2.0: (172 commits)
  [Admin] Change name of official support section in menu and adjust translations
  Add all translations & change label
  Add business support CTA to admin panel
  [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
  [ECS] Apply types order changes
  [ECS] Add union types ordering rule
  [ECS] Apply ecs fixes
  [ChannelsTest] use inArray to check locales
  [ApiBundle] Add contract tests for ProductTaxon resource
  ...
2023-12-15 14:45:38 +01:00
Jacob Tobiasz
f7aa75f602
Add a support for Symfony Panther in the JS-based Behats
Co-authored-by: Loic Fremont <lc.fremont@gmail.com>
2023-12-07 17:28:43 +01:00
Grzegorz Sadowski
5526e0603c
Merge branch '1.13' into 2.0
* 1.13:
  Exclude PHP 8.0/Symfony 6.4 from workflows' matrixes
  [Maintenance] Fix postgres behats
  Fix product name's casing in the Behat scenario
  Add the sylius-labs/suite-tags-extension package
  [Dependencies] Change possible versions of doctrine/persistence
  [CI] Update Symfony versions in build
  [Behat][UI] Add strong typing in the CartContext class
  [ECS] Apply another ecs fixes
  [ECS] Apply ecs fixes
  [ECS] Apply ecs fixes in the tests directory
  [ECS] Add checking in the tests directory
2023-12-05 13:04:16 +01:00
Grzegorz Sadowski
df9c44fc9e
Merge branch '1.12' into 1.13
* 1.12:
  Exclude PHP 8.0/Symfony 6.4 from workflows' matrixes
  [Maintenance] Fix postgres behats
  Fix product name's casing in the Behat scenario
  Add the sylius-labs/suite-tags-extension package
  [Dependencies] Change possible versions of doctrine/persistence
  [CI] Update Symfony versions in build
2023-12-05 12:57:17 +01:00
Jacob Tobiasz
03611a4c70
Exclude PHP 8.0/Symfony 6.4 from workflows' matrixes 2023-12-05 12:37:05 +01:00
Jan Góralski
458d23d08d
minor #15602 Add the sylius-labs/suite-tags-extension package (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 | n/a
| License         | MIT

I only added the package to fix full build. I skipped adding isolating to the `1.12`'s workflows.

Commits
-------
  Add the sylius-labs/suite-tags-extension package
  Fix product name's casing in the Behat scenario
  [Maintenance] Fix postgres behats
2023-12-05 12:25:15 +01:00
Jan Goralski
307f4fe31f
Add the sylius-labs/suite-tags-extension package 2023-12-05 11:15:44 +01:00
Grzegorz Sadowski
e8fa468f83
[CI] Update Symfony versions in build 2023-12-05 10:05:03 +01:00
Jacob Tobiasz
82d3c251a7
[UPMERGE] 1.13 -> 2.0 (#15599) 2023-12-05 08:40:49 +01:00
Jacob Tobiasz
41adfa8071 Update merge instructions in upmerge_pr.yaml 2023-12-04 18:50:18 +01:00
Jacob Tobiasz
43f73cac95
Resolve conflicts between 1.13 and 2.0 2023-12-04 14:25:08 +01:00
Jacob Tobiasz
5accb39812
[UPMERGE] 1.12 -> 1.13 (#15591) 2023-12-04 13:39:52 +01:00
Jacob Tobiasz
bc145f5ced
Fix conflicts between 1.12 and 1.13 2023-12-04 11:59:05 +01:00
Jacob Tobiasz
7ece6725ef
Remove Psalm 2023-12-04 11:10:34 +01:00
Jan Goralski
770c7ee90f
[Maintenance][Behat] Add suite isolation 2023-11-30 11:43:25 +01:00
Grzegorz Sadowski
6d3290f613
Merge branch '2.0' into api-platform-3
* 2.0:
  Add ignore parse errors to composer require checker
  Update README.md
2023-11-15 06:51:01 +01:00
Grzegorz Sadowski
0df083e89b
Merge branch '1.13' into 2.0
* 1.13:
  Add ignore parse errors to composer require checker
  Update README.md
2023-11-15 06:50:57 +01:00
Grzegorz Sadowski
336682edb5
Merge branch '1.12' into 1.13
* 1.12:
  Add ignore parse errors to composer require checker
2023-11-15 06:50:42 +01:00
Wojdylak
303b43063d Add ignore parse errors to composer require checker 2023-11-14 16:09:33 +01:00
Grzegorz Sadowski
398a14b12f
Merge branch '2.0' into api-platform-3
* 2.0: (69 commits)
  Add a conflict for "doctrine/doctrine-bundle": "2.11.0"
  Disable check for security vulnerabilites step
  [CS][DX] Refactor
  [API] Adjust contract tests after changes with translations
  [API] Disallow removing the translation in default locale
  [API] Improve contract test of creating a product with invalid translation locale
  [Maintenance] Fix other possibly invalid route attribute getting
  [Maintenance] Fix AdminFilterSubscriber failing when no _route attribute present
  [ApiBundle] Fix ProductAssociationTypesTest
  [ApiBundle] Remove unnecessary method in TranslatableLocaleKeyDenormalizer
  [ApiBundle] Translation key as locale
  [ApiBundle] Fix type-hint
  [PromotionBundle] Remove unnecessary constraint
  [AttributeBundle] Standardize locale validation translations
  Standardize locale validation translations
  [ApiBundle] Improve readability
  [ApiBundle] Add contract test to check validation of locale
  [TaxonomyBundle] Add validation on locale of translation
  [ShippingBundle] Add validation on locale of translation
  [PromotionBundle] Add validation on locale of translation
  ...
2023-11-14 13:44:48 +01:00
Grzegorz Sadowski
13cb92a300
Merge branch '1.13' into 2.0
* 1.13:
  Add a conflict for "doctrine/doctrine-bundle": "2.11.0"
  Disable check for security vulnerabilites step
2023-11-14 13:37:27 +01:00
Grzegorz Sadowski
88c508e4cd
Merge branch '1.12' into 1.13
* 1.12:
  Add a conflict for "doctrine/doctrine-bundle": "2.11.0"
  Disable check for security vulnerabilites step
2023-11-14 13:36:33 +01:00
Wojdylak
eba08b9042 Disable check for security vulnerabilites step 2023-11-14 09:57:44 +01:00
Grzegorz Sadowski
9d5a1b3604
[API] Bump APIP to 3.1 and configure admin authentication 2023-09-28 15:10:20 +02:00
Jan Goralski
8434b7546b [CI] Fix logs uploading 2023-09-23 09:13:57 +02:00
Jacob Tobiasz
0006061812
[UPMERGE] 1.13 -> 2.0 (#15331) 2023-09-20 13:02:57 +02:00
Jacob Tobiasz
17c7273d96 Add upmerging from 1.13 to 2.0 2023-09-20 12:28:39 +02:00
Jan Góralski
0c0db5b6e1
Bump Symfony dependencies' versions (#15327)
Thanks @jakubtobiasz 🍻
2023-09-19 10:49:59 +02:00
Jacob Tobiasz
838d678456
Remove Symfony 5.4 from the CI 2023-09-18 20:49:55 +02:00
Jacob Tobiasz
c8a0237501
Remove gulp (#15314) 2023-09-18 18:08:19 +02:00
Jacob Tobiasz
26b32d2174
Add assets configuration to AdminBundle's, ApiBundle's and CoreBundle's test apps 2023-09-17 09:04:26 +02:00
Jacob Tobiasz
f5e2f29824
Add preparing manifest.json files to CI 2023-09-17 09:04:26 +02:00
Jacob Tobiasz
93958d050c
Remove swiftmailer-related workflows 2023-09-16 06:28:03 +02:00
Jacob Tobiasz
e510ca49fc
Bump the PHP's version in the CI 2023-09-16 06:17:57 +02:00
Jacob Tobiasz
953f66dae0
Update extra.branch-alias in all composer.json files 2023-09-15 20:46:39 +02:00