Commit graph

80 commits

Author SHA1 Message Date
Jacob Tobiasz
7ece6725ef
Remove Psalm 2023-12-04 11:10:34 +01:00
Wojdylak
303b43063d Add ignore parse errors to composer require checker 2023-11-14 16:09: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
f01bf57303
Remove the conflict for doctrine/orm 2.15.* 2023-08-11 12:12:01 +02:00
Jacob Tobiasz
1d6208074d
Add a conflict for doctrine/orm 2.15.2 and higher 2023-08-02 07:53:31 +02:00
Grzegorz Sadowski
549bf8b866
Add a conflict for doctrine/orm:2.15.4 2023-07-28 09:00:03 +02:00
Jakub Tobiasz
210754fe1a
Add a conflict for "stof/doctrine-extensions-bundle": "1.8.0" 2023-07-10 16:28:11 +02:00
TheMilek
21bca41a1c
Update conflicts file 2023-06-27 12:15:25 +02:00
Jakub Tobiasz
c6eab12107
Add a conflict for doctrine/orm:2.15.3 2023-06-23 07:03:40 +02:00
Jakub Tobiasz
b812ff2ff1
Add a conflict for doctrine/orm:2.15.2 2023-06-03 08:24:59 +02:00
Jakub Tobiasz
057960f4ac
Revert "Add conflict for doctrine/orm:2.14.2"
This reverts commit de58169f58.
2023-04-14 14:03:54 +02:00
Jakub Tobiasz
de58169f58
Add conflict for doctrine/orm:2.14.2 2023-04-13 08:31:27 +02:00
Rafikooo
3805e7eb75
[Conflict] Add conflict with symfony/framework-bundle:6.2.8 2023-03-31 16:44:33 +02:00
Jakub Tobiasz
7cbf19a2f4
Fix CI 2023-02-09 16:59:18 +01:00
Rafikooo
c765d68271
Merge branch '1.11' into 1.12
* 1.11:
  Add a conflict for doctrine/migrations:3.5.3
2023-01-11 15:58:17 +01:00
Jakub Tobiasz
fbb2227b1d
Add a conflict for doctrine/migrations:3.5.3 2023-01-11 14:56:03 +01:00
Jakub Tobiasz
92f8ea3f2d
Precise symfony/framework-bundle and dependency-injection conflict versions 2022-11-18 16:22:42 +01:00
Rafikooo
38db9df646
[Maintenance] Outdated Symfony 6 conflicts removed 2022-11-02 00:19:08 +01:00
Łukasz Chruściel
efcf21713c
[Maintenance] Removal of direct unneeded dependency on proxy manager LTS #14318 2022-10-31 20:29:23 +01:00
Grzegorz Sadowski
e2b2a1748d
Merge branch '1.11' into 1.12
* 1.11:
  [Maintenance] Allow APIP 2.7.2
2022-10-26 08:26:33 +02:00
Jan Goralski
55ee86e038
[Maintenance] Allow APIP 2.7.2 2022-10-25 08:33:22 +02:00
Grzegorz Sadowski
d054f18586
[Hot-fix] Conflict with the SymfonyMockerContainer 1.0.6 due to incompatible version with Symfony 4.x 2022-10-14 13:46:12 +02:00
Grzegorz Sadowski
dbc9c04618
[Hot-fix] Conflict with the newest AP that changes a Customer->User response 2022-10-13 13:39:51 +02:00
Rafikooo
b8e3bc6826
[Maintenance] Removed conflicts in the composer related to unsupported versions of Symfony 2022-10-10 12:31:02 +02:00
Mateusz Zalewski
02f9862c06
[Hot-fix] Conflict with newest AP that changes a Customer->User response 2022-10-07 15:27:33 +02:00
Kevin Kaniaburka
416c2d3beb
[Maintenance] Update UPGRADE-1.12.md 2022-09-15 15:48:20 +02:00
Grzegorz Sadowski
f459ac53a2
Merge branch '1.11' into 1.12
* 1.11:
  [Maintenance] Conflict api-platform/core 2.7.0 documented
  Conflict api-platform/core 2.7.0
2022-09-15 15:00:27 +02:00
Rafikooo
a7ae947522
[Maintenance] Conflict api-platform/core 2.7.0 documented 2022-09-15 13:19:17 +02:00
Kevin Kaniaburka
8735b6c969
[Maintenance] Add conflict with jms/serializer-bundle 4.1.0 2022-09-13 08:26:11 +02:00
Jakub Tobiasz
0c72a59d8d Remove information about conflict with doctrine/dbal:^3 2022-07-12 11:59:29 +02:00
Ł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