Merge remote-tracking branch 'mainline/2.3-develop' into payflow-graphql-pr

Author: danielrenaud

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

@@ -14,8 +14,8 @@
  <element name="advancedReportingIndustry" type="select" selector="#analytics_general_vertical"/>
  <element name="advancedReportingIndustryLabel" type="text" selector=".config-vertical-label>label>span"/>
  <element name="advancedReportingHour" type="select" selector="#row_analytics_general_collection_time>td:nth-child(2)>select:nth-child(2)"/>
- <element name="advancedReportingMinute" type="select" selector="#row_analytics_general_collection_time>td:nth-child(2)>select:nth-child(3)"/>
- <element name="advancedReportingSeconds" type="select" selector="#row_analytics_general_collection_time>td:nth-child(2)>select:nth-child(4)"/>
+ <element name="advancedReportingMinute" type="select" selector="#row_analytics_general_collection_time>td:nth-child(2)>select:nth-child(4)"/>
+ <element name="advancedReportingSeconds" type="select" selector="#row_analytics_general_collection_time>td:nth-child(2)>select:nth-child(6)"/>
  <element name="advancedReportingBlankIndustryError" type="text" selector=".message-error>div"/>
  </section>
 </sections>

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

@@ -12,7 +12,7 @@
  data-bind="scope: 'minicart_content'">
  <span class="text"><?= $block->escapeHtml(__('My Cart')) ?></span>
  <span class="counter qty empty"
- data-bind="css: { empty: !!getCartParam('summary_count') == false }, blockLoader: isLoading">
+ data-bind="css: { empty: !!getCartParam('summary_count') == false && !isLoading() }, blockLoader: isLoading">
  <span class="counter-number"><!-- ko text: getCartParam('summary_count') --><!-- /ko --></span>
  <span class="counter-label">
  <!-- ko if: getCartParam('summary_count') -->

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

@@ -10,10 +10,16 @@
 use Magento\Framework\Controller\ResultFactory;
 use Magento\Store\Model\Store;
 use Magento\Framework\Exception\LocalizedException;
+use Magento\Review\Model\Review;
 
+/**
+ * Review admin controller for POST request.
+ */
 class Post extends ProductController implements HttpPostActionInterface
 {
  /**
+ * Create a product review.
+ *
  * @return \Magento\Backend\Model\View\Result\Redirect
  */
  public function execute()
@@ -33,7 +39,7 @@ public function execute()
  }
  $review = $this->reviewFactory->create()->setData($data);
  try {
- $review->setEntityId(1) // product
+ $review->setEntityId($review->getEntityIdByCode(Review::ENTITY_PRODUCT_CODE))
  ->setEntityPkValue($productId)
  ->setStoreId(Store::DEFAULT_STORE_ID)
  ->setStatusId($data['status_id'])

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

@@ -6,6 +6,7 @@
 namespace Magento\Review\Test\Unit\Controller\Adminhtml\Product;
 
 use Magento\Framework\Controller\ResultFactory;
+use Magento\Review\Model\Review;
 
 /**
  * @SuppressWarnings(PHPMD.TooManyFields)
@@ -109,7 +110,7 @@ protected function _prepareMockObjects()
  $this->storeModelMock = $this->createPartialMock(\Magento\Store\Model\Store::class, ['__wakeup', 'getId']);
  $this->reviewMock = $this->createPartialMock(
  \Magento\Review\Model\Review::class,
- ['__wakeup', 'create', 'save', 'getId', 'getResource', 'aggregate']
+ ['__wakeup', 'create', 'save', 'getId', 'getResource', 'aggregate', 'getEntityIdByCode']
  );
  $this->reviewFactoryMock = $this->createPartialMock(\Magento\Review\Model\ReviewFactory::class, ['create']);
  $this->ratingMock = $this->createPartialMock(
@@ -174,6 +175,10 @@ public function testPostAction()
  $this->reviewMock->expects($this->once())
  ->method('aggregate')
  ->willReturn($this->reviewMock);
+ $this->reviewMock->expects($this->once())
+ ->method('getEntityIdByCode')
+ ->with(Review::ENTITY_PRODUCT_CODE)
+ ->willReturn(1);
  $this->ratingMock->expects($this->once())
  ->method('setRatingId')
  ->willReturnSelf();

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

@@ -39,11 +39,18 @@ define([
  }]
  },
 
+ /**
+ * Create widget.
+ */
+ _create: function () {
+ this.options.actions.always();
+ this._super();
+ },
+
  /**
  * Close modal window.
  */
  closeModal: function () {
- this.options.actions.always();
  this.element.bind('alertclosed', _.bind(this._remove, this));
 
  return this._super();

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

@@ -511,6 +511,11 @@
  right: 0;
  top: 0;
  }
+ 
+ .time-separator {
+ font-size: 14px;
+ padding-left: 5px;
+ } 
 
  .tooltip-content {
  background: @color-very-dark-gray-black2;

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

@@ -81,7 +81,7 @@ public function testGetRequiredPhpVersion($composerDir)
  ['composerFactory' => $this->composerFactory]
  );
 
- $this->assertEquals("~5.5.0|~5.6.0|~7.0.0", $composerInfo->getRequiredPhpVersion());
+ $this->assertEquals("~7.1.3||~7.2.0", $composerInfo->getRequiredPhpVersion());
  }
 
  /**
@@ -92,7 +92,7 @@ public function testGetRequiredPhpVersion($composerDir)
  public function testGetRequiredExtensions($composerDir)
  {
  $this->setupDirectory($composerDir);
- $expectedExtensions = ['ctype', 'gd', 'spl', 'dom', 'simplexml', 'mcrypt', 'hash', 'curl', 'iconv', 'intl'];
+ $expectedExtensions = ['ctype', 'gd', 'spl', 'dom', 'simplexml', 'hash', 'curl', 'iconv', 'intl'];
 
  /** @var \Magento\Framework\Composer\ComposerInformation $composerInfo */
  $composerInfo = $this->objectManager->create(