Commit graph

465 commits

Author SHA1 Message Date
Grzegorz Sadowski
30f27d8714
Merge branch '1.13' into 2.0
* 1.13: (77 commits)
  Resolve comments
  Update upgrade file
  Fix serialization groups config formatting
  Move all the contract tests to parent catalog Responses and remove expected catalog
  [Shop][Taxon] unify contract tests catalog
  [Shop][Product] unify contract tests catalog
  [Shop][ShippingMethods] unify contract tests catalog
  [Shop][Channel] unify contract tests catalog
  [Shop][Order] unify contract tests catalog
  [Shop][Country] unify contract tests catalog
  [Shop][ExchangeRate] unify contract tests catalog
  [Shop][Locale] unify contract tests catalog
  [Shop][Payment] unify contract tests catalog
  [Admin][ShopBillingData] unify contract tests catalog
  [Admin][Payment] unify contract tests catalog
  [Admin][Locale] unify contract tests catalog
  [Admin][Order] unify contract tests catalog
  [Admin][PriceHistory] unify contract tests catalog
  [Admin][AdminUser] unify contact tests catalog
  Update upgrade api file
  ...
2024-02-16 11:41:12 +01:00
Grzegorz Sadowski
ef078e0721
Bump up Node.js only to supported LTS versions (18 and 20) 2024-02-09 13:52:53 +01:00
Jan Góralski
a79a8a3c92
minor #15828 Bump up Symfony 6 to 6.4 (GSadee)
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                                                          |

Continuation of https://github.com/Sylius/Sylius/pull/15827

As Symfony 6 versions lower than 6.4 are no longer supported, we would like to remove support for them also in the upcoming release of Sylius. Now, 1.13 will support both long-term supported Symfony versions: 5.4 and 6.4.

<!--
 - 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
-------
  Bump up Symfony 6 to 6.4
  Bump up dev Symfony requirement to 6.4
  Add note to the UPGRADE file about minimal versions of Symfony
  Remove unnecessary Symfony conflicts
2024-02-09 13:22:37 +01:00
Grzegorz Sadowski
e337e431a6
[CI] Remove unsupported MySQL 5.7 from workflows 2024-02-09 12:47:34 +01:00
Grzegorz Sadowski
1c5a1af285
Bump up Symfony 6 to 6.4 2024-02-09 12:43:58 +01:00
Grzegorz Sadowski
79dcdbccab
Setup proper PHP version for given branch in refactor workflow 2024-02-09 11:32:09 +01:00
Grzegorz Sadowski
d29ec36041
Bump up PHP to 8.1 2024-02-09 10:32:40 +01:00
Grzegorz Sadowski
a9f88ff77b
Merge branch '1.13' into 2.0
* 1.13:
  Bump up symfony/flex version
2024-02-09 08:59:49 +01:00
Grzegorz Sadowski
5c02786199
Merge branch '1.12' into 1.13
* 1.12:
  Bump up symfony/flex version
2024-02-09 08:57:30 +01:00
Grzegorz Sadowski
4281187414
Bump up symfony/flex version 2024-02-09 07:19:43 +01:00
Grzegorz Sadowski
146afbe4d7
Merge branch '1.13' into 2.0
* 1.13: (33 commits)
  Update the branch-aliases
  [CS][DX] Refactor
  Fix validating resending shipment confirmation
  Fix validating resending order confirmation
  Slight cleanup
  Add parameter for states that allows to resend confirmation email
  Validate resending order confirmation email in correct state
  [Maintenance][Behat] Autoload calendar contexts into container
  [Maintenance] Update .gitattributes [Maintenance] Remove Laminas priority queue stub
  [Documentation] Fix table of supported versions
  Update the license years for the last time
  [StateMachineAbstraction] Add README file
  [StateMachineAbstraction] Add LICENSE file
  Update upgrade file
  Minor improvements in replace email managers compiler passes
  [Admin] Add matthiasnoback/symfony-dependency-injection-test dependency to composer
  [Shop] Introduce BC solution for deprecated and overwritten email managers
  [Admin] Introduce BC solution for deprecated and overwritten email managers
  Remove unneeded deprecation of email managers services
  Add notes to UPGRADE file about deprecating email managers
  ...
2024-02-05 10:32:37 +01:00
Wojdylak
0c54f067c0
Update the branch-aliases 2024-02-05 09:42:18 +01:00
Jacob Tobiasz
7846f8c118
Resolve conflicts between 1.12 and 1.13 2024-02-02 12:25:14 +01:00
Jacob Tobiasz
3bb18489f6
Bump the PHP version for the frontend CI 2024-02-01 10:43:03 +01:00
Jacob Tobiasz
fcfd8d5444
Bump the node.js to 20.x for the CI 2024-02-01 10:43:03 +01:00
Jacob Tobiasz
1dd6ee5884
Add the @Sylius/development-team as a codeowner 2024-02-01 10:40:15 +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
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
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
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
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