Commit graph

50 commits

Author SHA1 Message Date
Łukasz Chruściel
0219e0d0d8
Merge branch '1.10' into 1.11
* 1.10:
  [Maintenance] Add conflict to symfony/framework-bundle to fix problem with solving path prefix in API scenarios
  [Maintenace] Add explicit doctrine/dbal requirement in ApiBundle to fix problem with json_array type
  [PHPSpec] Change UsernameNotFoundException to RuntimeException in username provider
  [Maintenance] Add conflict to symfony/dependency-injection
  [Maintenance] Remove validation of schema from GitHub Actions
2022-03-07 10:56:36 +01:00
Łukasz Chruściel
be496a64e7
Merge branch '1.9' into 1.10
* 1.9:
  [Maintenance] Add conflict to symfony/framework-bundle to fix problem with solving path prefix in API scenarios
  [Maintenace] Add explicit doctrine/dbal requirement in ApiBundle to fix problem with json_array type
  [PHPSpec] Change UsernameNotFoundException to RuntimeException in username provider
  [Maintenance] Add conflict to symfony/dependency-injection
  [Maintenance] Remove validation of schema from GitHub Actions
2022-03-07 10:56:05 +01:00
Grzegorz Sadowski
26a6c741cb
[Maintenance] Add conflict to symfony/framework-bundle to fix problem with solving path prefix in API scenarios 2022-03-07 09:37:09 +01:00
Grzegorz Sadowski
db1cac8b97
[Maintenance] Add conflict to symfony/dependency-injection 2022-03-04 15:26:54 +01:00
Mateusz Zalewski
4f6200c800
Merge branch '1.10' into 1.11
* 1.10:
  add dependency injection conflict
2022-02-28 17:01:45 +01:00
SirDomin
01a627fae9
add dependency injection conflict 2022-02-28 16:07:42 +01:00
Mateusz Zalewski
d65f8db546
bug #13391 [Maintenance] Conflict with Symfony 6 packages (lchrusciel)
This PR was merged into the 1.11 branch.

Discussion
----------

| Q               | A
| --------------- | -----
| Branch?         | 1.11
| Bug fix?        | yes
| New feature?    | no
| BC breaks?      | no
| Deprecations?   | no
| Related tickets | 
| License         | MIT

A recent check of sylius-standard installation proved, that installing it without symfony/flex may result in wrong libraries being installed, like symfony/cache. As we want to provide smooth upgrade path to Sylius 1.11, I'm proposing conflicting them for now. 

<!--
 - Bug fixes must be submitted against the 1.10 branch
 - Features and deprecations must be submitted against the master 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
-------

2c55893508 [Maintenance] Conflict with Symfony 6 packages
2021-12-14 16:15:52 +01:00
Łukasz Chruściel
2c55893508
[Maintenance] Conflict with Symfony 6 packages 2021-12-14 15:48:49 +01:00
Mateusz Zalewski
c7d508fe52
Merge branch '1.10'
* 1.10:
  [Docs] Add missing references in CONFLICT.md
2021-12-13 09:30:39 +01:00
Mateusz Zalewski
cdc7be607d
bug #13366 [Docs] Add missing references in CONFLICT.md (lchrusciel)
This PR was merged into the 1.10 branch.

Discussion
----------

| Q               | A
| --------------- | -----
| Branch?         | 1.10
| Bug fix?        | yes
| New feature?  | no
| BC breaks?      | no
| Deprecations?   | no
| Related tickets | Leftover from https://github.com/Sylius/Sylius/pull/13357 and https://github.com/Sylius/Sylius/pull/13358
| License         | MIT

<!--
 - Bug fixes must be submitted against the 1.10 branch
 - Features and deprecations must be submitted against the master 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
-------

e3ba9b9b9d [Docs] Add missing references in CONFLICT.md
2021-12-13 09:07:13 +01:00
Łukasz Chruściel
7133c8bec1
Merge branch '1.10'
* 1.10:
  Revert "Move "polishsymfonycommunity/symfony-mocker-container" into dev dependencies" due to the BC break
  Remove ORM 2.10 conflict
2021-12-09 21:51:20 +01:00
Michael Babker
edcfdd2a2d
Remove ORM 2.10 conflict 2021-12-08 19:26:25 -06:00
Łukasz Chruściel
8b72684abc
[Maintenance] Remove Sf6.0 conflicts 2021-12-07 16:53:45 +01:00
Łukasz Chruściel
e3ba9b9b9d
[Docs] Add missing references in CONFLICT.md 2021-12-07 16:48:14 +01:00
Łukasz Chruściel
5937ebba34
[Maintenance] Conflict with Symfony ^6.0 2021-12-06 12:27:46 +01:00
Łukasz Chruściel
860399f8b1
[Minor] Fix CONFLICT.md lining 2021-12-06 11:36:49 +01:00
Adam Kasperczak
860c3e840c
[Maintanance] add conflict 2021-12-06 10:41:47 +01:00
Grzegorz Sadowski
a198d04fea
Merge branch '1.9' into 1.10
* 1.9:
  [Maintenance] Add note about doctrine/dbal requirement
2021-11-08 11:42:20 +01:00
Łukasz Chruściel
cc66b79e3a
[Maintenance] Add note about doctrine/dbal requirement 2021-11-05 18:20:05 +01:00
Mateusz Zalewski
5b6c831c6e
Merge branch '1.9' into 1.10
* 1.9:
  [Maintenance] Replace dbal conflict with explicit requirement
2021-10-28 09:54:05 +02:00
Łukasz Chruściel
cb7cac8788
[Maintenance] Replace dbal conflict with explicit requirement 2021-10-27 14:35:27 +02:00
Łukasz Chruściel
4693a2abfd
Merge branch '1.9' into 1.10
* 1.9:
  Add conflict with doctrine/dba ^3 to avoid missing json_array type error
2021-10-27 14:30:27 +02:00
Francis Hilaire
b7b7095432
Merge branch '1.9' into constraint-doctrine-dbal 2021-10-21 18:22:46 +02:00
Francis Hilaire
4466a76b5f Add conflict with doctrine/dba ^3 to avoid missing json_array type error 2021-10-21 17:06:25 +02:00
Mateusz Zalewski
bded4c10dd
Merge branch '1.9' into 1.10
* 1.9:
  [HotFix] Update conflict to doctrine/orm to fix the problem with creating taxons
2021-10-06 11:40:17 +02:00
Grzegorz Sadowski
82d459819e
[HotFix] Update conflict to doctrine/orm to fix the problem with creating taxons 2021-10-06 07:12:40 +02:00
Mateusz Zalewski
cd88d20387
Merge branch '1.9' into 1.10
* 1.9:
  [HotFix] Add conflict to doctrine/orm to fix the problem with creating taxons
2021-10-04 12:02:59 +02:00
Grzegorz Sadowski
312746312e
[HotFix] Add conflict to doctrine/orm to fix the problem with creating taxons 2021-10-04 11:40:44 +02:00
Grzegorz Sadowski
24299d98c2
Revert "Bring back conflict to symfony/polyfill-mbstring" 2021-06-21 13:41:16 +02:00
Kamil Kokot
3b332e5017
bug #12733 Bring back conflict to symfony/polyfill-mbstring (GSadee)
This PR was merged into the 1.10 branch.

Discussion
----------

| Q               | A
| --------------- | -----
| Branch?         | 1.10
| Bug fix?        | yes
| New feature?    | no
| BC breaks?      | no
| Deprecations?   | no
| Related tickets | 
| License         | MIT


Commits
-------

ecc9869357 Bring back conflict to symfony/polyfill-mbstring
2021-06-21 08:54:17 +01:00
Grzegorz Sadowski
ecc9869357
Bring back conflict to symfony/polyfill-mbstring 2021-06-21 09:50:27 +02:00
Grzegorz Sadowski
8f507192d7
Remove unnecessary note about conflict with api-platform/core 2021-06-21 09:27:21 +02:00
Kamil Kokot
14bd63ddac
Fix the build after upgrade to Symfony 5.3 in GitHub Actions 2021-06-10 12:33:32 +01:00
Grzegorz Sadowski
dc01355ac2
[API] Conflict with symfony/property-info due to problem with wrong namespaces of some translation entities 2021-05-12 14:49:34 +02:00
Łukasz Chruściel
75ab808bd4 [Maintenance] Conflict with JMSSerializer 3.9.0 due to issues with mapping of persistent collection 2021-03-22 19:49:35 +00:00
Kamil Kokot
8b9498523b Merge branch '1.8' into 1.9
* 1.8:
  Fix the build by conflicting with doctrine/doctrine-bundle 2.3.0
2021-03-22 14:49:00 +00:00
Kamil Kokot
61848c9a91 Fix the build by conflicting with doctrine/doctrine-bundle 2.3.0 2021-03-22 14:07:05 +00:00
Grzegorz Sadowski
0d6b3d62f9 [Composer] Add conflict to symfony/serializer due to problem with accessing to private properties 2021-01-28 15:20:51 +01:00
Grzegorz Sadowski
f12aa05b84
[Composer] Add conflict to symfony/serializer due to problem with accessing to private properties 2021-01-28 15:01:35 +01:00
Mateusz Zalewski
feacc8aa04
Merge branch '1.8' into master
* 1.8:
  Add conflict with api-platform/core:^2.6
2021-01-27 11:49:07 +01:00
Kamil Kokot
a35af6741d Add conflict with api-platform/core:^2.6 2021-01-27 10:06:53 +01:00
Kamil Kokot
9c2c2adf94
Merge branch '1.8'
* 1.8:
  Backport symfony/polyfill-mbstring:1.22.0 conflict to make the build passing on 1.8
2021-01-12 14:08:21 +01:00
Kamil Kokot
f3247f5d1c
Backport symfony/polyfill-mbstring:1.22.0 conflict to make the build passing on 1.8 2021-01-12 11:35:01 +01:00
Kamil Kokot
3e0e14003c
Upgrade ResourceBundle and GridBundle 2021-01-11 18:14:04 +01:00
Tomanhez
9b6b975356 Add conflict with polyfill-mbstrin 2021-01-08 12:42:18 +01:00
Tomanhez
40810ed310 Add remove conflict 2021-01-03 21:06:43 +01:00
Tomanhez
dad3cb12ab
Update conflicts.md 2020-12-31 16:42:09 +01:00
Tomanhez
0c87905b2e Update conflicts.md 2020-12-31 11:29:02 +01:00
Tomanhez
8de9f22936
Remove lcobucci/jwt v3.4 conflict 2020-11-30 13:04:08 +01:00
Kamil Kokot
1b58837601
Add conflict with lcobucci/jwt to prevent Behat build failures 2020-11-25 16:19:16 +01:00