Skip to content
This repository was archived by the owner on Apr 29, 2019. It is now read-only.

Commit 9291b8a

Browse files
magento-engcom-teammagento-engcom-team
authored
🔃 [EngCom] Public Pull Requests - 2.3-develop
Accepted Public Pull Requests: - magento/magento2#20042: magento/magento2#12549: Payment method option is not showing under shopping cart rules condition tab. (by @p-bystritsky) - magento/magento2#19803: Fixed 19800 Contact us : design improvement (by @suryakant-krish) - magento/magento2#19643: Fixed issue 19642- Catalog product action multi select search label icon alignment issue (by @abrarpathan19) - magento/magento2#19644: correct devdocs url from http to https (by @ravi-chandra3197) - magento/magento2#19665: Configure missing group for core payment methods (by @wojtekn) - magento/magento2#18471: [2.3] Alternative fix for Multi Store Emails issue, Fix Async Emails issues, Fix Multiple Email issues (by @gwharton) - magento/magento2#18407: added config for newsletter in frontend (by @torhoehn) Fixed GitHub Issues: - magento/magento2#12549: Payment method option is not showing under shopping cart rules condition tab (reported by @AbdurBhadarka) has been fixed in magento/magento2#20042 by @p-bystritsky in 2.3-develop branch Related commits: 1. 76ca463 - magento/magento2#19800: Contact us : design improvement (reported by @suryakant-krish) has been fixed in magento/magento2#19803 by @suryakant-krish in 2.3-develop branch Related commits: 1. 10e7927 2. b618757 3. c8fa36f 4. abfa040 5. 2e08f60 6. 6e47e58 7. 9bf7ab7 - magento/magento2#19642: Catalog product action multi select search label icon alignment issue (reported by @abrarpathan19) has been fixed in magento/magento2#19643 by @abrarpathan19 in 2.3-develop branch Related commits: 1. f72c013 2. f49c569 - magento/magento2#19664: Payment methods from core source model are not grouped properly (reported by @wojtekn) has been fixed in magento/magento2#19665 by @wojtekn in 2.3-develop branch Related commits: 1. 614a7e4 2. 9566898 - magento/magento2#7739: "From Header set twice" when sending an email (reported by @RishabhRkRai) has been fixed in magento/magento2#18471 by @gwharton in 2.3-develop branch Related commits: 1. ad50297 2. e16ff74 3. 621d2cf 4. b6f9e48 5. 0dc8578 6. 122019c 7. 193c6c2 8. bd0aa57 9. 523b046 10. 424929f 11. c32ca7a 12. e39ce7a 13. 99621b3 14. f171c9d - magento/magento2#11740: Sending emails from Admin in Multi-Store Environment defaults to Primary Store (reported by @lee586) has been fixed in magento/magento2#18471 by @gwharton in 2.3-develop branch Related commits: 1. ad50297 2. e16ff74 3. 621d2cf 4. b6f9e48 5. 0dc8578 6. 122019c 7. 193c6c2 8. bd0aa57 9. 523b046 10. 424929f 11. c32ca7a 12. e39ce7a 13. 99621b3 14. f171c9d - magento/magento2#14236: Sending multiple emails using the TransportBuilder class causes an Zend_Mail exception (reported by @david-kominek) has been fixed in magento/magento2#18471 by @gwharton in 2.3-develop branch Related commits: 1. ad50297 2. e16ff74 3. 621d2cf 4. b6f9e48 5. 0dc8578 6. 122019c 7. 193c6c2 8. bd0aa57 9. 523b046 10. 424929f 11. c32ca7a 12. e39ce7a 13. 99621b3 14. f171c9d - magento/magento2#14945: Store Email Addresses are not used anymore (reported by @chequille) has been fixed in magento/magento2#18471 by @gwharton in 2.3-develop branch Related commits: 1. ad50297 2. e16ff74 3. 621d2cf 4. b6f9e48 5. 0dc8578 6. 122019c 7. 193c6c2 8. bd0aa57 9. 523b046 10. 424929f 11. c32ca7a 12. e39ce7a 13. 99621b3 14. f171c9d - magento/magento2#14952: Confirmation emails have no FROM or FROM email address 2.2.4 (reported by @tstamplis) has been fixed in magento/magento2#18471 by @gwharton in 2.3-develop branch Related commits: 1. ad50297 2. e16ff74 3. 621d2cf 4. b6f9e48 5. 0dc8578 6. 122019c 7. 193c6c2 8. bd0aa57 9. 523b046 10. 424929f 11. c32ca7a 12. e39ce7a 13. 99621b3 14. f171c9d - magento/magento2#16165: Sales Emails Async Sending issue (reported by @mihaifaget) has been fixed in magento/magento2#18471 by @gwharton in 2.3-develop branch Related commits: 1. ad50297 2. e16ff74 3. 621d2cf 4. b6f9e48 5. 0dc8578 6. 122019c 7. 193c6c2 8. bd0aa57 9. 523b046 10. 424929f 11. c32ca7a 12. e39ce7a 13. 99621b3 14. f171c9d - magento/magento2#16203: New order notification is not sent to the admin (reported by @bnymn) has been fixed in magento/magento2#18471 by @gwharton in 2.3-develop branch Related commits: 1. ad50297 2. e16ff74 3. 621d2cf 4. b6f9e48 5. 0dc8578 6. 122019c 7. 193c6c2 8. bd0aa57 9. 523b046 10. 424929f 11. c32ca7a 12. e39ce7a 13. 99621b3 14. f171c9d - magento/magento2#16355: Magento 2.2.4 not sending from sales sender (reported by @versdivers) has been fixed in magento/magento2#18471 by @gwharton in 2.3-develop branch Related commits: 1. ad50297 2. e16ff74 3. 621d2cf 4. b6f9e48 5. 0dc8578 6. 122019c 7. 193c6c2 8. bd0aa57 9. 523b046 10. 424929f 11. c32ca7a 12. e39ce7a 13. 99621b3 14. f171c9d - magento/magento2#16509: Magento 2.2.4 Multishipping Order Confirmation Emails sent only for the first order (reported by @arjuninfo) has been fixed in magento/magento2#18471 by @gwharton in 2.3-develop branch Related commits: 1. ad50297 2. e16ff74 3. 621d2cf 4. b6f9e48 5. 0dc8578 6. 122019c 7. 193c6c2 8. bd0aa57 9. 523b046 10. 424929f 11. c32ca7a 12. e39ce7a 13. 99621b3 14. f171c9d - magento/magento2#17781: Magento 2.2.5 Order Email Confirmation is not working (reported by @nilesh111091) has been fixed in magento/magento2#18471 by @gwharton in 2.3-develop branch Related commits: 1. ad50297 2. e16ff74 3. 621d2cf 4. b6f9e48 5. 0dc8578 6. 122019c 7. 193c6c2 8. bd0aa57 9. 523b046 10. 424929f 11. c32ca7a 12. e39ce7a 13. 99621b3 14. f171c9d - magento/magento2#18470: Store emails have correct from address but do not have a from name (reported by @gwharton) has been fixed in magento/magento2#18471 by @gwharton in 2.3-develop branch Related commits: 1. ad50297 2. e16ff74 3. 621d2cf 4. b6f9e48 5. 0dc8578 6. 122019c 7. 193c6c2 8. bd0aa57 9. 523b046 10. 424929f 11. c32ca7a 12. e39ce7a 13. 99621b3 14. f171c9d
2 parents 908a6bb + f79968e commit 9291b8a

File tree

100 files changed

+637
-234
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

100 files changed

+637
-234
lines changed

‎.github/CONTRIBUTING.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ The Magento 2 development team will review all issues and contributions submitte
1616
4. PRs which include bug fixes must be accompanied with a step-by-step description of how to reproduce the bug.
1717
3. PRs which include new logic or new features must be submitted along with:
1818
* Unit/integration test coverage
19-
* Proposed [documentation](http://devdocs.magento.com) updates. Documentation contributions can be submitted via the [devdocs GitHub](https://github.com/magento/devdocs).
19+
* Proposed [documentation](https://devdocs.magento.com) updates. Documentation contributions can be submitted via the [devdocs GitHub](https://github.com/magento/devdocs).
2020
4. For larger features or changes, please [open an issue](https://github.com/magento/magento2/issues) to discuss the proposed changes prior to development. This may prevent duplicate or unnecessary effort and allow other contributors to provide input.
2121
5. All automated tests must pass (all builds on [Travis CI](https://travis-ci.org/magento/magento2) must be green).
2222

@@ -27,7 +27,7 @@ If you are a new GitHub user, we recommend that you create your own [free github
2727
1. Search current [listed issues](https://github.com/magento/magento2/issues) (open or closed) for similar proposals of intended contribution before starting work on a new contribution.
2828
2. Review the [Contributor License Agreement](https://magento.com/legaldocuments/mca) if this is your first time contributing.
2929
3. Create and test your work.
30-
4. Fork the Magento 2 repository according to the [Fork A Repository instructions](http://devdocs.magento.com/guides/v2.2/contributor-guide/contributing.html#fork) and when you are ready to send us a pull request – follow the [Create A Pull Request instructions](http://devdocs.magento.com/guides/v2.2/contributor-guide/contributing.html#pull_request).
30+
4. Fork the Magento 2 repository according to the [Fork A Repository instructions](https://devdocs.magento.com/guides/v2.2/contributor-guide/contributing.html#fork) and when you are ready to send us a pull request – follow the [Create A Pull Request instructions](https://devdocs.magento.com/guides/v2.2/contributor-guide/contributing.html#pull_request).
3131
5. Once your contribution is received the Magento 2 development team will review the contribution and collaborate with you as needed.
3232

3333
## Code of Conduct

‎CHANGELOG.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ To get detailed information about changes in Magento 2.3.0, see the [Release Not
44

55
2.1.0
66
=============
7-
To get detailed information about changes in Magento 2.1.0, please visit [Magento Community Edition (CE) Release Notes](http://devdocs.magento.com/guides/v2.1/release-notes/ReleaseNotes2.1.0CE.html "Magento Community Edition (CE) Release Notes")
7+
To get detailed information about changes in Magento 2.1.0, please visit [Magento Community Edition (CE) Release Notes](https://devdocs.magento.com/guides/v2.1/release-notes/ReleaseNotes2.1.0CE.html "Magento Community Edition (CE) Release Notes")
88

99
2.0.0
1010
=============
@@ -1025,7 +1025,7 @@ Tests:
10251025
* Improved backend menu keyboard accessibility
10261026
* Accessibility improvements: WAI-ARIA in a product item on a category page and related products
10271027
* Checkout flow code can work with a separate DB storage
1028-
* <a href="http://devdocs.magento.com/guides/v1.0/release-notes/changes.html#change-devrc-unit">Unit tests moved to module directories</a>
1028+
* <a href="https://devdocs.magento.com/guides/v1.0/release-notes/changes.html#change-devrc-unit">Unit tests moved to module directories</a>
10291029
* Addressed naming inconsistencies in REST routes
10301030
* Added Advanced Developer workflow for frontend developers
10311031
* Setup

‎app/code/Magento/Analytics/README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Magento_Analytics Module
22

3-
The Magento_Analytics module integrates your Magento instance with the [Magento Business Intelligence (MBI)](https://magento.com/products/business-intelligence) to use [Advanced Reporting](http://devdocs.magento.com/guides/v2.2/advanced-reporting/modules.html) functionality.
3+
The Magento_Analytics module integrates your Magento instance with the [Magento Business Intelligence (MBI)](https://magento.com/products/business-intelligence) to use [Advanced Reporting](https://devdocs.magento.com/guides/v2.2/advanced-reporting/modules.html) functionality.
44

55
The module implements the following functionality:
66

@@ -16,8 +16,8 @@ The module implements the following functionality:
1616

1717
## Structure
1818

19-
Beyond the [usual module file structure](http://devdocs.magento.com/guides/v2.2/architecture/archi_perspectives/components/modules/mod_intro.html) the module contains a directory `ReportXml`.
20-
[Report XML](http://devdocs.magento.com/guides/v2.2/advanced-reporting/report-xml.html) is a markup language used to build reports for Advanced Reporting.
19+
Beyond the [usual module file structure](https://devdocs.magento.com/guides/v2.2/architecture/archi_perspectives/components/modules/mod_intro.html) the module contains a directory `ReportXml`.
20+
[Report XML](https://devdocs.magento.com/guides/v2.2/advanced-reporting/report-xml.html) is a markup language used to build reports for Advanced Reporting.
2121
The language declares SQL queries using XML declaration.
2222

2323
## Subscription Process

‎app/code/Magento/Authorizenet/etc/config.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
<cgi_url_td_test_mode>https://apitest.authorize.net/xml/v1/request.api</cgi_url_td_test_mode>
3434
<cgi_url_td>https://api2.authorize.net/xml/v1/request.api</cgi_url_td>
3535
<paymentInfoKeys>x_card_type,x_account_number,x_avs_code,x_auth_code,x_response_reason_text,x_cvv2_resp_code</paymentInfoKeys>
36+
<group>authorizenet</group>
3637
</authorizenet_directpost>
3738
</payment>
3839
</default>

‎app/code/Magento/Authorizenet/etc/payment.xml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
<?xml version="1.0"?>
2+
<!--
3+
/**
4+
* Copyright © Magento, Inc. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
<payment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9+
xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Payment:etc/payment.xsd">
10+
<groups>
11+
<group id="authorizenet">
12+
<label>Authorize.net</label>
13+
</group>
14+
</groups>
15+
</payment>

‎app/code/Magento/Braintree/etc/config.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@
4242
<paymentInfoKeys>cc_type,cc_number,avsPostalCodeResponseCode,avsStreetAddressResponseCode,cvvResponseCode,processorAuthorizationCode,processorResponseCode,processorResponseText,liabilityShifted,liabilityShiftPossible,riskDataId,riskDataDecision</paymentInfoKeys>
4343
<avs_ems_adapter>Magento\Braintree\Model\AvsEmsCodeMapper</avs_ems_adapter>
4444
<cvv_ems_adapter>Magento\Braintree\Model\CvvEmsCodeMapper</cvv_ems_adapter>
45+
<group>braintree</group>
4546
</braintree>
4647
<braintree_paypal>
4748
<model>BraintreePayPalFacade</model>
@@ -67,6 +68,7 @@
6768
<privateInfoKeys>processorResponseCode,processorResponseText,paymentId</privateInfoKeys>
6869
<paymentInfoKeys>processorResponseCode,processorResponseText,paymentId,payerEmail</paymentInfoKeys>
6970
<supported_locales>en_US,en_GB,en_AU,da_DK,fr_FR,fr_CA,de_DE,zh_HK,it_IT,nl_NL,no_NO,pl_PL,es_ES,sv_SE,tr_TR,pt_BR,ja_JP,id_ID,ko_KR,pt_PT,ru_RU,th_TH,zh_CN,zh_TW</supported_locales>
71+
<group>braintree</group>
7072
</braintree_paypal>
7173
<braintree_cc_vault>
7274
<model>BraintreeCreditCardVaultFacade</model>
@@ -76,6 +78,7 @@
7678
<tokenFormat>Magento\Braintree\Model\InstantPurchase\CreditCard\TokenFormatter</tokenFormat>
7779
<additionalInformation>Magento\Braintree\Model\InstantPurchase\PaymentAdditionalInformationProvider</additionalInformation>
7880
</instant_purchase>
81+
<group>braintree</group>
7982
</braintree_cc_vault>
8083
<braintree_paypal_vault>
8184
<model>BraintreePayPalVaultFacade</model>
@@ -85,6 +88,7 @@
8588
<tokenFormat>Magento\Braintree\Model\InstantPurchase\PayPal\TokenFormatter</tokenFormat>
8689
<additionalInformation>Magento\Braintree\Model\InstantPurchase\PaymentAdditionalInformationProvider</additionalInformation>
8790
</instant_purchase>
91+
<group>braintree</group>
8892
</braintree_paypal_vault>
8993
</payment>
9094
</default>

‎app/code/Magento/Braintree/etc/payment.xml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
<?xml version="1.0"?>
2+
<!--
3+
/**
4+
* Copyright © Magento, Inc. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
<payment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9+
xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Payment:etc/payment.xsd">
10+
<groups>
11+
<group id="braintree">
12+
<label>Braintree</label>
13+
</group>
14+
</groups>
15+
</payment>

‎app/code/Magento/CatalogAnalytics/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
# Magento_CatalogAnalytics module
22

3-
The Magento_CatalogAnalytics module configures data definitions for a data collection related to the Catalog module entities to be used in [Advanced Reporting](http://devdocs.magento.com/guides/v2.2/advanced-reporting/modules.html).
3+
The Magento_CatalogAnalytics module configures data definitions for a data collection related to the Catalog module entities to be used in [Advanced Reporting](https://devdocs.magento.com/guides/v2.2/advanced-reporting/modules.html).

‎app/code/Magento/Contact/view/frontend/web/css/source/_module.less

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
/**
2+
* Copyright © Magento, Inc. All rights reserved.
3+
* See COPYING.txt for license details.
4+
*/
5+
6+
& when (@media-common = true) {
7+
.contact-index-index {
8+
.column:not(.sidebar-main) {
9+
.form.contact {
10+
float: none;
11+
width: 50%;
12+
}
13+
}
14+
15+
.column:not(.sidebar-additional) {
16+
.form.contact {
17+
float: none;
18+
width: 50%;
19+
}
20+
}
21+
}
22+
}
23+
24+
// Mobile
25+
.media-width(@extremum, @break) when (@extremum = 'max') and (@break = @screen__m) {
26+
.contact-index-index {
27+
.column:not(.sidebar-main) {
28+
.form.contact {
29+
float: none;
30+
width: 100%;
31+
}
32+
}
33+
34+
.column:not(.sidebar-additional) {
35+
.form.contact {
36+
float: none;
37+
width: 100%;
38+
}
39+
}
40+
}
41+
}
42+

‎app/code/Magento/Customer/Api/CustomerRepositoryInterface.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ public function getById($customerId);
5151
* Retrieve customers which match a specified criteria.
5252
*
5353
* This call returns an array of objects, but detailed information about each object’s attributes might not be
54-
* included. See http://devdocs.magento.com/codelinks/attributes.html#CustomerRepositoryInterface to determine
54+
* included. See https://devdocs.magento.com/codelinks/attributes.html#CustomerRepositoryInterface to determine
5555
* which call to use to get detailed information about all attributes for an object.
5656
*
5757
* @param \Magento\Framework\Api\SearchCriteriaInterface $searchCriteria

‎app/code/Magento/Customer/Api/GroupRepositoryInterface.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ public function getById($id);
4242
* be filtered by tax class.
4343
*
4444
* This call returns an array of objects, but detailed information about each object’s attributes might not be
45-
* included. See http://devdocs.magento.com/codelinks/attributes.html#GroupRepositoryInterface to determine
45+
* included. See https://devdocs.magento.com/codelinks/attributes.html#GroupRepositoryInterface to determine
4646
* which call to use to get detailed information about all attributes for an object.
4747
*
4848
* @param \Magento\Framework\Api\SearchCriteriaInterface $searchCriteria

‎app/code/Magento/Customer/Block/Form/Register.php

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
namespace Magento\Customer\Block\Form;
77

88
use Magento\Customer\Model\AccountManagement;
9+
use Magento\Newsletter\Observer\PredispatchNewsletterObserver;
910

1011
/**
1112
* Customer register form block
@@ -86,6 +87,8 @@ public function getConfig($path)
8687
}
8788

8889
/**
90+
* Prepare layout
91+
*
8992
* @return $this
9093
*/
9194
protected function _prepareLayout()
@@ -177,11 +180,13 @@ public function getRegion()
177180
*/
178181
public function isNewsletterEnabled()
179182
{
180-
return $this->_moduleManager->isOutputEnabled('Magento_Newsletter');
183+
return $this->_moduleManager->isOutputEnabled('Magento_Newsletter')
184+
&& $this->getConfig(PredispatchNewsletterObserver::XML_PATH_NEWSLETTER_ACTIVE);
181185
}
182186

183187
/**
184188
* Restore entity data from session
189+
*
185190
* Entity and form code must be defined for the form
186191
*
187192
* @param \Magento\Customer\Model\Metadata\Form $form

‎app/code/Magento/Customer/Test/Unit/Block/Form/RegisterTest.php

Lines changed: 17 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77

88
use Magento\Customer\Block\Form\Register;
99
use Magento\Customer\Model\AccountManagement;
10+
use Magento\Newsletter\Observer\PredispatchNewsletterObserver;
1011

1112
/**
1213
* Test class for \Magento\Customer\Block\Form\Register.
@@ -274,12 +275,13 @@ public function testGetRegionNull()
274275
}
275276

276277
/**
277-
* @param $isNewsletterEnabled
278-
* @param $expectedValue
278+
* @param boolean $isNewsletterEnabled
279+
* @param string $isNewsletterActive
280+
* @param boolean $expectedValue
279281
*
280282
* @dataProvider isNewsletterEnabledProvider
281283
*/
282-
public function testIsNewsletterEnabled($isNewsletterEnabled, $expectedValue)
284+
public function testIsNewsletterEnabled($isNewsletterEnabled, $isNewsletterActive, $expectedValue)
283285
{
284286
$this->_moduleManager->expects(
285287
$this->once()
@@ -290,6 +292,17 @@ public function testIsNewsletterEnabled($isNewsletterEnabled, $expectedValue)
290292
)->will(
291293
$this->returnValue($isNewsletterEnabled)
292294
);
295+
296+
$this->_scopeConfig->expects(
297+
$this->any()
298+
)->method(
299+
'getValue'
300+
)->with(
301+
PredispatchNewsletterObserver::XML_PATH_NEWSLETTER_ACTIVE
302+
)->will(
303+
$this->returnValue($isNewsletterActive)
304+
);
305+
293306
$this->assertEquals($expectedValue, $this->_block->isNewsletterEnabled());
294307
}
295308

@@ -298,7 +311,7 @@ public function testIsNewsletterEnabled($isNewsletterEnabled, $expectedValue)
298311
*/
299312
public function isNewsletterEnabledProvider()
300313
{
301-
return [[true, true], [false, false]];
314+
return [[true, true, true], [true, false, false], [false, true, false], [false, false, false]];
302315
}
303316

304317
/**

‎app/code/Magento/CustomerAnalytics/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
# Magento_CustomerAnalytics module
22

3-
The Magento_CustomerAnalytics module configures data definitions for a data collection related to the Customer module entities to be used in [Advanced Reporting](http://devdocs.magento.com/guides/v2.2/advanced-reporting/modules.html).
3+
The Magento_CustomerAnalytics module configures data definitions for a data collection related to the Customer module entities to be used in [Advanced Reporting](https://devdocs.magento.com/guides/v2.2/advanced-reporting/modules.html).

‎app/code/Magento/Deploy/Model/Filesystem.php

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ class Filesystem
2929
* Access permissions to the files are set during deploy Magento 2, directly after
3030
* uploading code of Magento. Also it is possible to specify the value
3131
* of inverse mask for setting access permissions to files generated by Magento.
32-
* @link http://devdocs.magento.com/guides/v2.0/install-gde/install/post-install-umask.html
33-
* @link http://devdocs.magento.com/guides/v2.0/install-gde/prereq/file-system-perms.html
32+
* @link https://devdocs.magento.com/guides/v2.0/install-gde/install/post-install-umask.html
33+
* @link https://devdocs.magento.com/guides/v2.0/install-gde/prereq/file-system-perms.html
3434
*/
3535
const PERMISSIONS_FILE = 0640;
3636

@@ -41,8 +41,8 @@ class Filesystem
4141
* Access permissions to the directories are set during deploy Magento 2, directly after
4242
* uploading code of Magento. Also it is possible to specify the value
4343
* of inverse mask for setting access permissions to directories generated by Magento.
44-
* @link http://devdocs.magento.com/guides/v2.0/install-gde/install/post-install-umask.html
45-
* @link http://devdocs.magento.com/guides/v2.0/install-gde/prereq/file-system-perms.html
44+
* @link https://devdocs.magento.com/guides/v2.0/install-gde/install/post-install-umask.html
45+
* @link https://devdocs.magento.com/guides/v2.0/install-gde/prereq/file-system-perms.html
4646
*/
4747
const PERMISSIONS_DIR = 0750;
4848

@@ -320,8 +320,8 @@ public function cleanupFilesystem($directoryCodeList)
320320
* Access permissions to the files and directories are set during deploy Magento 2, directly after
321321
* uploading code of Magento. Also it is possible to specify the value
322322
* of inverse mask for setting access permissions to files and directories generated by Magento.
323-
* @link http://devdocs.magento.com/guides/v2.0/install-gde/install/post-install-umask.html
324-
* @link http://devdocs.magento.com/guides/v2.0/install-gde/prereq/file-system-perms.html
323+
* @link https://devdocs.magento.com/guides/v2.0/install-gde/install/post-install-umask.html
324+
* @link https://devdocs.magento.com/guides/v2.0/install-gde/prereq/file-system-perms.html
325325
*/
326326
protected function changePermissions($directoryCodeList, $dirPermissions, $filePermissions)
327327
{
@@ -345,8 +345,8 @@ protected function changePermissions($directoryCodeList, $dirPermissions, $fileP
345345
* Access permissions to the files and directories are set during deploy Magento 2, directly after
346346
* uploading code of Magento. Also it is possible to specify the value
347347
* of inverse mask for setting access permissions to files and directories generated by Magento.
348-
* @link http://devdocs.magento.com/guides/v2.0/install-gde/install/post-install-umask.html
349-
* @link http://devdocs.magento.com/guides/v2.0/install-gde/prereq/file-system-perms.html
348+
* @link https://devdocs.magento.com/guides/v2.0/install-gde/install/post-install-umask.html
349+
* @link https://devdocs.magento.com/guides/v2.0/install-gde/prereq/file-system-perms.html
350350
*/
351351
public function lockStaticResources()
352352
{

‎app/code/Magento/Eav/Api/AttributeSetRepositoryInterface.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ interface AttributeSetRepositoryInterface
1717
* Retrieve list of Attribute Sets
1818
*
1919
* This call returns an array of objects, but detailed information about each object’s attributes might not be
20-
* included. See http://devdocs.magento.com/codelinks/attributes.html#AttributeSetRepositoryInterface to determine
20+
* included. See https://devdocs.magento.com/codelinks/attributes.html#AttributeSetRepositoryInterface to determine
2121
* which call to use to get detailed information about all attributes for an object.
2222
*
2323
* @param \Magento\Framework\Api\SearchCriteriaInterface $searchCriteria

‎app/code/Magento/Indexer/Model/Message/Invalid.php

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@
66

77
namespace Magento\Indexer\Model\Message;
88

9+
/**
10+
* Message about invalid indexers.
11+
*/
912
class Invalid implements \Magento\Framework\Notification\MessageInterface
1013
{
1114
/**
@@ -71,7 +74,7 @@ public function getText()
7174
return __(
7275
'One or more <a href="%1">indexers are invalid</a>. Make sure your <a href="%2" target="_blank">Magento cron job</a> is running.',
7376
$url,
74-
'http://devdocs.magento.com/guides/v2.2/config-guide/cli/config-cli-subcommands-cron.html#create-or-remove-the-magento-crontab'
77+
'https://devdocs.magento.com/guides/v2.2/config-guide/cli/config-cli-subcommands-cron.html#create-or-remove-the-magento-crontab'
7578
);
7679
//@codingStandardsIgnoreEnd
7780
}

0 commit comments

Comments
 (0)