Skip to content

Commit 7a59397

Browse files
committed
Fixed stuff
2 parents 486d383 + 4e470c1 commit 7a59397

File tree

542 files changed

+14694
-1068
lines changed

Some content is hidden

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

542 files changed

+14694
-1068
lines changed

CHANGELOG.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -612,11 +612,11 @@ To get detailed information about changes in Magento 2.3.0, see the [Release Not
612612

613613
2.2.0
614614
=============
615-
To get detailed information about changes in Magento 2.2.0, see the [Release Notes](https://devdocs.magento.com/guides/v2.2/release-notes/bk-release-notes.html)
615+
To get detailed information about changes in Magento 2.2.0, see the [Release Notes](https://devdocs.magento.com/guides/v2.3/release-notes/bk-release-notes.html)
616616

617617
2.1.0
618618
=============
619-
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")
619+
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.3/release-notes/ReleaseNotes2.1.0CE.html "Magento Community Edition (CE) Release Notes")
620620

621621
2.0.0
622622
=============
@@ -1637,7 +1637,7 @@ Tests:
16371637
* Improved backend menu keyboard accessibility
16381638
* Accessibility improvements: WAI-ARIA in a product item on a category page and related products
16391639
* Checkout flow code can work with a separate DB storage
1640-
* <a href="https://devdocs.magento.com/guides/v1.0/release-notes/changes.html#change-devrc-unit">Unit tests moved to module directories</a>
1640+
* Unit tests moved to module directories
16411641
* Addressed naming inconsistencies in REST routes
16421642
* Added Advanced Developer workflow for frontend developers
16431643
* Setup

README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@ To learn about issues, click [here][2]. To open an issue, click [here][3].
2020

2121
To suggest documentation improvements, click [here][4].
2222

23-
[1]: <https://devdocs.magento.com/guides/v2.3/contributor-guide/contributing.html>
24-
[2]: <https://devdocs.magento.com/guides/v2.3/contributor-guide/contributing.html#report>
25-
[3]: <https://github.com/magento/magento2/issues>
26-
[4]: <https://devdocs.magento.com>
23+
[1]: https://devdocs.magento.com/guides/v2.3/contributor-guide/contributing.html
24+
[2]: https://devdocs.magento.com/guides/v2.3/contributor-guide/contributing.html#report
25+
[3]: https://github.com/magento/magento2/issues
26+
[4]: https://devdocs.magento.com
2727

2828
<h3>Community Maintainers</h3>
2929
The members of this team have been recognized for their outstanding commitment to maintaining and improving Magento. Magento has granted them permission to accept, merge, and reject pull requests, as well as review issues, and thanks these Community Maintainers for their valuable contributions.
Lines changed: 29 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,30 @@
1-
# Admin Notification
1+
# Magento_AdminNotification module
22

3-
**Admin Notification** provides the ability to alert administrators via
4-
system messages and provides a message inbox for surveys and notifications.
3+
The Magento_AdminNotification module provides the ability to alert administrators via system messages and provides a message inbox for surveys and notifications.
4+
5+
## Installation details
6+
7+
Before disabling or uninstalling this module, note that the Magento_Indexer module depends on this module.
8+
9+
For information about module installation in Magento 2, see [Enable or disable modules](http://devdocs.magento.com/guides/v2.3/install-gde/install/cli/install-cli-subcommands-enable.html).
10+
11+
### Events
12+
13+
This module observes the following events:
14+
15+
- `controller_action_predispatch` event in `Magento\AdminNotification\Observer\PredispatchAdminActionControllerObserver`
16+
17+
### Layouts
18+
19+
This module introduces the following layouts and layout handles in the `view/adminhtml/layout` directory:
20+
21+
- `adminhtml_notification_index`
22+
- `adminhtml_notification_block`
23+
24+
For more information about layouts in Magento 2, see the [Layout documentation](http://devdocs.magento.com/guides/v2.3/frontend-dev-guide/layouts/layout-overview.html).
25+
26+
### UI components
27+
28+
You can extend admin notifications using the `view/adminhtml/ui_component/notification_area.xml` configuration file.
29+
30+
For information about UI components in Magento 2, see [Overview of UI components](http://devdocs.magento.com/guides/v2.3/ui_comp_guide/bk-ui_comps.html).
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* Copyright © Magento, Inc. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
9+
<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
11+
<section name="AdminSystemMessagesSection">
12+
<element name="systemMessagesDropdown" type="button" selector="#system_messages .message-system-action-dropdown"/>
13+
<element name="actionMessageLog" type="button" selector="//*[contains(@class, 'message-system-summary')]/a[contains(text(), '{{textMessage}}')]" parameterized="true"/>
14+
</section>
15+
</sections>

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](https://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.3/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](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.
19+
Beyond the [usual module file structure](https://devdocs.magento.com/guides/v2.3/architecture/archi_perspectives/components/modules/mod_intro.html) the module contains a directory `ReportXml`.
20+
[Report XML](https://devdocs.magento.com/guides/v2.3/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/Backend/Block/AbstractBlock.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ class AbstractBlock extends \Magento\Framework\View\Element\AbstractBlock
2727
*/
2828
public function __construct(\Magento\Backend\Block\Context $context, array $data = [])
2929
{
30-
parent::__construct($context, $data);
3130
$this->_authorization = $context->getAuthorization();
31+
parent::__construct($context, $data);
3232
}
3333
}

app/code/Magento/Backend/Test/Mftf/Section/AdminSecondaryGridSection.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
<element name="catalogRuleIdentifierSearch" type="input" selector=".col-name .admin__control-text"/>
1515
<element name="searchButton" type="input" selector=".admin__filter-actions [title='Search']"/>
1616
<element name="firstRow" type="block" selector="tr[data-role='row']"/>
17+
<element name="rowByName" type="block" selector="//td[contains(text(), '{{searchingName}}')]" parameterized="true" timeout="30"/>
1718
</section>
1819
</sections>
1920

app/code/Magento/Backend/Test/Unit/Model/Config/SessionLifetime/BackendModelTest.php

100755100644
File mode changed.

app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option.php

Lines changed: 41 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,18 @@
33
* Copyright © Magento, Inc. All rights reserved.
44
* See COPYING.txt for license details.
55
*/
6+
declare(strict_types=1);
7+
68
namespace Magento\Bundle\Block\Adminhtml\Catalog\Product\Edit\Tab\Bundle;
79

810
use Magento\Framework\Data\Form\Element\AbstractElement;
11+
use Magento\Store\Model\Store;
912

13+
/**
14+
* Block for rendering option of bundle product
15+
*
16+
* Class \Magento\Bundle\Block\Adminhtml\Catalog\Product\Edit\Tab\Bundle\Option
17+
*/
1018
class Option extends \Magento\Backend\Block\Widget
1119
{
1220
/**
@@ -79,6 +87,8 @@ protected function _construct()
7987
}
8088

8189
/**
90+
* Return Field Id
91+
*
8292
* @return string
8393
*/
8494
public function getFieldId()
@@ -87,6 +97,8 @@ public function getFieldId()
8797
}
8898

8999
/**
100+
* Return Field Name
101+
*
90102
* @return string
91103
*/
92104
public function getFieldName()
@@ -108,6 +120,8 @@ public function getProduct()
108120
}
109121

110122
/**
123+
* Render
124+
*
111125
* @param AbstractElement $element
112126
* @return string
113127
*/
@@ -118,6 +132,8 @@ public function render(AbstractElement $element)
118132
}
119133

120134
/**
135+
* Set Element
136+
*
121137
* @param AbstractElement $element
122138
* @return $this
123139
*/
@@ -128,6 +144,8 @@ public function setElement(AbstractElement $element)
128144
}
129145

130146
/**
147+
* Get Element
148+
*
131149
* @return AbstractElement|null
132150
*/
133151
public function getElement()
@@ -136,6 +154,8 @@ public function getElement()
136154
}
137155

138156
/**
157+
* Return Is Multi Websites
158+
*
139159
* @return bool
140160
*/
141161
public function isMultiWebsites()
@@ -144,6 +164,8 @@ public function isMultiWebsites()
144164
}
145165

146166
/**
167+
* Prepare Layout
168+
*
147169
* @return $this
148170
*/
149171
protected function _prepareLayout()
@@ -184,6 +206,8 @@ protected function _prepareLayout()
184206
}
185207

186208
/**
209+
* Get Add Button Html
210+
*
187211
* @return string
188212
*/
189213
public function getAddButtonHtml()
@@ -192,6 +216,8 @@ public function getAddButtonHtml()
192216
}
193217

194218
/**
219+
* Get Close Search Button Html
220+
*
195221
* @return string
196222
*/
197223
public function getCloseSearchButtonHtml()
@@ -200,6 +226,8 @@ public function getCloseSearchButtonHtml()
200226
}
201227

202228
/**
229+
* Get Add Selection Button Html
230+
*
203231
* @return string
204232
*/
205233
public function getAddSelectionButtonHtml()
@@ -239,6 +267,8 @@ public function getOptions()
239267
}
240268

241269
/**
270+
* Get Add Button Id
271+
*
242272
* @return mixed
243273
*/
244274
public function getAddButtonId()
@@ -248,6 +278,8 @@ public function getAddButtonId()
248278
}
249279

250280
/**
281+
* Get Options Delete Button Html
282+
*
251283
* @return string
252284
*/
253285
public function getOptionDeleteButtonHtml()
@@ -256,6 +288,8 @@ public function getOptionDeleteButtonHtml()
256288
}
257289

258290
/**
291+
* Get Selection Html
292+
*
259293
* @return string
260294
*/
261295
public function getSelectionHtml()
@@ -264,6 +298,8 @@ public function getSelectionHtml()
264298
}
265299

266300
/**
301+
* Get Type Select Html
302+
*
267303
* @return mixed
268304
*/
269305
public function getTypeSelectHtml()
@@ -286,6 +322,8 @@ public function getTypeSelectHtml()
286322
}
287323

288324
/**
325+
* Get Require Select Html
326+
*
289327
* @return mixed
290328
*/
291329
public function getRequireSelectHtml()
@@ -304,10 +342,12 @@ public function getRequireSelectHtml()
304342
}
305343

306344
/**
345+
* Return Is Default Store
346+
*
307347
* @return bool
308348
*/
309349
public function isDefaultStore()
310350
{
311-
return $this->getProduct()->getStoreId() == '0';
351+
return $this->getProduct()->getStoreId() == Store::DEFAULT_STORE_ID;
312352
}
313353
}

app/code/Magento/Bundle/Test/Mftf/ActionGroup/AdminClearFiltersActionGroup.xml

100755100644
File mode changed.

0 commit comments

Comments
 (0)