Skip to content

Commit cee0c40

Browse files
author
Stanislav Idolov
authored
🔃 [EngCom] Public Pull Requests - 2.1-develop
Accepted Public Pull Requests: - #15298: [Backport] Fix typos in variable names (by @dmytro-ch) - #15299: [Backport] Fix typos in PHPDocs and comments (by @dmytro-ch) - #15363: [Backport] Alignment Array assignment (by @VitaliyBoyko) - #15375: [Backport] Fix typo in securityCheckers array (by @VitaliyBoyko) - #15377: [Backport] Typo in SSL port number (by @VitaliyBoyko) - #15380: [Backport] Fix incorrect phpdoc return type (by @VitaliyBoyko) - #15385: [Backport] Unused variable removed (by @VitaliyBoyko) - #15324: [Backport] Added hyphenation cutting edge to cutting-edge (by @rogyar)
2 parents 347fd37 + 5e6d1b2 commit cee0c40

File tree

37 files changed

+59
-54
lines changed

37 files changed

+59
-54
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
[![Open Source Helpers](https://www.codetriage.com/magento/magento2/badges/users.svg)](https://www.codetriage.com/magento/magento2)
33
[![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/magento/magento2?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
44
<h2>Welcome</h2>
5-
Welcome to Magento 2 installation! We're glad you chose to install Magento 2, a cutting edge, feature-rich eCommerce solution that gets results.
5+
Welcome to Magento 2 installation! We're glad you chose to install Magento 2, a cutting-edge, feature-rich eCommerce solution that gets results.
66

77
The installation instructions that used to be here are now published on our GitHub site. Use the information on this page to get started or go directly to the <a href="http://devdocs.magento.com/guides/v2.0/install-gde/bk-install-guide.html" target="_blank">guide</a>.
88

app/code/Magento/Catalog/Model/ResourceModel/Collection/AbstractCollection.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ public function getDefaultStoreId()
137137
*
138138
* @param string $table
139139
* @param array|int $attributeIds
140-
* @return \Magento\Eav\Model\Entity\Collection\AbstractCollection
140+
* @return \Magento\Framework\DB\Select
141141
*/
142142
protected function _getLoadAttributesSelect($table, $attributeIds = [])
143143
{

app/code/Magento/Security/etc/adminhtml/di.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<arguments>
2525
<argument name="securityCheckers" xsi:type="array">
2626
<item name="frequency" xsi:type="object">Magento\Security\Model\SecurityChecker\Frequency</item>
27-
<item name="wuantity" xsi:type="object">Magento\Security\Model\SecurityChecker\Quantity</item>
27+
<item name="quantity" xsi:type="object">Magento\Security\Model\SecurityChecker\Quantity</item>
2828
</argument>
2929
</arguments>
3030
</type>

app/code/Magento/Store/Setup/InstallSchema.php

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -270,7 +270,13 @@ public function install(SchemaSetupInterface $setup, ModuleContextInterface $con
270270
*/
271271
$connection->insertForce(
272272
$installer->getTable('store_group'),
273-
['group_id' => 0, 'website_id' => 0, 'name' => 'Default', 'root_category_id' => 0, 'default_store_id' => 0]
273+
[
274+
'group_id' => 0,
275+
'website_id' => 0,
276+
'name' => 'Default',
277+
'root_category_id' => 0,
278+
'default_store_id' => 0
279+
]
274280
);
275281
$connection->insertForce(
276282
$installer->getTable('store_group'),

dev/tests/functional/lib/Magento/Mtf/Client/Element/SimplifiedselectElement.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ class SimplifiedselectElement extends SelectElement
2121
protected $optionGroupValue = ".//*[@data-title='%s' or contains(normalize-space(.), %s)]";
2222

2323
/**
24-
* Select value in ropdown which has option groups.
24+
* Select value in dropdown which has option groups.
2525
*
2626
* @param string $value
2727
* @return void

dev/tests/functional/lib/Magento/Mtf/Client/Element/SwitcherElement.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ class SwitcherElement extends SimpleElement
2222
protected $parentContainer = 'parent::div[@data-role="switcher"]';
2323

2424
/**
25-
* XPath selector for label text on swticher element.
25+
* XPath selector for label text on switcher element.
2626
*
2727
* @var string
2828
*/

dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Section/Attributes/Search.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ class Search extends SuggestElement
3737
protected $actionToggle = '.action-toggle';
3838

3939
/**
40-
* Saerch result dropdown.
40+
* Search result dropdown.
4141
*
4242
* @var string
4343
*/

dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeIsHtmlAllowed.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ class AssertProductAttributeIsHtmlAllowed extends AbstractConstraint
2323

2424
/**
2525
* Check whether html tags are using in attribute value.
26-
* Checked tag structure <b><i>atttribute_default_value</p></i></b>
26+
* Checked tag structure <b><i>attribute_default_value</p></i></b>
2727
*
2828
* @param InjectableFixture $product
2929
* @param CatalogProductAttribute $attribute

dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/Product/TierPrice.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ class TierPrice extends DataSource
4141
private $fixtureFactory;
4242

4343
/**
44-
* Rought fixture field data.
44+
* Rough fixture field data.
4545
*
4646
* @var array
4747
*/

dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/Product/WebsiteIds.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ class WebsiteIds extends DataSource
3737
private $fixtureFactory;
3838

3939
/**
40-
* Rought fixture field data.
40+
* Rough fixture field data.
4141
*
4242
* @var array
4343
*/

0 commit comments

Comments
 (0)