Skip to content

Commit 355b6ff

Browse files
🔃 [Magento Community Engineering] Community Contributions - 2.3-develop expedited
Accepted Community Pull Requests: - #23393: Fixed issue #21974 (by @geet07) - #23394: Fixed issue #23377 (by @geet07) - #23403: Remove rogue closing tag from store-switcher template (by @sta1r) - #23353: Get review entity id by code instead hard-coded. (by @DaniloEmpire) - #23234: [Ui] Calling the always action on opening and closing the modal. (by @eduard13) - #22116: Fix magento root package identification for metapackage installation (by @oleksii-lisovyi) Fixed GitHub Issues: - #21974: Changes for PayPal affect core config fields with tooltip (reported by @AndreasMueller75) has been fixed in #23393 by @geet07 in 2.3-develop branch Related commits: 1. eb28f14 - #23377: Mini cart loader not working first time magento2 (reported by @iamckindia) has been fixed in #23394 by @geet07 in 2.3-develop branch Related commits: 1. 3d6b783 - #23233: Alert widget doesn't trigger always method on showing the message (reported by @eduard13) has been fixed in #23234 by @eduard13 in 2.3-develop branch Related commits: 1. 0c402ae 2. 10c89f7 3. 07590d9 4. 92adfeb - #21136: Magento installation via metapackage: checkExtensions fails (reported by @oleksii-lisovyi) has been fixed in #22116 by @oleksii-lisovyi in 2.3-develop branch Related commits: 1. 2c91e5a
2 parents 21b3caf + 7ca8861 commit 355b6ff

File tree

12 files changed

+40789
-10394
lines changed

12 files changed

+40789
-10394
lines changed

app/code/Magento/Analytics/Test/Mftf/Section/AdminConfigAdvancedReportingSection.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
<element name="advancedReportingIndustry" type="select" selector="#analytics_general_vertical"/>
1515
<element name="advancedReportingIndustryLabel" type="text" selector=".config-vertical-label>label>span"/>
1616
<element name="advancedReportingHour" type="select" selector="#row_analytics_general_collection_time>td:nth-child(2)>select:nth-child(2)"/>
17-
<element name="advancedReportingMinute" type="select" selector="#row_analytics_general_collection_time>td:nth-child(2)>select:nth-child(3)"/>
18-
<element name="advancedReportingSeconds" type="select" selector="#row_analytics_general_collection_time>td:nth-child(2)>select:nth-child(4)"/>
17+
<element name="advancedReportingMinute" type="select" selector="#row_analytics_general_collection_time>td:nth-child(2)>select:nth-child(4)"/>
18+
<element name="advancedReportingSeconds" type="select" selector="#row_analytics_general_collection_time>td:nth-child(2)>select:nth-child(6)"/>
1919
<element name="advancedReportingBlankIndustryError" type="text" selector=".message-error>div"/>
2020
</section>
2121
</sections>

app/code/Magento/Checkout/view/frontend/templates/cart/minicart.phtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
data-bind="scope: 'minicart_content'">
1313
<span class="text"><?= $block->escapeHtml(__('My Cart')) ?></span>
1414
<span class="counter qty empty"
15-
data-bind="css: { empty: !!getCartParam('summary_count') == false }, blockLoader: isLoading">
15+
data-bind="css: { empty: !!getCartParam('summary_count') == false && !isLoading() }, blockLoader: isLoading">
1616
<span class="counter-number"><!-- ko text: getCartParam('summary_count') --><!-- /ko --></span>
1717
<span class="counter-label">
1818
<!-- ko if: getCartParam('summary_count') -->

app/code/Magento/Review/Controller/Adminhtml/Product/Post.php

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,16 @@
1010
use Magento\Framework\Controller\ResultFactory;
1111
use Magento\Store\Model\Store;
1212
use Magento\Framework\Exception\LocalizedException;
13+
use Magento\Review\Model\Review;
1314

15+
/**
16+
* Review admin controller for POST request.
17+
*/
1418
class Post extends ProductController implements HttpPostActionInterface
1519
{
1620
/**
21+
* Create a product review.
22+
*
1723
* @return \Magento\Backend\Model\View\Result\Redirect
1824
*/
1925
public function execute()
@@ -33,7 +39,7 @@ public function execute()
3339
}
3440
$review = $this->reviewFactory->create()->setData($data);
3541
try {
36-
$review->setEntityId(1) // product
42+
$review->setEntityId($review->getEntityIdByCode(Review::ENTITY_PRODUCT_CODE))
3743
->setEntityPkValue($productId)
3844
->setStoreId(Store::DEFAULT_STORE_ID)
3945
->setStatusId($data['status_id'])

app/code/Magento/Review/Test/Unit/Controller/Adminhtml/Product/PostTest.php

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
namespace Magento\Review\Test\Unit\Controller\Adminhtml\Product;
77

88
use Magento\Framework\Controller\ResultFactory;
9+
use Magento\Review\Model\Review;
910

1011
/**
1112
* @SuppressWarnings(PHPMD.TooManyFields)
@@ -109,7 +110,7 @@ protected function _prepareMockObjects()
109110
$this->storeModelMock = $this->createPartialMock(\Magento\Store\Model\Store::class, ['__wakeup', 'getId']);
110111
$this->reviewMock = $this->createPartialMock(
111112
\Magento\Review\Model\Review::class,
112-
['__wakeup', 'create', 'save', 'getId', 'getResource', 'aggregate']
113+
['__wakeup', 'create', 'save', 'getId', 'getResource', 'aggregate', 'getEntityIdByCode']
113114
);
114115
$this->reviewFactoryMock = $this->createPartialMock(\Magento\Review\Model\ReviewFactory::class, ['create']);
115116
$this->ratingMock = $this->createPartialMock(
@@ -174,6 +175,10 @@ public function testPostAction()
174175
$this->reviewMock->expects($this->once())
175176
->method('aggregate')
176177
->willReturn($this->reviewMock);
178+
$this->reviewMock->expects($this->once())
179+
->method('getEntityIdByCode')
180+
->with(Review::ENTITY_PRODUCT_CODE)
181+
->willReturn(1);
177182
$this->ratingMock->expects($this->once())
178183
->method('setRatingId')
179184
->willReturnSelf();

app/code/Magento/Ui/view/base/web/js/modal/alert.js

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,11 +39,18 @@ define([
3939
}]
4040
},
4141

42+
/**
43+
* Create widget.
44+
*/
45+
_create: function () {
46+
this.options.actions.always();
47+
this._super();
48+
},
49+
4250
/**
4351
* Close modal window.
4452
*/
4553
closeModal: function () {
46-
this.options.actions.always();
4754
this.element.bind('alertclosed', _.bind(this._remove, this));
4855

4956
return this._super();

app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/main/_collapsible-blocks.less

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -511,6 +511,11 @@
511511
right: 0;
512512
top: 0;
513513
}
514+
515+
.time-separator {
516+
font-size: 14px;
517+
padding-left: 5px;
518+
}
514519

515520
.tooltip-content {
516521
background: @color-very-dark-gray-black2;

dev/tests/integration/testsuite/Magento/Framework/Composer/ComposerInformationTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ public function testGetRequiredPhpVersion($composerDir)
8181
['composerFactory' => $this->composerFactory]
8282
);
8383

84-
$this->assertEquals("~5.5.0|~5.6.0|~7.0.0", $composerInfo->getRequiredPhpVersion());
84+
$this->assertEquals("~7.1.3||~7.2.0", $composerInfo->getRequiredPhpVersion());
8585
}
8686

8787
/**
@@ -92,7 +92,7 @@ public function testGetRequiredPhpVersion($composerDir)
9292
public function testGetRequiredExtensions($composerDir)
9393
{
9494
$this->setupDirectory($composerDir);
95-
$expectedExtensions = ['ctype', 'gd', 'spl', 'dom', 'simplexml', 'mcrypt', 'hash', 'curl', 'iconv', 'intl'];
95+
$expectedExtensions = ['ctype', 'gd', 'spl', 'dom', 'simplexml', 'hash', 'curl', 'iconv', 'intl'];
9696

9797
/** @var \Magento\Framework\Composer\ComposerInformation $composerInfo */
9898
$composerInfo = $this->objectManager->create(

0 commit comments

Comments
 (0)