Merge 2.4-develop into 2.4.0-develop

dvoskoboinikov · web-flow · commit fd0f081dd9aa · 2020-05-08T16:09:29.000-05:00
diff --git a/app/code/Magento/BundleSampleData/composer.json b/app/code/Magento/BundleSampleData/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-bundle-sample-data",
     "description": "N/A",
     "require": {
-        "php": "~7.1.3||~7.2.0||~7.3.0",
+        "php": "~7.3.0||~7.4.0",
         "magento/framework": "*",
         "magento/module-bundle": "*",
         "magento/module-catalog-sample-data": "*",
diff --git a/app/code/Magento/CatalogRuleSampleData/composer.json b/app/code/Magento/CatalogRuleSampleData/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-catalog-rule-sample-data",
     "description": "N/A",
     "require": {
-        "php": "~7.1.3||~7.2.0||~7.3.0",
+        "php": "~7.3.0||~7.4.0",
         "magento/framework": "*",
         "magento/module-catalog-rule": "*",
         "magento/module-store": "*",
diff --git a/app/code/Magento/CatalogSampleData/composer.json b/app/code/Magento/CatalogSampleData/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-catalog-sample-data",
     "description": "N/A",
     "require": {
-        "php": "~7.1.3||~7.2.0||~7.3.0",
+        "php": "~7.3.0||~7.4.0",
         "magento/framework": "*",
         "magento/module-store": "*",
         "magento/module-eav": "*",
diff --git a/app/code/Magento/CmsSampleData/composer.json b/app/code/Magento/CmsSampleData/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-cms-sample-data",
     "description": "N/A",
     "require": {
-        "php": "~7.1.3||~7.2.0||~7.3.0",
+        "php": "~7.3.0||~7.4.0",
         "magento/framework": "*",
         "magento/module-cms": "*",
         "magento/module-theme-sample-data": "*",
diff --git a/app/code/Magento/ConfigurableSampleData/composer.json b/app/code/Magento/ConfigurableSampleData/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-configurable-sample-data",
     "description": "N/A",
     "require": {
-        "php": "~7.1.3||~7.2.0||~7.3.0",
+        "php": "~7.3.0||~7.4.0",
         "magento/framework": "*",
         "magento/module-configurable-product": "*",
         "magento/module-product-links-sample-data": "*",
diff --git a/app/code/Magento/CustomerSampleData/composer.json b/app/code/Magento/CustomerSampleData/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-customer-sample-data",
     "description": "N/A",
     "require": {
-        "php": "~7.1.3||~7.2.0||~7.3.0",
+        "php": "~7.3.0||~7.4.0",
         "magento/framework": "*",
         "magento/module-customer": "*",
         "magento/module-directory": "*",
diff --git a/app/code/Magento/DownloadableSampleData/composer.json b/app/code/Magento/DownloadableSampleData/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-downloadable-sample-data",
     "description": "N/A",
     "require": {
-        "php": "~7.1.3||~7.2.0||~7.3.0",
+        "php": "~7.3.0||~7.4.0",
         "magento/framework": "*",
         "magento/module-catalog-sample-data": "*",
         "magento/module-downloadable": "*",
diff --git a/app/code/Magento/GroupedProductSampleData/composer.json b/app/code/Magento/GroupedProductSampleData/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-grouped-product-sample-data",
     "description": "N/A",
     "require": {
-        "php": "~7.1.3||~7.2.0||~7.3.0",
+        "php": "~7.3.0||~7.4.0",
         "magento/framework": "*",
         "magento/module-catalog-sample-data": "*",
         "magento/module-grouped-product": "*",
diff --git a/app/code/Magento/MsrpSampleData/composer.json b/app/code/Magento/MsrpSampleData/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-msrp-sample-data",
     "description": "N/A",
     "require": {
-        "php": "~7.1.3||~7.2.0||~7.3.0",
+        "php": "~7.3.0||~7.4.0",
         "magento/framework": "*",
         "magento/module-msrp": "*",
         "magento/module-customer": "*",
diff --git a/app/code/Magento/OfflineShippingSampleData/composer.json b/app/code/Magento/OfflineShippingSampleData/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-offline-shipping-sample-data",
     "description": "N/A",
     "require": {
-        "php": "~7.1.3||~7.2.0||~7.3.0",
+        "php": "~7.3.0||~7.4.0",
         "magento/framework": "*",
         "magento/module-offline-shipping": "*",
         "magento/module-directory": "*",
diff --git a/app/code/Magento/ProductLinksSampleData/composer.json b/app/code/Magento/ProductLinksSampleData/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-product-links-sample-data",
     "description": "N/A",
     "require": {
-        "php": "~7.1.3||~7.2.0||~7.3.0",
+        "php": "~7.3.0||~7.4.0",
         "magento/framework": "*",
         "magento/module-catalog": "*"
     },
diff --git a/app/code/Magento/ReviewSampleData/composer.json b/app/code/Magento/ReviewSampleData/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-review-sample-data",
     "description": "N/A",
     "require": {
-        "php": "~7.1.3||~7.2.0||~7.3.0",
+        "php": "~7.3.0||~7.4.0",
         "magento/framework": "*",
         "magento/module-review": "*",
         "magento/module-customer": "*",
diff --git a/app/code/Magento/SalesRuleSampleData/composer.json b/app/code/Magento/SalesRuleSampleData/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-sales-rule-sample-data",
     "description": "N/A",
     "require": {
-        "php": "~7.1.3||~7.2.0||~7.3.0",
+        "php": "~7.3.0||~7.4.0",
         "magento/framework": "*",
         "magento/module-catalog-rule-sample-data": "*",
         "magento/module-sales-rule": "*",
diff --git a/app/code/Magento/SalesSampleData/composer.json b/app/code/Magento/SalesSampleData/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-sales-sample-data",
     "description": "N/A",
     "require": {
-        "php": "~7.1.3||~7.2.0||~7.3.0",
+        "php": "~7.3.0||~7.4.0",
         "magento/framework": "*",
         "magento/module-sales": "*",
         "magento/module-configurable-sample-data": "*",
diff --git a/app/code/Magento/SwatchesSampleData/composer.json b/app/code/Magento/SwatchesSampleData/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-swatches-sample-data",
     "description": "N/A",
     "require": {
-        "php": "~7.1.3||~7.2.0||~7.3.0",
+        "php": "~7.3.0||~7.4.0",
         "magento/framework": "*",
         "magento/module-eav": "*",
         "magento/module-catalog": "*"
diff --git a/app/code/Magento/TaxSampleData/Test/Model/TaxTest.php b/app/code/Magento/TaxSampleData/Test/Model/TaxTest.php
@@ -29,62 +29,62 @@
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
-class TaxTest extends \PHPUnit_Framework_TestCase
+class TaxTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * @var Tax
      */
     private $taxModel;
 
     /**
-     * @var TaxRuleRepositoryInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var TaxRuleRepositoryInterface|\PHPUnit\Framework\MockObject\MockObject
      */
     private $taxRuleRepository;
 
     /**
-     * @var TaxRuleInterfaceFactory|\PHPUnit_Framework_MockObject_MockObject
+     * @var TaxRuleInterfaceFactory|\PHPUnit\Framework\MockObject\MockObject
      */
     private $ruleFactory;
 
     /**
-     * @var TaxRateRepositoryInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var TaxRateRepositoryInterface|\PHPUnit\Framework\MockObject\MockObject
      */
     private $taxRateRepository;
 
     /**
-     * @var TaxRateInterfaceFactory|\PHPUnit_Framework_MockObject_MockObject
+     * @var TaxRateInterfaceFactory|\PHPUnit\Framework\MockObject\MockObject
      */
     private $rateFactory;
 
     /**
-     * @var RateFactory|\PHPUnit_Framework_MockObject_MockObject
+     * @var RateFactory|\PHPUnit\Framework\MockObject\MockObject
      */
     private $taxRateFactory;
 
     /**
-     * @var SearchCriteriaBuilder|\PHPUnit_Framework_MockObject_MockObject
+     * @var SearchCriteriaBuilder|\PHPUnit\Framework\MockObject\MockObject
      */
     private $criteriaBuilder;
 
     /**
-     * @var FilterBuilder|\PHPUnit_Framework_MockObject_MockObject
+     * @var FilterBuilder|\PHPUnit\Framework\MockObject\MockObject
      */
     private $filterBuilder;
 
     /**
-     * @var FixtureManager|\PHPUnit_Framework_MockObject_MockObject
+     * @var FixtureManager|\PHPUnit\Framework\MockObject\MockObject
      */
     private $fixtureManager;
 
     /**
-     * @var Csv|\PHPUnit_Framework_MockObject_MockObject
+     * @var Csv|\PHPUnit\Framework\MockObject\MockObject
      */
     private $csvReader;
 
     /**
      * Region collection factory.
      *
-     * @var CollectionFactory|\PHPUnit_Framework_MockObject_MockObject
+     * @var CollectionFactory|\PHPUnit\Framework\MockObject\MockObject
      */
     private $regionCollectionFactory;
 
@@ -96,7 +96,7 @@ class TaxTest extends \PHPUnit_Framework_TestCase
     /**
      * @inheritdoc
      */
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->objectManager = new ObjectManager($this);
 
@@ -205,7 +205,7 @@ public function installDataProvider()
     /**
      * Prepare region collection mock.
      *
-     * @return \PHPUnit_Framework_MockObject_MockObject
+     * @return \PHPUnit\Framework\MockObject\MockObject
      */
     private function prepareRegionCollection()
     {
@@ -312,7 +312,7 @@ private function prepareContext()
     /**
      * Prepare tax rate mock.
      *
-     * @return TaxRateInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @return TaxRateInterface|\PHPUnit\Framework\MockObject\MockObject
      */
     private function prepareTaxRate()
     {
@@ -370,7 +370,7 @@ private function prepareFilters()
             ->method('addFilters')
             ->willReturnSelf();
 
-        $searchCriteria = $this->getMock(SearchCriteria::class);
+        $searchCriteria = $this->createMock(SearchCriteria::class);
 
         $this->criteriaBuilder->expects(self::once())
             ->method('create')
@@ -392,7 +392,7 @@ private function prepareFilters()
     /**
      * Prepare tax rule mock.
      *
-     * @return TaxRuleInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @return TaxRuleInterface|\PHPUnit\Framework\MockObject\MockObject
      */
     private function prepareTaxRule()
     {
diff --git a/app/code/Magento/TaxSampleData/composer.json b/app/code/Magento/TaxSampleData/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-tax-sample-data",
     "description": "N/A",
     "require": {
-        "php": "~7.1.3||~7.2.0||~7.3.0",
+        "php": "~7.3.0||~7.4.0",
         "magento/framework": "*",
         "magento/module-tax": "*",
         "magento/module-directory": "*"
diff --git a/app/code/Magento/ThemeSampleData/composer.json b/app/code/Magento/ThemeSampleData/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-theme-sample-data",
     "description": "N/A",
     "require": {
-        "php": "~7.1.3||~7.2.0||~7.3.0",
+        "php": "~7.3.0||~7.4.0",
         "magento/framework": "*",
         "magento/module-theme": "*",
         "magento/module-store": "*"
diff --git a/app/code/Magento/WidgetSampleData/composer.json b/app/code/Magento/WidgetSampleData/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-widget-sample-data",
     "description": "N/A",
     "require": {
-        "php": "~7.1.3||~7.2.0||~7.3.0",
+        "php": "~7.3.0||~7.4.0",
         "magento/framework": "*",
         "magento/module-widget": "*",
         "magento/module-theme": "*",
diff --git a/app/code/Magento/WishlistSampleData/composer.json b/app/code/Magento/WishlistSampleData/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-wishlist-sample-data",
     "description": "N/A",
     "require": {
-        "php": "~7.1.3||~7.2.0||~7.3.0",
+        "php": "~7.3.0||~7.4.0",
         "magento/framework": "*",
         "magento/module-wishlist": "*",
         "magento/module-customer": "*",
