Skip to content

Commit 406d6ff

Browse files
mnoconadriendupuis
andcommitted
Added mention of temporary Composer conflicts needed during v4 update (#2391)
* Added mention of temporary Composer conflicts needed during v4 update * Apply suggestions from code review * update_from_4.5.md: `conflict` to upgrade to 4.5.latest The fixes appeared in 4.5.1 and 4.5.6 so you may still need them when coming from 4.5.0, right? * update_from_4.4.md: `conflict` to upgrade to 4.5.latest `conflict` entries are needed between 4.4.0 and 4.4.latest (4.4.4) but are not needed from 4.4.latest (4.4.4) to 4.5.latest (4.5.7) --------- Co-authored-by: Adrien Dupuis <[email protected]>
1 parent 72dcbe4 commit 406d6ff

File tree

8 files changed

+36
-2
lines changed

8 files changed

+36
-2
lines changed
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
!!! caution "Temporary need of Composer `conflict`"
2+
3+
To go through this update, [map the conflicting packages](https://getcomposer.org/doc/04-schema.md#conflict) in your `composer.json` file as following:
4+
```json
5+
"conflict": {
6+
"jms/serializer": ">=3.30.0",
7+
"gedmo/doctrine-extensions": ">=3.12.0"
8+
},
9+
```
10+
These entries can be removed after fully upgrading to v4.6 LTS.

docs/update_and_migration/from_3.3/to_4.0.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ See [a list of all changed namespaces, configuration key, service names, and oth
99

1010
An additional compatibility layer makes the process of updating your code easier.
1111

12+
[[% include 'snippets/update/temporary_v4_conflicts.md' %]]
13+
1214
!!! note "Symfony 5.4"
1315

1416
If you are using Symfony 5.3, you need to update your installation to Symfony 5.4.

docs/update_and_migration/from_4.0/to_4.1.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ This update procedure applies if you are using v4.0.0.
44

55
Go through the following steps to update to v4.1.
66

7+
[[% include 'snippets/update/temporary_v4_conflicts.md' %]]
8+
79
!!! note
810

911
During the update process you can encounter the following error:

docs/update_and_migration/from_4.1/update_from_4.1.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ description: Update your installation to the v4.2.latest version from an v4.1 ve
66

77
This update procedure applies if you are using a v4.1 installation.
88

9+
[[% include 'snippets/update/temporary_v4_conflicts.md' %]]
10+
911
## Update from v4.1.x to v4.1.latest
1012

1113
Before you update to v4.2, you need to go through the following steps to update to the latest maintenance release of v4.1 (v[[= latest_tag_4_1 =]]).
@@ -143,4 +145,4 @@ otherwise you can encounter errors during compiling.
143145
``` bash
144146
rm -Rf node_modules
145147
rm -Rf yarn.lock
146-
```
148+
```

docs/update_and_migration/from_4.2/update_from_4.2.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ description: Update your installation to the latest v4.3 version from v4.2.x.
66

77
This update procedure applies if you are using a v4.2 installation.
88

9+
[[% include 'snippets/update/temporary_v4_conflicts.md' %]]
10+
911
## Update from v4.2.x to v4.2.latest
1012

1113
Before you update to v4.3, you need to go through the following steps to update to the latest maintenance release of v4.2 (v[[= latest_tag_4_2 =]]).

docs/update_and_migration/from_4.3/update_from_4.3_new_commerce.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ description: Update procedure to v4.4 for people who don't use Commerce packages
55

66
This update procedure applies if you have a v4.3 installation, and you do not use Commerce packages.
77

8+
[[% include 'snippets/update/temporary_v4_conflicts.md' %]]
9+
810
## Update from v4.3.x to v4.3.latest
911

1012
Before you update to v4.4, you need to go through the following steps to update to the latest maintenance release of v4.3 (v[[= latest_tag_4_3 =]]).

docs/update_and_migration/from_4.3/update_from_4.3_old_commerce.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ Note that all commerce packages as of v4.4 are deprecated and will be removed in
1010
Until that time, they will be maintained by [[= product_name_base =]] with fixes, including security fixes, but they won't be further developed.
1111
Old packages are replaced by [the all-new Ibexa Commerce packages](ibexa_dxp_v4.4.md#all-new-ibexa-commerce-packages).
1212

13+
[[% include 'snippets/update/temporary_v4_conflicts.md' %]]
14+
1315
## Update from v4.3.x to v4.3.latest
1416

1517
Before you update to v4.4, you need to go through the following steps to update to the latest maintenance release of v4.3 (v[[= latest_tag_4_3 =]]).
@@ -219,4 +221,4 @@ run data migration required by the Customer Portal applications feature:
219221
```bash
220222
php bin/console ibexa:migrations:import vendor/ibexa/corporate-account/src/bundle/Resources/migrations/application_internal_fields.yaml --name=2022_11_07_22_46_application_internal_fields.yaml
221223
php bin/console ibexa:migrations:migrate --file=2022_11_07_22_46_application_internal_fields.yaml
222-
```
224+
```

docs/update_and_migration/from_4.4/update_from_4.4.md

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@ Before you update to v4.5, you need to go through the following steps to update
1212

1313
### Update the application to v4.4.latest
1414

15+
[[% include 'snippets/update/temporary_v4_conflicts.md' %]]
16+
1517
Run:
1618

1719
=== "[[= product_name_content =]]"
@@ -30,6 +32,16 @@ Run:
3032
composer require ibexa/commerce:[[= latest_tag_4_4 =]] --with-all-dependencies --no-scripts
3133
```
3234

35+
!!! note "Remove temporary Composer `conflict`"
36+
37+
You can now remove the temporary Composer `conflict` entries from your `composer.json` file:
38+
```diff
39+
"conflict": {
40+
- "jms/serializer": ">=3.30.0",
41+
- "gedmo/doctrine-extensions": ">=3.12.0"
42+
},
43+
```
44+
3345
## Update from v4.4.latest to v4.5
3446

3547
When you have the latest version of v4.4, you can update to v4.5.

0 commit comments

Comments
 (0)