Commit graph

1389 commits

Author SHA1 Message Date
Grzegorz Sadowski
7ae6ac56ba
[Composer] Remove symfony/templating dependency 2024-10-02 07:13:35 +02:00
Grzegorz Sadowski
8db6bc38e0
[UPMERGE] 2.0 -> payment-request (#17080)
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/payment-request -m "Resolve conflicts between 2.0 and payment-request"
```

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-10-02 06:49:03 +02:00
Grzegorz Sadowski
da9e565eab
[Composer] Bump sylius/mailer-bundle to 2.1 version 2024-10-01 13:08:32 +02:00
Grzegorz Sadowski
54238fa3d4
Merge branch 'payment-request' into upmerge/2.0_payment-request 2024-10-01 09:09:56 +02:00
Loïc Frémont
c8dd728b58 Bump Pagerfanta version to 4.x 2024-09-30 09:20:47 +02:00
Michał Pysiak
5360772aaf
Remove dependecies 2024-09-27 06:09:00 +02:00
Grzegorz Sadowski
42f2fcb123
Resolve conflicts between 2.0 and payment-request 2024-09-26 13:52:33 +02:00
Grzegorz Sadowski
6f23ae3844
[Composer] Bump minimum Symfony 7 version to 7.1 2024-09-25 10:41:03 +02:00
Grzegorz Sadowski
64d6b9d526
Resolve conflicts between 2.0 and payment-request 2024-09-25 07:34:26 +02:00
Grzegorz Sadowski
cd1dda3e8c
Change application's version to v2.0.0-DEV 2024-09-24 13:35:47 +02:00
Grzegorz Sadowski
6e79c0d6a7
Change application's version to v2.0.0-ALPHA.2 2024-09-24 13:29:32 +02:00
Grzegorz Sadowski
049445e3e5
Change application's version to v1.14.0-DEV 2024-09-24 13:18:24 +02:00
Grzegorz Sadowski
46ebd02cee
Change application's version to v1.14.0-ALPHA.1 2024-09-24 13:14:08 +02:00
Grzegorz Sadowski
aa50b60421
Change application's version to v1.13.7-dev 2024-09-24 13:03:21 +02:00
Grzegorz Sadowski
fa29546f7e
Change application's version to v1.13.6 2024-09-24 13:02:09 +02:00
Wojdylak
532be0456b
Resolve conflicts between 2.0 and payment-request 2024-09-24 09:18:52 +02:00
Grzegorz Sadowski
df217d7182
Resolve conflicts between 2.0 and symfony-7 2024-09-24 08:48:32 +02:00
Grzegorz Sadowski
7c863fe5a9
[Composer] Add doctrine/doctrine-bundle to UserBundle 2024-09-24 06:55:50 +02:00
Grzegorz Sadowski
fe38ee8bba
Change application's version to v2.0.0-DEV 2024-09-19 14:32:30 +02:00
Grzegorz Sadowski
db2cd5e5a2
Change application's version to v2.0.0-ALPHA.1 2024-09-19 14:22:12 +02:00
Michał Pysiak
1c62b1bb5c
Bump minimal APIP version to 3.4.0 2024-09-19 10:50:14 +02:00
Grzegorz Sadowski
0a6db753a8 [Composer] Remove willdurand/hateoas and willdurand/hateoas-bundle dependencies 2024-09-18 08:03:36 +02:00
Michał Pysiak
f9f3bbc7a2 Install guzzle7 client 2024-09-16 14:22:00 +02:00
Grzegorz Sadowski
7de412f515 [Composer] Remove willdurand/hateoas and willdurand/hateoas-bundle dependencies 2024-09-16 14:22:00 +02:00
Grzegorz Sadowski
2e61eac40a [Composer] Try to remove conflict to doctrine/orm 2024-09-16 14:22:00 +02:00
Grzegorz Sadowski
ea273dc633 [Composer] Temporarily upgrade sylius/resource-bundle dependency to alpha version 2024-09-16 14:22:00 +02:00
Grzegorz Sadowski
81047affb7 [Composer] Temporarily upgrade sylius/grid-bundle dependency to alpha version 2024-09-16 14:22:00 +02:00
Grzegorz Sadowski
5978b8d559 [Composer] Temporarily upgrade sylius/mailer-bundle dependency to alpha version 2024-09-16 14:22:00 +02:00
Grzegorz Sadowski
77c867bb51 [Composer] Update SF require to ^7.0 2024-09-16 14:22:00 +02:00
Grzegorz Sadowski
cfab50ed45
[Composer] Remove polishsymfonycommunity/symfony-mocker-container dependency 2024-09-16 11:53:49 +02:00
Grzegorz Sadowski
b5ff350a68
[PayPal] Remove deprecated Express Checkout gateway 2024-09-16 11:53:49 +02:00
Grzegorz Sadowski
842ae474f2
[Stripe] Remove deprecated gateway 2024-09-16 10:03:20 +02:00
Grzegorz Sadowski
636088e879 [Composer] Upgrade consolidation/log and psr/log dependencies 2024-09-13 07:03:23 +02:00
Grzegorz Sadowski
757d0e548c [Composer] Remove sylius-labs/polyfill-symfony-event-dispatcher dependency 2024-09-13 07:03:23 +02:00
Grzegorz Sadowski
8d8b15258b [Composer] Remove sylius-labs/polyfill-symfony-security dependency 2024-09-13 07:03:23 +02:00
Grzegorz Sadowski
3cf6569af6 [Composer] Remove sylius-labs/polyfill-symfony-framework-bundle dependency 2024-09-13 07:03:23 +02:00
Grzegorz Sadowski
885c89c9bb [Composer] Upgrade knplabs/knp-gaufrette-bundle dependency 2024-09-13 07:03:23 +02:00
Grzegorz Sadowski
e6d2b69b94 [Composer] Upgrade doctrine/event-manager dependency 2024-09-13 07:03:23 +02:00
Grzegorz Sadowski
ddd4ee8707 [Composer] Upgrade babdev/pagerfanta-bundle dependency 2024-09-13 07:03:23 +02:00
Grzegorz Sadowski
3abcfe213d
Merge branch '2.0' into symfony-7
* 2.0:
  [CI] Split JS builds for Panther and Chromedriver + add additional rerun
  Revert "[CI] Upmerge Action False Positive"
  Remove note about twig/twig from CONFLICTS.md file
  Bump twig packages
  [CI] Complete upmerge action successfully even if there are no changes between branches
  Add missing tags and cover scenarios in shopping_cart suite
  [CS][DX] Refactor
2024-09-12 14:57:06 +02:00
Grzegorz Sadowski
9c6dedfe47 [Composer] Change symfony/templating require versions 2024-09-12 09:33:22 +02:00
Michał Pysiak
232f0ef9a4 Bump twig packages 2024-09-11 11:04:07 +02:00
Loïc Frémont
238aa2e636 [SF7] Uniform package versions 2024-09-09 09:50:17 +02:00
Wojdylak
708a7ef4de
Resolve conflicts between 2.0 and payment-request 2024-09-09 09:49:58 +02:00
Grzegorz Sadowski
25fa915993
Merge branch '2.0' into symfony-7
* 2.0: (26 commits)
  Update namespaces to Resource ^1.11 in 2.0
  [CS][DX] Refactor
  [CS][DX] Refactor
  [Maintenance] Update resource changes comparison in the upgrade file
  [Maintenance] Fix LazyOption repository template covariants
  [Maintenance] Note resource namespaces changes
  [Docs] Update namespaces
  [Maintenance] Update leftover namespaces
  Cover the scenario for allowing access for only correctly logged in users
  Enable the remaining cart suites
  [Maintenance] Fix translations' duplicated validation
  [Api][Unit] Fix it_gets_all_product_variants_when_invalid_product_filter_provided test
  [Api] Replace sylius.api to sylius_api
  [Api] Cover sorting and filtration of resources
  [Behat] Refine codebase for promotion and cart contexts
  Enable dashboard and homepage suites
  Minor Product config improvement
  Enable the rest of product tests and correct order of the attribute values in the response
  Correct contract tests and behat
  Bring back non exposed ProductOptionValue
  ...
2024-09-09 09:38:50 +02:00
Grzegorz Sadowski
bfdfa929e8
Resolve conflicts between 1.14 and 2.0 2024-09-09 07:28:58 +02:00
Wojdylak
3f164fcf09
Resolve conflicts between 2.0 and payment-request 2024-09-06 11:04:40 +02:00
Grzegorz Sadowski
d1407d6153
Resolve conflicts between 2.0 and symfony-7 2024-09-04 13:19:19 +02:00
Jan Goralski
0718d5babd
[Maintenance] Bumped Sylius resource packages to ^1.11 2024-09-04 09:08:58 +02:00
Grzegorz Sadowski
cd01851554
[Composer][CI] Minor clean up 2024-09-04 07:14:17 +02:00