Skip to content

Commit 6a9860f

Browse files
🔃 [EngCom] Public Pull Requests - 2.3-develop Minor Fixes
Accepted Public Pull Requests: - #22621: Resolved Typo (by @UdgamN) - #22599: Correct spelling (by @ravi-chandra3197) - #22594: Fixed typo issue (by @AfreenScarlet) - #22569: 2.3 develop pr1 (by @abhinay111222) - #22561: [Catalog|Eav] Revert change of PR #13302 not included into revert commit (by @Den4ik) - #22423: Store view specific labels cut in left navigation menu #22406 (by @sudhanshu-bajaj) Fixed GitHub Issues: - #22406: Store view specific labels cut in left navigation menu (reported by @abrarpathan19) has been fixed in #22423 by @sudhanshu-bajaj in 2.3-develop branch Related commits: 1. 2b60b9f
2 parents 19fcb92 + e4c9638 commit 6a9860f

File tree

9 files changed

+9
-14
lines changed

9 files changed

+9
-14
lines changed

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
use Magento\Framework\DB\Select;
2020
use Magento\Framework\EntityManager\MetadataPool;
2121
use Magento\Framework\Indexer\DimensionFactory;
22-
use Magento\Framework\Model\ResourceModel\ResourceModelPoolInterface;
2322
use Magento\Store\Model\Indexer\WebsiteDimensionProvider;
2423
use Magento\Store\Model\Store;
2524

app/code/Magento/Catalog/Ui/DataProvider/Product/ProductRenderCollectorComposite.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,7 @@
99
use Magento\Catalog\Api\Data\ProductRenderInterface;
1010

1111
/**
12-
* Composite, which holds collectors, that collect enought information for
13-
* product render
12+
* Composite, which holds collectors, that collect enough information for product render
1413
*/
1514
class ProductRenderCollectorComposite implements ProductRenderCollectorInterface
1615
{

app/code/Magento/Eav/Test/Unit/Model/Entity/Collection/AbstractCollectionTest.php

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,6 @@
55
*/
66
namespace Magento\Eav\Test\Unit\Model\Entity\Collection;
77

8-
use Magento\Framework\Data\Collection\Db\FetchStrategyInterface;
9-
use Magento\Framework\Model\ResourceModel\ResourceModelPoolInterface;
10-
118
/**
129
* AbstractCollection test
1310
*
@@ -31,7 +28,7 @@ class AbstractCollectionTest extends \PHPUnit\Framework\TestCase
3128
protected $loggerMock;
3229

3330
/**
34-
* @var FetchStrategyInterface|\PHPUnit_Framework_MockObject_MockObject
31+
* @var \Magento\Framework\Data\Collection\Db\FetchStrategyInterface|\PHPUnit_Framework_MockObject_MockObject
3532
*/
3633
protected $fetchStrategyMock;
3734

@@ -61,7 +58,7 @@ class AbstractCollectionTest extends \PHPUnit\Framework\TestCase
6158
protected $resourceHelperMock;
6259

6360
/**
64-
* @var ResourceModelPoolInterface|\PHPUnit_Framework_MockObject_MockObject
61+
* @var \Magento\Framework\Validator\UniversalFactory|\PHPUnit_Framework_MockObject_MockObject
6562
*/
6663
protected $validatorFactoryMock;
6764

app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/main/_store-scope.less

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
.store-scope {
3838
.admin__legend {
3939
.admin__field-tooltip {
40-
margin-left: -@indent__base;
40+
margin-left: 0;
4141
margin-top: .5rem;
4242
}
4343
}

app/design/adminhtml/Magento/backend/web/css/styles-old.less

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1366,7 +1366,7 @@
13661366
font-size: 14px;
13671367
font-weight: 600;
13681368
line-height: 3.2rem;
1369-
padding: 0 30px 0 0;
1369+
padding: 0 30px 0 30px;
13701370
white-space: nowrap;
13711371
word-wrap: break-word;
13721372

lib/web/css/docs/source/_breadcrumbs.less

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
//
99
// Breadcrumbs layout with links can be separated by any symbol, for example <code>></code> symbol.
1010
//
11-
// The following markup corresponds to the accesibility demands:
11+
// The following markup corresponds to the accessibility demands:
1212
// ```html
1313
// <div class="example-breadcrumbs-1">
1414
// <span class="label" id="breadcrumb-label">You are here:</span>

lib/web/css/docs/source/_pages.less

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
// */
55

66
// # Pagination HTML markup
7-
// Pagination is used to display numbers of pages in case content exceeds page limits. The markup corresponds to accesibility demands.
7+
// Pagination is used to display numbers of pages in case content exceeds page limits. The markup corresponds to accessibility demands.
88
//
99
// Required HTML markup:
1010
// ```html

lib/web/css/docs/source/_popups.less

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -245,7 +245,7 @@
245245
// <td>@popup-title-headings__level</td>
246246
// <td class="vars_value">h3</td>
247247
// <td class="vars_value">h1 | h2 | h3 | h4 | h5 | h6</td>
248-
// <td>What heading style is applyed to the popup title</td>
248+
// <td>What heading style is applied to the popup title</td>
249249
// </tr>
250250
// <tr>
251251
// <th colspan="5" class="vars_section">Popup close button</th>

lib/web/css/docs/source/_responsive.less

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@
8181
//
8282
// ## Gathering
8383
//
84-
// Everything that you include in collector mixins above will go in place where they declarated.
84+
// Everything that you include in collector mixins above will go in place where they declared.
8585
// As example all
8686
// ```css
8787
// .media-width(@extremum, @break) {

0 commit comments

Comments
 (0)