diff --git a/CHANGELOG.md b/CHANGELOG.md
index ef841ec0337f2..078b93bd7199c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1977,7 +1977,7 @@ Tests:
* [#686](https://github.com/magento/magento2/issues/686) -- Product save validation errors in the admin don't hide the overlay
* [#702](https://github.com/magento/magento2/issues/702) -- Base table or view not found
* [#652](https://github.com/magento/magento2/issues/652) -- Multishipping checkout not to change the Billing address js issue
- * [#648](https://github.com/magento/magento2/issues/648) -- An equal (=) sign in the hash of the product page to to break the tabs functionality
+ * [#648](https://github.com/magento/magento2/issues/648) -- An equal (=) sign in the hash of the product page to break the tabs functionality
* Service Contracts:
* Refactored usage of new API of the Customer module
* Implemented Service Contracts for the Sales module
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/page/header.phtml b/app/code/Magento/Backend/view/adminhtml/templates/page/header.phtml
index 8feccc9cf1b8f..f952001f5e2ff 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/page/header.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/page/header.phtml
@@ -17,7 +17,7 @@
class="logo">
-
1
- 1
+ 0
1.11
1
1
diff --git a/app/code/Magento/Bundle/Test/Mftf/Data/BundleOptionData.xml b/app/code/Magento/Bundle/Test/Mftf/Data/BundleOptionData.xml
index 80d9307255e59..e10fe4e33c208 100644
--- a/app/code/Magento/Bundle/Test/Mftf/Data/BundleOptionData.xml
+++ b/app/code/Magento/Bundle/Test/Mftf/Data/BundleOptionData.xml
@@ -8,13 +8,34 @@
-
+
bundle-option-dropdown
true
- dropdown
+ select
+ 0
+
+
+ bundle-option-radio
+ true
+ radio
1
+
+ bundle-option-checkbox
+ true
+ checkbox
+ 3
+
+
+ bundle-option-multipleselect
+ true
+ multi
+ 4
+
diff --git a/app/code/Magento/Bundle/Test/Mftf/Data/CustomAttributeData.xml b/app/code/Magento/Bundle/Test/Mftf/Data/CustomAttributeData.xml
index 65ac763460151..380b5b8959025 100644
--- a/app/code/Magento/Bundle/Test/Mftf/Data/CustomAttributeData.xml
+++ b/app/code/Magento/Bundle/Test/Mftf/Data/CustomAttributeData.xml
@@ -19,4 +19,8 @@
price_view
1
+
+ price_view
+ 0
+
diff --git a/app/code/Magento/Bundle/Test/Mftf/Data/ProductData.xml b/app/code/Magento/Bundle/Test/Mftf/Data/ProductData.xml
index 80ffe13ff3fe4..9c48b904bb7fd 100644
--- a/app/code/Magento/Bundle/Test/Mftf/Data/ProductData.xml
+++ b/app/code/Magento/Bundle/Test/Mftf/Data/ProductData.xml
@@ -45,4 +45,19 @@
CustomAttributeDynamicPrice
CustomAttributePriceView
+
+ Api Bundle Product
+ api-bundle-product
+ bundle
+ 4
+ 4
+ 1
+ api-bundle-product
+ CustomAttributeCategoryIds
+ EavStockItem
+ ApiProductDescription
+ ApiProductShortDescription
+ CustomAttributeDynamicPrice
+ CustomAttributePriceViewRange
+
diff --git a/app/code/Magento/Bundle/Test/Mftf/Metadata/bundle_link-meta.xml b/app/code/Magento/Bundle/Test/Mftf/Metadata/bundle_link-meta.xml
index 435cf59c6cbfd..ca39253aa54a0 100644
--- a/app/code/Magento/Bundle/Test/Mftf/Metadata/bundle_link-meta.xml
+++ b/app/code/Magento/Bundle/Test/Mftf/Metadata/bundle_link-meta.xml
@@ -8,7 +8,7 @@
-
+
application/json
string
diff --git a/app/code/Magento/Bundle/Test/Mftf/Section/StorefrontCategoryProductSection.xml b/app/code/Magento/Bundle/Test/Mftf/Section/StorefrontCategoryProductSection.xml
new file mode 100644
index 0000000000000..c76f822a0913f
--- /dev/null
+++ b/app/code/Magento/Bundle/Test/Mftf/Section/StorefrontCategoryProductSection.xml
@@ -0,0 +1,15 @@
+
+
+
+
+
+
diff --git a/app/code/Magento/Bundle/Test/Mftf/Section/StorefrontProductInfoMainSection.xml b/app/code/Magento/Bundle/Test/Mftf/Section/StorefrontProductInfoMainSection.xml
new file mode 100644
index 0000000000000..41c00b5eda184
--- /dev/null
+++ b/app/code/Magento/Bundle/Test/Mftf/Section/StorefrontProductInfoMainSection.xml
@@ -0,0 +1,17 @@
+
+
+
+
+
+
diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontVerifyDynamicBundleProductPricesForCombinationOfOptionsTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontVerifyDynamicBundleProductPricesForCombinationOfOptionsTest.xml
new file mode 100644
index 0000000000000..1b1a46d1c8ba4
--- /dev/null
+++ b/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontVerifyDynamicBundleProductPricesForCombinationOfOptionsTest.xml
@@ -0,0 +1,237 @@
+
+
+
+
+
+
+
+
+
+ 4.99
+
+
+ 2.89
+
+
+ 7.33
+
+
+ 18.25
+
+
+ 10.00
+
+
+
+
+
+
+ false
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 2
+
+
+
+
+
+
+ 5
+
+
+
+
+
+
+
+
+ false
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Catalog/Model/Indexer/Category/Product/Action/Full.php b/app/code/Magento/Catalog/Model/Indexer/Category/Product/Action/Full.php
index 09dbed350c5e4..f8121b55dbf99 100644
--- a/app/code/Magento/Catalog/Model/Indexer/Category/Product/Action/Full.php
+++ b/app/code/Magento/Catalog/Model/Indexer/Category/Product/Action/Full.php
@@ -8,6 +8,7 @@
use Magento\Catalog\Model\ResourceModel\Indexer\ActiveTableSwitcher;
use Magento\Framework\DB\Query\Generator as QueryGenerator;
use Magento\Framework\App\ResourceConnection;
+use Magento\Indexer\Model\ProcessManager;
/**
* Class Full reindex action
@@ -44,6 +45,11 @@ class Full extends \Magento\Catalog\Model\Indexer\Category\Product\AbstractActio
*/
private $activeTableSwitcher;
+ /**
+ * @var ProcessManager
+ */
+ private $processManager;
+
/**
* @param ResourceConnection $resource
* @param \Magento\Store\Model\StoreManagerInterface $storeManager
@@ -52,9 +58,10 @@ class Full extends \Magento\Catalog\Model\Indexer\Category\Product\AbstractActio
* @param \Magento\Framework\Indexer\BatchSizeManagementInterface|null $batchSizeManagement
* @param \Magento\Framework\Indexer\BatchProviderInterface|null $batchProvider
* @param \Magento\Framework\EntityManager\MetadataPool|null $metadataPool
- * @param \Magento\Indexer\Model\Indexer\StateFactory|null $stateFactory
* @param int|null $batchRowsCount
* @param ActiveTableSwitcher|null $activeTableSwitcher
+ * @param ProcessManager $processManager
+ * @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
public function __construct(
\Magento\Framework\App\ResourceConnection $resource,
@@ -65,7 +72,8 @@ public function __construct(
\Magento\Framework\Indexer\BatchProviderInterface $batchProvider = null,
\Magento\Framework\EntityManager\MetadataPool $metadataPool = null,
$batchRowsCount = null,
- ActiveTableSwitcher $activeTableSwitcher = null
+ ActiveTableSwitcher $activeTableSwitcher = null,
+ ProcessManager $processManager = null
) {
parent::__construct(
$resource,
@@ -85,6 +93,7 @@ public function __construct(
);
$this->batchRowsCount = $batchRowsCount;
$this->activeTableSwitcher = $activeTableSwitcher ?: $objectManager->get(ActiveTableSwitcher::class);
+ $this->processManager = $processManager ?: $objectManager->get(ProcessManager::class);
}
/**
@@ -133,6 +142,38 @@ public function execute()
return $this;
}
+ /**
+ * Run reindexation
+ *
+ * @return void
+ */
+ protected function reindex()
+ {
+ $userFunctions = [];
+
+ foreach ($this->storeManager->getStores() as $store) {
+ if ($this->getPathFromCategoryId($store->getRootCategoryId())) {
+ $userFunctions[$store->getId()] = function () use ($store) {
+ return $this->reindexStore($store);
+ };
+ }
+ }
+
+ $this->processManager->execute($userFunctions);
+ }
+
+ /**
+ * Execute indexation by store
+ *
+ * @param \Magento\Store\Model\Store $store
+ */
+ private function reindexStore($store)
+ {
+ $this->reindexRootCategory($store);
+ $this->reindexAnchorCategories($store);
+ $this->reindexNonAnchorCategories($store);
+ }
+
/**
* Publish data from tmp to replica table
*
diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductActionGroup.xml
index f64812fd5bf49..bca6ae2b60bf3 100644
--- a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductActionGroup.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductActionGroup.xml
@@ -181,6 +181,19 @@
+
+
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/Page/AdminProductCreatePage.xml b/app/code/Magento/Catalog/Test/Mftf/Page/AdminProductCreatePage.xml
index 35fa00efcfe8e..be7c44e378f08 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Page/AdminProductCreatePage.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Page/AdminProductCreatePage.xml
@@ -16,5 +16,6 @@
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFormAdvancedPricingSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFormAdvancedPricingSection.xml
new file mode 100644
index 0000000000000..1042b1e5a5464
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFormAdvancedPricingSection.xml
@@ -0,0 +1,25 @@
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontCategoryProductSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontCategoryProductSection.xml
index 4892e25818e2c..19b3a5cc127a7 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontCategoryProductSection.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontCategoryProductSection.xml
@@ -23,6 +23,10 @@
+
+
+
+
+
+ 1
+
+
+ 100
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ $1,000.00
+ grabTextFromSubtotalField1
+
+
+ $1,350.00
+ grabTextFromSubtotalField2
+
+
+ $1,640.00
+ grabTextFromSubtotalField3
+
+
+
+
+
+ $1,500.00
+ grabTextFromSubtotalField4
+
+
+ $1,500.00
+ grabTextFromCheckoutCartSummarySectionSubtotal1
+
+
+ $1,500.00
+ grabTextFromMiniCartSubtotalField
+
+
+ $1,500.00
+ grabTextFromSubtotalField5
+
+
+ $1,500.00
+ grabTextFromSubtotalField6
+
+
+
+
+ $4,000.00
+ grabTextFromSubtotalField7
+
+
+ $4,000.00
+ grabTextFromCheckoutCartSummarySectionSubtotal2
+
+
+ $4,000.00
+ grabTextFromMiniCartSubtotalField2
+
+
+
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/view/addto/compare.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/view/addto/compare.phtml
index 16a5147e13458..adf0f44d0c831 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/view/addto/compare.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/view/addto/compare.phtml
@@ -6,7 +6,7 @@
// @codingStandardsIgnoreFile
-/** @var $block \Magento\Catalog\Block\Catalog\Product\View\Addto\Compare */
+/** @var $block \Magento\Catalog\Block\Product\View\Addto\Compare */
?>
addFieldToFilter('level', ['lteq' => $level + $depth - self::DEPTH_OFFSET]);
$collection->setOrder('level');
$collection->getSelect()->orWhere(
- $this->metadata->getMetadata(CategoryInterface::class)->getLinkField() . ' = ?',
+ $this->metadata->getMetadata(CategoryInterface::class)->getIdentifierField() . ' = ?',
$rootCategoryId
);
return $this->processTree($collection->getIterator());
diff --git a/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext.php b/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext.php
index d51be12f01db5..df9eb6e78990a 100644
--- a/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext.php
+++ b/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext.php
@@ -10,10 +10,13 @@
use Magento\CatalogSearch\Model\ResourceModel\Fulltext as FulltextResource;
use Magento\Framework\Indexer\Dimension\DimensionProviderInterface;
use Magento\Store\Model\StoreDimensionProvider;
+use Magento\Indexer\Model\ProcessManager;
/**
* Provide functionality for Fulltext Search indexing.
*
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ *
* @api
* @since 100.0.2
*/
@@ -62,14 +65,20 @@ class Fulltext implements
*/
private $dimensionProvider;
+ /**
+ * @var ProcessManager
+ */
+ private $processManager;
+
/**
* @param FullFactory $fullActionFactory
* @param IndexerHandlerFactory $indexerHandlerFactory
* @param FulltextResource $fulltextResource
- * @param array $data
* @param IndexSwitcherInterface $indexSwitcher
* @param StateFactory $indexScopeStateFactory
* @param DimensionProviderInterface $dimensionProvider
+ * @param array $data
+ * @param ProcessManager $processManager
*/
public function __construct(
FullFactory $fullActionFactory,
@@ -78,7 +87,8 @@ public function __construct(
IndexSwitcherInterface $indexSwitcher,
StateFactory $indexScopeStateFactory,
DimensionProviderInterface $dimensionProvider,
- array $data
+ array $data,
+ ProcessManager $processManager = null
) {
$this->fullAction = $fullActionFactory->create(['data' => $data]);
$this->indexerHandlerFactory = $indexerHandlerFactory;
@@ -87,6 +97,9 @@ public function __construct(
$this->indexSwitcher = $indexSwitcher;
$this->indexScopeState = $indexScopeStateFactory->create();
$this->dimensionProvider = $dimensionProvider;
+ $this->processManager = $processManager ?: \Magento\Framework\App\ObjectManager::getInstance()->get(
+ ProcessManager::class
+ );
}
/**
@@ -145,9 +158,13 @@ public function executeByDimension(array $dimensions, \Traversable $entityIds =
*/
public function executeFull()
{
+ $userFunctions = [];
foreach ($this->dimensionProvider->getIterator() as $dimension) {
- $this->executeByDimension($dimension);
+ $userFunctions[] = function () use ($dimension) {
+ $this->executeByDimension($dimension);
+ };
}
+ $this->processManager->execute($userFunctions);
}
/**
diff --git a/app/code/Magento/CatalogSearch/Test/Unit/Model/Indexer/FulltextTest.php b/app/code/Magento/CatalogSearch/Test/Unit/Model/Indexer/FulltextTest.php
index 0c3bd42a1b5eb..595e32b4c1988 100644
--- a/app/code/Magento/CatalogSearch/Test/Unit/Model/Indexer/FulltextTest.php
+++ b/app/code/Magento/CatalogSearch/Test/Unit/Model/Indexer/FulltextTest.php
@@ -44,6 +44,11 @@ class FulltextTest extends \PHPUnit\Framework\TestCase
*/
private $dimensionProviderMock;
+ /**
+ * @var \Magento\Indexer\Model\ProcessManager|\PHPUnit_Framework_MockObject_MockObject
+ */
+ private $processManager;
+
protected function setUp()
{
$this->fullAction = $this->getClassMock(\Magento\CatalogSearch\Model\Indexer\Fulltext\Action\Full::class);
@@ -70,6 +75,11 @@ protected function setUp()
$stateMock = $this->getMockBuilder(\Magento\CatalogSearch\Model\Indexer\Scope\State::class)
->getMock();
$objectManagerHelper = new ObjectManagerHelper($this);
+
+ $this->processManager = new \Magento\Indexer\Model\ProcessManager(
+ $this->getClassMock(\Magento\Framework\App\ResourceConnection::class)
+ );
+
$this->model = $objectManagerHelper->getObject(
\Magento\CatalogSearch\Model\Indexer\Fulltext::class,
[
@@ -80,6 +90,7 @@ protected function setUp()
'indexSwitcher' => $this->indexSwitcher,
'dimensionProvider' => $this->dimensionProviderMock,
'indexScopeState' => $stateMock,
+ 'processManager' => $this->processManager,
]
);
}
diff --git a/app/code/Magento/CatalogSearch/composer.json b/app/code/Magento/CatalogSearch/composer.json
index 72bf2ec90a582..298511ef428a9 100644
--- a/app/code/Magento/CatalogSearch/composer.json
+++ b/app/code/Magento/CatalogSearch/composer.json
@@ -9,6 +9,7 @@
"magento/framework": "*",
"magento/module-backend": "*",
"magento/module-catalog": "*",
+ "magento/module-indexer": "100.2.*",
"magento/module-catalog-inventory": "*",
"magento/module-customer": "*",
"magento/module-directory": "*",
diff --git a/app/code/Magento/CatalogSearch/etc/module.xml b/app/code/Magento/CatalogSearch/etc/module.xml
index 68253014ec150..8fe282ce7539b 100644
--- a/app/code/Magento/CatalogSearch/etc/module.xml
+++ b/app/code/Magento/CatalogSearch/etc/module.xml
@@ -10,6 +10,7 @@
diff --git a/app/code/Magento/Checkout/Test/Mftf/Page/CheckoutCartPage.xml b/app/code/Magento/Checkout/Test/Mftf/Page/CheckoutCartPage.xml
index dcc652829b3cc..433d397ee81a9 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Page/CheckoutCartPage.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Page/CheckoutCartPage.xml
@@ -8,7 +8,7 @@
-
+
diff --git a/app/code/Magento/Checkout/Test/Mftf/Page/CheckoutShippingPage.xml b/app/code/Magento/Checkout/Test/Mftf/Page/CheckoutShippingPage.xml
new file mode 100644
index 0000000000000..59c3b20aca674
--- /dev/null
+++ b/app/code/Magento/Checkout/Test/Mftf/Page/CheckoutShippingPage.xml
@@ -0,0 +1,15 @@
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutCartProductSection.xml b/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutCartProductSection.xml
index 6e2262d58b89d..b3e3f082319fb 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutCartProductSection.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutCartProductSection.xml
@@ -29,5 +29,7 @@
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Checkout/view/frontend/web/template/billing-address/form.html b/app/code/Magento/Checkout/view/frontend/web/template/billing-address/form.html
index 086cca814bec1..dcd726076d900 100644
--- a/app/code/Magento/Checkout/view/frontend/web/template/billing-address/form.html
+++ b/app/code/Magento/Checkout/view/frontend/web/template/billing-address/form.html
@@ -16,8 +16,8 @@
-
+
diff --git a/app/code/Magento/Config/Test/Mftf/Page/AdminSalesConfigPage.xml b/app/code/Magento/Config/Test/Mftf/Page/AdminSalesConfigPage.xml
new file mode 100644
index 0000000000000..1a99ff6533dbb
--- /dev/null
+++ b/app/code/Magento/Config/Test/Mftf/Page/AdminSalesConfigPage.xml
@@ -0,0 +1,12 @@
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Config/Test/Mftf/Section/AdminSalesConfigSection.xml b/app/code/Magento/Config/Test/Mftf/Section/AdminSalesConfigSection.xml
new file mode 100644
index 0000000000000..4897e8415c1b8
--- /dev/null
+++ b/app/code/Magento/Config/Test/Mftf/Section/AdminSalesConfigSection.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/app/code/Magento/Cookie/view/frontend/web/js/notices.js b/app/code/Magento/Cookie/view/frontend/web/js/notices.js
index 253950747ce14..f1f3754ea54b1 100644
--- a/app/code/Magento/Cookie/view/frontend/web/js/notices.js
+++ b/app/code/Magento/Cookie/view/frontend/web/js/notices.js
@@ -29,7 +29,7 @@ define([
});
if ($.mage.cookies.get(this.options.cookieName)) {
- window.location.reload();
+ this.element.hide();
} else {
window.location.href = this.options.noCookiesUrl;
}
diff --git a/app/code/Magento/Customer/Test/Mftf/Data/AddressData.xml b/app/code/Magento/Customer/Test/Mftf/Data/AddressData.xml
index a1f0277ec40ec..d26ecac28113e 100644
--- a/app/code/Magento/Customer/Test/Mftf/Data/AddressData.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Data/AddressData.xml
@@ -85,6 +85,12 @@
+
+ - 7700 xyz street
+ - 113
+
+ London
GB
+ 512-345-6789
diff --git a/app/code/Magento/Customer/Test/Mftf/Data/RegionData.xml b/app/code/Magento/Customer/Test/Mftf/Data/RegionData.xml
index 747f2d59745a1..99741a357109e 100644
--- a/app/code/Magento/Customer/Test/Mftf/Data/RegionData.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Data/RegionData.xml
@@ -20,11 +20,11 @@
California
CA
- 2
+ 12
New York
NY
- 3
+ 43
diff --git a/app/code/Magento/Customer/view/frontend/web/js/password-strength-indicator.js b/app/code/Magento/Customer/view/frontend/web/js/password-strength-indicator.js
index be2e0aedfe4bb..89d9b320c049d 100644
--- a/app/code/Magento/Customer/view/frontend/web/js/password-strength-indicator.js
+++ b/app/code/Magento/Customer/view/frontend/web/js/password-strength-indicator.js
@@ -31,7 +31,7 @@ define([
this.options.cache.label = $(this.options.passwordStrengthMeterLabelSelector, this.element);
// We need to look outside the module for backward compatibility, since someone can already use the module.
- // @todo Narrow this selector in 2.3 so it doesn't accidentally finds the the email field from the
+ // @todo Narrow this selector in 2.3 so it doesn't accidentally finds the email field from the
// newsletter email field or any other "email" field.
this.options.cache.email = $(this.options.formSelector).find(this.options.emailSelector);
this._bind();
diff --git a/app/code/Magento/Elasticsearch/Model/Client/Elasticsearch.php b/app/code/Magento/Elasticsearch/Model/Client/Elasticsearch.php
index b6ec06d48a487..118535c36560b 100644
--- a/app/code/Magento/Elasticsearch/Model/Client/Elasticsearch.php
+++ b/app/code/Magento/Elasticsearch/Model/Client/Elasticsearch.php
@@ -17,7 +17,7 @@ class Elasticsearch implements ClientInterface
/**
* Elasticsearch Client instance
*
- * @var \Elasticsearch\Client
+ * @var \Elasticsearch\Client[]
*/
protected $client;
@@ -53,10 +53,19 @@ public function __construct(
$config = $this->buildConfig($options);
$elasticsearchClient = \Elasticsearch\ClientBuilder::fromConfig($config, true);
}
- $this->client = $elasticsearchClient;
+ $this->client[getmypid()] = $elasticsearchClient;
$this->clientOptions = $options;
}
+ private function getClient()
+ {
+ $pid = getmypid();
+ if (!isset($this->client[$pid])) {
+ $config = $this->buildConfig($this->clientOptions);
+ $this->client[$pid] = \Elasticsearch\ClientBuilder::fromConfig($config, true);
+ }
+ return $this->client[$pid];
+ }
/**
* Ping the Elasticsearch client
*
@@ -65,7 +74,7 @@ public function __construct(
public function ping()
{
if ($this->pingResult === null) {
- $this->pingResult = $this->client->ping(['client' => ['timeout' => $this->clientOptions['timeout']]]);
+ $this->pingResult = $this->getClient()->ping(['client' => ['timeout' => $this->clientOptions['timeout']]]);
}
return $this->pingResult;
}
@@ -110,7 +119,7 @@ private function buildConfig($options = [])
*/
public function bulkQuery($query)
{
- $this->client->bulk($query);
+ $this->getClient()->bulk($query);
}
/**
@@ -122,7 +131,7 @@ public function bulkQuery($query)
*/
public function createIndex($index, $settings)
{
- $this->client->indices()->create([
+ $this->getClient()->indices()->create([
'index' => $index,
'body' => $settings,
]);
@@ -136,7 +145,7 @@ public function createIndex($index, $settings)
*/
public function deleteIndex($index)
{
- $this->client->indices()->delete(['index' => $index]);
+ $this->getClient()->indices()->delete(['index' => $index]);
}
/**
@@ -147,7 +156,7 @@ public function deleteIndex($index)
*/
public function isEmptyIndex($index)
{
- $stats = $this->client->indices()->stats(['index' => $index, 'metric' => 'docs']);
+ $stats = $this->getClient()->indices()->stats(['index' => $index, 'metric' => 'docs']);
if ($stats['indices'][$index]['primaries']['docs']['count'] == 0) {
return true;
}
@@ -172,7 +181,7 @@ public function updateAlias($alias, $newIndex, $oldIndex = '')
$params['body']['actions'][] = ['add' => ['alias' => $alias, 'index' => $newIndex]];
}
- $this->client->indices()->updateAliases($params);
+ $this->getClient()->indices()->updateAliases($params);
}
/**
@@ -183,7 +192,7 @@ public function updateAlias($alias, $newIndex, $oldIndex = '')
*/
public function indexExists($index)
{
- return $this->client->indices()->exists(['index' => $index]);
+ return $this->getClient()->indices()->exists(['index' => $index]);
}
/**
@@ -198,7 +207,7 @@ public function existsAlias($alias, $index = '')
if ($index) {
$params['index'] = $index;
}
- return $this->client->indices()->existsAlias($params);
+ return $this->getClient()->indices()->existsAlias($params);
}
/**
@@ -208,7 +217,7 @@ public function existsAlias($alias, $index = '')
*/
public function getAlias($alias)
{
- return $this->client->indices()->getAlias(['name' => $alias]);
+ return $this->getClient()->indices()->getAlias(['name' => $alias]);
}
/**
@@ -267,7 +276,7 @@ public function addFieldsMapping(array $fields, $index, $entityType)
foreach ($fields as $field => $fieldInfo) {
$params['body'][$entityType]['properties'][$field] = $fieldInfo;
}
- $this->client->indices()->putMapping($params);
+ $this->getClient()->indices()->putMapping($params);
}
/**
@@ -279,7 +288,7 @@ public function addFieldsMapping(array $fields, $index, $entityType)
*/
public function deleteMapping($index, $entityType)
{
- $this->client->indices()->deleteMapping([
+ $this->getClient()->indices()->deleteMapping([
'index' => $index,
'type' => $entityType,
]);
@@ -293,8 +302,7 @@ public function deleteMapping($index, $entityType)
*/
public function query($query)
{
- $params = array_merge($query, ['client' => ['timeout' => $this->clientOptions['timeout']]]);
- return $this->client->search($params);
+ return $this->getClient()->search($query);
}
/**
@@ -305,6 +313,6 @@ public function query($query)
*/
public function suggest($query)
{
- return $this->client->suggest($query);
+ return $this->getClient()->suggest($query);
}
}
diff --git a/app/code/Magento/Indexer/Model/ProcessManager.php b/app/code/Magento/Indexer/Model/ProcessManager.php
new file mode 100644
index 0000000000000..04cd713fffb11
--- /dev/null
+++ b/app/code/Magento/Indexer/Model/ProcessManager.php
@@ -0,0 +1,156 @@
+resource = $resource;
+ if (null === $registry) {
+ $registry = \Magento\Framework\App\ObjectManager::getInstance()->get(
+ \Magento\Framework\Registry::class
+ );
+ }
+ $this->registry = $registry;
+ $this->threadsCount = (int)$threadsCount;
+ }
+
+ /**
+ * Execute user functions
+ *
+ * @param \Traversable $userFunctions
+ */
+ public function execute($userFunctions)
+ {
+ if ($this->threadsCount > 1 && $this->isCanBeParalleled() && !$this->isSetupMode() && PHP_SAPI == 'cli') {
+ $this->multiThreadsExecute($userFunctions);
+ } else {
+ $this->simpleThreadExecute($userFunctions);
+ }
+ }
+
+ /**
+ * Execute user functions in singleThreads mode
+ *
+ * @param \Traversable $userFunctions
+ */
+ private function simpleThreadExecute($userFunctions)
+ {
+ foreach ($userFunctions as $userFunction) {
+ call_user_func($userFunction);
+ }
+ }
+
+ /**
+ * Execute user functions in multiThreads mode
+ *
+ * @param \Traversable $userFunctions
+ * @SuppressWarnings(PHPMD.UnusedLocalVariable)
+ */
+ private function multiThreadsExecute($userFunctions)
+ {
+ $this->resource->closeConnection(null);
+ $threadNumber = 0;
+ foreach ($userFunctions as $userFunction) {
+ $pid = pcntl_fork();
+ if ($pid == -1) {
+ throw new \RuntimeException('Unable to fork a new process');
+ } elseif ($pid) {
+ $this->executeParentProcess($threadNumber);
+ } else {
+ $this->startChildProcess($userFunction);
+ }
+ }
+ while (pcntl_waitpid(0, $status) != -1) {
+ //Waiting for the completion of child processes
+ }
+
+ if ($this->failInChildProcess) {
+ throw new \RuntimeException('Fail in child process');
+ }
+ }
+
+ /**
+ * Is process can be paralleled
+ *
+ * @return bool
+ */
+ private function isCanBeParalleled(): bool
+ {
+ return function_exists('pcntl_fork');
+ }
+
+ /**
+ * Is setup mode
+ *
+ * @return bool
+ */
+ private function isSetupMode(): bool
+ {
+ return $this->registry->registry('setup-mode-enabled') ?: false;
+ }
+
+ /**
+ * Start child process
+ *
+ * @param callable $userFunction
+ * @SuppressWarnings(PHPMD.ExitExpression)
+ */
+ private function startChildProcess(callable $userFunction)
+ {
+ $status = call_user_func($userFunction);
+ $status = is_integer($status) ? $status : 0;
+ exit($status);
+ }
+
+ /**
+ * Execute parent process
+ *
+ * @param int $threadNumber
+ */
+ private function executeParentProcess(int &$threadNumber)
+ {
+ $threadNumber++;
+ if ($threadNumber >= $this->threadsCount) {
+ pcntl_wait($status);
+ if (pcntl_wexitstatus($status) !== 0) {
+ $this->failInChildProcess = true;
+ }
+ $threadNumber--;
+ }
+ }
+}
diff --git a/app/code/Magento/Indexer/etc/di.xml b/app/code/Magento/Indexer/etc/di.xml
index 610f08fac3a05..6abaaf625e108 100644
--- a/app/code/Magento/Indexer/etc/di.xml
+++ b/app/code/Magento/Indexer/etc/di.xml
@@ -42,7 +42,11 @@
+
+ Magento\Indexer\Model\ProcessManager::THREADS_COUNT
+
+
diff --git a/app/code/Magento/Integration/view/adminhtml/web/js/integration.js b/app/code/Magento/Integration/view/adminhtml/web/js/integration.js
index 0bd7df8c0fa10..6921f645a2330 100644
--- a/app/code/Magento/Integration/view/adminhtml/web/js/integration.js
+++ b/app/code/Magento/Integration/view/adminhtml/web/js/integration.js
@@ -200,7 +200,7 @@ define([
if (IdentityLogin.win.closed ||
IdentityLogin.win.location.href == IdentityLogin.successCallbackUrl //eslint-disable-line eqeqeq
) {
- //Stop the the polling
+ //Stop the polling
clearInterval(IdentityLogin.checker);
$('body').trigger('processStart');
//Check for window closed
diff --git a/app/code/Magento/Newsletter/Block/Adminhtml/Template/Edit.php b/app/code/Magento/Newsletter/Block/Adminhtml/Template/Edit.php
index 79db83e7a49b8..33c3706183368 100644
--- a/app/code/Magento/Newsletter/Block/Adminhtml/Template/Edit.php
+++ b/app/code/Magento/Newsletter/Block/Adminhtml/Template/Edit.php
@@ -216,7 +216,7 @@ public function getForm()
}
/**
- * Return return template name for JS
+ * Return template name for JS
*
* @return string
*/
diff --git a/app/code/Magento/Quote/Model/ResourceModel/Quote/Item/Collection.php b/app/code/Magento/Quote/Model/ResourceModel/Quote/Item/Collection.php
index 0487d7e46eb26..2405eaa9d37a3 100644
--- a/app/code/Magento/Quote/Model/ResourceModel/Quote/Item/Collection.php
+++ b/app/code/Magento/Quote/Model/ResourceModel/Quote/Item/Collection.php
@@ -45,6 +45,11 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\VersionContro
*/
protected $_quoteConfig;
+ /**
+ * @var \Magento\Store\Model\StoreManagerInterface|null
+ */
+ private $storeManager;
+
/**
* @param \Magento\Framework\Data\Collection\EntityFactory $entityFactory
* @param \Psr\Log\LoggerInterface $logger
@@ -56,6 +61,7 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\VersionContro
* @param \Magento\Quote\Model\Quote\Config $quoteConfig
* @param \Magento\Framework\DB\Adapter\AdapterInterface $connection
* @param \Magento\Framework\Model\ResourceModel\Db\AbstractDb $resource
+ * @param \Magento\Store\Model\StoreManagerInterface|null $storeManager
* @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
public function __construct(
@@ -68,7 +74,8 @@ public function __construct(
\Magento\Catalog\Model\ResourceModel\Product\CollectionFactory $productCollectionFactory,
\Magento\Quote\Model\Quote\Config $quoteConfig,
\Magento\Framework\DB\Adapter\AdapterInterface $connection = null,
- \Magento\Framework\Model\ResourceModel\Db\AbstractDb $resource = null
+ \Magento\Framework\Model\ResourceModel\Db\AbstractDb $resource = null,
+ \Magento\Store\Model\StoreManagerInterface $storeManager = null
) {
parent::__construct(
$entityFactory,
@@ -82,6 +89,10 @@ public function __construct(
$this->_itemOptionCollectionFactory = $itemOptionCollectionFactory;
$this->_productCollectionFactory = $productCollectionFactory;
$this->_quoteConfig = $quoteConfig;
+
+ // Backward compatibility constructor parameters
+ $this->storeManager = $storeManager ?:
+ \Magento\Framework\App\ObjectManager::getInstance()->get(\Magento\Store\Model\StoreManagerInterface::class);
}
/**
@@ -101,7 +112,10 @@ protected function _construct()
*/
public function getStoreId()
{
- return (int)$this->_productCollectionFactory->create()->getStoreId();
+ // Fallback to current storeId if no quote is provided
+ // (see https://github.com/magento/magento2/commit/9d3be732a88884a66d667b443b3dc1655ddd0721)
+ return $this->_quote === null ?
+ (int) $this->storeManager->getStore()->getId() : (int) $this->_quote->getStoreId();
}
/**
diff --git a/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminOrderGridActionGroup.xml b/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminOrderGridActionGroup.xml
index 7dcb89fdc1628..df0f56dbf7866 100644
--- a/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminOrderGridActionGroup.xml
+++ b/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminOrderGridActionGroup.xml
@@ -68,4 +68,10 @@
+
diff --git a/app/code/Magento/Sales/Test/Mftf/Section/AdminOrdersGridSection.xml b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrdersGridSection.xml
index aa744787b0fef..49aae467b7e09 100644
--- a/app/code/Magento/Sales/Test/Mftf/Section/AdminOrdersGridSection.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrdersGridSection.xml
@@ -17,6 +17,7 @@
@@ -30,6 +31,7 @@
+
+
+
+ US
+
+
+ *
+
+
+
+ 1
+
+
+ 1
+
+
+ 1
+
+
+
+ CountryUS
+ Region_CA
+ AllPostCode
+
+ IncludeTaxInOrderTotalCart
+ DisplayFullTaxSummaryCart
+ DisplayZeroTaxSubtotalCart
+
+
+
+
+ CountryUS
+ Region_NY
+ AllPostCode
+
+ IncludeTaxInOrderTotalCart
+ DisplayFullTaxSummaryCart
+ DisplayZeroTaxSubtotalCart
+
+
+
+ DefaultTotalFlagZero
+ EmptyField
+
+
+ 0
+
+
+
+
diff --git a/app/code/Magento/Tax/Test/Mftf/Data/TaxRegionData.xml b/app/code/Magento/Tax/Test/Mftf/Data/TaxRegionData.xml
new file mode 100644
index 0000000000000..c27225a339831
--- /dev/null
+++ b/app/code/Magento/Tax/Test/Mftf/Data/TaxRegionData.xml
@@ -0,0 +1,17 @@
+
+
+
+
+
+ 43
+
+
+ 12
+
+
diff --git a/app/code/Magento/Tax/Test/Mftf/Data/TaxRuleData.xml b/app/code/Magento/Tax/Test/Mftf/Data/TaxRuleData.xml
new file mode 100644
index 0000000000000..16c891745426d
--- /dev/null
+++ b/app/code/Magento/Tax/Test/Mftf/Data/TaxRuleData.xml
@@ -0,0 +1,26 @@
+
+
+
+
+ TaxRule
+ 0
+ 0
+
+ - 3
+
+
+ - 2
+
+
+ - 1
+ - 2
+
+ true
+
+
diff --git a/app/code/Magento/Tax/Test/Mftf/Metadata/tax_config-meta.xml b/app/code/Magento/Tax/Test/Mftf/Metadata/tax_config-meta.xml
new file mode 100644
index 0000000000000..137c2e48c111e
--- /dev/null
+++ b/app/code/Magento/Tax/Test/Mftf/Metadata/tax_config-meta.xml
@@ -0,0 +1,183 @@
+
+
+
+
+
+
+
+
+ string
+
+
+ string
+
+
+ string
+
+
+
+
+
+
+ string
+
+
+ string
+
+
+ string
+
+
+
+
+
+
+
+
+
+
+
+ integer
+
+
+
+
+ integer
+
+
+
+
+ integer
+
+
+
+
+ integer
+
+
+
+
+ integer
+
+
+
+
+ integer
+
+
+
+
+ integer
+
+
+
+ integer
+
+
+
+
+
+
+
+ integer
+
+
+
+
+ integer
+
+
+
+ string
+
+
+
+
+
+
+
+ integer
+
+
+
+
+ integer
+
+
+
+
+ integer
+
+
+
+ integer
+
+
+ integer
+
+
+
+ integer
+
+
+
+
+ integer
+
+
+
+
+ integer
+
+
+
+
+
+
+
+
+ integer
+
+
+
+
+ integer
+
+
+
+
+ integer
+
+
+
+ integer
+
+
+ integer
+
+
+
+ integer
+
+
+
+
+ integer
+
+
+
+
+ integer
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Tax/Test/Mftf/Metadata/tax_rule-meta.xml b/app/code/Magento/Tax/Test/Mftf/Metadata/tax_rule-meta.xml
new file mode 100644
index 0000000000000..f9886303fd3a3
--- /dev/null
+++ b/app/code/Magento/Tax/Test/Mftf/Metadata/tax_rule-meta.xml
@@ -0,0 +1,33 @@
+
+
+
+
+ application/json
+
+ integer
+ string
+ integer
+ integer
+
+ integer
+
+
+ integer
+
+
+ integer
+
+ boolean
+ empty_extension_attribute
+
+
+
+ application/json
+
+
diff --git a/app/code/Magento/Tax/Test/Mftf/Section/AdminConfigureTaxSection.xml b/app/code/Magento/Tax/Test/Mftf/Section/AdminConfigureTaxSection.xml
index ad68179119834..c54c525d8d7ed 100644
--- a/app/code/Magento/Tax/Test/Mftf/Section/AdminConfigureTaxSection.xml
+++ b/app/code/Magento/Tax/Test/Mftf/Section/AdminConfigureTaxSection.xml
@@ -11,14 +11,29 @@
diff --git a/app/code/Magento/Tax/Test/Mftf/Section/CheckoutCartSummarySection.xml b/app/code/Magento/Tax/Test/Mftf/Section/CheckoutCartSummarySection.xml
new file mode 100644
index 0000000000000..b47e8b85e5231
--- /dev/null
+++ b/app/code/Magento/Tax/Test/Mftf/Section/CheckoutCartSummarySection.xml
@@ -0,0 +1,16 @@
+
+
+
+
+
+
diff --git a/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxInformationInShoppingCartForCustomerPhysicalQuoteTest.xml b/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxInformationInShoppingCartForCustomerPhysicalQuoteTest.xml
new file mode 100644
index 0000000000000..fdd6d18dae9c4
--- /dev/null
+++ b/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxInformationInShoppingCartForCustomerPhysicalQuoteTest.xml
@@ -0,0 +1,119 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 10.00
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxInformationInShoppingCartForCustomerVirtualQuoteTest.xml b/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxInformationInShoppingCartForCustomerVirtualQuoteTest.xml
new file mode 100644
index 0000000000000..c27af9a6f63f5
--- /dev/null
+++ b/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxInformationInShoppingCartForCustomerVirtualQuoteTest.xml
@@ -0,0 +1,83 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 40.00
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxInformationInShoppingCartForGuestPhysicalQuoteTest.xml b/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxInformationInShoppingCartForGuestPhysicalQuoteTest.xml
new file mode 100644
index 0000000000000..891e8f4e7968b
--- /dev/null
+++ b/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxInformationInShoppingCartForGuestPhysicalQuoteTest.xml
@@ -0,0 +1,114 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 10.00
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxInformationInShoppingCartForGuestVirtualQuoteTest.xml b/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxInformationInShoppingCartForGuestVirtualQuoteTest.xml
new file mode 100644
index 0000000000000..9f33c1a8b155a
--- /dev/null
+++ b/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxInformationInShoppingCartForGuestVirtualQuoteTest.xml
@@ -0,0 +1,78 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 40.00
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Theme/view/frontend/templates/html/bugreport.phtml b/app/code/Magento/Theme/view/frontend/templates/html/bugreport.phtml
index 5d8203244256e..f147b7085945f 100644
--- a/app/code/Magento/Theme/view/frontend/templates/html/bugreport.phtml
+++ b/app/code/Magento/Theme/view/frontend/templates/html/bugreport.phtml
@@ -7,7 +7,7 @@
+ target="_blank" title="">
diff --git a/app/code/Magento/Theme/view/frontend/templates/html/header/logo.phtml b/app/code/Magento/Theme/view/frontend/templates/html/header/logo.phtml
index 8c3663337cbbe..17f8d7c70f574 100644
--- a/app/code/Magento/Theme/view/frontend/templates/html/header/logo.phtml
+++ b/app/code/Magento/Theme/view/frontend/templates/html/header/logo.phtml
@@ -18,6 +18,7 @@
-
+
diff --git a/app/code/Magento/Weee/Test/Mftf/ActionGroup/AdminProductAddFPTValueActionGroup.xml b/app/code/Magento/Weee/Test/Mftf/ActionGroup/AdminProductAddFPTValueActionGroup.xml
new file mode 100644
index 0000000000000..c41eb7c02a557
--- /dev/null
+++ b/app/code/Magento/Weee/Test/Mftf/ActionGroup/AdminProductAddFPTValueActionGroup.xml
@@ -0,0 +1,24 @@
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Weee/Test/Mftf/Data/FixedProductAttributeData.xml b/app/code/Magento/Weee/Test/Mftf/Data/FixedProductAttributeData.xml
new file mode 100644
index 0000000000000..e981dae483f32
--- /dev/null
+++ b/app/code/Magento/Weee/Test/Mftf/Data/FixedProductAttributeData.xml
@@ -0,0 +1,20 @@
+
+
+
+
+
+ attribute
+ true
+ weee
+ true
+ true
+ true
+ ProductAttributeFrontendLabel
+
+
diff --git a/app/code/Magento/Weee/Test/Mftf/Data/WeeeConfigData.xml b/app/code/Magento/Weee/Test/Mftf/Data/WeeeConfigData.xml
new file mode 100644
index 0000000000000..120dd10eee359
--- /dev/null
+++ b/app/code/Magento/Weee/Test/Mftf/Data/WeeeConfigData.xml
@@ -0,0 +1,25 @@
+
+
+
+
+
+
+ EnableFPT
+
+
+ 1
+
+
+
+ DisableFPT
+
+
+ 0
+
+
diff --git a/app/code/Magento/Weee/Test/Mftf/Metadata/weee_config-meta.xml b/app/code/Magento/Weee/Test/Mftf/Metadata/weee_config-meta.xml
new file mode 100644
index 0000000000000..2e2b71c30ef47
--- /dev/null
+++ b/app/code/Magento/Weee/Test/Mftf/Metadata/weee_config-meta.xml
@@ -0,0 +1,34 @@
+
+
+
+
+
+
+
+
+ string
+
+
+
+
+
+
+
+
+
+
+
+ integer
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Weee/Test/Mftf/Page/AdminProductEditPage.xml b/app/code/Magento/Weee/Test/Mftf/Page/AdminProductEditPage.xml
new file mode 100644
index 0000000000000..fa3663ee719e1
--- /dev/null
+++ b/app/code/Magento/Weee/Test/Mftf/Page/AdminProductEditPage.xml
@@ -0,0 +1,14 @@
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Weee/Test/Mftf/Section/AdminProductAddFPTValueSection.xml b/app/code/Magento/Weee/Test/Mftf/Section/AdminProductAddFPTValueSection.xml
new file mode 100644
index 0000000000000..40a9a97f31425
--- /dev/null
+++ b/app/code/Magento/Weee/Test/Mftf/Section/AdminProductAddFPTValueSection.xml
@@ -0,0 +1,17 @@
+
+
+
+
+
+
diff --git a/app/code/Magento/Weee/Test/Mftf/Section/CheckoutCartSummarySection.xml b/app/code/Magento/Weee/Test/Mftf/Section/CheckoutCartSummarySection.xml
new file mode 100644
index 0000000000000..9b6541b93541d
--- /dev/null
+++ b/app/code/Magento/Weee/Test/Mftf/Section/CheckoutCartSummarySection.xml
@@ -0,0 +1,14 @@
+
+
+
+
+
+
diff --git a/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/_module-old.less b/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/_module-old.less
index 6937855492263..7c71913ed8db3 100644
--- a/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/_module-old.less
+++ b/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/_module-old.less
@@ -14,7 +14,7 @@
display: inline-block;
vertical-align: top;
width: 100%;
- background-color: #fff;
+ background-color: @color-white;
border: 1px solid #ada89e;
border-radius: 2px;
@@ -72,7 +72,7 @@
top: 100%;
margin: 1px -1px 0 -1px;
border: 1px solid #cac2b5;
- background: #fff;
+ background: @color-white;
box-shadow: 0 2px 4px rgba(0, 0, 0, .2);
z-index: 990;
@@ -229,7 +229,7 @@
> input.ui-autocomplete-loading,
> input.mage-suggest-state-loading {
- background: #fff url("@{baseDir}mui/images/ajax-loader-small.gif") no-repeat 190px 50%;
+ background: @color-white url("@{baseDir}mui/images/ajax-loader-small.gif") no-repeat 190px 50%;
}
}
diff --git a/app/design/adminhtml/Magento/backend/Magento_Catalog/web/css/source/_module-old.less b/app/design/adminhtml/Magento/backend/Magento_Catalog/web/css/source/_module-old.less
index eefbc11201d9c..2074106e719db 100644
--- a/app/design/adminhtml/Magento/backend/Magento_Catalog/web/css/source/_module-old.less
+++ b/app/design/adminhtml/Magento/backend/Magento_Catalog/web/css/source/_module-old.less
@@ -53,7 +53,7 @@
}
.attribute-change-checkbox {
- background: #fff;
+ background: @color-white;
display: block;
margin-top: 5px;
diff --git a/app/design/adminhtml/Magento/backend/Magento_ConfigurableProduct/web/css/source/_module-old.less b/app/design/adminhtml/Magento/backend/Magento_ConfigurableProduct/web/css/source/_module-old.less
index 865ece970465d..73e1bcf4a7d58 100644
--- a/app/design/adminhtml/Magento/backend/Magento_ConfigurableProduct/web/css/source/_module-old.less
+++ b/app/design/adminhtml/Magento/backend/Magento_ConfigurableProduct/web/css/source/_module-old.less
@@ -16,7 +16,7 @@
);
.action.toggle {
- background: #fff;
+ background: @color-white;
border-radius: 0 1px 1px 0;
border: 1px solid #ada89e;
height: 33px;
@@ -58,7 +58,7 @@
.action.toggle {
padding: 0 3px;
border: 1px solid #b7b2a7;
- background: #fff;
+ background: @color-white;
border-radius: 0 1px 1px 0;
border-left: none;
height: 50px;
@@ -121,7 +121,7 @@
width: auto;
.addafter {
- background: #fff;
+ background: @color-white;
border-width: 1px 0 1px 1px;
direction: ltr;
height: 33px;
diff --git a/app/design/adminhtml/Magento/backend/Magento_Enterprise/web/css/source/_module-old.less b/app/design/adminhtml/Magento/backend/Magento_Enterprise/web/css/source/_module-old.less
index 0eba6b0d361f8..3a7b6d30c914d 100644
--- a/app/design/adminhtml/Magento/backend/Magento_Enterprise/web/css/source/_module-old.less
+++ b/app/design/adminhtml/Magento/backend/Magento_Enterprise/web/css/source/_module-old.less
@@ -299,7 +299,7 @@
.invitee_information .data-table tbody tr th,
.inviter_information .data-table tbody tr td,
.inviter_information .data-table tbody tr th {
- background-color: #fff;
+ background-color: @color-white;
border: 0;
color: #666;
padding: 9px 10px 10px;
diff --git a/app/design/adminhtml/Magento/backend/Magento_Ui/web/css/source/_module-old.less b/app/design/adminhtml/Magento/backend/Magento_Ui/web/css/source/_module-old.less
index 17910d7c8e5b4..11e0fcc7c8b84 100644
--- a/app/design/adminhtml/Magento/backend/Magento_Ui/web/css/source/_module-old.less
+++ b/app/design/adminhtml/Magento/backend/Magento_Ui/web/css/source/_module-old.less
@@ -78,7 +78,7 @@
&.ui-state-active {
z-index: 2;
- background: #FFF;
+ background: @color-white;
padding: 1px (@spacing-m - 1px);
border: 2px solid #eb5202;
margin: -1px;
diff --git a/app/design/adminhtml/Magento/backend/web/css/styles-old.less b/app/design/adminhtml/Magento/backend/web/css/styles-old.less
index b66fed0c0a09a..487457372582a 100644
--- a/app/design/adminhtml/Magento/backend/web/css/styles-old.less
+++ b/app/design/adminhtml/Magento/backend/web/css/styles-old.less
@@ -525,7 +525,7 @@
right: 0;
top: 100%;
border: 1px solid #cac2b5;
- background: #fff;
+ background: @color-white;
box-shadow: 0 1px 1px rgba(0, 0, 0, .2);
z-index: 990;
}
@@ -786,7 +786,7 @@
border-radius: 1px;
padding: 4px;
color: #303030;
- background-color: #fff;
+ background-color: @color-white;
font-weight: 500;
font-size: 14px;
height: 33px;
@@ -860,7 +860,7 @@
input[type="radio"],
input[type="checkbox"] {
.lib-css(appearance, none, 1);
- background: #fff;
+ background: @color-white;
border-radius: 2px;
border: 1px solid #adadad;
cursor: pointer;
@@ -945,7 +945,7 @@
}
select[disabled] option[selected] {
- color: #fff;
+ color: @color-white;
background: #aaa;
}
@@ -1157,7 +1157,7 @@
.fieldset-wrapper,
.fieldset {
- background: #fff;
+ background: @color-white;
border: 0;
margin: 0;
padding: 5px 0 38px;
@@ -1574,7 +1574,7 @@
.multiselect-alt .item {
position: relative;
- border-top: 1px solid #fff;
+ border-top: 1px solid @color-white;
cursor: pointer;
}
@@ -1651,7 +1651,7 @@
~ .addafter strong {
display: inline-block;
- background: #fff;
+ background: @color-white;
line-height: 24px;
margin: 0 3px 0 0;
padding-left: 4px;
@@ -2041,7 +2041,7 @@
&:before {
position: absolute;
content: "";
- background-color: #fff;
+ background-color: @color-white;
right: 0;
top: 0;
bottom: 0;
@@ -2298,7 +2298,7 @@
// --------------------------------------
.preview-window {
- background: #fff;
+ background: @color-white;
}
.preview-window .toolbar {
@@ -2458,7 +2458,7 @@
}
.attribute-popup .page-actions.fixed .page-actions-inner {
- background: #fff;
+ background: @color-white;
padding: 0;
min-width: 100%;
max-width: 100%;
@@ -2757,7 +2757,7 @@
border: 1px solid #c9c2b8;
border-width: 0 0 1px;
padding: 6px 10px 7px;
- background: #fff;
+ background: @color-white;
.style2();
span {
@@ -2769,7 +2769,7 @@
td {
border: none;
padding: 6px 10px 7px;
- background: #fff;
+ background: @color-white;
}
tr:last-child td {
@@ -2858,7 +2858,7 @@
.table-fieldset-alt tbody tr:nth-child(odd) td,
.table-fieldset-alt tbody tr:nth-child(odd):hover td {
- background: #fff;
+ background: @color-white;
}
//
@@ -2918,7 +2918,7 @@
}
.order-details-existing-customer {
- background: #fff;
+ background: @color-white;
padding-left: 0;
position: relative;
width: 77.9%;
@@ -3035,7 +3035,7 @@
}
.gift-options-tooltip {
- background: #fff;
+ background: @color-white;
border-radius: 5px;
padding: 10px;
box-shadow: 0 0 3px rgba(0, 0, 0, .3);
@@ -3194,7 +3194,7 @@
left: 0;
margin: 0 8px;
padding: 10px;
- background: #fff;
+ background: @color-white;
}
}
@@ -3386,7 +3386,7 @@
.rma-popup,
.cms-popup {
- background: #fff;
+ background: @color-white;
box-shadow: 0 3px 6px rgba(0, 0, 0, .4);
cursor: default;
position: fixed;
@@ -3410,7 +3410,7 @@
}
.rma-popup .content {
- background: #fff;
+ background: @color-white;
border-bottom: 1px solid #ccc;
max-height: 400px;
overflow: auto;
@@ -3467,7 +3467,7 @@
.grid .rma-popup .form-list tr,
.grid tr.even .rma-popup .form-list tr,
.grid tr.on-mouse .rma-popup .form-list tr {
- background: #fff !important;
+ background: @color-white !important;
}
//
@@ -3885,7 +3885,7 @@
.defaultSkin {
table.mceLayout {
td {
- background: #fff;
+ background: @color-white;
}
}
diff --git a/app/design/adminhtml/Magento/backend/web/mui/styles/_table.less b/app/design/adminhtml/Magento/backend/web/mui/styles/_table.less
index c0aa5510c6e07..7565ee88714f6 100644
--- a/app/design/adminhtml/Magento/backend/web/mui/styles/_table.less
+++ b/app/design/adminhtml/Magento/backend/web/mui/styles/_table.less
@@ -360,7 +360,7 @@ td.col-type {
position: relative;
border-bottom-right-radius: 0;
box-shadow: none;
- background: #fff;
+ background: @color-white;
&:after {
position: absolute;
@@ -369,7 +369,7 @@ td.col-type {
right: 0;
height: 2px;
margin-top: -1px;
- background: #fff;
+ background: @color-white;
content: '';
z-index: 2;
}
diff --git a/app/design/frontend/Magento/blank/Magento_CatalogSearch/web/css/source/_module.less b/app/design/frontend/Magento/blank/Magento_CatalogSearch/web/css/source/_module.less
index 52f1beafa32e1..daed96db717c7 100644
--- a/app/design/frontend/Magento/blank/Magento_CatalogSearch/web/css/source/_module.less
+++ b/app/design/frontend/Magento/blank/Magento_CatalogSearch/web/css/source/_module.less
@@ -36,9 +36,9 @@
@_icon-font-content: @icon-search,
@_icon-font-size: 35px,
@_icon-font-line-height: 33px,
- @_icon-font-color: @minicart-icons-color,
- @_icon-font-color-hover: @minicart-icons-color-hover,
- @_icon-font-color-active: @minicart-icons-color-hover,
+ @_icon-font-color: @header-icons-color,
+ @_icon-font-color-hover: @header-icons-color-hover,
+ @_icon-font-color-active: @header-icons-color-hover,
@_icon-font-text-hide: true
);
display: inline-block;
diff --git a/app/design/frontend/Magento/luma/Magento_CatalogSearch/web/css/source/_module.less b/app/design/frontend/Magento/luma/Magento_CatalogSearch/web/css/source/_module.less
index 23acf9ee8b08d..f785dd74d900e 100644
--- a/app/design/frontend/Magento/luma/Magento_CatalogSearch/web/css/source/_module.less
+++ b/app/design/frontend/Magento/luma/Magento_CatalogSearch/web/css/source/_module.less
@@ -37,9 +37,9 @@
@_icon-font-size: 22px,
@_icon-font-line-height: 28px,
@_icon-font-margin: 0 @indent__s 0 0,
- @_icon-font-color: @minicart-icons-color,
- @_icon-font-color-hover: @minicart-icons-color-hover,
- @_icon-font-color-active: @minicart-icons-color-hover,
+ @_icon-font-color: @header-icons-color,
+ @_icon-font-color-hover: @header-icons-color-hover,
+ @_icon-font-color-active: @header-icons-color-hover,
@_icon-font-text-hide: true
);
display: inline-block;
diff --git a/app/design/frontend/Magento/luma/Magento_Theme/web/css/source/_module.less b/app/design/frontend/Magento/luma/Magento_Theme/web/css/source/_module.less
index 83157281561c2..2c177571b9f5a 100644
--- a/app/design/frontend/Magento/luma/Magento_Theme/web/css/source/_module.less
+++ b/app/design/frontend/Magento/luma/Magento_Theme/web/css/source/_module.less
@@ -261,6 +261,7 @@
.copyright {
.lib-css(background-color, @copyright__background-color);
.lib-css(color, @color-white);
+ box-sizing: border-box;
display: block;
padding: @indent__s;
text-align: center;
@@ -417,6 +418,12 @@
}
}
}
+ .page-footer,
+ .copyright {
+ bottom: 0;
+ position: absolute;
+ width: 100%;
+ }
}
.media-width(@extremum, @break) when (@extremum = 'max') and (@break = @screen__s) {
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/CategoryTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/CategoryTest.php
index 4f68090657a10..c7697a99875be 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/CategoryTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/CategoryTest.php
@@ -8,6 +8,7 @@
namespace Magento\GraphQl\Catalog;
use Magento\Catalog\Api\Data\CategoryInterface;
+use Magento\Catalog\Model\ResourceModel\Category\Collection as CategoryCollection;
use Magento\Framework\DataObject;
use Magento\TestFramework\TestCase\GraphQlAbstract;
use Magento\Catalog\Api\Data\ProductInterface;
@@ -283,16 +284,13 @@ public function testCategoryProducts()
*/
public function testAnchorCategory()
{
- /** @var \Magento\Catalog\Model\ResourceModel\Category\Collection $categoryCollection */
- $categoryCollection = $this->objectManager->create(
- \Magento\Catalog\Model\ResourceModel\Category\Collection::class
- );
+ /** @var CategoryCollection $categoryCollection */
+ $categoryCollection = $this->objectManager->create(CategoryCollection::class);
$categoryCollection->addFieldToFilter('name', 'Category 1');
+ /** @var CategoryInterface $category */
$category = $categoryCollection->getFirstItem();
- /** @var \Magento\Framework\EntityManager\MetadataPool $entityManagerMetadataPool */
- $entityManagerMetadataPool = $this->objectManager->create(\Magento\Framework\EntityManager\MetadataPool::class);
- $categoryLinkField = $entityManagerMetadataPool->getMetadata(CategoryInterface::class)->getLinkField();
- $categoryId = $category->getData($categoryLinkField);
+ $categoryId = $category->getId();
+
$this->assertNotEmpty($categoryId, "Preconditions failed: category is not available.");
$query = <<objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+ }
+
+ /**
+ * @magentoApiDataFixture Magento/Store/_files/store.php
+ */
+ public function testGetStoreConfig()
+ {
+ /** @var StoreConfigManagerInterface $storeConfigsManager */
+ $storeConfigsManager = $this->objectManager->get(StoreConfigManagerInterface::class);
+ /** @var StoreResolverInterface $storeResolver */
+ $storeResolver = $this->objectManager->get(StoreResolverInterface::class);
+ /** @var StoreRepositoryInterface $storeRepository */
+ $storeRepository = $this->objectManager->get(StoreRepositoryInterface::class);
+ $storeId = $storeResolver->getCurrentStoreId();
+ $store = $storeRepository->getById($storeId);
+ /** @var StoreConfigInterface $storeConfig */
+ $storeConfig = current($storeConfigsManager->getStoreConfigs([$store->getCode()]));
+ $query
+ = <<graphQlQuery($query);
+ $this->assertArrayHasKey('storeConfig', $response);
+ $this->assertEquals($storeConfig->getId(), $response['storeConfig']['id']);
+ $this->assertEquals($storeConfig->getCode(), $response['storeConfig']['code']);
+ $this->assertEquals($storeConfig->getLocale(), $response['storeConfig']['locale']);
+ $this->assertEquals($storeConfig->getBaseCurrencyCode(), $response['storeConfig']['base_currency_code']);
+ $this->assertEquals(
+ $storeConfig->getDefaultDisplayCurrencyCode(),
+ $response['storeConfig']['default_display_currency_code']
+ );
+ $this->assertEquals($storeConfig->getTimezone(), $response['storeConfig']['timezone']);
+ $this->assertEquals($storeConfig->getWeightUnit(), $response['storeConfig']['weight_unit']);
+ $this->assertEquals($storeConfig->getBaseUrl(), $response['storeConfig']['base_url']);
+ $this->assertEquals($storeConfig->getBaseLinkUrl(), $response['storeConfig']['base_link_url']);
+ $this->assertEquals($storeConfig->getBaseStaticUrl(), $response['storeConfig']['base_static_url']);
+ $this->assertEquals($storeConfig->getBaseMediaUrl(), $response['storeConfig']['base_media_url']);
+ $this->assertEquals($storeConfig->getSecureBaseUrl(), $response['storeConfig']['secure_base_url']);
+ $this->assertEquals($storeConfig->getSecureBaseLinkUrl(), $response['storeConfig']['secure_base_link_url']);
+ $this->assertEquals(
+ $storeConfig->getSecureBaseStaticUrl(),
+ $response['storeConfig']['secure_base_static_url']
+ );
+ $this->assertEquals($storeConfig->getSecureBaseMediaUrl(), $response['storeConfig']['secure_base_media_url']);
+ }
+}
diff --git a/dev/tests/integration/testsuite/Magento/CatalogRule/Model/Indexer/ProductRuleTest.php b/dev/tests/integration/testsuite/Magento/CatalogRule/Model/Indexer/ProductRuleTest.php
index 76d17527d567a..911c7aa30641e 100644
--- a/dev/tests/integration/testsuite/Magento/CatalogRule/Model/Indexer/ProductRuleTest.php
+++ b/dev/tests/integration/testsuite/Magento/CatalogRule/Model/Indexer/ProductRuleTest.php
@@ -67,7 +67,7 @@ public function testReindexWithProductNotVisibleIndividually()
$this->assertEquals(
7.5,
$this->resourceRule->getRulePrice(new \DateTime(), 1, 1, $product->getId()),
- "Catalog price rule doesn't apply to to product with visibility value \"Not Visibility Individually\""
+ "Catalog price rule doesn't apply to product with visibility value \"Not Visibility Individually\""
);
}
}
diff --git a/dev/tests/integration/testsuite/Magento/Customer/Model/CustomerMetadataTest.php b/dev/tests/integration/testsuite/Magento/Customer/Model/CustomerMetadataTest.php
index 3ed330ed98d6b..336b438661705 100644
--- a/dev/tests/integration/testsuite/Magento/Customer/Model/CustomerMetadataTest.php
+++ b/dev/tests/integration/testsuite/Magento/Customer/Model/CustomerMetadataTest.php
@@ -262,7 +262,7 @@ public function testGetCustomerAttributeMetadata()
$this->assertEquals(
$attributeMetadata,
$attributeMetadata1,
- 'Attribute metadata from the the same service became different after getAttributeCode was called'
+ 'Attribute metadata from the same service became different after getAttributeCode was called'
);
// Verify the consistency of attribute metadata from two services
// after getAttributeCode was called
diff --git a/dev/tests/integration/testsuite/Magento/Framework/View/_files/layout_directives_test/group.xml b/dev/tests/integration/testsuite/Magento/Framework/View/_files/layout_directives_test/group.xml
index 18501ecfbbfbf..8e50fe1888104 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/View/_files/layout_directives_test/group.xml
+++ b/dev/tests/integration/testsuite/Magento/Framework/View/_files/layout_directives_test/group.xml
@@ -9,17 +9,17 @@
- blok2
+ block2
- blok3
+ block3
- blok4
+ block4
diff --git a/dev/tests/integration/testsuite/Magento/Tax/Model/TaxCalculationTest.php b/dev/tests/integration/testsuite/Magento/Tax/Model/TaxCalculationTest.php
index e0bd6f3523612..dd5d12c5b9be3 100644
--- a/dev/tests/integration/testsuite/Magento/Tax/Model/TaxCalculationTest.php
+++ b/dev/tests/integration/testsuite/Magento/Tax/Model/TaxCalculationTest.php
@@ -2192,7 +2192,7 @@ protected function setupMultiRuleQuote()
}
/**
- * Create the base results for the the multi rules test
+ * Create the base results for the multi rules test
*
* @return array
* @SuppressWarnings(PHPMD.ExcessiveMethodLength)
diff --git a/dev/tests/static/framework/Magento/Sniffs/NamingConventions/ReservedWordsSniff.php b/dev/tests/static/framework/Magento/Sniffs/NamingConventions/ReservedWordsSniff.php
index f41c235a6c0f8..e3cfdf532438c 100644
--- a/dev/tests/static/framework/Magento/Sniffs/NamingConventions/ReservedWordsSniff.php
+++ b/dev/tests/static/framework/Magento/Sniffs/NamingConventions/ReservedWordsSniff.php
@@ -64,7 +64,7 @@ protected function validateNamespace(File $sourceFile, $stackPtr)
'Cannot use "%s" in namespace as it is reserved since PHP %s',
$stackPtr,
'Namespace',
- [$namespacePart, $this->reservedWords[$namespacePart]]
+ [$namespacePart, $this->reservedWords[strtolower($namespacePart)]]
);
}
$stackPtr++;
diff --git a/lib/internal/Magento/Framework/Api/Uploader.php b/lib/internal/Magento/Framework/Api/Uploader.php
index d3ae11100b9dc..5cea3a34569a9 100644
--- a/lib/internal/Magento/Framework/Api/Uploader.php
+++ b/lib/internal/Magento/Framework/Api/Uploader.php
@@ -19,7 +19,7 @@ public function __construct()
}
/**
- * Explicitly set the the file attributes instead of setting it via constructor
+ * Explicitly set the file attributes instead of setting it via constructor
*
* @param array $fileAttributes
* @return void
diff --git a/lib/internal/Magento/Framework/App/ResourceConnection.php b/lib/internal/Magento/Framework/App/ResourceConnection.php
index 5b9ae925bff27..148053fa44e08 100644
--- a/lib/internal/Magento/Framework/App/ResourceConnection.php
+++ b/lib/internal/Magento/Framework/App/ResourceConnection.php
@@ -104,9 +104,21 @@ public function getConnection($resourceName = self::DEFAULT_CONNECTION)
*/
public function closeConnection($resourceName = self::DEFAULT_CONNECTION)
{
- $processConnectionName = $this->getProcessConnectionName($this->config->getConnectionName($resourceName));
- if (isset($this->connections[$processConnectionName])) {
- $this->connections[$processConnectionName] = null;
+ if ($resourceName === null) {
+ foreach ($this->connections as $processConnection) {
+ if ($processConnection !== null) {
+ $processConnection->closeConnection();
+ }
+ }
+ $this->connections = [];
+ } else {
+ $processConnectionName = $this->getProcessConnectionName($this->config->getConnectionName($resourceName));
+ if (isset($this->connections[$processConnectionName])) {
+ if ($this->connections[$processConnectionName] !== null) {
+ $this->connections[$processConnectionName]->closeConnection();
+ }
+ $this->connections[$processConnectionName] = null;
+ }
}
}
diff --git a/lib/web/MutationObserver.js b/lib/web/MutationObserver.js
index 53424fbfa8d0c..4044aa465e745 100644
--- a/lib/web/MutationObserver.js
+++ b/lib/web/MutationObserver.js
@@ -324,7 +324,7 @@
if (lastRecord === newRecord)
return lastRecord;
- // Check if the the record we are adding represents the same record. If
+ // Check if the record we are adding represents the same record. If
// so, we keep the one with the oldValue in it.
if (recordWithOldValue && recordRepresentsCurrentMutation(lastRecord))
return recordWithOldValue;
diff --git a/lib/web/css/docs/source/_buttons.less b/lib/web/css/docs/source/_buttons.less
index a071eed85ef9e..300991338fb71 100644
--- a/lib/web/css/docs/source/_buttons.less
+++ b/lib/web/css/docs/source/_buttons.less
@@ -524,10 +524,10 @@ button {
}
&.example-button-6 {
.lib-button-s();
- color: #fff;
+ color: @color-white;
&:hover,
&.active {
- color: #fff;
+ color: @color-white;
}
}
}
@@ -721,13 +721,13 @@ button {
@_button-padding: @button__padding,
@_button-gradient-color-start: #1979c3,
@_button-gradient-color-end: #006bb4,
- @_button-color: #fff,
+ @_button-color: @color-white,
@_button-gradient-color-start-hover: #006bb4,
@_button-gradient-color-end-hover: #1979c3,
- @_button-color-hover: #fff,
+ @_button-color-hover: @color-white,
@_button-gradient-color-start-active: #006bb4,
@_button-gradient-color-end-active: #006bb4,
- @_button-color-active: #fff,
+ @_button-color-active: @color-white,
@_button-gradient: true,
@_button-gradient-direction: vertical,
@_button-border: @button-primary__border,
diff --git a/lib/web/css/docs/source/_pages.less b/lib/web/css/docs/source/_pages.less
index 0b94f84e54f47..6b01fa7549e92 100644
--- a/lib/web/css/docs/source/_pages.less
+++ b/lib/web/css/docs/source/_pages.less
@@ -852,22 +852,22 @@
.example-pages-3 {
.lib-pager(
@_pager-label-display: none,
- @_pager-color: #fff,
+ @_pager-color: @color-white,
@_pager-background: @link__color,
- @_pager-color-visited: #fff,
+ @_pager-color-visited: @color-white,
@_pager-background-visited: @link__visited__color,
- @_pager-color-hover: #fff,
+ @_pager-color-hover: @color-white,
@_pager-background-hover: @link__hover__color,
- @_pager-color-active: #fff,
+ @_pager-color-active: @color-white,
@_pager-background-active: @link__active__color,
- @_pager-current-color: #fff,
+ @_pager-current-color: @color-white,
@_pager-current-background: @link__visited__color,
@_pager-action-background: @link__color,
@_pager-action-background-visited: @link__visited__color,
@_pager-action-background-hover: @link__hover__color,
@_pager-action-background-active: @link__active__color,
- @_pager-action-color: #fff,
- @_pager-action-color-hover: #fff,
- @_pager-action-color-active: #fff
+ @_pager-action-color: @color-white,
+ @_pager-action-color-hover: @color-white,
+ @_pager-action-color-active: @color-white
);
}
diff --git a/lib/web/css/docs/source/_tables.less b/lib/web/css/docs/source/_tables.less
index 9d0df2350cee9..3f7f940187f50 100644
--- a/lib/web/css/docs/source/_tables.less
+++ b/lib/web/css/docs/source/_tables.less
@@ -677,7 +677,7 @@
.example-table-5 {
.lib-table();
.lib-table-background-color(
- @_table-background-color: #fff,
+ @_table-background-color: @color-white,
@_table-head-background-color: #ccf,
@_table-foot-background-color: #cff,
@_table-td-background-color: #fcc,
diff --git a/lib/web/mage/requirejs/static.js b/lib/web/mage/requirejs/static.js
index 237aa0c6a8a63..898850cb2948b 100644
--- a/lib/web/mage/requirejs/static.js
+++ b/lib/web/mage/requirejs/static.js
@@ -13,7 +13,7 @@ define('buildTools', [
isEnabled: storage.getItem(storeName) === null,
/**
- * Removes base url from the the provided string
+ * Removes base url from the provided string
*
* @param {String} url - Url to be processed.
* @param {Object} config - RequiereJs config object.
diff --git a/lib/web/modernizr/modernizr.js b/lib/web/modernizr/modernizr.js
index 0833cfb105cee..d7ddc86f63cae 100644
--- a/lib/web/modernizr/modernizr.js
+++ b/lib/web/modernizr/modernizr.js
@@ -1013,7 +1013,7 @@ window.Modernizr = (function( window, document, undefined ) {
/** Name of the expando, to work with multiple documents or to re-shiv one document */
var expando = '_html5shiv';
- /** The id for the the documents expando */
+ /** The id for the documents expando */
var expanID = 0;
/** Cached data for each document */
diff --git a/setup/pub/angular/angular.js b/setup/pub/angular/angular.js
index f53b5280f8647..e3a85e3679ac6 100644
--- a/setup/pub/angular/angular.js
+++ b/setup/pub/angular/angular.js
@@ -7770,7 +7770,7 @@
* caching.
* - **timeout** – `{number|Promise}` – timeout in milliseconds, or {@link ng.$q promise}
* that should abort the request when resolved.
- * - **withCredentials** - `{boolean}` - whether to to set the `withCredentials` flag on the
+ * - **withCredentials** - `{boolean}` - whether to set the `withCredentials` flag on the
* XHR object. See [requests with credentials]https://developer.mozilla.org/en/http_access_control#section_5
* for more information.
* - **responseType** - `{string}` - see
diff --git a/setup/src/Magento/Setup/Console/Command/InfoBackupsListCommand.php b/setup/src/Magento/Setup/Console/Command/InfoBackupsListCommand.php
index 178102aa0b3b7..94337dd0742e3 100644
--- a/setup/src/Magento/Setup/Console/Command/InfoBackupsListCommand.php
+++ b/setup/src/Magento/Setup/Console/Command/InfoBackupsListCommand.php
@@ -11,8 +11,10 @@
use Magento\Framework\Filesystem\Driver\File;
use Magento\Framework\Setup\BackupRollback;
use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Helper\TableFactory;
use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Output\OutputInterface;
+use Magento\Framework\App\ObjectManager;
/**
* Command prints list of available backup files
@@ -33,16 +35,24 @@ class InfoBackupsListCommand extends Command
*/
private $directoryList;
+ /**
+ * @var TableFactory
+ */
+ private $tableHelperFactory;
+
/**
* @param DirectoryList $directoryList
* @param File $file
+ * @param TableFactory $tableHelperFactory
*/
public function __construct(
DirectoryList $directoryList,
- File $file
+ File $file,
+ TableFactory $tableHelperFactory = null
) {
$this->directoryList = $directoryList;
$this->file = $file;
+ $this->tableHelperFactory = $tableHelperFactory ?: ObjectManager::getInstance()->create(TableFactory::class);
parent::__construct();
}
@@ -90,14 +100,14 @@ protected function execute(InputInterface $input, OutputInterface $output)
return \Magento\Framework\Console\Cli::RETURN_SUCCESS;
}
$output->writeln("Showing backup files in $backupsDir. ");
- /** @var \Symfony\Component\Console\Helper\Table $table */
- $table = $this->getHelperSet()->get('table');
- $table->setHeaders(['Backup Filename', 'Backup Type']);
+ /** @var \Symfony\Component\Console\Helper\Table $tableHelper */
+ $tableHelper = $this->tableHelperFactory->create(['output' => $output]);
+ $tableHelper->setHeaders(['Backup Filename', 'Backup Type']);
asort($tempTable);
foreach ($tempTable as $key => $value) {
- $table->addRow([$key, $value]);
+ $tableHelper->addRow([$key, $value]);
}
- $table->render($output);
+ $tableHelper->render();
} else {
$output->writeln('No backup files found. ');
}
diff --git a/setup/src/Magento/Setup/Console/Command/InfoCurrencyListCommand.php b/setup/src/Magento/Setup/Console/Command/InfoCurrencyListCommand.php
index d673fc85c1ef1..91cfb5e7f6b5c 100644
--- a/setup/src/Magento/Setup/Console/Command/InfoCurrencyListCommand.php
+++ b/setup/src/Magento/Setup/Console/Command/InfoCurrencyListCommand.php
@@ -6,10 +6,12 @@
namespace Magento\Setup\Console\Command;
+use Symfony\Component\Console\Helper\TableFactory;
use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Output\OutputInterface;
use Symfony\Component\Console\Command\Command;
use Magento\Framework\Setup\Lists;
+use Magento\Framework\App\ObjectManager;
/**
* Command prints list of available currencies
@@ -23,12 +25,19 @@ class InfoCurrencyListCommand extends Command
*/
private $lists;
+ /**
+ * @var TableFactory
+ */
+ private $tableHelperFactory;
+
/**
* @param Lists $lists
+ * @param TableFactory $tableHelperFactory
*/
- public function __construct(Lists $lists)
+ public function __construct(Lists $lists, TableFactory $tableHelperFactory = null)
{
$this->lists = $lists;
+ $this->tableHelperFactory = $tableHelperFactory ?: ObjectManager::getInstance()->create(TableFactory::class);
parent::__construct();
}
@@ -48,14 +57,14 @@ protected function configure()
*/
protected function execute(InputInterface $input, OutputInterface $output)
{
- $table = $this->getHelperSet()->get('table');
- $table->setHeaders(['Currency', 'Code']);
+ $tableHelper = $this->tableHelperFactory->create(['output' => $output]);
+ $tableHelper->setHeaders(['Currency', 'Code']);
foreach ($this->lists->getCurrencyList() as $key => $currency) {
- $table->addRow([$currency, $key]);
+ $tableHelper->addRow([$currency, $key]);
}
- $table->render($output);
+ $tableHelper->render();
return \Magento\Framework\Console\Cli::RETURN_SUCCESS;
}
}
diff --git a/setup/src/Magento/Setup/Console/Command/InfoLanguageListCommand.php b/setup/src/Magento/Setup/Console/Command/InfoLanguageListCommand.php
index 88d1bdd5601d5..8950bd5edb2fa 100644
--- a/setup/src/Magento/Setup/Console/Command/InfoLanguageListCommand.php
+++ b/setup/src/Magento/Setup/Console/Command/InfoLanguageListCommand.php
@@ -6,8 +6,10 @@
namespace Magento\Setup\Console\Command;
+use Magento\Framework\App\ObjectManager;
use Magento\Framework\Setup\Lists;
use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Helper\TableFactory;
use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Output\OutputInterface;
@@ -23,12 +25,19 @@ class InfoLanguageListCommand extends Command
*/
private $lists;
+ /**
+ * @var TableFactory
+ */
+ private $tableHelperFactory;
+
/**
* @param Lists $lists
+ * @param TableFactory $tableHelperFactory
*/
- public function __construct(Lists $lists)
+ public function __construct(Lists $lists, TableFactory $tableHelperFactory = null)
{
$this->lists = $lists;
+ $this->tableHelperFactory = $tableHelperFactory ?: ObjectManager::getInstance()->create(TableFactory::class);
parent::__construct();
}
@@ -48,14 +57,14 @@ protected function configure()
*/
protected function execute(InputInterface $input, OutputInterface $output)
{
- $table = $this->getHelperSet()->get('table');
- $table->setHeaders(['Language', 'Code']);
+ $tableHelper = $this->tableHelperFactory->create(['output' => $output]);
+ $tableHelper->setHeaders(['Language', 'Code']);
foreach ($this->lists->getLocaleList() as $key => $locale) {
- $table->addRow([$locale, $key]);
+ $tableHelper->addRow([$locale, $key]);
}
- $table->render($output);
+ $tableHelper->render();
return \Magento\Framework\Console\Cli::RETURN_SUCCESS;
}
}
diff --git a/setup/src/Magento/Setup/Console/Command/InfoTimezoneListCommand.php b/setup/src/Magento/Setup/Console/Command/InfoTimezoneListCommand.php
index 95b4cd27bbd3a..2ff1d228dfe24 100644
--- a/setup/src/Magento/Setup/Console/Command/InfoTimezoneListCommand.php
+++ b/setup/src/Magento/Setup/Console/Command/InfoTimezoneListCommand.php
@@ -10,6 +10,8 @@
use Symfony\Component\Console\Output\OutputInterface;
use Symfony\Component\Console\Command\Command;
use Magento\Framework\Setup\Lists;
+use Symfony\Component\Console\Helper\TableFactory;
+use Magento\Framework\App\ObjectManager;
/**
* Command prints list of available timezones
@@ -23,12 +25,19 @@ class InfoTimezoneListCommand extends Command
*/
private $lists;
+ /**
+ * @var TableFactory
+ */
+ private $tableHelperFactory;
+
/**
* @param Lists $lists
+ * @param TableFactory $tableHelperFactory
*/
- public function __construct(Lists $lists)
+ public function __construct(Lists $lists, TableFactory $tableHelperFactory = null)
{
$this->lists = $lists;
+ $this->tableHelperFactory = $tableHelperFactory ?: ObjectManager::getInstance()->create(TableFactory::class);
parent::__construct();
}
@@ -48,14 +57,14 @@ protected function configure()
*/
protected function execute(InputInterface $input, OutputInterface $output)
{
- $table = $this->getHelperSet()->get('table');
- $table->setHeaders(['Timezone', 'Code']);
+ $tableHelper = $this->tableHelperFactory->create(['output' => $output]);
+ $tableHelper->setHeaders(['Timezone', 'Code']);
foreach ($this->lists->getTimezoneList() as $key => $timezone) {
- $table->addRow([$timezone, $key]);
+ $tableHelper->addRow([$timezone, $key]);
}
- $table->render($output);
+ $tableHelper->render();
return \Magento\Framework\Console\Cli::RETURN_SUCCESS;
}
}
diff --git a/setup/src/Magento/Setup/Model/Installer.php b/setup/src/Magento/Setup/Model/Installer.php
index a7dc4dd1e6099..a1a62dc594683 100644
--- a/setup/src/Magento/Setup/Model/Installer.php
+++ b/setup/src/Magento/Setup/Model/Installer.php
@@ -815,6 +815,11 @@ public function declarativeInstallSchema(array $request)
*/
public function installSchema(array $request)
{
+ /** @var \Magento\Framework\Registry $registry */
+ $registry = $this->objectManagerProvider->get()->get(\Magento\Framework\Registry::class);
+ //For backward compatibility in install and upgrade scripts with enabled parallelization.
+ $registry->register('setup-mode-enabled', true);
+
$this->assertDbConfigExists();
$this->assertDbAccessible();
$setup = $this->setupFactory->create($this->context->getResources());
@@ -831,6 +836,8 @@ public function installSchema(array $request)
$schemaListener->setResource('default');
$this->schemaPersistor->persist($schemaListener);
}
+
+ $registry->unregister('setup-mode-enabled');
}
/**
@@ -853,12 +860,19 @@ private function convertationOfOldScriptsIsAllowed(array $request)
*/
public function installDataFixtures(array $request = [])
{
+ /** @var \Magento\Framework\Registry $registry */
+ $registry = $this->objectManagerProvider->get()->get(\Magento\Framework\Registry::class);
+ //For backward compatibility in install and upgrade scripts with enabled parallelization.
+ $registry->register('setup-mode-enabled', true);
+
$this->assertDbConfigExists();
$this->assertDbAccessible();
$setup = $this->dataSetupFactory->create();
$this->checkFilePermissionsForDbUpgrade();
$this->log->log('Data install/update:');
$this->handleDBSchemaData($setup, 'data', $request);
+
+ $registry->unregister('setup-mode-enabled');
}
/**
diff --git a/setup/src/Magento/Setup/Test/Unit/Console/Command/InfoBackupsListCommandTest.php b/setup/src/Magento/Setup/Test/Unit/Console/Command/InfoBackupsListCommandTest.php
index ff4722ca0fd4a..1329324b74015 100644
--- a/setup/src/Magento/Setup/Test/Unit/Console/Command/InfoBackupsListCommandTest.php
+++ b/setup/src/Magento/Setup/Test/Unit/Console/Command/InfoBackupsListCommandTest.php
@@ -16,9 +16,9 @@ public function testExecute()
$table = $this->createMock(\Symfony\Component\Console\Helper\Table::class);
$table->expects($this->once())->method('setHeaders')->with(['Backup Filename', 'Backup Type']);
$table->expects($this->once())->method('addRow')->with(['backupFile_media.tgz', 'media']);
- /** @var \Symfony\Component\Console\Helper\HelperSet|\PHPUnit_Framework_MockObject_MockObject $helperSet */
- $helperSet = $this->createMock(\Symfony\Component\Console\Helper\HelperSet::class);
- $helperSet->expects($this->once())->method('get')->with('table')->will($this->returnValue($table));
+ /** @var \Symfony\Component\Console\Helper\TableFactory|\PHPUnit_Framework_MockObject_MockObject $helperSet */
+ $tableFactoryMock = $this->createMock(\Symfony\Component\Console\Helper\TableFactory::class);
+ $tableFactoryMock->expects($this->once())->method('create')->will($this->returnValue($table));
/** @var \Magento\Framework\App\Filesystem\DirectoryList
* |\PHPUnit_Framework_MockObject_MockObject $directoryList
*/
@@ -29,8 +29,7 @@ public function testExecute()
$file->expects($this->once())
->method('readDirectoryRecursively')
->will($this->returnValue(['backupFile_media.tgz']));
- $command = new InfoBackupsListCommand($directoryList, $file);
- $command->setHelperSet($helperSet);
+ $command = new InfoBackupsListCommand($directoryList, $file, $tableFactoryMock);
$commandTester = new CommandTester($command);
$commandTester->execute([]);
$expected = 'Showing backup files in ';
diff --git a/setup/src/Magento/Setup/Test/Unit/Console/Command/InfoCurrencyListCommandTest.php b/setup/src/Magento/Setup/Test/Unit/Console/Command/InfoCurrencyListCommandTest.php
index e3e0a1de71727..caee4af9c7fc4 100644
--- a/setup/src/Magento/Setup/Test/Unit/Console/Command/InfoCurrencyListCommandTest.php
+++ b/setup/src/Magento/Setup/Test/Unit/Console/Command/InfoCurrencyListCommandTest.php
@@ -21,15 +21,14 @@ public function testExecute()
$table->expects($this->once())->method('setHeaders')->with(['Currency', 'Code']);
$table->expects($this->once())->method('addRow')->with(['Currency description', 'CUR']);
- /** @var \Symfony\Component\Console\Helper\HelperSet|\PHPUnit_Framework_MockObject_MockObject $helperSet */
- $helperSet = $this->createMock(\Symfony\Component\Console\Helper\HelperSet::class);
- $helperSet->expects($this->once())->method('get')->with('table')->will($this->returnValue($table));
+ /** @var \Symfony\Component\Console\Helper\TableFactory|\PHPUnit_Framework_MockObject_MockObject $helperSet */
+ $tableFactoryMock = $this->createMock(\Symfony\Component\Console\Helper\TableFactory::class);
+ $tableFactoryMock->expects($this->once())->method('create')->will($this->returnValue($table));
/** @var \Magento\Framework\Setup\Lists|\PHPUnit_Framework_MockObject_MockObject $list */
$list = $this->createMock(\Magento\Framework\Setup\Lists::class);
$list->expects($this->once())->method('getCurrencyList')->will($this->returnValue($currencies));
- $command = new InfoCurrencyListCommand($list);
- $command->setHelperSet($helperSet);
+ $command = new InfoCurrencyListCommand($list, $tableFactoryMock);
$commandTester = new CommandTester($command);
$commandTester->execute([]);
}
diff --git a/setup/src/Magento/Setup/Test/Unit/Console/Command/InfoLanguageListCommandTest.php b/setup/src/Magento/Setup/Test/Unit/Console/Command/InfoLanguageListCommandTest.php
index f1622b59c4593..d9c899b178c37 100644
--- a/setup/src/Magento/Setup/Test/Unit/Console/Command/InfoLanguageListCommandTest.php
+++ b/setup/src/Magento/Setup/Test/Unit/Console/Command/InfoLanguageListCommandTest.php
@@ -21,15 +21,14 @@ public function testExecute()
$table->expects($this->once())->method('setHeaders')->with(['Language', 'Code']);
$table->expects($this->once())->method('addRow')->with(['Language description', 'LNG']);
- /** @var \Symfony\Component\Console\Helper\HelperSet|\PHPUnit_Framework_MockObject_MockObject $helperSet */
- $helperSet = $this->createMock(\Symfony\Component\Console\Helper\HelperSet::class);
- $helperSet->expects($this->once())->method('get')->with('table')->will($this->returnValue($table));
+ /** @var \Symfony\Component\Console\Helper\TableFactory|\PHPUnit_Framework_MockObject_MockObject $helperSet */
+ $tableFactoryMock = $this->createMock(\Symfony\Component\Console\Helper\TableFactory::class);
+ $tableFactoryMock->expects($this->once())->method('create')->will($this->returnValue($table));
/** @var \Magento\Framework\Setup\Lists|\PHPUnit_Framework_MockObject_MockObject $list */
$list = $this->createMock(\Magento\Framework\Setup\Lists::class);
$list->expects($this->once())->method('getLocaleList')->will($this->returnValue($languages));
- $command = new InfoLanguageListCommand($list);
- $command->setHelperSet($helperSet);
+ $command = new InfoLanguageListCommand($list, $tableFactoryMock);
$commandTester = new CommandTester($command);
$commandTester->execute([]);
}
diff --git a/setup/src/Magento/Setup/Test/Unit/Console/Command/InfoTimezoneListCommandTest.php b/setup/src/Magento/Setup/Test/Unit/Console/Command/InfoTimezoneListCommandTest.php
index 860862f304971..80871ecf634ed 100644
--- a/setup/src/Magento/Setup/Test/Unit/Console/Command/InfoTimezoneListCommandTest.php
+++ b/setup/src/Magento/Setup/Test/Unit/Console/Command/InfoTimezoneListCommandTest.php
@@ -21,15 +21,14 @@ public function testExecute()
$table->expects($this->once())->method('setHeaders')->with(['Timezone', 'Code']);
$table->expects($this->once())->method('addRow')->with(['timezone description', 'timezone']);
- /** @var \Symfony\Component\Console\Helper\HelperSet|\PHPUnit_Framework_MockObject_MockObject $helperSet */
- $helperSet = $this->createMock(\Symfony\Component\Console\Helper\HelperSet::class);
- $helperSet->expects($this->once())->method('get')->with('table')->will($this->returnValue($table));
+ /** @var \Symfony\Component\Console\Helper\TableFactory|\PHPUnit_Framework_MockObject_MockObject $helperSet */
+ $tableFactoryMock = $this->createMock(\Symfony\Component\Console\Helper\TableFactory::class);
+ $tableFactoryMock->expects($this->once())->method('create')->will($this->returnValue($table));
/** @var \Magento\Framework\Setup\Lists|\PHPUnit_Framework_MockObject_MockObject $list */
$list = $this->createMock(\Magento\Framework\Setup\Lists::class);
$list->expects($this->once())->method('getTimezoneList')->will($this->returnValue($timezones));
- $command = new InfoTimezoneListCommand($list);
- $command->setHelperSet($helperSet);
+ $command = new InfoTimezoneListCommand($list, $tableFactoryMock);
$commandTester = new CommandTester($command);
$commandTester->execute([]);
}
diff --git a/setup/src/Magento/Setup/Test/Unit/Model/InstallerTest.php b/setup/src/Magento/Setup/Test/Unit/Model/InstallerTest.php
index 413094a1e0115..882483ce7674a 100644
--- a/setup/src/Magento/Setup/Test/Unit/Model/InstallerTest.php
+++ b/setup/src/Magento/Setup/Test/Unit/Model/InstallerTest.php
@@ -267,6 +267,9 @@ private function createObject($connectionFactory = false, $objectManagerProvider
);
}
+ /**
+ * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+ */
public function testInstall()
{
$request = [
@@ -316,6 +319,7 @@ public function testInstall()
$appState->expects($this->once())
->method('setAreaCode')
->with(\Magento\Framework\App\Area::AREA_GLOBAL);
+ $registry = $this->createMock(\Magento\Framework\Registry::class);
$this->setupFactory->expects($this->atLeastOnce())->method('create')->with($resource)->willReturn($setup);
$this->dataSetupFactory->expects($this->atLeastOnce())->method('create')->willReturn($dataSetup);
$this->objectManager->expects($this->any())
@@ -346,7 +350,8 @@ public function testInstall()
->will($this->returnValueMap([
[\Magento\Framework\App\State::class, $appState],
[\Magento\Framework\App\Cache\Manager::class, $cacheManager],
- [\Magento\Setup\Model\DeclarationInstaller::class, $this->declarationInstallerMock]
+ [\Magento\Setup\Model\DeclarationInstaller::class, $this->declarationInstallerMock],
+ [\Magento\Framework\Registry::class, $registry]
]));
$this->adminFactory->expects($this->once())->method('create')->willReturn(
$this->createMock(\Magento\Setup\Model\AdminAccount::class)