Skip to content
This repository was archived by the owner on Nov 19, 2024. It is now read-only.

Commit 0f17245

Browse files
committed
Update v2.3 version
1 parent c5b6629 commit 0f17245

File tree

2 files changed

+44
-16
lines changed

2 files changed

+44
-16
lines changed

src/guides/v2.3/comp-mgr/cli/cli-upgrade.md

Lines changed: 39 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -41,12 +41,18 @@ Complete the following prerequisites to prepare your environment before starting
4141

4242
The plugin partially automates the manual upgrade by identifying and helping you resolve dependency conflicts instead of requiring you to identify and fix them manually.
4343

44-
To install the plugin:
44+
To install the plugin when using PHP 7.2 or lower:
4545

4646
```bash
4747
composer require magento/composer-root-update-plugin=~1.0 --no-update
4848
```
4949

50+
To install the plugin when using PHP 7.3 or higher:
51+
52+
```bash
53+
composer require magento/composer-root-update-plugin=~2.0 --no-update
54+
```
55+
5056
Update the dependencies:
5157

5258
```bash
@@ -70,28 +76,50 @@ See the examples at the end of this section for help specifying different releas
7076
composer remove magento/product-community-edition --no-update
7177
```
7278

73-
1. Indicate the Magento packages, both the edition (`community` or `enterprise`) and the version (`{{ page.guide_version }}.0`), that you want to upgrade to.
79+
1. Run the appropriate `composer` command to upgrade your instance. The command has the following syntax:
7480

75-
{:.bs-callout-info}
76-
The first time you upgrade using the plugin, you can interactively view and update any out-of-date values that may be remaining from previous versions.
77-
To enable this, use the `--interactive-magento-conflicts` option on the `composer require` commands.
81+
For PHP 7.2 or lower:
7882

79-
To override all conflicting custom values with the expected Magento values, re-run the `composer require` command with the `--use-default-magento-values` option.
83+
```bash
84+
composer require magento/<product.version> [--interactive-root-conflicts] [--force-root-updates] [--no update]
85+
```
86+
87+
For 7.3 or higher:
88+
89+
```bash
90+
composer require-commerce magento/<product.version> [--interactive-root-conflicts] [--force-root-updates] [--no update]
91+
```
92+
93+
where:
94+
95+
`<product>` - (Required) The package to upgrade. For on-premise installations, this value must either `product-community-edition` or `product-enterprise-edition`.
96+
97+
`<version>` - (Required) The version of {{site.data.var.ce}} or {{site.data.var.ce}} you are upgrading to. For example, `2.3.7`.
98+
99+
`--interactive-root-conflicts` - (Optional) Allows you to interactively view and update any out-of-date values that may be remaining from previous versions.
100+
101+
`--force-root-updates` - (Optional) Overrides all conflicting custom values with the expected Magento values.
102+
103+
`--no-update` - (Optional) Disables the automatic update of the dependencies.
104+
105+
If neither `--interactive-root-conflicts` nor `--force-root-updates` are specified, the command keeps the existing values that are in conflict and displays a warning message.
80106

81107
{:.bs-callout-tip}
82-
Use `composer require --help` to learn more about available options.
108+
Use `composer require-commerce --help` to learn more about available options.
83109
To learn more about usage of the plugin, refer to the [Plugin Usage](https://github.com/magento/composer-root-update-plugin/blob/0.1/src/Magento/ComposerRootUpdatePlugin/README.md#usage).
84110

111+
**Examples:**
112+
85113
_{{ ce }}_:
86114

87115
```bash
88-
composer require magento/product-community-edition={{ page.guide_version }}.7 --no-update
116+
composer require-commerce magento/product-community-edition=2.3.7 --no-update
89117
```
90118

91119
_{{ ee }}_:
92120

93121
```bash
94-
composer require magento/product-enterprise-edition={{ page.guide_version }}.7 --no-update
122+
composer require-commerce magento/product-enterprise-edition=2.3.7 --no-update
95123
```
96124

97125
<div class="bs-callout-tip" markdown="1">
@@ -100,13 +128,13 @@ See the examples at the end of this section for help specifying different releas
100128
_{{ ce }}_:
101129

102130
```bash
103-
composer show magento/product-community-edition {{ page.guide_version }}.* --all | grep -m 1 versions
131+
composer show magento/product-community-edition 2.3.* --all | grep -m 1 versions
104132
```
105133

106134
_{{ ee }}_:
107135

108136
```bash
109-
composer show magento/product-enterprise-edition {{ page.guide_version }}.* --all | grep -m 1 versions
137+
composer show magento/product-enterprise-edition 2.3.* --all | grep -m 1 versions
110138
```
111139

112140
</div>

src/guides/v2.4/comp-mgr/cli/cli-upgrade.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ See the examples at the end of this section for help specifying different releas
8585

8686
`<product>` - (Required) The package to upgrade. For on-premise installations, this value must either `product-community-edition` or `product-enterprise-edition`.
8787

88-
`<version>` - (Required) The version of {{site.data.var.ce}} or {{site.data.var.ce}} you are upgrading to. For example, `2.4.4`.
88+
`<version>` - (Required) The version of {{site.data.var.ce}} or {{site.data.var.ce}} you are upgrading to. For example, `2.4.3`.
8989

9090
`--interactive-root-conflicts` - (Optional) Allows you to interactively view and update any out-of-date values that may be remaining from previous versions.
9191

@@ -104,13 +104,13 @@ See the examples at the end of this section for help specifying different releas
104104
_{{ ce }}_:
105105

106106
```bash
107-
composer require-commerce magento/product-community-edition={{ page.guide_version }}.4 --no-update
107+
composer require-commerce magento/product-community-edition=2.4.3 --no-update
108108
```
109109

110110
_{{ ee }}_:
111111

112112
```bash
113-
composer require-commerce magento/product-enterprise-edition={{ page.guide_version }}.4 --no-update
113+
composer require-commerce magento/product-enterprise-edition=2.4.3 --no-update
114114
```
115115

116116
<div class="bs-callout-tip" markdown="1">
@@ -119,13 +119,13 @@ See the examples at the end of this section for help specifying different releas
119119
_{{ ce }}_:
120120

121121
```bash
122-
composer show magento/product-community-edition {{ page.guide_version }}.* --available | grep -m 1 versions
122+
composer show magento/product-community-edition 2.4.* --available | grep -m 1 versions
123123
```
124124

125125
_{{ ee }}_:
126126

127127
```bash
128-
composer show magento/product-enterprise-edition {{ page.guide_version }}.* --available | grep -m 1 versions
128+
composer show magento/product-enterprise-edition 2.4.* --available | grep -m 1 versions
129129
```
130130

131131
</div>

0 commit comments

Comments
 (0)