Commit graph

652 commits

Author SHA1 Message Date
Grzegorz Sadowski
26b8ab0330
Merge branch '2.0' into api-platform-3
* 2.0:
  [Behat] Use chromedrives in some scenarios
  Update phpstan/phpstan-doctrine requirement from 1.3.43 to 1.3.69
  Update PR template
  [Documentation] Update release cycle after 1.13 release
2024-04-29 10:58:25 +02:00
Grzegorz Sadowski
3223ea3a9f
Merge branch '2.0' into bootstrap-admin-panel
* 2.0:
  [Behat] Use chromedrives in some scenarios
  Update phpstan/phpstan-doctrine requirement from 1.3.43 to 1.3.69
  Update PR template
  [Documentation] Update release cycle after 1.13 release
  [Maintenance] Use chromedrive in behat tests
  [Maintenance][AbstractStateMachine] Add Sylius logo to readme
2024-04-29 10:57:54 +02:00
Grzegorz Sadowski
8db2501200
Merge branch '1.14' into 2.0
* 1.14:
  [Behat] Use chromedrives in some scenarios
  Update phpstan/phpstan-doctrine requirement from 1.3.43 to 1.3.69
  Update PR template
  [Documentation] Update release cycle after 1.13 release
2024-04-29 10:44:44 +02:00
Grzegorz Sadowski
cd2f28fb2f
Merge branch '1.12' into 1.13
* 1.12:
  [Behat] Use chromedrives in some scenarios
  Update PR template
  [Documentation] Update release cycle after 1.13 release
2024-04-29 10:44:19 +02:00
Grzegorz Sadowski
783ce8a0c9
Update PR template 2024-04-26 15:10:28 +02:00
Karol
db881181d2
[UPMERGE] 2.0 -> bootstrap-admin-panel (#16166)
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-23 08:29:11 +02:00
Wojdylak
12c05d0f14
Resolve conflicts between 2.0 and api-platform-3 2024-04-23 08:12:51 +02:00
Karol
3cd6f12ef2
[UPMERGE] 1.13 -> 2.0 (#16155)
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-22 08:40:04 +02:00
Wojdylak
e2224c191e
[Maintenance] Add branch 2.0 to refactor build 2024-04-19 09:17:08 +02:00
Jan Goralski
77b533da8a [Maintenance] Disable non-api tests in CI 2024-04-19 08:06:37 +02:00
Jan Goralski
fb05956ee9 [Maintenance] Disable non-ui tests in CI 2024-04-19 07:40:13 +02:00
Grzegorz Sadowski
a29f1ea135
Merge branch '2.0' into api-platform-3
* 2.0: (25 commits)
  Change application's version to v1.13.0-DEV
  Generate changelog for v1.13.0-RC.1
  Change application's version to v1.13.0-RC.1
  [Documentation] Update release dates for 1.13 and 2.0 versions
  [ECS] Fix nullable type declarations in the codebase
  [ECS] Fix nullable type declarations in Behat namespace
  [ECS] Add the NullableTypeDeclarationForDefaultNullValueFixer rule
  Add default label template in ShopBundle extending the UiBundle one
  Use extends instead of include in ShopBundle flashes template
  Manage confirmation modal for ShopBundle extending UiBundle
  Use Shop pagination macro in templates
  Use Shop messages macro in templates
  Use Shop flags macro in templates
  Use Shop headers macro in templates
  Use Shop buttons macro in templates
  [Documentation] Remove duplicated callback from state machine
  Update docs/book/architecture/state_machine.rst
  Add upmerging from 2.0 to api-platform-3
  Update php-entrypoint to give www-data permissions to public/media
  Update FUNDING.yml
  ...
2024-04-16 15:14:53 +02:00
Grzegorz Sadowski
ee9a386574
Merge branch '1.13' into 2.0
* 1.13:
  [ECS] Fix nullable type declarations in the codebase
  [ECS] Fix nullable type declarations in Behat namespace
  [ECS] Add the NullableTypeDeclarationForDefaultNullValueFixer rule
  Add default label template in ShopBundle extending the UiBundle one
  Use extends instead of include in ShopBundle flashes template
  Manage confirmation modal for ShopBundle extending UiBundle
  Use Shop pagination macro in templates
  Use Shop messages macro in templates
  Use Shop flags macro in templates
  Use Shop headers macro in templates
  Use Shop buttons macro in templates
  Add upmerging from 2.0 to api-platform-3
2024-04-16 12:45:01 +02:00
Grzegorz Sadowski
a578582d4f
Add upmerging from 2.0 to api-platform-3 2024-04-16 07:29:01 +02:00
Wojdylak
6c3fc02be6
Resolve conflicts between 1.13 and 2.0 2024-04-11 08:31:52 +02:00
Damian Murawski
8974f4cf59 Update FUNDING.yml 2024-04-10 12:27:09 +02:00
Damian Murawski
1a3f1c1825 Create FUNDING.yml 2024-04-10 12:27:09 +02:00
Grzegorz Sadowski
b6e593cf84
Merge branch '2.0' into api-platform-3
* 2.0:
  Update the merge instruction
  Enable updating an existing PR for a given "from"_"to" if it already exists
  [CS][DX] Refactor
2024-04-02 08:28:45 +02:00
Grzegorz Sadowski
2fcc5d22c5
Merge branch '1.13' into 2.0
* 1.13:
  Update the merge instruction
  Enable updating an existing PR for a given "from"_"to" if it already exists
  [CS][DX] Refactor
2024-04-02 08:28:41 +02:00
Jacob Tobiasz
e8dadbad28
Update the merge instruction 2024-04-01 08:21:31 +02:00
Jacob Tobiasz
3082029890
Enable updating an existing PR for a given "from"_"to" if it already exists 2024-04-01 08:20:42 +02:00
Grzegorz Sadowski
d13ebb94d8
Merge branch '2.0' into api-platform-3
* 2.0: (776 commits)
  Add missing validation for the customers first and last name
  [CS][DX] Refactor
  Bring back all Sylius' state machines to Winzou
  Add overriding the Resource's state machine with the one from the Sylius abstraction
  Add missing locales to contract test
  [Taxon][Behat] validate translations with unexisting locales
  [ShippingMethod][Behat] validate translations with unexisting locales
  [Promotion][Behat] validate translations with unexisting locales
  [Product][Behat] validate translations with unexisting locales
  [PaymentMethod][Behat] validate translations with unexisting locales
  Validate all translatable objects for unexisiting locales
  Validate customer's password reset
  Validate customer creation and edit
  Make the validation trait more generic
  [Api] Change namespace of TaxonImagesTest class
  [Api] Remove _response suffix
  [Behat] Minor improvments of viewing_taxon_image scenario
  [Api][ProductImage] Add https prefix check
  [Api][Admin] Allow using float for ratio in exchange rate
  SYL-3329 Fix behat test for SyliusPayPalPlugin
  ...
2024-03-29 14:49:47 +01:00
Jacob Tobiasz
374cbc80ac
[UPMERGE] 1.13 -> 2.0 (#16005)
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
change the commit title to
```
Resolve conflicts between 1.13 and 2.0
```
2024-03-14 14:02:49 +01:00
Jacob Tobiasz
cbcfa31572
[UPMERGE] 1.12 -> 1.13 (#16004)
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/1.13 -m "Resolve conflicts between 1.12 and 1.13"
```

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
```
2024-03-14 14:01:18 +01:00
Jacob Tobiasz
510da2f0f6
Remove the redundant comma between code owners 2024-03-14 13:54:17 +01:00
Jacob Tobiasz
20d1ad224a
Fix the CODEOWNERS file 2024-03-14 11:07:15 +01:00
Jacob Tobiasz
0408b923c8
Resolve conflicts between 1.13 and 2.0 2024-03-09 06:47:53 +01:00
Jan Goralski
c1466726e9
[Maintenance] Update GHA 2024-03-07 18:22:20 +01:00
Jacob Tobiasz
53d070be0b
Resolve conflicts between 1.13 and 2.0 2024-02-28 09:05:50 +01:00
Jacob Tobiasz
447eec2c84
Split ci__full.yaml workflow into smaller ones 2024-02-26 11:06:42 +01:00
Jacob Tobiasz
cb1ae1e029
[UPMERGE] 1.13 -> 2.0 (#15886)
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
change the commit title to
```
Resolve conflicts between 1.13 and 2.0
```
2024-02-25 14:28:54 +01:00
Jacob Tobiasz
c8e20cea07 Add upmerging from 2.0 to bootstrap-admin-panel 2024-02-25 12:38:40 +01:00
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