diff --git a/app/code/Magento/Backend/etc/adminhtml/system.xml b/app/code/Magento/Backend/etc/adminhtml/system.xml
index e3411166ee4a4..44ab1dcc00176 100644
--- a/app/code/Magento/Backend/etc/adminhtml/system.xml
+++ b/app/code/Magento/Backend/etc/adminhtml/system.xml
@@ -153,15 +153,15 @@
-
+
Magento\Config\Model\Config\Source\Yesno
-
+
Magento\Config\Model\Config\Source\Yesno
-
+
Magento\Config\Model\Config\Source\Yesno
Minification is not applied in developer mode.
@@ -169,11 +169,11 @@
-
+
Magento\Config\Model\Config\Source\Yesno
-
+
Magento\Config\Model\Config\Source\Yesno
Minification is not applied in developer mode.
diff --git a/app/code/Magento/CatalogInventory/etc/di.xml b/app/code/Magento/CatalogInventory/etc/di.xml
index 535e91ba30f52..8c47865da6aa7 100644
--- a/app/code/Magento/CatalogInventory/etc/di.xml
+++ b/app/code/Magento/CatalogInventory/etc/di.xml
@@ -44,7 +44,7 @@
- Magento\CatalogInventory\Model\ResourceModel\Stock\Proxy
+ Magento\CatalogInventory\Model\ResourceModel\Stock\Item\Proxy
diff --git a/app/code/Magento/CatalogWidget/Setup/UpgradeData.php b/app/code/Magento/CatalogWidget/Setup/UpgradeData.php
new file mode 100644
index 0000000000000..5ebdbe2390d51
--- /dev/null
+++ b/app/code/Magento/CatalogWidget/Setup/UpgradeData.php
@@ -0,0 +1,103 @@
+serializer = $serializer;
+ }
+
+ /**
+ * @inheritdoc
+ */
+ public function upgrade(ModuleDataSetupInterface $setup, ModuleContextInterface $context)
+ {
+ if (version_compare($context->getVersion(), '2.0.1', '<')) {
+ $this->replaceIsWithIsOneOf($setup);
+ }
+ }
+
+ /**
+ * Replace 'is' condition with 'is one of' in database.
+ *
+ * If 'is' product list condition is used with multiple skus it should be replaced by 'is one of' condition.
+ *
+ * @param ModuleDataSetupInterface $setup
+ */
+ private function replaceIsWithIsOneOf(ModuleDataSetupInterface $setup)
+ {
+ $tableName = $setup->getTable('widget_instance');
+ $connection = $setup->getConnection();
+ $select = $connection->select()
+ ->from(
+ $tableName,
+ [
+ 'instance_id',
+ 'widget_parameters',
+ ]
+ )->where('instance_type = ? ', ProductsList::class);
+
+ $result = $setup->getConnection()->fetchAll($select);
+
+ if ($result) {
+ $updatedData = $this->updateWidgetData($result);
+
+ $connection->insertOnDuplicate(
+ $tableName,
+ $updatedData
+ );
+ }
+ }
+
+ /**
+ * Replace 'is' condition with 'is one of' in widget parameters.
+ *
+ * @param array $result
+ * @return array
+ */
+ private function updateWidgetData(array $result): array
+ {
+ return array_map(
+ function ($widgetData) {
+ $widgetParameters = $this->serializer->unserialize($widgetData['widget_parameters']);
+ foreach ($widgetParameters['conditions'] as &$condition) {
+ if (ConditionProduct::class === $condition['type'] &&
+ 'sku' === $condition['attribute'] &&
+ '==' === $condition['operator']) {
+ $condition['operator'] = '()';
+ }
+ }
+ $widgetData['widget_parameters'] = $this->serializer->serialize($widgetParameters);
+
+ return $widgetData;
+ },
+ $result
+ );
+ }
+}
diff --git a/app/code/Magento/CatalogWidget/etc/module.xml b/app/code/Magento/CatalogWidget/etc/module.xml
index 8954f11f954f7..1f2d84bef2d6b 100644
--- a/app/code/Magento/CatalogWidget/etc/module.xml
+++ b/app/code/Magento/CatalogWidget/etc/module.xml
@@ -6,7 +6,7 @@
*/
-->
-
+
diff --git a/app/code/Magento/Checkout/etc/di.xml b/app/code/Magento/Checkout/etc/di.xml
index 71dfd12bb4779..4ebd594a28562 100644
--- a/app/code/Magento/Checkout/etc/di.xml
+++ b/app/code/Magento/Checkout/etc/di.xml
@@ -49,7 +49,4 @@
-
-
-
diff --git a/app/code/Magento/Checkout/etc/frontend/di.xml b/app/code/Magento/Checkout/etc/frontend/di.xml
index 00bcd2a27005a..8f35fe9f37abf 100644
--- a/app/code/Magento/Checkout/etc/frontend/di.xml
+++ b/app/code/Magento/Checkout/etc/frontend/di.xml
@@ -96,4 +96,7 @@
+
+
+
diff --git a/app/code/Magento/Downloadable/Ui/DataProvider/Product/Form/Modifier/Links.php b/app/code/Magento/Downloadable/Ui/DataProvider/Product/Form/Modifier/Links.php
index a352c4bdf7bc3..9ab664cb27839 100644
--- a/app/code/Magento/Downloadable/Ui/DataProvider/Product/Form/Modifier/Links.php
+++ b/app/code/Magento/Downloadable/Ui/DataProvider/Product/Form/Modifier/Links.php
@@ -3,22 +3,24 @@
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
+
namespace Magento\Downloadable\Ui\DataProvider\Product\Form\Modifier;
-use Magento\Catalog\Ui\DataProvider\Product\Form\Modifier\AbstractModifier;
use Magento\Catalog\Model\Locator\LocatorInterface;
+use Magento\Catalog\Ui\DataProvider\Product\Form\Modifier\AbstractModifier;
use Magento\Downloadable\Model\Product\Type;
-use Magento\Downloadable\Model\Source\TypeUpload;
use Magento\Downloadable\Model\Source\Shareable;
-use Magento\Store\Model\StoreManagerInterface;
+use Magento\Downloadable\Model\Source\TypeUpload;
use Magento\Framework\Stdlib\ArrayManager;
-use Magento\Ui\Component\DynamicRows;
use Magento\Framework\UrlInterface;
+use Magento\Store\Model\StoreManagerInterface;
use Magento\Ui\Component\Container;
+use Magento\Ui\Component\DynamicRows;
use Magento\Ui\Component\Form;
/**
- * Class adds a grid with links
+ * Class adds a grid with links.
+ *
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
class Links extends AbstractModifier
@@ -86,7 +88,7 @@ public function __construct(
}
/**
- * {@inheritdoc}
+ * @inheritdoc
*/
public function modifyData(array $data)
{
@@ -101,7 +103,7 @@ public function modifyData(array $data)
}
/**
- * {@inheritdoc}
+ * @inheritdoc
* @SuppressWarnings(PHPMD.ExcessiveMethodLength)
*/
public function modifyMeta(array $meta)
@@ -160,6 +162,8 @@ public function modifyMeta(array $meta)
}
/**
+ * Get dynamic rows meta.
+ *
* @return array
*/
protected function getDynamicRows()
@@ -180,6 +184,8 @@ protected function getDynamicRows()
}
/**
+ * Get single link record meta.
+ *
* @return array
*/
protected function getRecord()
@@ -221,6 +227,8 @@ protected function getRecord()
}
/**
+ * Get link title meta.
+ *
* @return array
*/
protected function getTitleColumn()
@@ -232,6 +240,7 @@ protected function getTitleColumn()
'label' => __('Title'),
'showLabel' => false,
'dataScope' => '',
+ 'sortOrder' => 10,
];
$titleField['arguments']['data']['config'] = [
'formElement' => Form\Element\Input::NAME,
@@ -247,6 +256,8 @@ protected function getTitleColumn()
}
/**
+ * Get link price meta.
+ *
* @return array
*/
protected function getPriceColumn()
@@ -258,6 +269,7 @@ protected function getPriceColumn()
'label' => __('Price'),
'showLabel' => false,
'dataScope' => '',
+ 'sortOrder' => 20,
];
$priceField['arguments']['data']['config'] = [
'formElement' => Form\Element\Input::NAME,
@@ -281,6 +293,8 @@ protected function getPriceColumn()
}
/**
+ * Get link file element meta.
+ *
* @return array
*/
protected function getFileColumn()
@@ -292,6 +306,7 @@ protected function getFileColumn()
'label' => __('File'),
'showLabel' => false,
'dataScope' => '',
+ 'sortOrder' => 30,
];
$fileTypeField['arguments']['data']['config'] = [
'formElement' => Form\Element\Select::NAME,
@@ -344,6 +359,8 @@ protected function getFileColumn()
}
/**
+ * Get sample container meta.
+ *
* @return array
*/
protected function getSampleColumn()
@@ -355,6 +372,7 @@ protected function getSampleColumn()
'label' => __('Sample'),
'showLabel' => false,
'dataScope' => '',
+ 'sortOrder' => 40,
];
$sampleTypeField['arguments']['data']['config'] = [
'formElement' => Form\Element\Select::NAME,
@@ -403,6 +421,8 @@ protected function getSampleColumn()
}
/**
+ * Get link "is sharable" element meta.
+ *
* @return array
*/
protected function getShareableColumn()
@@ -413,6 +433,7 @@ protected function getShareableColumn()
'componentType' => Form\Field::NAME,
'dataType' => Form\Element\DataType\Number::NAME,
'dataScope' => 'is_shareable',
+ 'sortOrder' => 50,
'options' => $this->shareable->toOptionArray(),
];
@@ -420,6 +441,8 @@ protected function getShareableColumn()
}
/**
+ * Get link "max downloads" element meta.
+ *
* @return array
*/
protected function getMaxDownloadsColumn()
@@ -431,6 +454,7 @@ protected function getMaxDownloadsColumn()
'label' => __('Max. Downloads'),
'showLabel' => false,
'dataScope' => '',
+ 'sortOrder' => 60,
];
$numberOfDownloadsField['arguments']['data']['config'] = [
'formElement' => Form\Element\Input::NAME,
diff --git a/app/code/Magento/Downloadable/Ui/DataProvider/Product/Form/Modifier/Samples.php b/app/code/Magento/Downloadable/Ui/DataProvider/Product/Form/Modifier/Samples.php
index 1587163ba8121..3890ee5b9e2b2 100644
--- a/app/code/Magento/Downloadable/Ui/DataProvider/Product/Form/Modifier/Samples.php
+++ b/app/code/Magento/Downloadable/Ui/DataProvider/Product/Form/Modifier/Samples.php
@@ -3,21 +3,23 @@
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
+
namespace Magento\Downloadable\Ui\DataProvider\Product\Form\Modifier;
-use Magento\Catalog\Ui\DataProvider\Product\Form\Modifier\AbstractModifier;
use Magento\Catalog\Model\Locator\LocatorInterface;
+use Magento\Catalog\Ui\DataProvider\Product\Form\Modifier\AbstractModifier;
use Magento\Downloadable\Model\Product\Type;
use Magento\Downloadable\Model\Source\TypeUpload;
-use Magento\Store\Model\StoreManagerInterface;
use Magento\Framework\Stdlib\ArrayManager;
-use Magento\Ui\Component\DynamicRows;
use Magento\Framework\UrlInterface;
+use Magento\Store\Model\StoreManagerInterface;
use Magento\Ui\Component\Container;
+use Magento\Ui\Component\DynamicRows;
use Magento\Ui\Component\Form;
/**
- * Class adds a grid with samples
+ * Class adds a grid with samples.
+ *
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
class Samples extends AbstractModifier
@@ -77,7 +79,7 @@ public function __construct(
}
/**
- * {@inheritdoc}
+ * @inheritdoc
*/
public function modifyData(array $data)
{
@@ -90,7 +92,7 @@ public function modifyData(array $data)
}
/**
- * {@inheritdoc}
+ * @inheritdoc
* @SuppressWarnings(PHPMD.ExcessiveMethodLength)
*/
public function modifyMeta(array $meta)
@@ -135,6 +137,8 @@ public function modifyMeta(array $meta)
}
/**
+ * Get sample rows meta.
+ *
* @return array
*/
protected function getDynamicRows()
@@ -155,6 +159,8 @@ protected function getDynamicRows()
}
/**
+ * Get single sample row meta.
+ *
* @return array
*/
protected function getRecord()
@@ -192,6 +198,8 @@ protected function getRecord()
}
/**
+ * Get sample title meta.
+ *
* @return array
*/
protected function getTitleColumn()
@@ -203,6 +211,7 @@ protected function getTitleColumn()
'showLabel' => false,
'label' => __('Title'),
'dataScope' => '',
+ 'sortOrder' => 10,
];
$titleField['arguments']['data']['config'] = [
'formElement' => Form\Element\Input::NAME,
@@ -218,6 +227,8 @@ protected function getTitleColumn()
}
/**
+ * Get sample element meta.
+ *
* @return array
*/
protected function getSampleColumn()
@@ -229,6 +240,7 @@ protected function getSampleColumn()
'label' => __('File'),
'showLabel' => false,
'dataScope' => '',
+ 'sortOrder' => 20,
];
$sampleType['arguments']['data']['config'] = [
'formElement' => Form\Element\Select::NAME,
diff --git a/app/code/Magento/Eav/Model/Entity/Attribute/Source/AbstractSource.php b/app/code/Magento/Eav/Model/Entity/Attribute/Source/AbstractSource.php
index 0991b3f9f4b23..36ad026029056 100644
--- a/app/code/Magento/Eav/Model/Entity/Attribute/Source/AbstractSource.php
+++ b/app/code/Magento/Eav/Model/Entity/Attribute/Source/AbstractSource.php
@@ -73,13 +73,15 @@ public function getOptionText($value)
}
}
// End
- if (isset($options[$value])) {
+ if (is_scalar($value) && isset($options[$value])) {
return $options[$value];
}
return false;
}
/**
+ * Get option id.
+ *
* @param string $value
* @return null|string
*/
diff --git a/app/code/Magento/OfflinePayments/view/base/templates/info/pdf/checkmo.phtml b/app/code/Magento/OfflinePayments/view/base/templates/info/pdf/checkmo.phtml
new file mode 100644
index 0000000000000..4d63577319d5b
--- /dev/null
+++ b/app/code/Magento/OfflinePayments/view/base/templates/info/pdf/checkmo.phtml
@@ -0,0 +1,26 @@
+
+= $block->escapeHtml($block->getMethod()->getTitle()) ?>
+ {{pdf_row_separator}}
+getInfo()->getAdditionalInformation()): ?>
+ {{pdf_row_separator}}
+ getPayableTo()): ?>
+ = $block->escapeHtml(__('Make Check payable to: %1', $block->getPayableTo())) ?>
+ {{pdf_row_separator}}
+
+ getMailingAddress()): ?>
+ = $block->escapeHtml(__('Send Check to:')) ?>
+ {{pdf_row_separator}}
+ = /* @noEscape */ nl2br($block->escapeHtml($block->getMailingAddress())) ?>
+ {{pdf_row_separator}}
+
+
diff --git a/app/code/Magento/OfflinePayments/view/base/templates/info/pdf/purchaseorder.phtml b/app/code/Magento/OfflinePayments/view/base/templates/info/pdf/purchaseorder.phtml
new file mode 100644
index 0000000000000..4a6ea1c00b21c
--- /dev/null
+++ b/app/code/Magento/OfflinePayments/view/base/templates/info/pdf/purchaseorder.phtml
@@ -0,0 +1,11 @@
+
+= $block->escapeHtml(__('Purchase Order Number: %1', $block->getInfo()->getPoNumber())) ?>
+ {{pdf_row_separator}}
diff --git a/app/code/Magento/Payment/view/base/templates/info/pdf/default.phtml b/app/code/Magento/Payment/view/base/templates/info/pdf/default.phtml
new file mode 100644
index 0000000000000..7acac62f65d38
--- /dev/null
+++ b/app/code/Magento/Payment/view/base/templates/info/pdf/default.phtml
@@ -0,0 +1,23 @@
+
+= $block->escapeHtml($block->getMethod()->getTitle()) ?>{{pdf_row_separator}}
+
+getSpecificInformation()):?>
+ $value):?>
+ = $block->escapeHtml($label) ?>:
+ = $block->escapeHtml(implode(' ', $block->getValueAsArray($value))) ?>
+ {{pdf_row_separator}}
+
+
+
+= $block->escapeHtml(implode('{{pdf_row_separator}}', $block->getChildPdfAsArray())) ?>
diff --git a/app/code/Magento/Robots/Model/Config/Value.php b/app/code/Magento/Robots/Model/Config/Value.php
index 83c21d6602fca..4c80588d814f6 100644
--- a/app/code/Magento/Robots/Model/Config/Value.php
+++ b/app/code/Magento/Robots/Model/Config/Value.php
@@ -3,6 +3,7 @@
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
+
namespace Magento\Robots\Model\Config;
use Magento\Framework\App\Cache\TypeListInterface;
@@ -30,12 +31,11 @@ class Value extends ConfigValue implements IdentityInterface
const CACHE_TAG = 'robots';
/**
- * Model cache tag for clear cache in after save and after delete
+ * @inheritdoc
*
- * @var string
* @since 100.2.0
*/
- protected $_cacheTag = true;
+ protected $_cacheTag = [self::CACHE_TAG];
/**
* @var StoreResolver
diff --git a/app/code/Magento/Rule/Model/Condition/Product/AbstractProduct.php b/app/code/Magento/Rule/Model/Condition/Product/AbstractProduct.php
index e5d613f7c9558..53ba319d47ef0 100644
--- a/app/code/Magento/Rule/Model/Condition/Product/AbstractProduct.php
+++ b/app/code/Magento/Rule/Model/Condition/Product/AbstractProduct.php
@@ -137,7 +137,6 @@ public function getDefaultOperatorInputByType()
*/
$this->_defaultOperatorInputByType['category'] = ['==', '!=', '{}', '!{}', '()', '!()'];
$this->_arrayInputTypes[] = 'category';
- $this->_defaultOperatorInputByType['sku'] = ['==', '!=', '{}', '!{}', '()', '!()'];
}
return $this->_defaultOperatorInputByType;
}
@@ -383,9 +382,6 @@ public function getInputType()
if ($this->getAttributeObject()->getAttributeCode() == 'category_ids') {
return 'category';
}
- if ($this->getAttributeObject()->getAttributeCode() == 'sku') {
- return 'sku';
- }
switch ($this->getAttributeObject()->getFrontendInput()) {
case 'select':
return 'select';
@@ -614,10 +610,6 @@ public function getBindArgumentValue()
$this->getValueParsed()
)->__toString()
);
- } elseif ($this->getAttribute() === 'sku') {
- $value = $this->getData('value');
- $value = preg_split('#\s*[,;]\s*#', $value, null, PREG_SPLIT_NO_EMPTY);
- $this->setValueParsed($value);
}
return parent::getBindArgumentValue();
@@ -718,7 +710,7 @@ protected function _getAttributeSetId($productId)
public function getOperatorForValidate()
{
$operator = $this->getOperator();
- if (in_array($this->getInputType(), ['category', 'sku'])) {
+ if ('category' === $this->getInputType()) {
if ($operator == '==') {
$operator = '{}';
} elseif ($operator == '!=') {
diff --git a/app/code/Magento/Sitemap/Model/Sitemap.php b/app/code/Magento/Sitemap/Model/Sitemap.php
index dda1697da7fdf..7279f6eda85d7 100644
--- a/app/code/Magento/Sitemap/Model/Sitemap.php
+++ b/app/code/Magento/Sitemap/Model/Sitemap.php
@@ -1,4 +1,5 @@
+
+
diff --git a/app/code/Magento/Widget/Test/Mftf/Data/WidgetsData.xml b/app/code/Magento/Widget/Test/Mftf/Data/WidgetsData.xml
index d7db8fe50cb7f..ce56a6d92dd97 100644
--- a/app/code/Magento/Widget/Test/Mftf/Data/WidgetsData.xml
+++ b/app/code/Magento/Widget/Test/Mftf/Data/WidgetsData.xml
@@ -18,6 +18,7 @@
SKU
All Pages
Main Content Area
+ is one of
Banner Rotator
diff --git a/app/code/Magento/Widget/Test/Mftf/Section/AdminNewWidgetSection.xml b/app/code/Magento/Widget/Test/Mftf/Section/AdminNewWidgetSection.xml
index 472539bdcc7ed..c8c0d0abc3576 100644
--- a/app/code/Magento/Widget/Test/Mftf/Section/AdminNewWidgetSection.xml
+++ b/app/code/Magento/Widget/Test/Mftf/Section/AdminNewWidgetSection.xml
@@ -21,6 +21,8 @@
+
+
diff --git a/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column/Actions.php b/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column/Actions.php
index cafb6a5291481..40882ae00dae1 100644
--- a/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column/Actions.php
+++ b/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column/Actions.php
@@ -5,14 +5,15 @@
*/
/**
- * Wishlist for item column in customer wishlist
- *
* @author Magento Core Team
*/
namespace Magento\Wishlist\Block\Customer\Wishlist\Item\Column;
/**
+ * Model for item column in customer wishlist.
+ *
* @api
+ * @deprecated
* @since 100.0.2
*/
class Actions extends \Magento\Wishlist\Block\Customer\Wishlist\Item\Column
diff --git a/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column/Comment.php b/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column/Comment.php
index 2d75956858a0a..53f67626e956d 100644
--- a/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column/Comment.php
+++ b/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column/Comment.php
@@ -5,14 +5,15 @@
*/
/**
- * Wishlist block customer item cart column
- *
* @author Magento Core Team
*/
namespace Magento\Wishlist\Block\Customer\Wishlist\Item\Column;
/**
+ * Wishlist block customer item cart column.
+ *
* @api
+ * @deprecated
* @since 100.0.2
*/
class Comment extends \Magento\Wishlist\Block\Customer\Wishlist\Item\Column
diff --git a/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column/Edit.php b/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column/Edit.php
index 53ca78c63524d..c4c786961694b 100644
--- a/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column/Edit.php
+++ b/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column/Edit.php
@@ -5,14 +5,15 @@
*/
/**
- * Edit item in customer wishlist table
- *
* @author Magento Core Team
*/
namespace Magento\Wishlist\Block\Customer\Wishlist\Item\Column;
/**
+ * Edit item in customer wishlist table.
+ *
* @api
+ * @deprecated
* @since 100.0.2
*/
class Edit extends \Magento\Wishlist\Block\Customer\Wishlist\Item\Column
diff --git a/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column/Info.php b/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column/Info.php
index 33fb0f7325cdd..b7eaf53fc23b5 100644
--- a/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column/Info.php
+++ b/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column/Info.php
@@ -5,14 +5,15 @@
*/
/**
- * Wishlist block customer item cart column
- *
* @author Magento Core Team
*/
namespace Magento\Wishlist\Block\Customer\Wishlist\Item\Column;
/**
+ * Wishlist block customer item cart column.
+ *
* @api
+ * @deprecated
* @since 100.0.2
*/
class Info extends \Magento\Wishlist\Block\Customer\Wishlist\Item\Column
diff --git a/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column/Remove.php b/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column/Remove.php
index 57703b9300db8..09f5014edead6 100644
--- a/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column/Remove.php
+++ b/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column/Remove.php
@@ -5,14 +5,15 @@
*/
/**
- * Delete item column in customer wishlist table
- *
* @author Magento Core Team
*/
namespace Magento\Wishlist\Block\Customer\Wishlist\Item\Column;
/**
+ * Delete item column in customer wishlist table
+ *
* @api
+ * @deprecated
* @since 100.0.2
*/
class Remove extends \Magento\Wishlist\Block\Customer\Wishlist\Item\Column
diff --git a/app/code/Magento/Wishlist/view/frontend/layout/wishlist_index_index.xml b/app/code/Magento/Wishlist/view/frontend/layout/wishlist_index_index.xml
index 243a06062425a..218b5ac1c879b 100644
--- a/app/code/Magento/Wishlist/view/frontend/layout/wishlist_index_index.xml
+++ b/app/code/Magento/Wishlist/view/frontend/layout/wishlist_index_index.xml
@@ -17,6 +17,7 @@
+
diff --git a/app/code/Magento/Wishlist/view/frontend/templates/item/column/review.phtml b/app/code/Magento/Wishlist/view/frontend/templates/item/column/review.phtml
new file mode 100644
index 0000000000000..3fd492233bdd5
--- /dev/null
+++ b/app/code/Magento/Wishlist/view/frontend/templates/item/column/review.phtml
@@ -0,0 +1,10 @@
+getItem()->getProduct();
+?>
+= $block->getReviewsSummaryHtml($product, 'short');
diff --git a/dev/tests/integration/testsuite/Magento/Backend/Controller/Adminhtml/DashboardTest.php b/dev/tests/integration/testsuite/Magento/Backend/Controller/Adminhtml/DashboardTest.php
index 07af21505f180..20fbe2a3f3f62 100644
--- a/dev/tests/integration/testsuite/Magento/Backend/Controller/Adminhtml/DashboardTest.php
+++ b/dev/tests/integration/testsuite/Magento/Backend/Controller/Adminhtml/DashboardTest.php
@@ -21,6 +21,8 @@ public function testAjaxBlockAction()
public function testTunnelAction()
{
+ $this->markTestSkipped('MAGETWO-98803');
+
$testUrl = \Magento\Backend\Block\Dashboard\Graph::API_URL . '?cht=p3&chd=t:60,40&chs=250x100&chl=Hello|World';
$handle = curl_init();
curl_setopt($handle, CURLOPT_URL, $testUrl);
diff --git a/dev/tests/integration/testsuite/Magento/CatalogWidget/Block/Product/ProductListTest.php b/dev/tests/integration/testsuite/Magento/CatalogWidget/Block/Product/ProductListTest.php
index 08e9ebbd1f9f0..5774f1cf76ae9 100644
--- a/dev/tests/integration/testsuite/Magento/CatalogWidget/Block/Product/ProductListTest.php
+++ b/dev/tests/integration/testsuite/Magento/CatalogWidget/Block/Product/ProductListTest.php
@@ -73,21 +73,6 @@ public function testCreateCollection()
$this->performAssertions(2);
}
- /**
- * Test product list widget can process condition with multiple product sku.
- *
- * @magentoDbIsolation disabled
- * @magentoDataFixture Magento/Catalog/_files/multiple_products.php
- */
- public function testCreateCollectionWithMultipleSkuCondition()
- {
- $encodedConditions = '^[`1`:^[`type`:`Magento||CatalogWidget||Model||Rule||Condition||Combine`,' .
- '`aggregator`:`all`,`value`:`1`,`new_child`:``^],`1--1`:^[`type`:`Magento||CatalogWidget||Model||Rule|' .
- '|Condition||Product`,`attribute`:`sku`,`operator`:`==`,`value`:`simple1, simple2`^]^]';
- $this->block->setData('conditions_encoded', $encodedConditions);
- $this->performAssertions(2);
- }
-
/**
* Test product list widget can process condition with dropdown type of attribute
*
diff --git a/dev/tests/integration/testsuite/Magento/Checkout/Plugin/Model/Quote/ResetQuoteAddressesTest.php b/dev/tests/integration/testsuite/Magento/Checkout/Plugin/Model/Quote/ResetQuoteAddressesTest.php
index 43108dbca1f5e..85dede0d84c2d 100644
--- a/dev/tests/integration/testsuite/Magento/Checkout/Plugin/Model/Quote/ResetQuoteAddressesTest.php
+++ b/dev/tests/integration/testsuite/Magento/Checkout/Plugin/Model/Quote/ResetQuoteAddressesTest.php
@@ -21,6 +21,7 @@ class ResetQuoteAddressesTest extends \PHPUnit\Framework\TestCase
{
/**
* @magentoDataFixture Magento/Checkout/_files/quote_with_virtual_product_and_address.php
+ * @magentoAppArea frontend
*
* @return void
*/