Commit graph

1393 commits

Author SHA1 Message Date
Jacob Tobiasz
e0d8391f55
Update the branch-aliases and inter-dependencies versions 2024-01-23 07:45:00 +01:00
Grzegorz Sadowski
1e943288a6
Merge branch '1.13' into 2.0
* 1.13: (82 commits)
  CreateAdminUserCommandTest class - sorting of used classes
  InformAboutGUSCommand class - fix a typo
  Update upgrade file
  [AdminBundle] Change namespace of CreateAdminUser
  [CoreBundle] Move classes from Command to Console/Command
  [UserBundle] Move classes from Command to Console/Command
  [UiBundle] Move classes from Command to Console/Command
  [PromotionBundle] Move classes from Command to Console/Command
  [OrderBundle] Move classes from Command to Console/Command
  [AdminBundle] Move classes from Command to Console/Command
  [ECS] Apply ecs fixes
  [Addressing] Support BC for ZoneMatcher
  [Upgrade] Note ZoneRepository addition and ZoneMatcher constructor changes
  [DX] Update OrderRepository
  [Statistics] Refactor GetStatisticsAction
  Change new orders name to paid orders to not mix up names
  fix unit test
  Apply changes from comments and improve outdated StatisticsModifier
  fix behat tests
  Remove specs for unexisting classes and add existing ones
  ...
2024-01-19 14:50:54 +01:00
Jacob Tobiasz
97fef09fa7
Extract StateMachine abstraction into its own package 2024-01-15 15:40:07 +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
Jacob Tobiasz
9dccd3cfe4
Allow to install lower version of stripe/stripe-php 2023-12-22 13:57:22 +01:00
Jacob Tobiasz
66d6a047d8
Resolve conflicts between 1.12 and 1.13 2023-12-22 13:53:00 +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
Jacob Tobiasz
5d2ec8fb5b
Bump all Symfony dependencies' versions to ^6.4 2023-12-07 09:13:46 +01:00
Jacob Tobiasz
2e9be89ca9
Revert few symfony/* 6.4 packages to 6.3 ones 2023-12-06 18:03:56 +01:00
Grzegorz Sadowski
6b23c10f58
Change application's version to v1.12.14-dev 2023-12-05 13:59:07 +01:00
Grzegorz Sadowski
e212e20197
Change application's version to v1.12.13 2023-12-05 13:58:28 +01:00
Grzegorz Sadowski
f414ffb729
[Composer] Fix Symfony dependencies after upmerge 2023-12-05 13:16:56 +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
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
385aea39a2
[Dependencies] Change possible versions of doctrine/persistence 2023-12-05 10:05:05 +01:00
Jacob Tobiasz
c5d235d45c
Bring back the accidentally removed "sylius-labs/suite-tags-extension" package 2023-12-04 14:37:55 +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
665c21a869
Change application's version to v1.12.13-dev 2023-11-17 13:48:12 +01:00
Grzegorz Sadowski
3321507cbb
Change application's version to v1.12.12 2023-11-17 13:47:40 +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
5a1f03c171 Add a conflict for "doctrine/doctrine-bundle": "2.11.0" 2023-11-14 11:09:13 +01:00
Jacob Tobiasz
9ee01ac071
Merge 1.13 into 2.0 2023-11-13 16:32:54 +01:00
Francis Hilaire
a643e8d663
Clean requirements 2023-11-01 14:37:53 +01:00
Francis Hilaire
b3914d4bcd
Add PAYPAL convert action service ID to the removed services 2023-11-01 14:28:10 +01:00
Francis Hilaire
ba400e4fa0
Move payum gateways to require-dev 2023-11-01 14:15:50 +01:00
Francis Hilaire
e5a1ac44c1
Re-add payum/stripe and remove stripe lib from require-dev 2023-10-31 22:04:31 +01:00
Wojdylak
7dfd84fe5b [API] Upgrade api-platform/core 2023-10-31 09:13:59 +01:00
Wojdylak
86955aa06f [API] Remove ItemNormalizer class 2023-10-31 08:33:23 +01:00
Jacob Tobiasz
03efe82baa
Make the taxon tree a live component 2023-10-20 12:15:52 +02:00
Kamil Grygierzec
df152aec6e [PHPSpec] Remove unused specs, move temporarily unimplemented ones to another catalog and enable spec for implemented ones 2023-10-05 14:32:00 +02:00
Jacob Tobiasz
77af62ec7d
Refactor Template Events to use a standalone ComponentBlock with a bc manner 2023-10-03 18:20:49 +02:00
Grzegorz Sadowski
9d5a1b3604
[API] Bump APIP to 3.1 and configure admin authentication 2023-09-28 15:10:20 +02:00
Rafikooo
567b599a40
Upmerge 1.13 into 2.0 2023-09-25 23:31:01 +02:00
Jan Goralski
8434b7546b [CI] Fix logs uploading 2023-09-23 09:13:57 +02:00
Jacob Tobiasz
7a84255b6d
Add support for Twig Components in Template Events 2023-09-22 10:28:20 +02:00
Jacob Tobiasz
8870db1bf3
Replace the sylius/calendar package with the symfony/clock package in the root composer.json 2023-09-21 13:34:59 +02:00