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

Commit 0fe8c87

Browse files
authored
Merge pull request #2759 from magento-commerce/1-28_integration
1 28 integration
2 parents 776b511 + 80a6d79 commit 0fe8c87

File tree

5 files changed

+16
-16
lines changed

5 files changed

+16
-16
lines changed

src/cloud/project/ece-tools-upgrade-project.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -71,14 +71,14 @@ To upgrade project to use ece-tools:
7171
# We run build hooks before your application has been packaged.
7272
build: |
7373
set -e
74-
php ./vendor/bin/ece-tools build:generate
75-
php ./vendor/bin/ece-tools build:transfer
74+
php ./vendor/bin/ece-tools run scenario/build/generate.xml
75+
php ./vendor/bin/ece-tools run scenario/build/transfer.xml
7676
# We run deploy hook after your application has been deployed and started.
7777
deploy: |
78-
php ./vendor/bin/ece-tools deploy
78+
php ./vendor/bin/ece-tools run scenario/deploy.xml
7979
# We run post deploy hook to clean and warm the cache. Available with ECE-Tools 2002.0.10.
8080
post_deploy: |
81-
php ./vendor/bin/ece-tools post-deploy
81+
php ./vendor/bin/ece-tools run scenario/post-deploy.xml
8282
```
8383

8484
1. Check for and remove the [deprecated packages](#remove-deprecated-packages). The deprecated packages can prevent a successful upgrade.

src/cloud/project/project-upgrade.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -64,14 +64,14 @@ To update the `.magento.app.yaml` file:
6464
# We run build hooks before your application has been packaged.
6565
build: |
6666
set -e
67-
php ./vendor/bin/ece-tools build:generate
68-
php ./vendor/bin/ece-tools build:transfer
67+
php ./vendor/bin/ece-tools run scenario/build/generate.xml
68+
php ./vendor/bin/ece-tools run scenario/build/transfer.xml
6969
# We run deploy hook after your application has been deployed and started.
7070
deploy: |
71-
php ./vendor/bin/ece-tools deploy
71+
php ./vendor/bin/ece-tools run scenario/deploy.xml
7272
# We run post deploy hook to clean and warm the cache. Available with ECE-Tools 2002.0.10.
7373
post_deploy: |
74-
php ./vendor/bin/ece-tools post-deploy
74+
php ./vendor/bin/ece-tools run scenario/post-deploy.xml
7575
```
7676

7777
1. Add the following environment variables to the end of the `magento.app.yaml` file.

src/guides/v2.3/extension-dev-guide/build/di-xml-file.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -263,20 +263,20 @@ The `preference` node specifies the default implementation:
263263
```xml
264264
<!-- File: app/etc/di.xml -->
265265
<config>
266-
<preference for="Magento\Core\Model\UrlInterface" type="Magento\Core\Model\Url" />
266+
<preference for="Magento\Framework\UrlInterface" type="Magento\Framework\Url" />
267267
</config>
268268
```
269269

270-
This mapping is in `app/etc/di.xml`, so the object manager injects the `Magento\Core\Model\Url` implementation class wherever there is a request for the `Magento\Core\Model\UrlInterface` in the global scope.
270+
This mapping is in `app/etc/di.xml`, so the object manager injects the `Magento\Framework\Url` implementation class wherever there is a request for the `Magento\Framework\UrlInterface` in the global scope.
271271

272272
```xml
273273
<!-- File: app/code/Magento/Backend/etc/adminhtml/di.xml -->
274274
<config>
275-
<preference for="Magento\Core\Model\UrlInterface" type="Magento\Backend\Model\Url" />
275+
<preference for="Magento\Framework\UrlInterface" type="Magento\Backend\Model\UrlInterface" />
276276
</config>
277277
```
278278

279-
This mapping is in `app/code/Magento/Backend/etc/adminhtml/di.xml`, so the object manager injects the `Magento\Backend\Model\Url` implementation class wherever there is a request for the `Magento\Core\Model\UrlInterface` in the [admin](https://glossary.magento.com/admin) area.
279+
This mapping is in `app/code/Magento/Backend/etc/adminhtml/di.xml`, so the object manager injects the `Magento\Backend\Model\UrlInterface` implementation class wherever there is a request for the `Magento\Framework\UrlInterface` in the [admin](https://glossary.magento.com/admin) area.
280280

281281
### Override a method using 'preference' nodes
282282

@@ -363,7 +363,7 @@ Any descendant can override the parameters configured for its supertype; that is
363363
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
364364
<type name="Magento\Framework\View\Element\Context">
365365
<arguments>
366-
<argument name="urlBuilder" xsi:type="object">Magento\Core\Model\Url</argument>
366+
<argument name="urlBuilder" xsi:type="object">Magento\Framework\Url</argument>
367367
</arguments>
368368
</type>
369369
<type name="Magento\Backend\Block\Context">
@@ -376,7 +376,7 @@ Any descendant can override the parameters configured for its supertype; that is
376376

377377
In the preceding example, [`Magento\Backend\Block\Context`]({{ site.mage2bloburl }}/{{ page.guide_version }}/app/code/Magento/Backend/Block/Context.php) is a descendant of [`Magento\Framework\View\Element\Context`]({{ site.mage2bloburl }}/{{ page.guide_version }}/lib/internal/Magento/Framework/View/Element/Context.php).
378378

379-
The first entry configures all instances of `Magento\Framework\View\Element\Context` as well as its children to pass in [`Magento\Core\Model\Url`]({{ site.mage2bloburl }}/{{ page.guide_version }}/lib/internal/Magento/Framework/Url.php) as `$urlBuilder` in their constructors.
379+
The first entry configures all instances of `Magento\Framework\View\Element\Context` as well as its children to pass in [`Magento\Framework\Url`]({{ site.mage2bloburl }}/{{ page.guide_version }}/lib/internal/Magento/Framework/Url.php) as `$urlBuilder` in their constructors.
380380

381381
The second entry overrides this and configures all instances of `Magento\Backend\Block\Context` to use [`Magento\Backend\Model\Url`]({{ site.mage2bloburl }}/{{ page.guide_version }}/app/code/Magento/Backend/Model/Url.php) as the `$urlBuilder` instead.
382382

src/guides/v2.3/extension-dev-guide/build/module-load-order.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ If you know that your component's logic depends on something in another componen
1616
You can check your module's load order from the `<magento_root>/app/etc/config.php` file after you've successfully set up Magento. This file is created dynamically at run time during set up.
1717

1818
{:.bs-callout-info}
19-
If you change the component load order using `<sequence>`, you must regenerate the component list in `config.php`; otherwise, the load order does not take effect. Currently, the only way to do this is to enable the component using [`magento module:enable`]({{ page.baseurl}}/install-gde/install/cli/install-cli-subcommands-enable.html#instgde-cli-subcommands-enable-disable), where `<module-list>` is the component or components to which you added `<sequence>`.
19+
If you change the component load order using `<sequence>`, you must regenerate the component list in `config.php`; otherwise, the load order does not take effect. Currently, the only way to do this is to enable the component using [`magento module:enable <module-list>`]({{ page.baseurl}}/install-gde/install/cli/install-cli-subcommands-enable.html#instgde-cli-subcommands-enable-disable), where `<module-list>` is the component or components to which you added `<sequence>`.
2020

2121
### Examples
2222

src/guides/v2.3/extension-dev-guide/depend-inj.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ class Builder
8585

8686
### Constructor injection
8787

88-
In the code sample, the `Builder` class declares its dependency on the `Factory` and `Menu` classes in its constructor.
88+
In the code sample, the `Builder` class declares its dependency on the `Factory` class in its constructor.
8989
Magento uses the `di.xml` file to determine which implementations to inject into the `Builder` class.
9090

9191
#### Optional dependencies

0 commit comments

Comments
 (0)