').text($.mage.__('Sending swatch values as package.')));
+ });
+ });
});
window.saveAttributeInNewSet = swatchProductAttributes.saveAttributeInNewSet;
diff --git a/app/code/Magento/Tax/Block/Adminhtml/Rate/Form.php b/app/code/Magento/Tax/Block/Adminhtml/Rate/Form.php
index bfc0a99de37a1..c4c4f28e8a7d1 100644
--- a/app/code/Magento/Tax/Block/Adminhtml/Rate/Form.php
+++ b/app/code/Magento/Tax/Block/Adminhtml/Rate/Form.php
@@ -33,7 +33,7 @@ class Form extends \Magento\Backend\Block\Widget\Form\Generic
/**
* @var string
*/
- protected $_template = 'rate/form.phtml';
+ protected $_template = 'Magento_Tax::rate/form.phtml';
/**
* Tax data
diff --git a/app/code/Magento/Tax/Block/Adminhtml/Rate/Title.php b/app/code/Magento/Tax/Block/Adminhtml/Rate/Title.php
index e1e866c06571b..9612b57f8d5d8 100644
--- a/app/code/Magento/Tax/Block/Adminhtml/Rate/Title.php
+++ b/app/code/Magento/Tax/Block/Adminhtml/Rate/Title.php
@@ -23,7 +23,7 @@ class Title extends \Magento\Framework\View\Element\Template
/**
* @var string
*/
- protected $_template = 'rate/title.phtml';
+ protected $_template = 'Magento_Tax::rate/title.phtml';
/**
* @var \Magento\Store\Model\StoreFactory
diff --git a/app/code/Magento/Tax/Block/Adminhtml/Rate/Toolbar/Add.php b/app/code/Magento/Tax/Block/Adminhtml/Rate/Toolbar/Add.php
index 9cf96bc21e962..16d828542c5b9 100644
--- a/app/code/Magento/Tax/Block/Adminhtml/Rate/Toolbar/Add.php
+++ b/app/code/Magento/Tax/Block/Adminhtml/Rate/Toolbar/Add.php
@@ -20,7 +20,7 @@ class Add extends \Magento\Backend\Block\Template implements \Magento\Backend\Bl
/**
* @var string
*/
- protected $_template = 'toolbar/rate/add.phtml';
+ protected $_template = 'Magento_Tax::toolbar/rate/add.phtml';
/**
* @var \Magento\Backend\Block\Widget\Button\ButtonList
diff --git a/app/code/Magento/Tax/Block/Adminhtml/Rate/Toolbar/Save.php b/app/code/Magento/Tax/Block/Adminhtml/Rate/Toolbar/Save.php
index 19c5fab72ac4b..4eaaa3be8a8f2 100644
--- a/app/code/Magento/Tax/Block/Adminhtml/Rate/Toolbar/Save.php
+++ b/app/code/Magento/Tax/Block/Adminhtml/Rate/Toolbar/Save.php
@@ -16,7 +16,7 @@ class Save extends \Magento\Backend\Block\Template implements \Magento\Backend\B
/**
* @var string
*/
- protected $_template = 'toolbar/rate/save.phtml';
+ protected $_template = 'Magento_Tax::toolbar/rate/save.phtml';
/**
* @var \Magento\Backend\Block\Widget\Button\ButtonList
diff --git a/app/code/Magento/Tax/Block/Checkout/Grandtotal.php b/app/code/Magento/Tax/Block/Checkout/Grandtotal.php
index 68de4cb24a487..77af1ad99ea2c 100644
--- a/app/code/Magento/Tax/Block/Checkout/Grandtotal.php
+++ b/app/code/Magento/Tax/Block/Checkout/Grandtotal.php
@@ -15,7 +15,7 @@ class Grandtotal extends \Magento\Checkout\Block\Total\DefaultTotal
*
* @var string
*/
- protected $_template = 'checkout/grandtotal.phtml';
+ protected $_template = 'Magento_Tax::checkout/grandtotal.phtml';
/**
* @var \Magento\Tax\Model\Config
diff --git a/app/code/Magento/Tax/Block/Checkout/Shipping.php b/app/code/Magento/Tax/Block/Checkout/Shipping.php
index e9098035053be..299c586fd224c 100644
--- a/app/code/Magento/Tax/Block/Checkout/Shipping.php
+++ b/app/code/Magento/Tax/Block/Checkout/Shipping.php
@@ -15,7 +15,7 @@ class Shipping extends \Magento\Checkout\Block\Total\DefaultTotal
*
* @var string
*/
- protected $_template = 'checkout/shipping.phtml';
+ protected $_template = 'Magento_Tax::checkout/shipping.phtml';
/**
* @var \Magento\Tax\Model\Config
diff --git a/app/code/Magento/Tax/Block/Checkout/Subtotal.php b/app/code/Magento/Tax/Block/Checkout/Subtotal.php
index 7a9059df08bab..22da07954159d 100644
--- a/app/code/Magento/Tax/Block/Checkout/Subtotal.php
+++ b/app/code/Magento/Tax/Block/Checkout/Subtotal.php
@@ -15,7 +15,7 @@ class Subtotal extends \Magento\Checkout\Block\Total\DefaultTotal
*
* @var string
*/
- protected $_template = 'checkout/subtotal.phtml';
+ protected $_template = 'Magento_Tax::checkout/subtotal.phtml';
/**
* @var \Magento\Tax\Model\Config
diff --git a/app/code/Magento/Tax/Block/Checkout/Tax.php b/app/code/Magento/Tax/Block/Checkout/Tax.php
index f741e64019de1..0a86c0312ab1c 100644
--- a/app/code/Magento/Tax/Block/Checkout/Tax.php
+++ b/app/code/Magento/Tax/Block/Checkout/Tax.php
@@ -14,5 +14,5 @@ class Tax extends \Magento\Checkout\Block\Total\DefaultTotal
/**
* @var string
*/
- protected $_template = 'checkout/tax.phtml';
+ protected $_template = 'Magento_Tax::checkout/tax.phtml';
}
diff --git a/app/code/Magento/Tax/Test/Unit/Block/Checkout/ShippingTest.php b/app/code/Magento/Tax/Test/Unit/Block/Checkout/ShippingTest.php
index c1aa2b0c9900d..e7a11ec45ad3f 100644
--- a/app/code/Magento/Tax/Test/Unit/Block/Checkout/ShippingTest.php
+++ b/app/code/Magento/Tax/Test/Unit/Block/Checkout/ShippingTest.php
@@ -44,6 +44,9 @@ public function testDisplayShipping($shippingMethod, $expectedResult)
$this->assertEquals($expectedResult, $this->model->displayShipping());
}
+ /**
+ * @return array
+ */
public function displayShippingDataProvider()
{
return [
diff --git a/app/code/Magento/Tax/Test/Unit/Block/Item/Price/RendererTest.php b/app/code/Magento/Tax/Test/Unit/Block/Item/Price/RendererTest.php
index 1a16e69724479..90f0f09215889 100644
--- a/app/code/Magento/Tax/Test/Unit/Block/Item/Price/RendererTest.php
+++ b/app/code/Magento/Tax/Test/Unit/Block/Item/Price/RendererTest.php
@@ -96,6 +96,9 @@ public function testDisplayPriceInclTax($zone, $methodName)
$this->assertEquals($flag, $this->renderer->displayPriceInclTax());
}
+ /**
+ * @return array
+ */
public function displayPriceInclTaxDataProvider()
{
$data = [
@@ -143,6 +146,9 @@ public function testDisplayPriceExclTax($zone, $methodName)
$this->assertEquals($flag, $this->renderer->displayPriceExclTax());
}
+ /**
+ * @return array
+ */
public function displayPriceExclTaxDataProvider()
{
$data = [
@@ -190,6 +196,9 @@ public function testDisplayBothPrices($zone, $methodName)
$this->assertEquals($flag, $this->renderer->displayBothPrices());
}
+ /**
+ * @return array
+ */
public function displayBothPricesDataProvider()
{
$data = [
diff --git a/app/code/Magento/Tax/Test/Unit/Model/Calculation/RateRepositoryTest.php b/app/code/Magento/Tax/Test/Unit/Model/Calculation/RateRepositoryTest.php
index e6a29177301dd..47ec0d8732d81 100644
--- a/app/code/Magento/Tax/Test/Unit/Model/Calculation/RateRepositoryTest.php
+++ b/app/code/Magento/Tax/Test/Unit/Model/Calculation/RateRepositoryTest.php
@@ -312,6 +312,9 @@ public function testSaveThrowsExceptionIfCannotSaveTitles($expectedException, $e
$this->model->save($rateMock);
}
+ /**
+ * @return array
+ */
public function saveThrowsExceptionIfCannotSaveTitlesDataProvider()
{
return [
diff --git a/app/code/Magento/Tax/Test/Unit/Model/Plugin/OrderSaveTest.php b/app/code/Magento/Tax/Test/Unit/Model/Plugin/OrderSaveTest.php
index 912f42af0d3cd..82a473b42a82e 100644
--- a/app/code/Magento/Tax/Test/Unit/Model/Plugin/OrderSaveTest.php
+++ b/app/code/Magento/Tax/Test/Unit/Model/Plugin/OrderSaveTest.php
@@ -63,6 +63,9 @@ protected function setUp()
);
}
+ /**
+ * @return \PHPUnit_Framework_MockObject_MockObject
+ */
protected function setupOrderMock()
{
$orderMock = $this->getMockBuilder(\Magento\Sales\Model\Order::class)
@@ -80,6 +83,9 @@ protected function setupOrderMock()
return $orderMock;
}
+ /**
+ * @return \PHPUnit_Framework_MockObject_MockObject
+ */
protected function setupExtensionAttributeMock()
{
$orderExtensionAttributeMock = $this->getMockBuilder(\Magento\Sales\Api\Data\OrderExtensionInterface::class)
@@ -95,6 +101,9 @@ protected function setupExtensionAttributeMock()
return $orderExtensionAttributeMock;
}
+ /**
+ * @param $expectedTaxes
+ */
protected function verifyOrderTaxes($expectedTaxes)
{
$index = 0;
@@ -125,6 +134,9 @@ protected function verifyOrderTaxes($expectedTaxes)
}
}
+ /**
+ * @param $expectedItemTaxes
+ */
public function verifyItemTaxes($expectedItemTaxes)
{
$index = 0;
diff --git a/app/code/Magento/Tax/Test/Unit/Model/Quote/GrandTotalDetailsPluginTest.php b/app/code/Magento/Tax/Test/Unit/Model/Quote/GrandTotalDetailsPluginTest.php
index e5bd728e180f6..5e806bf36fc53 100644
--- a/app/code/Magento/Tax/Test/Unit/Model/Quote/GrandTotalDetailsPluginTest.php
+++ b/app/code/Magento/Tax/Test/Unit/Model/Quote/GrandTotalDetailsPluginTest.php
@@ -108,6 +108,11 @@ function ($value) {
);
}
+ /**
+ * @param array $data
+ *
+ * @return \PHPUnit_Framework_MockObject_MockObject
+ */
protected function setupTaxTotal(array $data)
{
$taxTotalMock = $this->getMockBuilder(\Magento\Quote\Model\Quote\Address\Total::class)
@@ -121,6 +126,11 @@ protected function setupTaxTotal(array $data)
return $taxTotalMock;
}
+ /**
+ * @param array $taxRate
+ *
+ * @return \PHPUnit_Framework_MockObject_MockObject
+ */
protected function setupTaxRateFactoryMock(array $taxRate)
{
$taxRateMock = $this->getMockBuilder(\Magento\Tax\Api\Data\GrandTotalRatesInterface::class)
@@ -142,6 +152,11 @@ protected function setupTaxRateFactoryMock(array $taxRate)
return $taxRateMock;
}
+ /**
+ * @param array $taxDetails
+ *
+ * @return \PHPUnit_Framework_MockObject_MockObject
+ */
protected function setupTaxDetails(array $taxDetails)
{
$taxDetailsMock = $this->getMockBuilder(\Magento\Tax\Api\Data\GrandTotalDetailsInterface::class)
diff --git a/app/code/Magento/Tax/Test/Unit/Model/Quote/ToOrderConverterTest.php b/app/code/Magento/Tax/Test/Unit/Model/Quote/ToOrderConverterTest.php
index 23ce032764a8f..09f82b32137b3 100644
--- a/app/code/Magento/Tax/Test/Unit/Model/Quote/ToOrderConverterTest.php
+++ b/app/code/Magento/Tax/Test/Unit/Model/Quote/ToOrderConverterTest.php
@@ -64,6 +64,9 @@ protected function setUp()
);
}
+ /**
+ * @return \PHPUnit_Framework_MockObject_MockObject
+ */
protected function setupOrderExtensionAttributeMock()
{
$orderExtensionAttributeMock = $this->getMockBuilder(\Magento\Sales\Api\Data\OrderExtensionInterface::class)
diff --git a/app/code/Magento/Tax/Test/Unit/Model/Sales/Total/Quote/CommonTaxCollectorTest.php b/app/code/Magento/Tax/Test/Unit/Model/Sales/Total/Quote/CommonTaxCollectorTest.php
index 6440751961796..9b963434e321d 100644
--- a/app/code/Magento/Tax/Test/Unit/Model/Sales/Total/Quote/CommonTaxCollectorTest.php
+++ b/app/code/Magento/Tax/Test/Unit/Model/Sales/Total/Quote/CommonTaxCollectorTest.php
@@ -183,6 +183,9 @@ public function testGetShippingDataObject(
}
}
+ /**
+ * @return array
+ */
public function getShippingDataObjectDataProvider()
{
$data = [
diff --git a/app/code/Magento/Tax/Test/Unit/Model/Sales/Total/Quote/TaxTest.php b/app/code/Magento/Tax/Test/Unit/Model/Sales/Total/Quote/TaxTest.php
index feee41c342069..3523d2828948c 100644
--- a/app/code/Magento/Tax/Test/Unit/Model/Sales/Total/Quote/TaxTest.php
+++ b/app/code/Magento/Tax/Test/Unit/Model/Sales/Total/Quote/TaxTest.php
@@ -552,6 +552,9 @@ public function testMapQuoteExtraTaxables($itemData, $addressData)
/*
* @return array
*/
+ /**
+ * @return array
+ */
public function dataProviderMapQuoteExtraTaxablesArray()
{
$data = [
diff --git a/app/code/Magento/Tax/Test/Unit/Model/System/Message/Notification/ApplyDiscountOnPricesTest.php b/app/code/Magento/Tax/Test/Unit/Model/System/Message/Notification/ApplyDiscountOnPricesTest.php
index f8cd3fce693a6..6902a59a2dab4 100644
--- a/app/code/Magento/Tax/Test/Unit/Model/System/Message/Notification/ApplyDiscountOnPricesTest.php
+++ b/app/code/Magento/Tax/Test/Unit/Model/System/Message/Notification/ApplyDiscountOnPricesTest.php
@@ -95,6 +95,9 @@ public function testIsDisplayed(
$this->assertEquals($expectedResult, $this->applyDiscountOnPricesNotification->isDisplayed());
}
+ /**
+ * @return array
+ */
public function dataProviderIsDisplayed()
{
return [
diff --git a/app/code/Magento/Tax/Test/Unit/Model/System/Message/NotificationsTest.php b/app/code/Magento/Tax/Test/Unit/Model/System/Message/NotificationsTest.php
index 3cf1421ebcf37..3fda67669fe86 100644
--- a/app/code/Magento/Tax/Test/Unit/Model/System/Message/NotificationsTest.php
+++ b/app/code/Magento/Tax/Test/Unit/Model/System/Message/NotificationsTest.php
@@ -73,6 +73,9 @@ public function testIsDisplayed(
$this->assertEquals($expectedResult, $this->notifications->isDisplayed());
}
+ /**
+ * @return array
+ */
public function dataProviderIsDisplayed()
{
return [
diff --git a/app/code/Magento/Tax/Test/Unit/Model/TaxAddressManagerTest.php b/app/code/Magento/Tax/Test/Unit/Model/TaxAddressManagerTest.php
index ec640b74f8985..493eebf9e1123 100644
--- a/app/code/Magento/Tax/Test/Unit/Model/TaxAddressManagerTest.php
+++ b/app/code/Magento/Tax/Test/Unit/Model/TaxAddressManagerTest.php
@@ -109,6 +109,9 @@ public function testSetDefaultAddressAfterSave(
$this->manager->setDefaultAddressAfterSave($address);
}
+ /**
+ * @return array
+ */
public function setAddressCustomerSessionAddressSaveDataProvider()
{
return [
@@ -151,6 +154,9 @@ public function testSetDefaultAddressAfterLogIn(
$this->manager->setDefaultAddressAfterLogIn([$address]);
}
+ /**
+ * @return array
+ */
public function setAddressCustomerSessionLogInDataProvider()
{
return [
diff --git a/app/code/Magento/Tax/Test/Unit/Model/TaxClass/FactoryTest.php b/app/code/Magento/Tax/Test/Unit/Model/TaxClass/FactoryTest.php
index eb107c248880b..d46c9996c390c 100644
--- a/app/code/Magento/Tax/Test/Unit/Model/TaxClass/FactoryTest.php
+++ b/app/code/Magento/Tax/Test/Unit/Model/TaxClass/FactoryTest.php
@@ -39,6 +39,9 @@ public function testCreate($classType, $className, $classTypeMock)
$this->assertEquals($classTypeMock, $taxClassFactory->create($classMock));
}
+ /**
+ * @return array
+ */
public function createDataProvider()
{
$customerClassMock = $this->createMock(\Magento\Tax\Model\TaxClass\Type\Customer::class);
diff --git a/app/code/Magento/Tax/Test/Unit/Model/TaxClass/Type/CustomerTest.php b/app/code/Magento/Tax/Test/Unit/Model/TaxClass/Type/CustomerTest.php
index fc27e68c8e55b..707b999c5e467 100644
--- a/app/code/Magento/Tax/Test/Unit/Model/TaxClass/Type/CustomerTest.php
+++ b/app/code/Magento/Tax/Test/Unit/Model/TaxClass/Type/CustomerTest.php
@@ -26,9 +26,9 @@ public function testIsAssignedToObjects()
$filterBuilder->expects($this->once())->method('setField')->with(
\Magento\Customer\Api\Data\GroupInterface::TAX_CLASS_ID
- )->willReturnself();
- $filterBuilder->expects($this->once())->method('setValue')->willReturnself();
- $filterBuilder->expects($this->once())->method('create')->willReturnself();
+ )->willReturnSelf();
+ $filterBuilder->expects($this->once())->method('setValue')->willReturnSelf();
+ $filterBuilder->expects($this->once())->method('create')->willReturnSelf();
$filterGroupBuilder = $this->createMock(\Magento\Framework\Api\Search\FilterGroupBuilder::class);
$searchCriteriaBuilder = $this->getMockBuilder(\Magento\Framework\Api\SearchCriteriaBuilder::class)
diff --git a/app/code/Magento/Tax/Test/Unit/Model/TaxRuleRepositoryTest.php b/app/code/Magento/Tax/Test/Unit/Model/TaxRuleRepositoryTest.php
index f4151cd18ba66..3fddd5da47611 100644
--- a/app/code/Magento/Tax/Test/Unit/Model/TaxRuleRepositoryTest.php
+++ b/app/code/Magento/Tax/Test/Unit/Model/TaxRuleRepositoryTest.php
@@ -168,6 +168,9 @@ public function testSaveWithExceptions($exceptionObject, $exceptionName, $except
$this->model->save($rule);
}
+ /**
+ * @return array
+ */
public function saveExceptionsDataProvider()
{
return [
diff --git a/app/code/Magento/Tax/Test/Unit/Observer/AfterAddressSaveObserverTest.php b/app/code/Magento/Tax/Test/Unit/Observer/AfterAddressSaveObserverTest.php
index 14d678d02366b..96b4b81ae2817 100644
--- a/app/code/Magento/Tax/Test/Unit/Observer/AfterAddressSaveObserverTest.php
+++ b/app/code/Magento/Tax/Test/Unit/Observer/AfterAddressSaveObserverTest.php
@@ -138,6 +138,9 @@ public function testExecute(
$this->session->execute($this->observerMock);
}
+ /**
+ * @return array
+ */
public function getExecuteDataProvider()
{
return [
diff --git a/app/code/Magento/Tax/Test/Unit/Pricing/AdjustmentTest.php b/app/code/Magento/Tax/Test/Unit/Pricing/AdjustmentTest.php
index a92aa6a0d05eb..e7557e2164ca0 100644
--- a/app/code/Magento/Tax/Test/Unit/Pricing/AdjustmentTest.php
+++ b/app/code/Magento/Tax/Test/Unit/Pricing/AdjustmentTest.php
@@ -56,6 +56,9 @@ public function testIsIncludedInBasePrice($expectedResult)
$this->assertEquals($expectedResult, $this->adjustment->isIncludedInBasePrice());
}
+ /**
+ * @return array
+ */
public function isIncludedInBasePriceDataProvider()
{
return [[true], [false]];
@@ -113,6 +116,9 @@ public function testExtractAdjustment($isPriceIncludesTax, $amount, $price, $exp
$this->assertEquals($expectedResult, $this->adjustment->extractAdjustment($amount, $object));
}
+ /**
+ * @return array
+ */
public function extractAdjustmentDataProvider()
{
return [
@@ -164,6 +170,9 @@ public function testIsExcludedWith($adjustmentCode, $expectedResult)
$this->assertEquals($expectedResult, $this->adjustment->isExcludedWith($adjustmentCode));
}
+ /**
+ * @return array
+ */
public function isExcludedWithDataProvider()
{
return [
diff --git a/app/code/Magento/TaxImportExport/Block/Adminhtml/Rate/ImportExport.php b/app/code/Magento/TaxImportExport/Block/Adminhtml/Rate/ImportExport.php
index a42877b3ecf8a..ab64567f4fe28 100644
--- a/app/code/Magento/TaxImportExport/Block/Adminhtml/Rate/ImportExport.php
+++ b/app/code/Magento/TaxImportExport/Block/Adminhtml/Rate/ImportExport.php
@@ -14,7 +14,7 @@ class ImportExport extends \Magento\Backend\Block\Widget
/**
* @var string
*/
- protected $_template = 'importExport.phtml';
+ protected $_template = 'Magento_TaxImportExport::importExport.phtml';
/**
* @param \Magento\Backend\Block\Template\Context $context
diff --git a/app/code/Magento/TaxImportExport/Block/Adminhtml/Rate/ImportExportHeader.php b/app/code/Magento/TaxImportExport/Block/Adminhtml/Rate/ImportExportHeader.php
index 8897e9b2083e9..e223adc3adb1a 100644
--- a/app/code/Magento/TaxImportExport/Block/Adminhtml/Rate/ImportExportHeader.php
+++ b/app/code/Magento/TaxImportExport/Block/Adminhtml/Rate/ImportExportHeader.php
@@ -16,5 +16,5 @@ class ImportExportHeader extends \Magento\Backend\Block\Widget
*
* @var string
*/
- protected $_template = 'importExportHeader.phtml';
+ protected $_template = 'Magento_TaxImportExport::importExportHeader.phtml';
}
diff --git a/app/code/Magento/Theme/Block/Adminhtml/Wysiwyg/Files/Content/Uploader.php b/app/code/Magento/Theme/Block/Adminhtml/Wysiwyg/Files/Content/Uploader.php
index 8e7f4c9cc680c..e99500dbd0694 100644
--- a/app/code/Magento/Theme/Block/Adminhtml/Wysiwyg/Files/Content/Uploader.php
+++ b/app/code/Magento/Theme/Block/Adminhtml/Wysiwyg/Files/Content/Uploader.php
@@ -19,7 +19,7 @@ class Uploader extends \Magento\Backend\Block\Media\Uploader
*
* @var string
*/
- protected $_template = 'browser/content/uploader.phtml';
+ protected $_template = 'Magento_Theme::browser/content/uploader.phtml';
/**
* @var \Magento\Theme\Helper\Storage
diff --git a/app/code/Magento/Theme/Block/Html/Breadcrumbs.php b/app/code/Magento/Theme/Block/Html/Breadcrumbs.php
index c1f8ea620ef41..cff87fc8726bd 100644
--- a/app/code/Magento/Theme/Block/Html/Breadcrumbs.php
+++ b/app/code/Magento/Theme/Block/Html/Breadcrumbs.php
@@ -21,7 +21,7 @@ class Breadcrumbs extends \Magento\Framework\View\Element\Template
*
* @var string
*/
- protected $_template = 'html/breadcrumbs.phtml';
+ protected $_template = 'Magento_Theme::html/breadcrumbs.phtml';
/**
* List of available breadcrumb properties
diff --git a/app/code/Magento/Theme/Block/Html/Header.php b/app/code/Magento/Theme/Block/Html/Header.php
index f597b4034da92..2663a4da15011 100644
--- a/app/code/Magento/Theme/Block/Html/Header.php
+++ b/app/code/Magento/Theme/Block/Html/Header.php
@@ -19,7 +19,7 @@ class Header extends \Magento\Framework\View\Element\Template
*
* @var string
*/
- protected $_template = 'html/header.phtml';
+ protected $_template = 'Magento_Theme::html/header.phtml';
/**
* Retrieve welcome text
diff --git a/app/code/Magento/Theme/Block/Html/Header/Logo.php b/app/code/Magento/Theme/Block/Html/Header/Logo.php
index 5b0c2eaf04c45..0a0e71f44ba32 100644
--- a/app/code/Magento/Theme/Block/Html/Header/Logo.php
+++ b/app/code/Magento/Theme/Block/Html/Header/Logo.php
@@ -19,7 +19,7 @@ class Logo extends \Magento\Framework\View\Element\Template
*
* @var string
*/
- protected $_template = 'html/header/logo.phtml';
+ protected $_template = 'Magento_Theme::html/header/logo.phtml';
/**
* @var \Magento\MediaStorage\Helper\File\Storage\Database
diff --git a/app/code/Magento/Theme/Test/Unit/Block/Html/TopmenuTest.php b/app/code/Magento/Theme/Test/Unit/Block/Html/TopmenuTest.php
index 49066e79cb798..91c3ce47fc8b8 100644
--- a/app/code/Magento/Theme/Test/Unit/Block/Html/TopmenuTest.php
+++ b/app/code/Magento/Theme/Test/Unit/Block/Html/TopmenuTest.php
@@ -109,6 +109,9 @@ protected function setUp()
);
}
+ /**
+ * @return Topmenu
+ */
protected function getTopmenu()
{
return new Topmenu($this->context, $this->nodeFactory, $this->treeFactory);
diff --git a/app/code/Magento/Theme/Test/Unit/Console/Command/ThemeUninstallCommandTest.php b/app/code/Magento/Theme/Test/Unit/Console/Command/ThemeUninstallCommandTest.php
index 2ae889e69bb12..36daf7d4aff48 100644
--- a/app/code/Magento/Theme/Test/Unit/Console/Command/ThemeUninstallCommandTest.php
+++ b/app/code/Magento/Theme/Test/Unit/Console/Command/ThemeUninstallCommandTest.php
@@ -8,7 +8,7 @@
use Magento\Framework\App\Console\MaintenanceModeEnabler;
use Magento\Theme\Console\Command\ThemeUninstallCommand;
-use Magento\Theme\Model\Theme\themePackageInfo;
+use Magento\Theme\Model\Theme\ThemePackageInfo;
use Magento\Theme\Model\Theme\ThemeUninstaller;
use Magento\Theme\Model\Theme\ThemeDependencyChecker;
use Symfony\Component\Console\Tester\CommandTester;
diff --git a/app/code/Magento/Theme/Test/Unit/Controller/Adminhtml/System/Design/Theme/UploadJsTest.php b/app/code/Magento/Theme/Test/Unit/Controller/Adminhtml/System/Design/Theme/UploadJsTest.php
index d5919db5edcba..bbcaa87acb9c3 100644
--- a/app/code/Magento/Theme/Test/Unit/Controller/Adminhtml/System/Design/Theme/UploadJsTest.php
+++ b/app/code/Magento/Theme/Test/Unit/Controller/Adminhtml/System/Design/Theme/UploadJsTest.php
@@ -63,22 +63,22 @@ public function testExecuteWithoutTheme()
->expects($this->at(0))
->method('get')
->with(\Magento\Theme\Model\Uploader\Service::class)
- ->WillReturn($this->serviceModel);
+ ->willReturn($this->serviceModel);
$this->_objectManagerMock
->expects($this->at(1))
->method('get')
->with(\Magento\Framework\View\Design\Theme\FlyweightFactory::class)
- ->WillReturn($this->themeFactory);
+ ->willReturn($this->themeFactory);
$this->_objectManagerMock
->expects($this->at(2))
->method('get')
->with(\Magento\Framework\View\Design\Theme\Customization\File\Js::class)
- ->WillReturn($this->customizationJs);
+ ->willReturn($this->customizationJs);
$this->_objectManagerMock
->expects($this->at(3))
->method('get')
->with(\Magento\Framework\Json\Helper\Data::class)
- ->WillReturn($this->jsonHelper);
+ ->willReturn($this->jsonHelper);
$this->themeFactory->expects($this->once())
->method('create')
@@ -107,21 +107,21 @@ public function testExecuteWithException()
$this->_objectManagerMock->expects($this->at(0))
->method('get')
->with(\Magento\Theme\Model\Uploader\Service::class)
- ->WillReturn($this->serviceModel);
+ ->willReturn($this->serviceModel);
$this->_objectManagerMock->expects($this->at(1))
->method('get')
->with(\Magento\Framework\View\Design\Theme\FlyweightFactory::class)
- ->WillReturn($this->themeFactory);
+ ->willReturn($this->themeFactory);
$this->_objectManagerMock
->expects($this->at(2))
->method('get')
->with(\Magento\Framework\View\Design\Theme\Customization\File\Js::class)
- ->WillReturn($this->customizationJs);
+ ->willReturn($this->customizationJs);
$this->_objectManagerMock
->expects($this->at(4))
->method('get')
->with(\Magento\Framework\Json\Helper\Data::class)
- ->WillReturn($this->jsonHelper);
+ ->willReturn($this->jsonHelper);
$this->themeFactory->expects($this->once())
->method('create')
@@ -172,19 +172,19 @@ public function testExecute()
$this->_objectManagerMock->expects($this->at(0))
->method('get')
->with(\Magento\Theme\Model\Uploader\Service::class)
- ->WillReturn($this->serviceModel);
+ ->willReturn($this->serviceModel);
$this->_objectManagerMock->expects($this->at(1))
->method('get')
->with(\Magento\Framework\View\Design\Theme\FlyweightFactory::class)
- ->WillReturn($this->themeFactory);
+ ->willReturn($this->themeFactory);
$this->_objectManagerMock->expects($this->at(2))
->method('get')
->with(\Magento\Framework\View\Design\Theme\Customization\File\Js::class)
- ->WillReturn($this->customizationJs);
+ ->willReturn($this->customizationJs);
$this->_objectManagerMock->expects($this->at(4))
->method('get')
->with(\Magento\Framework\Json\Helper\Data::class)
- ->WillReturn($this->jsonHelper);
+ ->willReturn($this->jsonHelper);
$this->themeFactory->expects($this->once())
->method('create')
diff --git a/app/code/Magento/Theme/Test/Unit/Model/Design/Backend/ThemeTest.php b/app/code/Magento/Theme/Test/Unit/Model/Design/Backend/ThemeTest.php
index d959b95dcb0ca..1725fe158c16c 100644
--- a/app/code/Magento/Theme/Test/Unit/Model/Design/Backend/ThemeTest.php
+++ b/app/code/Magento/Theme/Test/Unit/Model/Design/Backend/ThemeTest.php
@@ -123,6 +123,9 @@ public function testGetValue($value, $expectedResult)
$this->assertEquals($expectedResult, $this->model->getValue());
}
+ /**
+ * @return array
+ */
public function getValueDataProvider()
{
return [
@@ -131,6 +134,9 @@ public function getValueDataProvider()
];
}
+ /**
+ * @return array
+ */
public function afterSaveDataProvider()
{
return [
diff --git a/app/code/Magento/Theme/Test/Unit/Model/Theme/ValidationTest.php b/app/code/Magento/Theme/Test/Unit/Model/Theme/ValidationTest.php
index 5d1c9f8cf7c3c..e302762c1c783 100644
--- a/app/code/Magento/Theme/Test/Unit/Model/Theme/ValidationTest.php
+++ b/app/code/Magento/Theme/Test/Unit/Model/Theme/ValidationTest.php
@@ -31,6 +31,9 @@ public function testValidate(array $data, $result, array $messages)
$this->assertEquals($messages, $validator->getErrorMessages());
}
+ /**
+ * @return array
+ */
public function dataProviderValidate()
{
return [
diff --git a/app/code/Magento/Theme/Test/Unit/Model/ThemeTest.php b/app/code/Magento/Theme/Test/Unit/Model/ThemeTest.php
index 4ff64e6f694e8..b191a64ac2c21 100644
--- a/app/code/Magento/Theme/Test/Unit/Model/ThemeTest.php
+++ b/app/code/Magento/Theme/Test/Unit/Model/ThemeTest.php
@@ -481,6 +481,9 @@ public function testToArray(array $themeData, array $expected)
$this->assertEquals($expected, $this->_model->toArray());
}
+ /**
+ * @return array
+ */
public function toArrayDataProvider()
{
$parentTheme = $this->getMockBuilder(\Magento\Theme\Model\Theme::class)
@@ -555,6 +558,9 @@ public function testPopulateFromArray(array $value, array $expected, $expectedCa
$this->assertEquals($expected, $this->_model->getData());
}
+ /**
+ * @return array
+ */
public function populateFromArrayDataProvider()
{
return [
diff --git a/app/code/Magento/Theme/Test/Unit/Model/Wysiwyg/StorageTest.php b/app/code/Magento/Theme/Test/Unit/Model/Wysiwyg/StorageTest.php
index 62b644042b68d..913561590607a 100644
--- a/app/code/Magento/Theme/Test/Unit/Model/Wysiwyg/StorageTest.php
+++ b/app/code/Magento/Theme/Test/Unit/Model/Wysiwyg/StorageTest.php
@@ -172,6 +172,9 @@ public function testUploadInvalidFile()
$this->_storageModel->uploadFile($this->_storageRoot);
}
+ /**
+ * @return \PHPUnit_Framework_MockObject_MockObject
+ */
protected function _prepareUploader()
{
$uploader = $this->createMock(\Magento\MediaStorage\Model\File\Uploader::class);
@@ -538,6 +541,9 @@ public function testDeleteRootDirectory()
$this->_storageModel->deleteDirectory($directoryPath);
}
+ /**
+ * @return array
+ */
public function booleanCasesDataProvider()
{
return [[true], [false]];
diff --git a/app/code/Magento/Theme/Test/Unit/Ui/Component/Listing/Column/EditActionTest.php b/app/code/Magento/Theme/Test/Unit/Ui/Component/Listing/Column/EditActionTest.php
index 068738f17c967..2ac959d0a9881 100644
--- a/app/code/Magento/Theme/Test/Unit/Ui/Component/Listing/Column/EditActionTest.php
+++ b/app/code/Magento/Theme/Test/Unit/Ui/Component/Listing/Column/EditActionTest.php
@@ -82,6 +82,9 @@ public function testPrepareDataSource($dataSourceItem, $scope, $scopeId)
$this->assertEquals($expectedDataSource, $dataSource);
}
+ /**
+ * @return array
+ */
public function getPrepareDataSourceDataProvider()
{
return [
diff --git a/app/code/Magento/Ui/Test/Unit/Component/Form/Element/AbstractElementTest.php b/app/code/Magento/Ui/Test/Unit/Component/Form/Element/AbstractElementTest.php
index 54bf0c9e8b37e..d9afe8f16a1a7 100644
--- a/app/code/Magento/Ui/Test/Unit/Component/Form/Element/AbstractElementTest.php
+++ b/app/code/Magento/Ui/Test/Unit/Component/Form/Element/AbstractElementTest.php
@@ -46,6 +46,9 @@ protected function setUp()
*/
abstract protected function getModelName();
+ /**
+ * @return mixed
+ */
abstract public function testGetComponentName();
/**
diff --git a/app/code/Magento/Ui/Test/Unit/Component/Form/Element/ActionDeleteTest.php b/app/code/Magento/Ui/Test/Unit/Component/Form/Element/ActionDeleteTest.php
index 6f45c192d6c4c..890737965d559 100644
--- a/app/code/Magento/Ui/Test/Unit/Component/Form/Element/ActionDeleteTest.php
+++ b/app/code/Magento/Ui/Test/Unit/Component/Form/Element/ActionDeleteTest.php
@@ -20,6 +20,9 @@ protected function getModelName()
return ActionDelete::class;
}
+ /**
+ * @return mixed|void
+ */
public function testGetComponentName()
{
$this->assertSame(ActionDelete::NAME, $this->getModel()->getComponentName());
diff --git a/app/code/Magento/Ui/Test/Unit/Component/Form/Element/CheckboxSetTest.php b/app/code/Magento/Ui/Test/Unit/Component/Form/Element/CheckboxSetTest.php
index 025f4a1582458..968155b92a3b9 100644
--- a/app/code/Magento/Ui/Test/Unit/Component/Form/Element/CheckboxSetTest.php
+++ b/app/code/Magento/Ui/Test/Unit/Component/Form/Element/CheckboxSetTest.php
@@ -22,6 +22,9 @@ protected function getModelName()
return CheckboxSet::class;
}
+ /**
+ * @return mixed|void
+ */
public function testGetComponentName()
{
$this->assertSame(CheckboxSet::NAME, $this->getModel()->getComponentName());
diff --git a/app/code/Magento/Ui/Test/Unit/Component/Form/Element/MultiSelectTest.php b/app/code/Magento/Ui/Test/Unit/Component/Form/Element/MultiSelectTest.php
index cb91fbb945bb5..723d6402fe865 100644
--- a/app/code/Magento/Ui/Test/Unit/Component/Form/Element/MultiSelectTest.php
+++ b/app/code/Magento/Ui/Test/Unit/Component/Form/Element/MultiSelectTest.php
@@ -22,6 +22,9 @@ protected function getModelName()
return MultiSelect::class;
}
+ /**
+ * @return mixed|void
+ */
public function testGetComponentName()
{
$this->contextMock->expects($this->never())->method('getProcessor');
diff --git a/app/code/Magento/Ui/Test/Unit/Component/Form/Element/RadioSetTest.php b/app/code/Magento/Ui/Test/Unit/Component/Form/Element/RadioSetTest.php
index 0e0fef60df60b..ea4f0f9f94a00 100644
--- a/app/code/Magento/Ui/Test/Unit/Component/Form/Element/RadioSetTest.php
+++ b/app/code/Magento/Ui/Test/Unit/Component/Form/Element/RadioSetTest.php
@@ -22,6 +22,9 @@ protected function getModelName()
return RadioSet::class;
}
+ /**
+ * @return mixed|void
+ */
public function testGetComponentName()
{
$this->assertSame(RadioSet::NAME, $this->getModel()->getComponentName());
diff --git a/app/code/Magento/Ui/Test/Unit/Component/Form/Element/SelectTest.php b/app/code/Magento/Ui/Test/Unit/Component/Form/Element/SelectTest.php
index c695262681063..6432f8404eaff 100644
--- a/app/code/Magento/Ui/Test/Unit/Component/Form/Element/SelectTest.php
+++ b/app/code/Magento/Ui/Test/Unit/Component/Form/Element/SelectTest.php
@@ -22,6 +22,9 @@ protected function getModelName()
return Select::class;
}
+ /**
+ * @return mixed|void
+ */
public function testGetComponentName()
{
$this->assertSame(Select::NAME, $this->getModel()->getComponentName());
diff --git a/app/code/Magento/Ui/Test/Unit/Component/Form/Element/WysiwygTest.php b/app/code/Magento/Ui/Test/Unit/Component/Form/Element/WysiwygTest.php
index d0e0542a19480..2304883666b74 100644
--- a/app/code/Magento/Ui/Test/Unit/Component/Form/Element/WysiwygTest.php
+++ b/app/code/Magento/Ui/Test/Unit/Component/Form/Element/WysiwygTest.php
@@ -62,6 +62,9 @@ protected function setUp()
->method('getElementHtml');
}
+ /**
+ * @return \Magento\Ui\Component\Form\Element\AbstractElement|object
+ */
protected function getModel()
{
return $this->objectManager->getObject(Wysiwyg::class, [
@@ -82,6 +85,9 @@ protected function getModelName()
return Wysiwyg::class;
}
+ /**
+ * @return mixed|void
+ */
public function testGetComponentName()
{
$this->assertSame(Wysiwyg::NAME, $this->getModel()->getComponentName());
diff --git a/app/code/Magento/Ui/Test/Unit/Component/MassActionTest.php b/app/code/Magento/Ui/Test/Unit/Component/MassActionTest.php
index 123b4cacf71a7..b2f494351597f 100644
--- a/app/code/Magento/Ui/Test/Unit/Component/MassActionTest.php
+++ b/app/code/Magento/Ui/Test/Unit/Component/MassActionTest.php
@@ -93,6 +93,9 @@ public function testPrepare($componentName, $componentData)
$this->assertEquals(['actions' => [$action->getConfiguration()]], $massAction->getConfiguration());
}
+ /**
+ * @return array
+ */
public function getPrepareDataProvider()
{
return [
diff --git a/app/code/Magento/Ui/Test/Unit/Config/Converter/ActionsTest.php b/app/code/Magento/Ui/Test/Unit/Config/Converter/ActionsTest.php
index 8228026dff3d1..d146a18a710c6 100644
--- a/app/code/Magento/Ui/Test/Unit/Config/Converter/ActionsTest.php
+++ b/app/code/Magento/Ui/Test/Unit/Config/Converter/ActionsTest.php
@@ -61,6 +61,9 @@ public function testConvert(array $expectedResult, $xpath)
$this->assertEquals($expectedResult, $this->converter->convert($actions));
}
+ /**
+ * @return array
+ */
public function convertDataProvider()
{
return [
diff --git a/app/code/Magento/Ui/Test/Unit/Config/Converter/OptionsTest.php b/app/code/Magento/Ui/Test/Unit/Config/Converter/OptionsTest.php
index 058e3651bde5c..8f5ab55f7a914 100644
--- a/app/code/Magento/Ui/Test/Unit/Config/Converter/OptionsTest.php
+++ b/app/code/Magento/Ui/Test/Unit/Config/Converter/OptionsTest.php
@@ -41,6 +41,9 @@ public function testConvert(array $expectedResult, $xpath)
$this->assertEquals($expectedResult, $res);
}
+ /**
+ * @return array
+ */
public function convertDataProvider()
{
return [
diff --git a/app/code/Magento/Ui/Test/Unit/Model/ManagerTest.php b/app/code/Magento/Ui/Test/Unit/Model/ManagerTest.php
index 96468b63314b4..fde743390816d 100644
--- a/app/code/Magento/Ui/Test/Unit/Model/ManagerTest.php
+++ b/app/code/Magento/Ui/Test/Unit/Model/ManagerTest.php
@@ -193,6 +193,9 @@ public function testPrepareGetData($componentName, $componentData, $isCached, $r
);
}
+ /**
+ * @return array
+ */
public function getComponentData()
{
$cachedData = new \ArrayObject(
@@ -293,6 +296,9 @@ public function testCreateRawComponentData($componentName, $configData, $compone
$this->assertEquals($componentData, $this->manager->createRawComponentData($componentName, $needEvaluate));
}
+ /**
+ * @return array
+ */
public function getComponentDataProvider()
{
return [
diff --git a/app/code/Magento/Ui/view/base/web/js/form/element/abstract.js b/app/code/Magento/Ui/view/base/web/js/form/element/abstract.js
index 854af5494b385..3b1026e1d7fd4 100755
--- a/app/code/Magento/Ui/view/base/web/js/form/element/abstract.js
+++ b/app/code/Magento/Ui/view/base/web/js/form/element/abstract.js
@@ -450,6 +450,10 @@ define([
*/
toggleUseDefault: function (state) {
this.disabled(state);
+
+ if (this.source && this.hasService()) {
+ this.source.set('data.use_default.' + this.index, Number(state));
+ }
},
/**
diff --git a/app/code/Magento/Ui/view/base/web/js/form/element/single-checkbox-use-config.js b/app/code/Magento/Ui/view/base/web/js/form/element/single-checkbox-use-config.js
index b20b2c31ee1fb..3ee7ddd1e738f 100644
--- a/app/code/Magento/Ui/view/base/web/js/form/element/single-checkbox-use-config.js
+++ b/app/code/Magento/Ui/view/base/web/js/form/element/single-checkbox-use-config.js
@@ -36,6 +36,10 @@ define([
*/
toggleElement: function () {
this.disabled(this.isUseDefault() || this.isUseConfig());
+
+ if (this.source) {
+ this.source.set('data.use_default.' + this.index, Number(this.isUseDefault()));
+ }
}
});
});
diff --git a/app/code/Magento/Ui/view/base/web/templates/form/element/helper/service.html b/app/code/Magento/Ui/view/base/web/templates/form/element/helper/service.html
index 46f0a2df52441..195104b36721e 100644
--- a/app/code/Magento/Ui/view/base/web/templates/form/element/helper/service.html
+++ b/app/code/Magento/Ui/view/base/web/templates/form/element/helper/service.html
@@ -10,7 +10,6 @@
attr="
id: $data.uid + '_default',
name: 'use_default[' + $data.index + ']',
- 'data-form-part': $data.ns
"
ko-checked="isUseDefault"
ko-disabled="$data.serviceDisabled">
diff --git a/app/code/Magento/UrlRewrite/Block/Catalog/Category/Tree.php b/app/code/Magento/UrlRewrite/Block/Catalog/Category/Tree.php
index ce9c6e6510f53..220f2376e15a5 100644
--- a/app/code/Magento/UrlRewrite/Block/Catalog/Category/Tree.php
+++ b/app/code/Magento/UrlRewrite/Block/Catalog/Category/Tree.php
@@ -34,7 +34,7 @@ class Tree extends AbstractCategory
/**
* @var string
*/
- protected $_template = 'categories.phtml';
+ protected $_template = 'Magento_UrlRewrite::categories.phtml';
/**
* Adminhtml data
diff --git a/app/code/Magento/UrlRewrite/Block/Selector.php b/app/code/Magento/UrlRewrite/Block/Selector.php
index 0a28ba215de5a..75266fd2f977c 100644
--- a/app/code/Magento/UrlRewrite/Block/Selector.php
+++ b/app/code/Magento/UrlRewrite/Block/Selector.php
@@ -18,7 +18,7 @@ class Selector extends \Magento\Backend\Block\Template
/**
* @var string
*/
- protected $_template = 'selector.phtml';
+ protected $_template = 'Magento_UrlRewrite::selector.phtml';
/**
* Set block template and get available modes
diff --git a/app/code/Magento/UrlRewrite/Test/Unit/Helper/UrlRewriteTest.php b/app/code/Magento/UrlRewrite/Test/Unit/Helper/UrlRewriteTest.php
index e41a06cb0c9f0..b99c5c48c3de0 100644
--- a/app/code/Magento/UrlRewrite/Test/Unit/Helper/UrlRewriteTest.php
+++ b/app/code/Magento/UrlRewrite/Test/Unit/Helper/UrlRewriteTest.php
@@ -55,6 +55,9 @@ public function testValidateSuffixException($suffix)
$this->_helper->validateSuffix($suffix);
}
+ /**
+ * @return array
+ */
public function requestPathDataProvider()
{
return [
@@ -63,6 +66,9 @@ public function requestPathDataProvider()
];
}
+ /**
+ * @return array
+ */
public function requestPathExceptionDataProvider()
{
return [
diff --git a/app/code/Magento/User/Block/Role/Tab/Edit.php b/app/code/Magento/User/Block/Role/Tab/Edit.php
index 0d5db4f527738..dbc5ac19a77c7 100644
--- a/app/code/Magento/User/Block/Role/Tab/Edit.php
+++ b/app/code/Magento/User/Block/Role/Tab/Edit.php
@@ -19,7 +19,7 @@ class Edit extends \Magento\Backend\Block\Widget\Form implements \Magento\Backen
/**
* @var string
*/
- protected $_template = 'role/edit.phtml';
+ protected $_template = 'Magento_User::role/edit.phtml';
/**
* Root ACL Resource
diff --git a/app/code/Magento/User/Block/Role/Tab/Users.php b/app/code/Magento/User/Block/Role/Tab/Users.php
index 27604c9aed29a..d93e7ad63e354 100644
--- a/app/code/Magento/User/Block/Role/Tab/Users.php
+++ b/app/code/Magento/User/Block/Role/Tab/Users.php
@@ -45,7 +45,9 @@ protected function _construct()
$roleId = $this->getRequest()->getParam('rid', false);
/** @var \Magento\User\Model\ResourceModel\User\Collection $users */
$users = $this->_userCollectionFactory->create()->load();
- $this->setTemplate('role/users.phtml')->assign('users', $users->getItems())->assign('roleId', $roleId);
+ $this->setTemplate('role/users.phtml')
+ ->assign('users', $users->getItems())
+ ->assign('roleId', $roleId);
}
/**
diff --git a/app/code/Magento/User/Model/User.php b/app/code/Magento/User/Model/User.php
index 2a7d43008f2ad..d711220441aaf 100644
--- a/app/code/Magento/User/Model/User.php
+++ b/app/code/Magento/User/Model/User.php
@@ -47,6 +47,8 @@ class User extends AbstractModel implements StorageInterface, UserInterface
/** @deprecated */
const XML_PATH_RESET_PASSWORD_TEMPLATE = 'admin/emails/reset_password_template';
+ const MESSAGE_ID_PASSWORD_EXPIRED = 'magento_user_password_expired';
+
/**
* Model event prefix
*
diff --git a/app/code/Magento/User/Observer/Backend/AuthObserver.php b/app/code/Magento/User/Observer/Backend/AuthObserver.php
index bc5d6af615f13..c7a1a69f7ce84 100644
--- a/app/code/Magento/User/Observer/Backend/AuthObserver.php
+++ b/app/code/Magento/User/Observer/Backend/AuthObserver.php
@@ -149,7 +149,7 @@ public function execute(EventObserver $observer)
/**
* Update locking information for the user
*
- * @param \Magento\User\Model\User $user
+ * @param User $user
* @return void
*/
private function _updateLockingInformation($user)
@@ -195,10 +195,16 @@ private function _checkExpiredPassword($latestPassword)
$myAccountUrl = $this->url->getUrl('adminhtml/system_account/');
$message = __('It\'s time to
change your password .', $myAccountUrl);
}
+
+ $messages = $this->messageManager->getMessages();
+
+ // Remove existing messages with same ID to avoid duplication
+ $messages->deleteMessageByIdentifier(User::MESSAGE_ID_PASSWORD_EXPIRED);
+
$this->messageManager->addNoticeMessage($message);
- $message = $this->messageManager->getMessages()->getLastAddedMessage();
+ $message = $messages->getLastAddedMessage();
if ($message) {
- $message->setIdentifier('magento_user_password_expired')->setIsSticky(true);
+ $message->setIdentifier(User::MESSAGE_ID_PASSWORD_EXPIRED)->setIsSticky(true);
$this->authSession->setPciAdminUserIsPasswordExpired(true);
}
}
diff --git a/app/code/Magento/User/Observer/Backend/TrackAdminNewPasswordObserver.php b/app/code/Magento/User/Observer/Backend/TrackAdminNewPasswordObserver.php
index 09605372df181..059879ab9613f 100644
--- a/app/code/Magento/User/Observer/Backend/TrackAdminNewPasswordObserver.php
+++ b/app/code/Magento/User/Observer/Backend/TrackAdminNewPasswordObserver.php
@@ -8,6 +8,7 @@
use Magento\Framework\Event\Observer as EventObserver;
use Magento\Framework\Event\ObserverInterface;
+use Magento\User\Model\User;
/**
* User backend observer model for passwords
@@ -74,7 +75,7 @@ public function execute(EventObserver $observer)
$passwordHash = $user->getPassword();
if ($passwordHash && !$user->getForceNewPassword()) {
$this->userResource->trackPassword($user, $passwordHash);
- $this->messageManager->getMessages()->deleteMessageByIdentifier('magento_user_password_expired');
+ $this->messageManager->getMessages()->deleteMessageByIdentifier(User::MESSAGE_ID_PASSWORD_EXPIRED);
$this->authSession->unsPciAdminUserIsPasswordExpired();
}
}
diff --git a/app/code/Magento/User/Test/Unit/Model/ResourceModel/UserTest.php b/app/code/Magento/User/Test/Unit/Model/ResourceModel/UserTest.php
index ff0873c369075..28bfe34a05733 100644
--- a/app/code/Magento/User/Test/Unit/Model/ResourceModel/UserTest.php
+++ b/app/code/Magento/User/Test/Unit/Model/ResourceModel/UserTest.php
@@ -330,7 +330,7 @@ public function testDeleteFromRole()
$roleId = 44;
$methodUserMock->expects($this->once())->method('getUserId')->willReturn($uid);
$this->resourceMock->expects($this->atLeastOnce())->method('getConnection')->willReturn($this->dbAdapterMock);
- $methodUserMock->expects($this->atleastOnce())->method('getRoleId')->willReturn($roleId);
+ $methodUserMock->expects($this->atLeastOnce())->method('getRoleId')->willReturn($roleId);
$this->dbAdapterMock->expects($this->once())->method('delete');
$this->assertInstanceOf(
diff --git a/app/code/Magento/Variable/Test/Unit/Model/VariableTest.php b/app/code/Magento/Variable/Test/Unit/Model/VariableTest.php
index 54ceffff665ea..0f70753e01fbf 100644
--- a/app/code/Magento/Variable/Test/Unit/Model/VariableTest.php
+++ b/app/code/Magento/Variable/Test/Unit/Model/VariableTest.php
@@ -111,6 +111,9 @@ public function testValidate($variableArray, $objectId, $expectedResult)
$this->assertEquals($expectedResult, $this->model->validate($variableArray));
}
+ /**
+ * @return array
+ */
public function validateDataProvider()
{
$variable = [
@@ -123,6 +126,9 @@ public function validateDataProvider()
];
}
+ /**
+ * @return array
+ */
public function validateMissingInfoDataProvider()
{
return [
diff --git a/app/code/Magento/Vault/Test/Unit/Observer/AfterPaymentSaveObserverTest.php b/app/code/Magento/Vault/Test/Unit/Observer/AfterPaymentSaveObserverTest.php
index efbe2e9745ef1..09c17d1e58d98 100644
--- a/app/code/Magento/Vault/Test/Unit/Observer/AfterPaymentSaveObserverTest.php
+++ b/app/code/Magento/Vault/Test/Unit/Observer/AfterPaymentSaveObserverTest.php
@@ -160,6 +160,9 @@ public function testPositiveCase($customerId, $createdAt, $token, $isActive, $me
static::assertEquals($createdAt, $paymentToken->getCreatedAt());
}
+ /**
+ * @return array
+ */
public function positiveCaseDataProvider()
{
return [
diff --git a/app/code/Magento/Webapi/Controller/Rest.php b/app/code/Magento/Webapi/Controller/Rest.php
index dc061aeea99e7..f0bad69979529 100644
--- a/app/code/Magento/Webapi/Controller/Rest.php
+++ b/app/code/Magento/Webapi/Controller/Rest.php
@@ -22,6 +22,7 @@
use Magento\Webapi\Controller\Rest\Router;
use Magento\Webapi\Controller\Rest\Router\Route;
use Magento\Webapi\Model\Rest\Swagger\Generator;
+use Magento\Webapi\Controller\Rest\RequestProcessorPool;
/**
* Front controller for WebAPI REST area.
@@ -119,6 +120,11 @@ class Rest implements \Magento\Framework\App\FrontControllerInterface
*/
protected $swaggerGenerator;
+ /**
+ * @var RequestProcessorPool
+ */
+ protected $requestProcessorPool;
+
/**
* @var StoreManagerInterface
* @deprecated 100.1.0
@@ -189,6 +195,7 @@ public function __construct(
$this->serviceOutputProcessor = $serviceOutputProcessor;
$this->swaggerGenerator = $swaggerGenerator;
$this->storeManager = $storeManager;
+ $this->requestProcessorPool = $this->_objectManager->get(RequestProcessorPool::class);
}
/**
@@ -233,15 +240,13 @@ public function dispatch(\Magento\Framework\App\RequestInterface $request)
$this->areaList->getArea($this->_appState->getAreaCode())
->load(\Magento\Framework\App\Area::PART_TRANSLATE);
try {
- if ($this->isSchemaRequest()) {
- $this->processSchemaRequest();
- } else {
- $this->processApiRequest();
- }
+ $processor = $this->requestProcessorPool->getProcessor($this->_request);
+ $processor->process($this->_request);
} catch (\Exception $e) {
$maskedException = $this->_errorProcessor->maskException($e);
$this->_response->setException($maskedException);
}
+
return $this->_response;
}
diff --git a/app/code/Magento/Webapi/Controller/Rest/RequestProcessorInterface.php b/app/code/Magento/Webapi/Controller/Rest/RequestProcessorInterface.php
new file mode 100644
index 0000000000000..f4340c18e2134
--- /dev/null
+++ b/app/code/Magento/Webapi/Controller/Rest/RequestProcessorInterface.php
@@ -0,0 +1,35 @@
+requestProcessors = $requestProcessors;
+ }
+
+ /**
+ * {@inheritdoc}
+ *
+ * @throws \Magento\Framework\Webapi\Exception
+ * return RequestProcessorInterface
+ */
+ public function getProcessor(\Magento\Framework\Webapi\Rest\Request $request)
+ {
+ foreach ($this->requestProcessors as $processor) {
+ if ($processor->canProcess($request)) {
+ return $processor;
+ }
+ }
+
+ throw new \Magento\Framework\Webapi\Exception(
+ __('Specified request cannot be processed.'),
+ 0,
+ \Magento\Framework\Webapi\Exception::HTTP_BAD_REQUEST
+ );
+ }
+}
diff --git a/app/code/Magento/Webapi/Controller/Rest/Router/Route.php b/app/code/Magento/Webapi/Controller/Rest/Router/Route.php
index 6e2fda94237d7..ca5dfe2e2b822 100644
--- a/app/code/Magento/Webapi/Controller/Rest/Router/Route.php
+++ b/app/code/Magento/Webapi/Controller/Rest/Router/Route.php
@@ -241,4 +241,14 @@ public function getParameters()
{
return $this->parameters;
}
+
+ /**
+ * Get route path.
+ *
+ * @return string
+ */
+ public function getRoutePath()
+ {
+ return $this->route;
+ }
}
diff --git a/app/code/Magento/Webapi/Controller/Rest/SchemaRequestProcessor.php b/app/code/Magento/Webapi/Controller/Rest/SchemaRequestProcessor.php
new file mode 100644
index 0000000000000..0f1587c342fa7
--- /dev/null
+++ b/app/code/Magento/Webapi/Controller/Rest/SchemaRequestProcessor.php
@@ -0,0 +1,74 @@
+swaggerGenerator = $swaggerGenerator;
+ $this->response = $response;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function process(\Magento\Framework\Webapi\Rest\Request $request)
+ {
+ $requestedServices = $request->getRequestedServices('all');
+ $requestedServices = $requestedServices == Request::ALL_SERVICES
+ ? $this->swaggerGenerator->getListOfServices()
+ : $requestedServices;
+ $responseBody = $this->swaggerGenerator->generate(
+ $requestedServices,
+ $request->getScheme(),
+ $request->getHttpHost(false),
+ $request->getRequestUri()
+ );
+ $this->response->setBody($responseBody)->setHeader('Content-Type', 'application/json');
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function canProcess(\Magento\Framework\Webapi\Rest\Request $request)
+ {
+ if (strpos(ltrim($request->getPathInfo(), '/'), self::PROCESSOR_PATH) === 0) {
+ return true;
+ }
+ return false;
+ }
+}
diff --git a/app/code/Magento/Webapi/Controller/Rest/SynchronousRequestProcessor.php b/app/code/Magento/Webapi/Controller/Rest/SynchronousRequestProcessor.php
new file mode 100644
index 0000000000000..f5aa6bd88c399
--- /dev/null
+++ b/app/code/Magento/Webapi/Controller/Rest/SynchronousRequestProcessor.php
@@ -0,0 +1,121 @@
+response = $response;
+ $this->inputParamsResolver = $inputParamsResolver;
+ $this->serviceOutputProcessor = $serviceOutputProcessor;
+ $this->fieldsFilter = $fieldsFilter;
+ $this->deploymentConfig = $deploymentConfig;
+ $this->objectManager = $objectManager;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function process(\Magento\Framework\Webapi\Rest\Request $request)
+ {
+ $inputParams = $this->inputParamsResolver->resolve();
+
+ $route = $this->inputParamsResolver->getRoute();
+ $serviceMethodName = $route->getServiceMethod();
+ $serviceClassName = $route->getServiceClass();
+ $service = $this->objectManager->get($serviceClassName);
+
+ /**
+ * @var \Magento\Framework\Api\AbstractExtensibleObject $outputData
+ */
+ $outputData = call_user_func_array([$service, $serviceMethodName], $inputParams);
+ $outputData = $this->serviceOutputProcessor->process(
+ $outputData,
+ $serviceClassName,
+ $serviceMethodName
+ );
+ if ($request->getParam(FieldsFilter::FILTER_PARAMETER) && is_array($outputData)) {
+ $outputData = $this->fieldsFilter->filter($outputData);
+ }
+ $header = $this->deploymentConfig->get(ConfigOptionsListConstants::CONFIG_PATH_X_FRAME_OPT);
+ if ($header) {
+ $this->response->setHeader('X-Frame-Options', $header);
+ }
+ $this->response->prepareResponse($outputData);
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function canProcess(\Magento\Framework\Webapi\Rest\Request $request)
+ {
+ if (preg_match(self::PROCESSOR_PATH, $request->getPathInfo()) === 1) {
+ return true;
+ }
+ return false;
+ }
+}
diff --git a/app/code/Magento/Webapi/Model/Config.php b/app/code/Magento/Webapi/Model/Config.php
index cf268828c8091..b957279edd2c0 100644
--- a/app/code/Magento/Webapi/Model/Config.php
+++ b/app/code/Magento/Webapi/Model/Config.php
@@ -17,7 +17,7 @@
* @api
* @since 100.0.2
*/
-class Config
+class Config implements ConfigInterface
{
const CACHE_ID = 'webapi_config';
@@ -66,9 +66,7 @@ public function __construct(
}
/**
- * Return services loaded from cache if enabled or from files merged previously
- *
- * @return array
+ * {@inheritdoc}
*/
public function getServices()
{
diff --git a/app/code/Magento/Webapi/Model/ConfigInterface.php b/app/code/Magento/Webapi/Model/ConfigInterface.php
new file mode 100644
index 0000000000000..338c18795595f
--- /dev/null
+++ b/app/code/Magento/Webapi/Model/ConfigInterface.php
@@ -0,0 +1,24 @@
+/etc/webapi.xml files.
+ *
+ * @api
+ */
+interface ConfigInterface
+{
+ /**
+ * Return services loaded from cache if enabled or from files merged previously
+ *
+ * @return array
+ */
+ public function getServices();
+}
diff --git a/app/code/Magento/Webapi/Model/Rest/Config.php b/app/code/Magento/Webapi/Model/Rest/Config.php
index 2e1148b8a6469..3fd8c640fb3b7 100644
--- a/app/code/Magento/Webapi/Model/Rest/Config.php
+++ b/app/code/Magento/Webapi/Model/Rest/Config.php
@@ -6,7 +6,7 @@
namespace Magento\Webapi\Model\Rest;
use Magento\Webapi\Controller\Rest\Router\Route;
-use Magento\Webapi\Model\Config as ModelConfig;
+use Magento\Webapi\Model\ConfigInterface as ModelConfigInterface;
use Magento\Webapi\Model\Config\Converter;
/**
@@ -43,11 +43,13 @@ class Config
protected $_routeFactory;
/**
- * @param ModelConfig $config
+ * @param ModelConfigInterface $config
* @param \Magento\Framework\Controller\Router\Route\Factory $routeFactory
*/
- public function __construct(ModelConfig $config, \Magento\Framework\Controller\Router\Route\Factory $routeFactory)
- {
+ public function __construct(
+ ModelConfigInterface $config,
+ \Magento\Framework\Controller\Router\Route\Factory $routeFactory
+ ) {
$this->_config = $config;
$this->_routeFactory = $routeFactory;
}
diff --git a/app/code/Magento/Webapi/Model/Rest/Swagger/Generator.php b/app/code/Magento/Webapi/Model/Rest/Swagger/Generator.php
index 1e3a9c64e927e..1308f519c4954 100644
--- a/app/code/Magento/Webapi/Model/Rest/Swagger/Generator.php
+++ b/app/code/Magento/Webapi/Model/Rest/Swagger/Generator.php
@@ -407,7 +407,7 @@ protected function getObjectSchema($typeName, $description = '')
if ($simpleType = $this->getSimpleType($trimedTypeName)) {
$result['items'] = ['type' => $simpleType];
} else {
- if (strpos($typeName, '[]')) {
+ if (strpos($typeName, '[]') !== false) {
$result['items'] = ['$ref' => $this->getDefinitionReference($trimedTypeName)];
} else {
$result = ['$ref' => $this->getDefinitionReference($trimedTypeName)];
@@ -863,9 +863,17 @@ private function generateMethodSuccessResponse($parameters, $responses)
if (isset($parameters['result']['type'])) {
$schema = $this->getObjectSchema($parameters['result']['type'], $description);
}
- $responses['200']['description'] = '200 Success.';
+
+ // Some methods may have a non-standard HTTP success code.
+ $specificResponseData = $parameters['result']['response_codes']['success'] ?? [];
+ // Default HTTP success code to 200 if nothing has been supplied.
+ $responseCode = $specificResponseData['code'] ?? '200';
+ // Default HTTP response status to 200 Success if nothing has been supplied.
+ $responseDescription = $specificResponseData['description'] ?? '200 Success.';
+
+ $responses[$responseCode]['description'] = $responseDescription;
if (!empty($schema)) {
- $responses['200']['schema'] = $schema;
+ $responses[$responseCode]['schema'] = $schema;
}
}
return $responses;
diff --git a/app/code/Magento/Webapi/Test/Unit/Controller/PathProcessorTest.php b/app/code/Magento/Webapi/Test/Unit/Controller/PathProcessorTest.php
index 7f3fe558a98eb..c213c72b5185a 100644
--- a/app/code/Magento/Webapi/Test/Unit/Controller/PathProcessorTest.php
+++ b/app/code/Magento/Webapi/Test/Unit/Controller/PathProcessorTest.php
@@ -51,6 +51,9 @@ public function testAllStoreCode($storeCodeInPath, $storeCodeSet, $setCurrentSto
$this->assertSame($this->endpointPath, $result);
}
+ /**
+ * @return array
+ */
public function processPathDataProvider()
{
return [
diff --git a/app/code/Magento/Webapi/Test/Unit/Controller/RestTest.php b/app/code/Magento/Webapi/Test/Unit/Controller/RestTest.php
index c747ada367aa2..582d387054ee6 100644
--- a/app/code/Magento/Webapi/Test/Unit/Controller/RestTest.php
+++ b/app/code/Magento/Webapi/Test/Unit/Controller/RestTest.php
@@ -4,8 +4,6 @@
* See COPYING.txt for license details.
*/
-// @codingStandardsIgnoreFile
-
namespace Magento\Webapi\Test\Unit\Controller;
use Magento\Authorization\Model\UserContextInterface;
@@ -64,16 +62,30 @@ class RestTest extends \PHPUnit\Framework\TestCase
*/
protected $swaggerGeneratorMock;
- /** @var \Magento\Store\Model\StoreManagerInterface | \PHPUnit_Framework_MockObject_MockObject */
+ /**
+ * @var \Magento\Store\Model\StoreManagerInterface | \PHPUnit_Framework_MockObject_MockObject
+ */
private $storeManagerMock;
- /** @var \Magento\Store\Api\Data\StoreInterface | \PHPUnit_Framework_MockObject_MockObject */
+ /**
+ * @var \Magento\Store\Api\Data\StoreInterface | \PHPUnit_Framework_MockObject_MockObject
+ */
private $storeMock;
/**
- * @var \PHPUnit_Framework_MockObject_MockObject
+ * @var \Magento\Webapi\Controller\Rest\SchemaRequestProcessor | \PHPUnit_Framework_MockObject_MockObject
+ */
+ protected $schemaRequestProcessor;
+
+ /**
+ * @var \Magento\Webapi\Controller\Rest\SynchronousRequestProcessor | \PHPUnit_Framework_MockObject_MockObject
+ */
+ protected $synchronousRequestProcessor;
+
+ /**
+ * @var \Magento\Webapi\Controller\Rest\RequestProcessorPool | \PHPUnit_Framework_MockObject_MockObject
*/
- private $deploymentConfigMock;
+ protected $requestProcessorPool;
const SERVICE_METHOD = 'testMethod';
@@ -81,94 +93,87 @@ class RestTest extends \PHPUnit\Framework\TestCase
protected function setUp()
{
- $this->deploymentConfigMock = $this->createMock(\Magento\Framework\App\DeploymentConfig::class);
- $this->_requestMock = $this->getMockBuilder(\Magento\Framework\Webapi\Rest\Request::class)
- ->setMethods(
- [
- 'isSecure',
- 'getRequestData',
- 'getParams',
- 'getParam',
- 'getRequestedServices',
- 'getPathInfo',
- 'getHttpHost',
- 'getMethod',
- ]
- )->disableOriginalConstructor()->getMock();
+ $objectManagerMock = $this->createMock(\Magento\Framework\ObjectManagerInterface::class);
+ $this->_requestMock = $this->getRequestMock();
$this->_requestMock->expects($this->any())->method('getHttpHost')->willReturn('testHostName.com');
- $this->_responseMock = $this->getMockBuilder(\Magento\Framework\Webapi\Rest\Response::class)
- ->setMethods(['sendResponse', 'prepareResponse', 'setHeader'])->disableOriginalConstructor()->getMock();
+ $this->_responseMock = $this->getResponseMock();
$routerMock = $this->getMockBuilder(\Magento\Webapi\Controller\Rest\Router::class)->setMethods(['match'])
->disableOriginalConstructor()->getMock();
- $this->_routeMock = $this->getMockBuilder(\Magento\Webapi\Controller\Rest\Router\Route::class)
- ->setMethods(['isSecure', 'getServiceMethod', 'getServiceClass', 'getAclResources', 'getParameters'])
- ->disableOriginalConstructor()->getMock();
- $objectManagerMock = $this->createMock(\Magento\Framework\ObjectManagerInterface::class);
+
+ $this->_routeMock = $this->getRouteMock();
$this->_serviceMock = $this->getMockBuilder(self::SERVICE_ID)->setMethods([self::SERVICE_METHOD])
->disableOriginalConstructor()->getMock();
+
$this->_oauthServiceMock = $this->getMockBuilder(\Magento\Framework\Oauth\OauthInterface::class)
->setMethods(['validateAccessTokenRequest'])->getMockForAbstractClass();
$this->_authorizationMock = $this->getMockBuilder(\Magento\Framework\Webapi\Authorization::class)
->disableOriginalConstructor()->getMock();
+
$paramsOverriderMock = $this->getMockBuilder(\Magento\Webapi\Controller\Rest\ParamsOverrider::class)
->setMethods(['overrideParams'])
->disableOriginalConstructor()->getMock();
+
$dataObjectProcessorMock = $this->getMockBuilder(\Magento\Framework\Reflection\DataObjectProcessor::class)
- ->disableOriginalConstructor()->setMethods(['getMethodReturnType'])->getMockForAbstractClass();
- $this->swaggerGeneratorMock = $this->getMockBuilder(\Magento\Webapi\Model\Rest\Swagger\Generator::class)
->disableOriginalConstructor()
- ->setMethods(['generate', 'getListOfServices'])
+ ->setMethods(['getMethodReturnType'])
->getMockForAbstractClass();
$layoutMock = $this->getMockBuilder(\Magento\Framework\View\LayoutInterface::class)
->disableOriginalConstructor()->getMock();
+
$errorProcessorMock = $this->createMock(\Magento\Framework\Webapi\ErrorProcessor::class);
$errorProcessorMock->expects($this->any())->method('maskException')->will($this->returnArgument(0));
+
$objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
+
$this->serviceInputProcessorMock = $this->getMockBuilder(\Magento\Framework\Webapi\ServiceInputProcessor::class)
->disableOriginalConstructor()->setMethods(['process'])->getMock();
+
$areaListMock = $this->createMock(\Magento\Framework\App\AreaList::class);
$areaMock = $this->createMock(\Magento\Framework\App\AreaInterface::class);
$areaListMock->expects($this->any())->method('getArea')->will($this->returnValue($areaMock));
$this->storeMock = $this->createMock(\Magento\Store\Api\Data\StoreInterface::class);
$this->storeManagerMock = $this->createMock(\Magento\Store\Model\StoreManagerInterface::class);
$this->storeManagerMock->expects($this->any())->method('getStore')->willReturn($this->storeMock);
+ $this->requestProcessorPool = $this->getRequestProccessotPoolMock();
- /** Init SUT. */
$this->_restController =
$objectManager->getObject(
\Magento\Webapi\Controller\Rest::class,
[
- 'request' => $this->_requestMock,
- 'response' => $this->_responseMock,
- 'router' => $routerMock,
- 'objectManager' => $objectManagerMock,
- 'layout' => $layoutMock,
- 'oauthService' => $this->_oauthServiceMock,
- 'authorization' => $this->_authorizationMock,
+ 'request' => $this->_requestMock,
+ 'response' => $this->_responseMock,
+ 'router' => $routerMock,
+ 'objectManager' => $objectManagerMock,
+ 'layout' => $layoutMock,
+ 'oauthService' => $this->_oauthServiceMock,
+ 'authorization' => $this->_authorizationMock,
'serviceInputProcessor' => $this->serviceInputProcessorMock,
- 'errorProcessor' => $errorProcessorMock,
- 'areaList' => $areaListMock,
- 'paramsOverrider' => $paramsOverriderMock,
- 'dataObjectProcessor' => $dataObjectProcessorMock,
- 'swaggerGenerator' => $this->swaggerGeneratorMock,
- 'storeManager' => $this->storeManagerMock
+ 'errorProcessor' => $errorProcessorMock,
+ 'areaList' => $areaListMock,
+ 'paramsOverrider' => $paramsOverriderMock,
+ 'dataObjectProcessor' => $dataObjectProcessorMock,
+ 'storeManager' => $this->storeManagerMock,
+ 'requestProcessorPool' => $this->requestProcessorPool,
]
);
- $this->_restController->setDeploymentConfig($this->deploymentConfigMock);
- // Set default expectations used by all tests
$this->_routeMock->expects($this->any())->method('getServiceClass')->will($this->returnValue(self::SERVICE_ID));
$this->_routeMock->expects($this->any())->method('getServiceMethod')
->will($this->returnValue(self::SERVICE_METHOD));
+
$routerMock->expects($this->any())->method('match')->will($this->returnValue($this->_routeMock));
+
$objectManagerMock->expects($this->any())->method('get')->will($this->returnValue($this->_serviceMock));
$this->_responseMock->expects($this->any())->method('prepareResponse')->will($this->returnValue([]));
$this->_serviceMock->expects($this->any())->method(self::SERVICE_METHOD)->will($this->returnValue(null));
+
$dataObjectProcessorMock->expects($this->any())->method('getMethodReturnType')
->with(self::SERVICE_ID, self::SERVICE_METHOD)
->will($this->returnValue('null'));
+
$paramsOverriderMock->expects($this->any())->method('overrideParams')->will($this->returnValue([]));
+
parent::setUp();
}
@@ -179,16 +184,17 @@ public function testDispatchSchemaRequest()
];
$this->_requestMock->expects($this->any())
->method('getPathInfo')
- ->willReturn(\Magento\Webapi\Controller\Rest::SCHEMA_PATH);
+ ->willReturn(\Magento\Webapi\Controller\Rest\SchemaRequestProcessor::PROCESSOR_PATH);
+
$this->_requestMock->expects($this->any())
->method('getParams')
->will($this->returnValue($params));
+
$schema = 'Some REST schema content';
$this->swaggerGeneratorMock->expects($this->any())->method('generate')->willReturn($schema);
+ $this->requestProcessorPool->getProcessor($this->_requestMock)->process($this->_requestMock);
- /** @var \Magento\Framework\App\ResponseInterface $response */
- $response = $this->_restController->dispatch($this->_requestMock);
- $this->assertEquals($schema, $response->getBody());
+ $this->assertEquals($schema, $this->_responseMock->getBody());
}
public function testDispatchAllSchemaRequest()
@@ -198,15 +204,17 @@ public function testDispatchAllSchemaRequest()
];
$this->_requestMock->expects($this->any())
->method('getPathInfo')
- ->willReturn(\Magento\Webapi\Controller\Rest::SCHEMA_PATH);
+ ->willReturn(\Magento\Webapi\Controller\Rest\SchemaRequestProcessor::PROCESSOR_PATH);
$this->_requestMock->expects($this->any())
->method('getParam')
->will(
- $this->returnValueMap(
+ $this->returnValueMap([
[
- [\Magento\Framework\Webapi\Request::REQUEST_PARAM_SERVICES, null, 'all']
- ]
- )
+ \Magento\Framework\Webapi\Request::REQUEST_PARAM_SERVICES,
+ null,
+ 'all',
+ ],
+ ])
);
$this->_requestMock->expects($this->any())
->method('getParams')
@@ -214,11 +222,95 @@ public function testDispatchAllSchemaRequest()
$this->_requestMock->expects($this->any())
->method('getRequestedServices')
->will($this->returnValue('all'));
+
$schema = 'Some REST schema content';
$this->swaggerGeneratorMock->expects($this->any())->method('generate')->willReturn($schema);
- $this->swaggerGeneratorMock->expects($this->once())->method('getListOfServices')
- ->willReturn(['listOfServices']);
- $this->_restController->dispatch($this->_requestMock);
+ $this->requestProcessorPool->getProcessor($this->_requestMock)->process($this->_requestMock);
+
$this->assertEquals($schema, $this->_responseMock->getBody());
}
+
+ /**
+ * @return object|\Magento\Webapi\Controller\Rest\RequestProcessorPool
+ */
+ private function getRequestProccessotPoolMock()
+ {
+ $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
+
+ $this->swaggerGeneratorMock = $this->getMockBuilder(\Magento\Webapi\Model\Rest\Swagger\Generator::class)
+ ->disableOriginalConstructor()
+ ->setMethods(['generate', 'getListOfServices'])
+ ->getMockForAbstractClass();
+
+ $this->schemaRequestProcessor = $objectManager->getObject(
+ \Magento\Webapi\Controller\Rest\SchemaRequestProcessor::class,
+ [
+ 'swaggerGenerator' => $this->swaggerGeneratorMock,
+ 'response' => $this->_responseMock,
+ ]
+ );
+
+ $this->synchronousRequestProcessor =
+ $this->getMockBuilder(\Magento\Webapi\Controller\Rest\SynchronousRequestProcessor::class)
+ ->setMethods(['process'])
+ ->disableOriginalConstructor()
+ ->getMock();
+
+ return $objectManager->getObject(
+ \Magento\Webapi\Controller\Rest\RequestProcessorPool::class,
+ [
+ 'requestProcessors' => [
+ 'syncSchema' => $this->schemaRequestProcessor,
+ 'sync' => $this->synchronousRequestProcessor,
+ ],
+ ]
+ );
+ }
+
+ /**
+ * @return \Magento\Webapi\Controller\Rest\Router\Route | \PHPUnit_Framework_MockObject_MockObject
+ */
+ private function getRouteMock()
+ {
+ return $this->getMockBuilder(\Magento\Webapi\Controller\Rest\Router\Route::class)
+ ->setMethods([
+ 'isSecure',
+ 'getServiceMethod',
+ 'getServiceClass',
+ 'getAclResources',
+ 'getParameters',
+ ])
+ ->disableOriginalConstructor()->getMock();
+ }
+
+ /**
+ * @return \Magento\Framework\Webapi\Rest\Request|\PHPUnit_Framework_MockObject_MockObject
+ */
+ private function getRequestMock()
+ {
+ return $this->getMockBuilder(\Magento\Framework\Webapi\Rest\Request::class)
+ ->setMethods(
+ [
+ 'isSecure',
+ 'getRequestData',
+ 'getParams',
+ 'getParam',
+ 'getRequestedServices',
+ 'getPathInfo',
+ 'getHttpHost',
+ 'getMethod',
+ ]
+ )->disableOriginalConstructor()->getMock();
+ }
+
+ /**
+ * @return \Magento\Framework\Webapi\Rest\Response|\PHPUnit_Framework_MockObject_MockObject
+ */
+ private function getResponseMock()
+ {
+ return $this->getMockBuilder(\Magento\Framework\Webapi\Rest\Response::class)
+ ->setMethods(['sendResponse', 'prepareResponse', 'setHeader'])
+ ->disableOriginalConstructor()
+ ->getMock();
+ }
}
diff --git a/app/code/Magento/Webapi/Test/Unit/Model/Authorization/TokenUserContextTest.php b/app/code/Magento/Webapi/Test/Unit/Model/Authorization/TokenUserContextTest.php
index c7272e3e5a2b2..86ef45e95618a 100644
--- a/app/code/Magento/Webapi/Test/Unit/Model/Authorization/TokenUserContextTest.php
+++ b/app/code/Magento/Webapi/Test/Unit/Model/Authorization/TokenUserContextTest.php
@@ -297,6 +297,9 @@ public function testValidToken($userType, $userId, $expectedUserType, $expectedU
$this->assertEquals($expectedUserId, $this->tokenUserContext->getUserId());
}
+ /**
+ * @return array
+ */
public function getValidTokenData()
{
return [
diff --git a/app/code/Magento/Webapi/Test/Unit/Model/Rest/Swagger/GeneratorTest.php b/app/code/Magento/Webapi/Test/Unit/Model/Rest/Swagger/GeneratorTest.php
index 611517df51657..8976ea6845dad 100644
--- a/app/code/Magento/Webapi/Test/Unit/Model/Rest/Swagger/GeneratorTest.php
+++ b/app/code/Magento/Webapi/Test/Unit/Model/Rest/Swagger/GeneratorTest.php
@@ -295,6 +295,9 @@ public function testGetObjectSchema($typeName, $description, $result)
$this->assertSame(json_encode($result), json_encode($actual));
}
+ /**
+ * @return array
+ */
public function getObjectSchemaDataProvider()
{
return [
@@ -354,6 +357,9 @@ public function testGenerateDefinition($typeData, $expected)
$this->assertSame(json_encode($expected), json_encode($actual));
}
+ /**
+ * @return array
+ */
public function generateDefinitionDataProvider()
{
return [
diff --git a/app/code/Magento/Webapi/etc/di.xml b/app/code/Magento/Webapi/etc/di.xml
index 9bb35a756a3cb..62ba22a658aaa 100644
--- a/app/code/Magento/Webapi/etc/di.xml
+++ b/app/code/Magento/Webapi/etc/di.xml
@@ -6,6 +6,7 @@
*/
-->
+
diff --git a/app/code/Magento/Webapi/etc/webapi_rest/di.xml b/app/code/Magento/Webapi/etc/webapi_rest/di.xml
index fa8252aca9095..f958d0d821a4b 100644
--- a/app/code/Magento/Webapi/etc/webapi_rest/di.xml
+++ b/app/code/Magento/Webapi/etc/webapi_rest/di.xml
@@ -69,4 +69,15 @@
+
+
+
+
+ - Magento\Webapi\Controller\Rest\SchemaRequestProcessor
+ - Magento\Webapi\Controller\Rest\SynchronousRequestProcessor
+
+
+
diff --git a/app/code/Magento/Weee/Block/Renderer/Weee/Tax.php b/app/code/Magento/Weee/Block/Renderer/Weee/Tax.php
index b079b034fd772..d262c8c5fb896 100644
--- a/app/code/Magento/Weee/Block/Renderer/Weee/Tax.php
+++ b/app/code/Magento/Weee/Block/Renderer/Weee/Tax.php
@@ -33,7 +33,7 @@ class Tax extends \Magento\Backend\Block\Widget implements \Magento\Framework\Da
/**
* @var string
*/
- protected $_template = 'renderer/tax.phtml';
+ protected $_template = 'Magento_Weee::renderer/tax.phtml';
/**
* Core registry
diff --git a/app/code/Magento/Weee/Model/Attribute/Backend/Weee/Tax.php b/app/code/Magento/Weee/Model/Attribute/Backend/Weee/Tax.php
index dfa40a166ba99..83ecad639fc5b 100644
--- a/app/code/Magento/Weee/Model/Attribute/Backend/Weee/Tax.php
+++ b/app/code/Magento/Weee/Model/Attribute/Backend/Weee/Tax.php
@@ -183,4 +183,12 @@ public function getTable()
{
return $this->_attributeTax->getTable('weee_tax');
}
+
+ /**
+ * {@inheritdoc}
+ */
+ public function getEntityIdField()
+ {
+ return $this->_attributeTax->getIdFieldName();
+ }
}
diff --git a/app/code/Magento/Weee/Test/Unit/Block/Item/Price/RendererTest.php b/app/code/Magento/Weee/Test/Unit/Block/Item/Price/RendererTest.php
index b49150fc6fac0..8b770ea763cdd 100644
--- a/app/code/Magento/Weee/Test/Unit/Block/Item/Price/RendererTest.php
+++ b/app/code/Magento/Weee/Test/Unit/Block/Item/Price/RendererTest.php
@@ -122,6 +122,9 @@ public function testDisplayPriceWithWeeeDetails(
$this->assertEquals($expectedValue, $this->renderer->displayPriceWithWeeeDetails());
}
+ /**
+ * @return array
+ */
public function displayPriceWithWeeeDetailsDataProvider()
{
$data = [
@@ -472,6 +475,9 @@ public function testGetBaseRowDisplayPriceInclTax(
$this->assertEquals($expectedValue, $this->renderer->getBaseRowDisplayPriceInclTax());
}
+ /**
+ * @return array
+ */
public function getDisplayPriceDataProvider()
{
$data = [
@@ -739,6 +745,9 @@ public function testGetBaseFinalRowDisplayPriceInclTax(
$this->assertEquals($expectedValue, $this->renderer->getBaseFinalRowDisplayPriceInclTax());
}
+ /**
+ * @return array
+ */
public function getFinalDisplayPriceDataProvider()
{
$data = [
diff --git a/app/code/Magento/Weee/Test/Unit/Model/Attribute/Backend/Weee/TaxTest.php b/app/code/Magento/Weee/Test/Unit/Model/Attribute/Backend/Weee/TaxTest.php
index 8ba8afaa1a8ab..05f7d3ccdff84 100644
--- a/app/code/Magento/Weee/Test/Unit/Model/Attribute/Backend/Weee/TaxTest.php
+++ b/app/code/Magento/Weee/Test/Unit/Model/Attribute/Backend/Weee/TaxTest.php
@@ -270,4 +270,31 @@ public function testGetTable()
$model->getTable();
}
+
+ /**
+ * Test method GetEntityIdField.
+ *
+ * @return void
+ */
+ public function testGetEntityIdField()
+ {
+ $attributeTaxMock = $this->getMockBuilder(\Magento\Weee\Model\ResourceModel\Attribute\Backend\Weee\Tax::class)
+ ->setMethods(['getEntityIdField', 'getIdFieldName'])
+ ->disableOriginalConstructor()
+ ->getMock();
+
+ $attributeTaxMock
+ ->expects($this->once())
+ ->method('getIdFieldName')
+ ->willReturn(null);
+
+ $model = $this->objectManager->getObject(
+ \Magento\Weee\Model\Attribute\Backend\Weee\Tax::class,
+ [
+ 'attributeTax' => $attributeTaxMock,
+ ]
+ );
+
+ $model->getEntityIdField();
+ }
}
diff --git a/app/code/Magento/Weee/Test/Unit/Model/Total/Invoice/WeeeTest.php b/app/code/Magento/Weee/Test/Unit/Model/Total/Invoice/WeeeTest.php
index 975580945bb3a..22d673e0c8b26 100644
--- a/app/code/Magento/Weee/Test/Unit/Model/Total/Invoice/WeeeTest.php
+++ b/app/code/Magento/Weee/Test/Unit/Model/Total/Invoice/WeeeTest.php
@@ -78,6 +78,9 @@ protected function setUp()
$this->invoice->expects($this->atLeastOnce())->method('getOrder')->will($this->returnValue($this->order));
}
+ /**
+ * @param $orderData
+ */
private function setupOrder($orderData)
{
//Set up order mock
diff --git a/app/code/Magento/Weee/Test/Unit/Observer/AfterAddressSaveTest.php b/app/code/Magento/Weee/Test/Unit/Observer/AfterAddressSaveTest.php
index 19f55550bac65..6d363847bf9e6 100644
--- a/app/code/Magento/Weee/Test/Unit/Observer/AfterAddressSaveTest.php
+++ b/app/code/Magento/Weee/Test/Unit/Observer/AfterAddressSaveTest.php
@@ -130,6 +130,9 @@ public function testExecute(
$this->session->execute($this->observerMock);
}
+ /**
+ * @return array
+ */
public function getExecuteDataProvider()
{
return [
diff --git a/app/code/Magento/Weee/Test/Unit/Pricing/AdjustmentTest.php b/app/code/Magento/Weee/Test/Unit/Pricing/AdjustmentTest.php
index e0eba358bc892..4c65011c1f69a 100644
--- a/app/code/Magento/Weee/Test/Unit/Pricing/AdjustmentTest.php
+++ b/app/code/Magento/Weee/Test/Unit/Pricing/AdjustmentTest.php
@@ -134,6 +134,9 @@ public function testIsExcludedWith($adjustmentCode, $expectedResult)
$this->assertEquals($expectedResult, $this->adjustment->isExcludedWith($adjustmentCode));
}
+ /**
+ * @return array
+ */
public function isExcludedWithDataProvider()
{
return [
@@ -157,6 +160,9 @@ public function testGetSortOrder($isTaxable, $expectedResult)
$this->assertEquals($expectedResult, $this->adjustment->getSortOrder());
}
+ /**
+ * @return array
+ */
public function getSortOrderProvider()
{
return [
diff --git a/app/code/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit/Tab/Main/Layout.php b/app/code/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit/Tab/Main/Layout.php
index 49345f29afd53..c48bf9e7e4c7a 100644
--- a/app/code/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit/Tab/Main/Layout.php
+++ b/app/code/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit/Tab/Main/Layout.php
@@ -27,7 +27,7 @@ class Layout extends Template implements RendererInterface
/**
* @var string
*/
- protected $_template = 'instance/edit/layout.phtml';
+ protected $_template = 'Magento_Widget::instance/edit/layout.phtml';
/**
* @var \Magento\Catalog\Model\Product\Type
diff --git a/app/code/Magento/Wishlist/Block/Rss/EmailLink.php b/app/code/Magento/Wishlist/Block/Rss/EmailLink.php
index 4a5f116cd8293..907dfd90e752e 100644
--- a/app/code/Magento/Wishlist/Block/Rss/EmailLink.php
+++ b/app/code/Magento/Wishlist/Block/Rss/EmailLink.php
@@ -21,7 +21,7 @@ class EmailLink extends Link
/**
* @var string
*/
- protected $_template = 'rss/email.phtml';
+ protected $_template = 'Magento_Wishlist::rss/email.phtml';
/**
* @return array
diff --git a/app/code/Magento/Wishlist/Block/Share/Email/Items.php b/app/code/Magento/Wishlist/Block/Share/Email/Items.php
index bc84f6a43df3c..d4e6587fd6519 100644
--- a/app/code/Magento/Wishlist/Block/Share/Email/Items.php
+++ b/app/code/Magento/Wishlist/Block/Share/Email/Items.php
@@ -20,7 +20,7 @@ class Items extends \Magento\Wishlist\Block\AbstractBlock
/**
* @var string
*/
- protected $_template = 'email/items.phtml';
+ protected $_template = 'Magento_Wishlist::email/items.phtml';
/**
* Retrieve Product View URL
diff --git a/app/code/Magento/Wishlist/Test/Unit/Block/Customer/Wishlist/Item/OptionsTest.php b/app/code/Magento/Wishlist/Test/Unit/Block/Customer/Wishlist/Item/OptionsTest.php
index 4b3ff8b8dd23e..36c51547c5a42 100644
--- a/app/code/Magento/Wishlist/Test/Unit/Block/Customer/Wishlist/Item/OptionsTest.php
+++ b/app/code/Magento/Wishlist/Test/Unit/Block/Customer/Wishlist/Item/OptionsTest.php
@@ -114,6 +114,9 @@ public function testGetConfiguredOptions($options, $callNum, $expected)
$this->assertEquals($expected, $this->block->getConfiguredOptions());
}
+ /**
+ * @return array
+ */
public function getConfiguredOptionsDataProvider()
{
return [
diff --git a/app/code/Magento/Wishlist/Test/Unit/Controller/Index/AllcartTest.php b/app/code/Magento/Wishlist/Test/Unit/Controller/Index/AllcartTest.php
index d7195086850e4..2df44a912a09c 100644
--- a/app/code/Magento/Wishlist/Test/Unit/Controller/Index/AllcartTest.php
+++ b/app/code/Magento/Wishlist/Test/Unit/Controller/Index/AllcartTest.php
@@ -136,6 +136,9 @@ protected function prepareContext()
->willReturn($this->resultFactoryMock);
}
+ /**
+ * @return \Magento\Wishlist\Controller\Index\Allcart
+ */
public function getController()
{
$this->prepareContext();
diff --git a/app/code/Magento/Wishlist/Test/Unit/Controller/Index/IndexTest.php b/app/code/Magento/Wishlist/Test/Unit/Controller/Index/IndexTest.php
index 136d0f7f36c3e..7c6ba740aa18d 100644
--- a/app/code/Magento/Wishlist/Test/Unit/Controller/Index/IndexTest.php
+++ b/app/code/Magento/Wishlist/Test/Unit/Controller/Index/IndexTest.php
@@ -123,6 +123,9 @@ protected function prepareContext()
->willReturn($this->resultFactoryMock);
}
+ /**
+ * @return \Magento\Wishlist\Controller\Index\Index
+ */
public function getController()
{
$this->prepareContext();
diff --git a/app/code/Magento/Wishlist/Test/Unit/Controller/Index/PluginTest.php b/app/code/Magento/Wishlist/Test/Unit/Controller/Index/PluginTest.php
index 82a58df1e579e..79186d29e666d 100644
--- a/app/code/Magento/Wishlist/Test/Unit/Controller/Index/PluginTest.php
+++ b/app/code/Magento/Wishlist/Test/Unit/Controller/Index/PluginTest.php
@@ -67,6 +67,9 @@ protected function tearDown()
);
}
+ /**
+ * @return \Magento\Wishlist\Controller\Index\Plugin
+ */
protected function getPlugin()
{
return new \Magento\Wishlist\Controller\Index\Plugin(
diff --git a/app/code/Magento/Wishlist/Test/Unit/Controller/Index/RemoveTest.php b/app/code/Magento/Wishlist/Test/Unit/Controller/Index/RemoveTest.php
index 2a36d3beb8558..6260a1292bee9 100644
--- a/app/code/Magento/Wishlist/Test/Unit/Controller/Index/RemoveTest.php
+++ b/app/code/Magento/Wishlist/Test/Unit/Controller/Index/RemoveTest.php
@@ -139,6 +139,9 @@ protected function prepareContext()
->willReturn($this->resultFactoryMock);
}
+ /**
+ * @return \Magento\Wishlist\Controller\Index\Remove
+ */
public function getController()
{
$this->prepareContext();
diff --git a/app/code/Magento/Wishlist/Test/Unit/Model/ItemTest.php b/app/code/Magento/Wishlist/Test/Unit/Model/ItemTest.php
index 0b1057683de86..9876b3f6bb75e 100644
--- a/app/code/Magento/Wishlist/Test/Unit/Model/ItemTest.php
+++ b/app/code/Magento/Wishlist/Test/Unit/Model/ItemTest.php
@@ -172,6 +172,9 @@ public function testRemoveOptionByCode($code, $option)
$this->assertTrue($actualOption->isDeleted());
}
+ /**
+ * @return array
+ */
public function getOptionsDataProvider()
{
$optionMock = $this->getMockBuilder(\Magento\Wishlist\Model\Item\Option::class)
diff --git a/app/code/Magento/Wishlist/Test/Unit/Model/LocaleQuantityProcessorTest.php b/app/code/Magento/Wishlist/Test/Unit/Model/LocaleQuantityProcessorTest.php
index 145d282554634..6cac17aa8c3da 100644
--- a/app/code/Magento/Wishlist/Test/Unit/Model/LocaleQuantityProcessorTest.php
+++ b/app/code/Magento/Wishlist/Test/Unit/Model/LocaleQuantityProcessorTest.php
@@ -60,6 +60,9 @@ public function testProcess($qtyResult, $expectedResult)
$this->assertEquals($expectedResult, $this->processor->process($qty));
}
+ /**
+ * @return array
+ */
public function processDataProvider()
{
return [
diff --git a/app/design/frontend/Magento/luma/Magento_Catalog/web/css/source/_module.less b/app/design/frontend/Magento/luma/Magento_Catalog/web/css/source/_module.less
index 6f7da202c16e6..228c6947c938b 100644
--- a/app/design/frontend/Magento/luma/Magento_Catalog/web/css/source/_module.less
+++ b/app/design/frontend/Magento/luma/Magento_Catalog/web/css/source/_module.less
@@ -336,6 +336,11 @@
.lib-css(margin-top, @indent__xs);
}
}
+ .field {
+ .note.mage-error {
+ color: @error__color;
+ }
+ }
}
.product-options-bottom .price-box,
@@ -789,7 +794,7 @@
clear: both;
max-width: 100%;
overflow-x: auto;
- position: relative; // Needed for Safari(iOS) to properly render "overflow-x" rule.
+ position: relative; // Needed for Safari(iOS) to properly render 'overflow-x' rule.
.table-comparison > tbody > tr {
> th,
diff --git a/app/etc/di.xml b/app/etc/di.xml
index fcc1ae5521df3..ad77ae3adc566 100755
--- a/app/etc/di.xml
+++ b/app/etc/di.xml
@@ -234,6 +234,11 @@
Magento\Backend\App\Request\PathInfoProcessor\Proxy
+
+
+ Magento\Framework\Session\Config\ConfigInterface\Proxy
+
+
diff --git a/composer.json b/composer.json
index 03cf41c30b5fa..63151a463b2c8 100644
--- a/composer.json
+++ b/composer.json
@@ -176,6 +176,7 @@
"magento/module-signifyd": "100.2.1",
"magento/module-sitemap": "100.2.3",
"magento/module-store": "100.2.3",
+ "magento/module-swagger-webapi": "100.0.0",
"magento/module-swagger": "100.2.2",
"magento/module-swatches": "100.2.2",
"magento/module-swatches-layered-navigation": "100.2.0",
@@ -263,4 +264,4 @@
}
},
"minimum-stability": "stable"
-}
+}
\ No newline at end of file
diff --git a/composer.lock b/composer.lock
index c38bb48a301c3..0720d7a47792c 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,8 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
"This file is @generated automatically"
],
- "content-hash": "ec6d7cf871a134a22f3e438b939c75be",
+ "hash": "7951fd69d258de36e80b71bc04d1712a",
+ "content-hash": "c1d845429d4f5bca4975609421182049",
"packages": [
{
"name": "braintree/braintree_php",
@@ -51,7 +52,7 @@
}
],
"description": "Braintree PHP Client Library",
- "time": "2018-02-08T23:03:34+00:00"
+ "time": "2018-02-08 23:03:34"
},
{
"name": "colinmollenhour/cache-backend-file",
@@ -87,7 +88,7 @@
],
"description": "The stock Zend_Cache_Backend_File backend has extremely poor performance for cleaning by tags making it become unusable as the number of cached items increases. This backend makes many changes resulting in a huge performance boost, especially for tag cleaning.",
"homepage": "https://github.com/colinmollenhour/Cm_Cache_Backend_File",
- "time": "2016-05-02T16:24:47+00:00"
+ "time": "2016-05-02 16:24:47"
},
{
"name": "colinmollenhour/cache-backend-redis",
@@ -123,7 +124,7 @@
],
"description": "Zend_Cache backend using Redis with full support for tags.",
"homepage": "https://github.com/colinmollenhour/Cm_Cache_Backend_Redis",
- "time": "2017-10-05T20:50:44+00:00"
+ "time": "2017-10-05 20:50:44"
},
{
"name": "colinmollenhour/credis",
@@ -163,7 +164,7 @@
],
"description": "Credis is a lightweight interface to the Redis key-value store which wraps the phpredis library when available for better performance.",
"homepage": "https://github.com/colinmollenhour/credis",
- "time": "2017-07-05T15:32:38+00:00"
+ "time": "2017-07-05 15:32:38"
},
{
"name": "colinmollenhour/php-redis-session-abstract",
@@ -200,7 +201,7 @@
],
"description": "A Redis-based session handler with optimistic locking",
"homepage": "https://github.com/colinmollenhour/php-redis-session-abstract",
- "time": "2017-03-22T16:13:03+00:00"
+ "time": "2017-03-22 16:13:03"
},
{
"name": "composer/ca-bundle",
@@ -256,7 +257,7 @@
"ssl",
"tls"
],
- "time": "2018-03-29T19:57:20+00:00"
+ "time": "2018-03-29 19:57:20"
},
{
"name": "composer/composer",
@@ -333,7 +334,7 @@
"dependency",
"package"
],
- "time": "2017-03-10T08:29:45+00:00"
+ "time": "2017-03-10 08:29:45"
},
{
"name": "composer/semver",
@@ -395,20 +396,20 @@
"validation",
"versioning"
],
- "time": "2016-08-30T16:08:34+00:00"
+ "time": "2016-08-30 16:08:34"
},
{
"name": "composer/spdx-licenses",
- "version": "1.3.0",
+ "version": "1.4.0",
"source": {
"type": "git",
"url": "https://github.com/composer/spdx-licenses.git",
- "reference": "7e111c50db92fa2ced140f5ba23b4e261bc77a30"
+ "reference": "cb17687e9f936acd7e7245ad3890f953770dec1b"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/composer/spdx-licenses/zipball/7e111c50db92fa2ced140f5ba23b4e261bc77a30",
- "reference": "7e111c50db92fa2ced140f5ba23b4e261bc77a30",
+ "url": "https://api.github.com/repos/composer/spdx-licenses/zipball/cb17687e9f936acd7e7245ad3890f953770dec1b",
+ "reference": "cb17687e9f936acd7e7245ad3890f953770dec1b",
"shasum": ""
},
"require": {
@@ -456,7 +457,7 @@
"spdx",
"validator"
],
- "time": "2018-01-31T13:17:27+00:00"
+ "time": "2018-04-30 10:33:04"
},
{
"name": "container-interop/container-interop",
@@ -487,7 +488,7 @@
],
"description": "Promoting the interoperability of container objects (DIC, SL, etc.)",
"homepage": "https://github.com/container-interop/container-interop",
- "time": "2017-02-14T19:40:03+00:00"
+ "time": "2017-02-14 19:40:03"
},
{
"name": "justinrainbow/json-schema",
@@ -553,7 +554,7 @@
"json",
"schema"
],
- "time": "2018-02-14T22:26:30+00:00"
+ "time": "2018-02-14 22:26:30"
},
{
"name": "magento/composer",
@@ -589,7 +590,7 @@
"AFL-3.0"
],
"description": "Magento composer library helps to instantiate Composer application and run composer commands.",
- "time": "2017-04-24T09:57:02+00:00"
+ "time": "2017-04-24 09:57:02"
},
{
"name": "magento/magento-composer-installer",
@@ -668,7 +669,7 @@
"composer-installer",
"magento"
],
- "time": "2017-12-29T16:45:24+00:00"
+ "time": "2017-12-29 16:45:24"
},
{
"name": "magento/zendframework1",
@@ -715,7 +716,7 @@
"ZF1",
"framework"
],
- "time": "2017-06-21T14:56:23+00:00"
+ "time": "2017-06-21 14:56:23"
},
{
"name": "monolog/monolog",
@@ -793,7 +794,7 @@
"logging",
"psr-3"
],
- "time": "2017-06-19T01:22:40+00:00"
+ "time": "2017-06-19 01:22:40"
},
{
"name": "oyejorge/less.php",
@@ -855,7 +856,7 @@
"php",
"stylesheet"
],
- "time": "2017-03-28T22:19:25+00:00"
+ "time": "2017-03-28 22:19:25"
},
{
"name": "paragonie/random_compat",
@@ -903,7 +904,7 @@
"pseudorandom",
"random"
],
- "time": "2018-04-04T21:24:14+00:00"
+ "time": "2018-04-04 21:24:14"
},
{
"name": "pelago/emogrifier",
@@ -972,7 +973,7 @@
"email",
"pre-processing"
],
- "time": "2018-01-05T23:30:21+00:00"
+ "time": "2018-01-05 23:30:21"
},
{
"name": "phpseclib/phpseclib",
@@ -1064,7 +1065,7 @@
"x.509",
"x509"
],
- "time": "2018-04-15T16:55:05+00:00"
+ "time": "2018-04-15 16:55:05"
},
{
"name": "psr/container",
@@ -1113,7 +1114,7 @@
"container-interop",
"psr"
],
- "time": "2017-02-14T16:28:37+00:00"
+ "time": "2017-02-14 16:28:37"
},
{
"name": "psr/http-message",
@@ -1163,7 +1164,7 @@
"request",
"response"
],
- "time": "2016-08-06T14:39:51+00:00"
+ "time": "2016-08-06 14:39:51"
},
{
"name": "psr/log",
@@ -1210,7 +1211,7 @@
"psr",
"psr-3"
],
- "time": "2016-10-10T12:19:37+00:00"
+ "time": "2016-10-10 12:19:37"
},
{
"name": "ramsey/uuid",
@@ -1290,7 +1291,7 @@
"identifier",
"uuid"
],
- "time": "2018-01-20T00:28:24+00:00"
+ "time": "2018-01-20 00:28:24"
},
{
"name": "seld/cli-prompt",
@@ -1338,7 +1339,7 @@
"input",
"prompt"
],
- "time": "2017-03-18T11:32:45+00:00"
+ "time": "2017-03-18 11:32:45"
},
{
"name": "seld/jsonlint",
@@ -1387,7 +1388,7 @@
"parser",
"validator"
],
- "time": "2018-01-24T12:46:19+00:00"
+ "time": "2018-01-24 12:46:19"
},
{
"name": "seld/phar-utils",
@@ -1431,7 +1432,7 @@
"keywords": [
"phra"
],
- "time": "2015-10-13T18:44:15+00:00"
+ "time": "2015-10-13 18:44:15"
},
{
"name": "symfony/console",
@@ -1492,7 +1493,7 @@
],
"description": "Symfony Console Component",
"homepage": "https://symfony.com",
- "time": "2018-04-30T01:21:07+00:00"
+ "time": "2018-04-30 01:21:07"
},
{
"name": "symfony/debug",
@@ -1549,7 +1550,7 @@
],
"description": "Symfony Debug Component",
"homepage": "https://symfony.com",
- "time": "2016-07-30T07:22:48+00:00"
+ "time": "2016-07-30 07:22:48"
},
{
"name": "symfony/event-dispatcher",
@@ -1609,11 +1610,11 @@
],
"description": "Symfony EventDispatcher Component",
"homepage": "https://symfony.com",
- "time": "2018-04-06T07:35:03+00:00"
+ "time": "2018-04-06 07:35:03"
},
{
"name": "symfony/filesystem",
- "version": "v3.4.8",
+ "version": "v3.4.9",
"source": {
"type": "git",
"url": "https://github.com/symfony/filesystem.git",
@@ -1658,11 +1659,11 @@
],
"description": "Symfony Filesystem Component",
"homepage": "https://symfony.com",
- "time": "2018-02-22T10:48:49+00:00"
+ "time": "2018-02-22 10:48:49"
},
{
"name": "symfony/finder",
- "version": "v3.4.8",
+ "version": "v3.4.9",
"source": {
"type": "git",
"url": "https://github.com/symfony/finder.git",
@@ -1707,20 +1708,20 @@
],
"description": "Symfony Finder Component",
"homepage": "https://symfony.com",
- "time": "2018-04-04T05:07:11+00:00"
+ "time": "2018-04-04 05:07:11"
},
{
"name": "symfony/polyfill-mbstring",
- "version": "v1.7.0",
+ "version": "v1.8.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-mbstring.git",
- "reference": "78be803ce01e55d3491c1397cf1c64beb9c1b63b"
+ "reference": "3296adf6a6454a050679cde90f95350ad604b171"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/78be803ce01e55d3491c1397cf1c64beb9c1b63b",
- "reference": "78be803ce01e55d3491c1397cf1c64beb9c1b63b",
+ "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/3296adf6a6454a050679cde90f95350ad604b171",
+ "reference": "3296adf6a6454a050679cde90f95350ad604b171",
"shasum": ""
},
"require": {
@@ -1732,7 +1733,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.7-dev"
+ "dev-master": "1.8-dev"
}
},
"autoload": {
@@ -1766,7 +1767,7 @@
"portable",
"shim"
],
- "time": "2018-01-30T19:27:44+00:00"
+ "time": "2018-04-26 10:06:28"
},
{
"name": "symfony/process",
@@ -1815,7 +1816,7 @@
],
"description": "Symfony Process Component",
"homepage": "https://symfony.com",
- "time": "2018-04-03T05:20:27+00:00"
+ "time": "2018-04-03 05:20:27"
},
{
"name": "tedivm/jshrink",
@@ -1861,7 +1862,7 @@
"javascript",
"minifier"
],
- "time": "2017-12-08T00:59:56+00:00"
+ "time": "2017-12-08 00:59:56"
},
{
"name": "tubalmartin/cssmin",
@@ -1914,7 +1915,7 @@
"minify",
"yui"
],
- "time": "2018-01-15T15:26:51+00:00"
+ "time": "2018-01-15 15:26:51"
},
{
"name": "zendframework/zend-captcha",
@@ -1972,7 +1973,7 @@
"captcha",
"zf"
],
- "time": "2018-04-24T17:24:10+00:00"
+ "time": "2018-04-24 17:24:10"
},
{
"name": "zendframework/zend-code",
@@ -2025,7 +2026,7 @@
"code",
"zf2"
],
- "time": "2016-10-24T13:23:32+00:00"
+ "time": "2016-10-24 13:23:32"
},
{
"name": "zendframework/zend-config",
@@ -2081,7 +2082,7 @@
"config",
"zf2"
],
- "time": "2016-02-04T23:01:10+00:00"
+ "time": "2016-02-04 23:01:10"
},
{
"name": "zendframework/zend-console",
@@ -2134,7 +2135,7 @@
"console",
"zf"
],
- "time": "2018-01-25T19:08:04+00:00"
+ "time": "2018-01-25 19:08:04"
},
{
"name": "zendframework/zend-crypt",
@@ -2184,7 +2185,7 @@
"crypt",
"zf2"
],
- "time": "2016-02-03T23:46:30+00:00"
+ "time": "2016-02-03 23:46:30"
},
{
"name": "zendframework/zend-db",
@@ -2242,7 +2243,7 @@
"db",
"zf"
],
- "time": "2018-04-09T13:21:36+00:00"
+ "time": "2018-04-09 13:21:36"
},
{
"name": "zendframework/zend-di",
@@ -2289,7 +2290,7 @@
"di",
"zf2"
],
- "time": "2016-04-25T20:58:11+00:00"
+ "time": "2016-04-25 20:58:11"
},
{
"name": "zendframework/zend-diactoros",
@@ -2341,7 +2342,7 @@
"psr",
"psr-7"
],
- "time": "2018-02-26T15:44:50+00:00"
+ "time": "2018-02-26 15:44:50"
},
{
"name": "zendframework/zend-escaper",
@@ -2386,7 +2387,7 @@
"escaper",
"zf"
],
- "time": "2018-04-25T15:48:53+00:00"
+ "time": "2018-04-25 15:48:53"
},
{
"name": "zendframework/zend-eventmanager",
@@ -2433,7 +2434,7 @@
"eventmanager",
"zf2"
],
- "time": "2017-12-12T17:48:56+00:00"
+ "time": "2017-12-12 17:48:56"
},
{
"name": "zendframework/zend-filter",
@@ -2496,7 +2497,7 @@
"filter",
"zf"
],
- "time": "2018-04-11T16:20:04+00:00"
+ "time": "2018-04-11 16:20:04"
},
{
"name": "zendframework/zend-form",
@@ -2574,7 +2575,7 @@
"form",
"zf"
],
- "time": "2017-12-06T21:09:08+00:00"
+ "time": "2017-12-06 21:09:08"
},
{
"name": "zendframework/zend-http",
@@ -2629,7 +2630,7 @@
"zend",
"zf"
],
- "time": "2018-04-26T21:04:50+00:00"
+ "time": "2018-04-26 21:04:50"
},
{
"name": "zendframework/zend-hydrator",
@@ -2687,7 +2688,7 @@
"hydrator",
"zf2"
],
- "time": "2016-02-18T22:38:26+00:00"
+ "time": "2016-02-18 22:38:26"
},
{
"name": "zendframework/zend-i18n",
@@ -2755,7 +2756,7 @@
"i18n",
"zf"
],
- "time": "2018-04-25T19:32:43+00:00"
+ "time": "2018-04-25 19:32:43"
},
{
"name": "zendframework/zend-inputfilter",
@@ -2808,7 +2809,7 @@
"inputfilter",
"zf"
],
- "time": "2018-01-22T19:41:18+00:00"
+ "time": "2018-01-22 19:41:18"
},
{
"name": "zendframework/zend-json",
@@ -2863,7 +2864,7 @@
"json",
"zf2"
],
- "time": "2016-02-04T21:20:26+00:00"
+ "time": "2016-02-04 21:20:26"
},
{
"name": "zendframework/zend-loader",
@@ -2908,7 +2909,7 @@
"loader",
"zf"
],
- "time": "2018-04-30T15:20:54+00:00"
+ "time": "2018-04-30 15:20:54"
},
{
"name": "zendframework/zend-log",
@@ -2979,7 +2980,7 @@
"logging",
"zf2"
],
- "time": "2018-04-09T21:59:51+00:00"
+ "time": "2018-04-09 21:59:51"
},
{
"name": "zendframework/zend-math",
@@ -3029,7 +3030,7 @@
"math",
"zf2"
],
- "time": "2016-04-07T16:29:53+00:00"
+ "time": "2016-04-07 16:29:53"
},
{
"name": "zendframework/zend-modulemanager",
@@ -3089,30 +3090,31 @@
"modulemanager",
"zf"
],
- "time": "2017-12-02T06:11:18+00:00"
+ "time": "2017-12-02 06:11:18"
},
{
"name": "zendframework/zend-mvc",
- "version": "2.7.13",
+ "version": "2.7.15",
"source": {
"type": "git",
"url": "https://github.com/zendframework/zend-mvc.git",
- "reference": "9dcaaad145254d023d3cd3559bf29e430f2884b2"
+ "reference": "a8d45689d37a9e4ff4b75ea0b7478fa3d4f9c089"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/zendframework/zend-mvc/zipball/9dcaaad145254d023d3cd3559bf29e430f2884b2",
- "reference": "9dcaaad145254d023d3cd3559bf29e430f2884b2",
+ "url": "https://api.github.com/repos/zendframework/zend-mvc/zipball/a8d45689d37a9e4ff4b75ea0b7478fa3d4f9c089",
+ "reference": "a8d45689d37a9e4ff4b75ea0b7478fa3d4f9c089",
"shasum": ""
},
"require": {
"container-interop/container-interop": "^1.1",
"php": "^5.5 || ^7.0",
- "zendframework/zend-eventmanager": "^2.6.2 || ^3.0",
- "zendframework/zend-form": "^2.8.2",
- "zendframework/zend-hydrator": "^1.1 || ^2.1",
+ "zendframework/zend-console": "^2.7",
+ "zendframework/zend-eventmanager": "^2.6.4 || ^3.0",
+ "zendframework/zend-form": "^2.11",
+ "zendframework/zend-hydrator": "^1.1 || ^2.4",
"zendframework/zend-psr7bridge": "^0.2",
- "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3",
+ "zendframework/zend-servicemanager": "^2.7.10 || ^3.0.3",
"zendframework/zend-stdlib": "^2.7.5 || ^3.0"
},
"replace": {
@@ -3120,30 +3122,29 @@
},
"require-dev": {
"friendsofphp/php-cs-fixer": "1.7.*",
- "phpunit/phpunit": "^4.5",
+ "phpunit/phpunit": "^4.8.36",
+ "sebastian/comparator": "^1.2.4",
"sebastian/version": "^1.0.4",
- "zendframework/zend-authentication": "^2.5.3",
- "zendframework/zend-cache": "^2.6.1",
- "zendframework/zend-console": "^2.6",
+ "zendframework/zend-authentication": "^2.6",
+ "zendframework/zend-cache": "^2.8",
"zendframework/zend-di": "^2.6",
- "zendframework/zend-filter": "^2.6.1",
- "zendframework/zend-http": "^2.5.4",
- "zendframework/zend-i18n": "^2.6",
- "zendframework/zend-inputfilter": "^2.6",
+ "zendframework/zend-filter": "^2.8",
+ "zendframework/zend-http": "^2.8",
+ "zendframework/zend-i18n": "^2.8",
+ "zendframework/zend-inputfilter": "^2.8",
"zendframework/zend-json": "^2.6.1",
- "zendframework/zend-log": "^2.7.1",
- "zendframework/zend-modulemanager": "^2.7.1",
- "zendframework/zend-serializer": "^2.6.1",
- "zendframework/zend-session": "^2.6.2",
- "zendframework/zend-text": "^2.6",
- "zendframework/zend-uri": "^2.5",
- "zendframework/zend-validator": "^2.6",
- "zendframework/zend-view": "^2.6.3"
+ "zendframework/zend-log": "^2.9.3",
+ "zendframework/zend-modulemanager": "^2.8",
+ "zendframework/zend-serializer": "^2.8",
+ "zendframework/zend-session": "^2.8.1",
+ "zendframework/zend-text": "^2.7",
+ "zendframework/zend-uri": "^2.6",
+ "zendframework/zend-validator": "^2.10",
+ "zendframework/zend-view": "^2.9"
},
"suggest": {
"zendframework/zend-authentication": "Zend\\Authentication component for Identity plugin",
"zendframework/zend-config": "Zend\\Config component",
- "zendframework/zend-console": "Zend\\Console component",
"zendframework/zend-di": "Zend\\Di component",
"zendframework/zend-filter": "Zend\\Filter component",
"zendframework/zend-http": "Zend\\Http component",
@@ -3168,6 +3169,9 @@
}
},
"autoload": {
+ "files": [
+ "src/autoload.php"
+ ],
"psr-4": {
"Zend\\Mvc\\": "src/"
}
@@ -3181,7 +3185,7 @@
"mvc",
"zf2"
],
- "time": "2017-12-14T22:44:10+00:00"
+ "time": "2018-05-03 13:13:41"
},
{
"name": "zendframework/zend-psr7bridge",
@@ -3230,7 +3234,7 @@
"psr",
"psr-7"
],
- "time": "2016-05-10T21:44:39+00:00"
+ "time": "2016-05-10 21:44:39"
},
{
"name": "zendframework/zend-serializer",
@@ -3288,20 +3292,20 @@
"serializer",
"zf2"
],
- "time": "2017-11-20T22:21:04+00:00"
+ "time": "2017-11-20 22:21:04"
},
{
"name": "zendframework/zend-server",
- "version": "2.7.0",
+ "version": "2.8.0",
"source": {
"type": "git",
"url": "https://github.com/zendframework/zend-server.git",
- "reference": "7cb617ca3e9b24579f544a244ee79ae61f480914"
+ "reference": "23a2e9a5599c83c05da831cb7c649e8a7809595e"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/zendframework/zend-server/zipball/7cb617ca3e9b24579f544a244ee79ae61f480914",
- "reference": "7cb617ca3e9b24579f544a244ee79ae61f480914",
+ "url": "https://api.github.com/repos/zendframework/zend-server/zipball/23a2e9a5599c83c05da831cb7c649e8a7809595e",
+ "reference": "23a2e9a5599c83c05da831cb7c649e8a7809595e",
"shasum": ""
},
"require": {
@@ -3310,14 +3314,14 @@
"zendframework/zend-stdlib": "^2.5 || ^3.0"
},
"require-dev": {
- "phpunit/phpunit": "^4.8",
- "squizlabs/php_codesniffer": "^2.3.1"
+ "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.4",
+ "zendframework/zend-coding-standard": "~1.0.0"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "2.7-dev",
- "dev-develop": "2.8-dev"
+ "dev-master": "2.8.x-dev",
+ "dev-develop": "2.9.x-dev"
}
},
"autoload": {
@@ -3329,12 +3333,13 @@
"license": [
"BSD-3-Clause"
],
- "homepage": "https://github.com/zendframework/zend-server",
+ "description": "Create Reflection-based RPC servers",
"keywords": [
+ "ZendFramework",
"server",
- "zf2"
+ "zf"
],
- "time": "2016-06-20T22:27:55+00:00"
+ "time": "2018-04-30 22:21:28"
},
{
"name": "zendframework/zend-servicemanager",
@@ -3386,7 +3391,7 @@
"servicemanager",
"zf2"
],
- "time": "2017-12-05T16:27:36+00:00"
+ "time": "2017-12-05 16:27:36"
},
{
"name": "zendframework/zend-session",
@@ -3453,7 +3458,7 @@
"session",
"zf"
],
- "time": "2018-02-22T16:33:54+00:00"
+ "time": "2018-02-22 16:33:54"
},
{
"name": "zendframework/zend-soap",
@@ -3506,7 +3511,7 @@
"soap",
"zf2"
],
- "time": "2018-01-29T17:51:26+00:00"
+ "time": "2018-01-29 17:51:26"
},
{
"name": "zendframework/zend-stdlib",
@@ -3565,7 +3570,7 @@
"stdlib",
"zf2"
],
- "time": "2016-04-12T21:17:31+00:00"
+ "time": "2016-04-12 21:17:31"
},
{
"name": "zendframework/zend-text",
@@ -3613,7 +3618,7 @@
"text",
"zf"
],
- "time": "2018-04-30T14:55:10+00:00"
+ "time": "2018-04-30 14:55:10"
},
{
"name": "zendframework/zend-uri",
@@ -3660,7 +3665,7 @@
"uri",
"zf"
],
- "time": "2018-04-30T13:40:08+00:00"
+ "time": "2018-04-30 13:40:08"
},
{
"name": "zendframework/zend-validator",
@@ -3731,7 +3736,7 @@
"validator",
"zf2"
],
- "time": "2018-02-01T17:05:33+00:00"
+ "time": "2018-02-01 17:05:33"
},
{
"name": "zendframework/zend-view",
@@ -3818,7 +3823,7 @@
"view",
"zf2"
],
- "time": "2018-01-17T22:21:50+00:00"
+ "time": "2018-01-17 22:21:50"
}
],
"packages-dev": [
@@ -3888,7 +3893,7 @@
"docblock",
"parser"
],
- "time": "2017-02-24T16:22:25+00:00"
+ "time": "2017-02-24 16:22:25"
},
{
"name": "doctrine/instantiator",
@@ -3942,7 +3947,7 @@
"constructor",
"instantiate"
],
- "time": "2015-06-14T21:17:01+00:00"
+ "time": "2015-06-14 21:17:01"
},
{
"name": "doctrine/lexer",
@@ -3996,7 +4001,62 @@
"lexer",
"parser"
],
- "time": "2014-09-09T13:34:57+00:00"
+ "time": "2014-09-09 13:34:57"
+ },
+ {
+ "name": "elasticsearch/elasticsearch",
+ "version": "v5.3.2",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/elastic/elasticsearch-php.git",
+ "reference": "4b29a4121e790bbfe690d5ee77da348b62d48eb8"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/elastic/elasticsearch-php/zipball/4b29a4121e790bbfe690d5ee77da348b62d48eb8",
+ "reference": "4b29a4121e790bbfe690d5ee77da348b62d48eb8",
+ "shasum": ""
+ },
+ "require": {
+ "guzzlehttp/ringphp": "~1.0",
+ "php": "^5.6|^7.0",
+ "psr/log": "~1.0"
+ },
+ "require-dev": {
+ "cpliakas/git-wrapper": "~1.0",
+ "doctrine/inflector": "^1.1",
+ "mockery/mockery": "0.9.4",
+ "phpunit/phpunit": "^4.7|^5.4",
+ "sami/sami": "~3.2",
+ "symfony/finder": "^2.8",
+ "symfony/yaml": "^2.8"
+ },
+ "suggest": {
+ "ext-curl": "*",
+ "monolog/monolog": "Allows for client-level logging and tracing"
+ },
+ "type": "library",
+ "autoload": {
+ "psr-4": {
+ "Elasticsearch\\": "src/Elasticsearch/"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "Apache-2.0"
+ ],
+ "authors": [
+ {
+ "name": "Zachary Tong"
+ }
+ ],
+ "description": "PHP Client for Elasticsearch",
+ "keywords": [
+ "client",
+ "elasticsearch",
+ "search"
+ ],
+ "time": "2017-11-08 17:04:47"
},
{
"name": "friendsofphp/php-cs-fixer",
@@ -4082,7 +4142,108 @@
}
],
"description": "A tool to automatically fix PHP code style",
- "time": "2018-03-20T18:04:00+00:00"
+ "time": "2018-03-20 18:04:00"
+ },
+ {
+ "name": "guzzlehttp/ringphp",
+ "version": "1.1.0",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/guzzle/RingPHP.git",
+ "reference": "dbbb91d7f6c191e5e405e900e3102ac7f261bc0b"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/guzzle/RingPHP/zipball/dbbb91d7f6c191e5e405e900e3102ac7f261bc0b",
+ "reference": "dbbb91d7f6c191e5e405e900e3102ac7f261bc0b",
+ "shasum": ""
+ },
+ "require": {
+ "guzzlehttp/streams": "~3.0",
+ "php": ">=5.4.0",
+ "react/promise": "~2.0"
+ },
+ "require-dev": {
+ "ext-curl": "*",
+ "phpunit/phpunit": "~4.0"
+ },
+ "suggest": {
+ "ext-curl": "Guzzle will use specific adapters if cURL is present"
+ },
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "1.1-dev"
+ }
+ },
+ "autoload": {
+ "psr-4": {
+ "GuzzleHttp\\Ring\\": "src/"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Michael Dowling",
+ "email": "mtdowling@gmail.com",
+ "homepage": "https://github.com/mtdowling"
+ }
+ ],
+ "description": "Provides a simple API and specification that abstracts away the details of HTTP into a single PHP function.",
+ "time": "2015-05-20 03:37:09"
+ },
+ {
+ "name": "guzzlehttp/streams",
+ "version": "3.0.0",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/guzzle/streams.git",
+ "reference": "47aaa48e27dae43d39fc1cea0ccf0d84ac1a2ba5"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/guzzle/streams/zipball/47aaa48e27dae43d39fc1cea0ccf0d84ac1a2ba5",
+ "reference": "47aaa48e27dae43d39fc1cea0ccf0d84ac1a2ba5",
+ "shasum": ""
+ },
+ "require": {
+ "php": ">=5.4.0"
+ },
+ "require-dev": {
+ "phpunit/phpunit": "~4.0"
+ },
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "3.0-dev"
+ }
+ },
+ "autoload": {
+ "psr-4": {
+ "GuzzleHttp\\Stream\\": "src/"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Michael Dowling",
+ "email": "mtdowling@gmail.com",
+ "homepage": "https://github.com/mtdowling"
+ }
+ ],
+ "description": "Provides a simple abstraction over streams of data",
+ "homepage": "http://guzzlephp.org/",
+ "keywords": [
+ "Guzzle",
+ "stream"
+ ],
+ "time": "2014-10-12 19:18:40"
},
{
"name": "ircmaxell/password-compat",
@@ -4124,7 +4285,56 @@
"hashing",
"password"
],
- "time": "2014-11-20T16:49:30+00:00"
+ "time": "2014-11-20 16:49:30"
+ },
+ {
+ "name": "league/climate",
+ "version": "2.6.1",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/thephpleague/climate.git",
+ "reference": "28851c909017424f61cc6a62089316313c645d1c"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/thephpleague/climate/zipball/28851c909017424f61cc6a62089316313c645d1c",
+ "reference": "28851c909017424f61cc6a62089316313c645d1c",
+ "shasum": ""
+ },
+ "require": {
+ "php": ">=5.4.0"
+ },
+ "require-dev": {
+ "mockery/mockery": "dev-master",
+ "phpunit/phpunit": "4.1.*"
+ },
+ "type": "library",
+ "autoload": {
+ "psr-4": {
+ "League\\CLImate\\": "src/"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Joe Tannenbaum",
+ "email": "hey@joe.codes",
+ "homepage": "http://joe.codes/",
+ "role": "Developer"
+ }
+ ],
+ "description": "PHP's best friend for the terminal. CLImate allows you to easily output colored text, special formats, and more.",
+ "keywords": [
+ "cli",
+ "colors",
+ "command",
+ "php",
+ "terminal"
+ ],
+ "time": "2015-01-18 14:31:58"
},
{
"name": "lusitanian/oauth",
@@ -4191,7 +4401,7 @@
"oauth",
"security"
],
- "time": "2018-02-14T22:37:14+00:00"
+ "time": "2018-02-14 22:37:14"
},
{
"name": "myclabs/deep-copy",
@@ -4236,7 +4446,7 @@
"object",
"object graph"
],
- "time": "2017-10-19T19:58:43+00:00"
+ "time": "2017-10-19 19:58:43"
},
{
"name": "pdepend/pdepend",
@@ -4276,7 +4486,7 @@
"BSD-3-Clause"
],
"description": "Official version of pdepend to be handled with Composer",
- "time": "2017-12-13T13:21:38+00:00"
+ "time": "2017-12-13 13:21:38"
},
{
"name": "phar-io/manifest",
@@ -4331,7 +4541,7 @@
}
],
"description": "Component for reading phar.io manifest information from a PHP Archive (PHAR)",
- "time": "2017-03-05T18:14:27+00:00"
+ "time": "2017-03-05 18:14:27"
},
{
"name": "phar-io/version",
@@ -4378,7 +4588,61 @@
}
],
"description": "Library for handling version information and constraints",
- "time": "2017-03-05T17:38:23+00:00"
+ "time": "2017-03-05 17:38:23"
+ },
+ {
+ "name": "php-amqplib/php-amqplib",
+ "version": "v2.5.2",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/php-amqplib/php-amqplib.git",
+ "reference": "eb8f94d97c8e79900accf77343dbd7eca7f58506"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/php-amqplib/php-amqplib/zipball/eb8f94d97c8e79900accf77343dbd7eca7f58506",
+ "reference": "eb8f94d97c8e79900accf77343dbd7eca7f58506",
+ "shasum": ""
+ },
+ "require": {
+ "ext-bcmath": "*",
+ "ext-mbstring": "*",
+ "php": ">=5.3.0"
+ },
+ "require-dev": {
+ "phpunit/phpunit": "3.7.*"
+ },
+ "suggest": {
+ "ext-sockets": "Use AMQPSocketConnection"
+ },
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "2.4-dev"
+ }
+ },
+ "autoload": {
+ "psr-4": {
+ "PhpAmqpLib\\": "PhpAmqpLib/"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "LGPL-2.1"
+ ],
+ "authors": [
+ {
+ "name": "Alvaro Videla"
+ }
+ ],
+ "description": "This library is a pure PHP implementation of the AMQP protocol. It's been tested against RabbitMQ.",
+ "homepage": "https://github.com/videlalvaro/php-amqplib/",
+ "keywords": [
+ "message",
+ "queue",
+ "rabbitmq"
+ ],
+ "time": "2015-08-11 12:30:09"
},
{
"name": "phpdocumentor/reflection-common",
@@ -4432,7 +4696,7 @@
"reflection",
"static analysis"
],
- "time": "2017-09-11T18:02:19+00:00"
+ "time": "2017-09-11 18:02:19"
},
{
"name": "phpdocumentor/reflection-docblock",
@@ -4483,7 +4747,7 @@
}
],
"description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.",
- "time": "2017-11-30T07:14:17+00:00"
+ "time": "2017-11-30 07:14:17"
},
{
"name": "phpdocumentor/type-resolver",
@@ -4530,7 +4794,7 @@
"email": "me@mikevanriel.com"
}
],
- "time": "2017-07-14T14:27:02+00:00"
+ "time": "2017-07-14 14:27:02"
},
{
"name": "phpmd/phpmd",
@@ -4596,7 +4860,7 @@
"phpmd",
"pmd"
],
- "time": "2017-01-20T14:41:10+00:00"
+ "time": "2017-01-20 14:41:10"
},
{
"name": "phpspec/prophecy",
@@ -4659,7 +4923,7 @@
"spy",
"stub"
],
- "time": "2018-04-18T13:57:24+00:00"
+ "time": "2018-04-18 13:57:24"
},
{
"name": "phpunit/php-code-coverage",
@@ -4722,7 +4986,7 @@
"testing",
"xunit"
],
- "time": "2018-04-06T15:36:58+00:00"
+ "time": "2018-04-06 15:36:58"
},
{
"name": "phpunit/php-file-iterator",
@@ -4769,7 +5033,7 @@
"filesystem",
"iterator"
],
- "time": "2017-11-27T13:52:08+00:00"
+ "time": "2017-11-27 13:52:08"
},
{
"name": "phpunit/php-text-template",
@@ -4810,7 +5074,7 @@
"keywords": [
"template"
],
- "time": "2015-06-21T13:50:34+00:00"
+ "time": "2015-06-21 13:50:34"
},
{
"name": "phpunit/php-timer",
@@ -4859,7 +5123,7 @@
"keywords": [
"timer"
],
- "time": "2017-02-26T11:10:40+00:00"
+ "time": "2017-02-26 11:10:40"
},
{
"name": "phpunit/php-token-stream",
@@ -4908,7 +5172,7 @@
"keywords": [
"tokenizer"
],
- "time": "2017-11-27T05:48:46+00:00"
+ "time": "2017-11-27 05:48:46"
},
{
"name": "phpunit/phpunit",
@@ -4992,7 +5256,7 @@
"testing",
"xunit"
],
- "time": "2017-08-03T13:59:28+00:00"
+ "time": "2017-08-03 13:59:28"
},
{
"name": "phpunit/phpunit-mock-objects",
@@ -5051,7 +5315,53 @@
"mock",
"xunit"
],
- "time": "2017-08-03T14:08:16+00:00"
+ "time": "2017-08-03 14:08:16"
+ },
+ {
+ "name": "react/promise",
+ "version": "v2.5.1",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/reactphp/promise.git",
+ "reference": "62785ae604c8d69725d693eb370e1d67e94c4053"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/reactphp/promise/zipball/62785ae604c8d69725d693eb370e1d67e94c4053",
+ "reference": "62785ae604c8d69725d693eb370e1d67e94c4053",
+ "shasum": ""
+ },
+ "require": {
+ "php": ">=5.4.0"
+ },
+ "require-dev": {
+ "phpunit/phpunit": "~4.8"
+ },
+ "type": "library",
+ "autoload": {
+ "psr-4": {
+ "React\\Promise\\": "src/"
+ },
+ "files": [
+ "src/functions_include.php"
+ ]
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Jan Sorgalla",
+ "email": "jsorgalla@gmail.com"
+ }
+ ],
+ "description": "A lightweight implementation of CommonJS Promises/A for PHP",
+ "keywords": [
+ "promise",
+ "promises"
+ ],
+ "time": "2017-03-25 12:08:31"
},
{
"name": "sebastian/code-unit-reverse-lookup",
@@ -5096,7 +5406,7 @@
],
"description": "Looks up which function or method a line of code belongs to",
"homepage": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/",
- "time": "2017-03-04T06:30:41+00:00"
+ "time": "2017-03-04 06:30:41"
},
{
"name": "sebastian/comparator",
@@ -5160,7 +5470,7 @@
"compare",
"equality"
],
- "time": "2017-03-03T06:26:08+00:00"
+ "time": "2017-03-03 06:26:08"
},
{
"name": "sebastian/diff",
@@ -5212,7 +5522,7 @@
"keywords": [
"diff"
],
- "time": "2017-05-22T07:24:03+00:00"
+ "time": "2017-05-22 07:24:03"
},
{
"name": "sebastian/environment",
@@ -5262,7 +5572,7 @@
"environment",
"hhvm"
],
- "time": "2017-07-01T08:51:00+00:00"
+ "time": "2017-07-01 08:51:00"
},
{
"name": "sebastian/exporter",
@@ -5329,7 +5639,7 @@
"export",
"exporter"
],
- "time": "2017-04-03T13:19:02+00:00"
+ "time": "2017-04-03 13:19:02"
},
{
"name": "sebastian/finder-facade",
@@ -5368,7 +5678,7 @@
],
"description": "FinderFacade is a convenience wrapper for Symfony's Finder component.",
"homepage": "https://github.com/sebastianbergmann/finder-facade",
- "time": "2017-11-18T17:31:49+00:00"
+ "time": "2017-11-18 17:31:49"
},
{
"name": "sebastian/global-state",
@@ -5419,7 +5729,7 @@
"keywords": [
"global state"
],
- "time": "2017-04-27T15:39:26+00:00"
+ "time": "2017-04-27 15:39:26"
},
{
"name": "sebastian/object-enumerator",
@@ -5466,7 +5776,7 @@
],
"description": "Traverses array structures and object graphs to enumerate all referenced objects",
"homepage": "https://github.com/sebastianbergmann/object-enumerator/",
- "time": "2017-08-03T12:35:26+00:00"
+ "time": "2017-08-03 12:35:26"
},
{
"name": "sebastian/object-reflector",
@@ -5511,7 +5821,7 @@
],
"description": "Allows reflection of object attributes, including inherited and non-public ones",
"homepage": "https://github.com/sebastianbergmann/object-reflector/",
- "time": "2017-03-29T09:07:27+00:00"
+ "time": "2017-03-29 09:07:27"
},
{
"name": "sebastian/phpcpd",
@@ -5562,7 +5872,7 @@
],
"description": "Copy/Paste Detector (CPD) for PHP code.",
"homepage": "https://github.com/sebastianbergmann/phpcpd",
- "time": "2016-04-17T19:32:49+00:00"
+ "time": "2016-04-17 19:32:49"
},
{
"name": "sebastian/recursion-context",
@@ -5615,7 +5925,7 @@
],
"description": "Provides functionality to recursively process PHP variables",
"homepage": "http://www.github.com/sebastianbergmann/recursion-context",
- "time": "2017-03-03T06:23:57+00:00"
+ "time": "2017-03-03 06:23:57"
},
{
"name": "sebastian/resource-operations",
@@ -5657,7 +5967,7 @@
],
"description": "Provides a list of PHP built-in functions that operate on resources",
"homepage": "https://www.github.com/sebastianbergmann/resource-operations",
- "time": "2015-07-28T20:34:47+00:00"
+ "time": "2015-07-28 20:34:47"
},
{
"name": "sebastian/version",
@@ -5700,7 +6010,119 @@
],
"description": "Library that helps with managing the version number of Git-hosted PHP projects",
"homepage": "https://github.com/sebastianbergmann/version",
- "time": "2016-10-03T07:35:21+00:00"
+ "time": "2016-10-03 07:35:21"
+ },
+ {
+ "name": "sjparkinson/static-review",
+ "version": "4.1.1",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/sjparkinson/static-review.git",
+ "reference": "493c3410cf146a12fca84209bad126c494e125f0"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/sjparkinson/static-review/zipball/493c3410cf146a12fca84209bad126c494e125f0",
+ "reference": "493c3410cf146a12fca84209bad126c494e125f0",
+ "shasum": ""
+ },
+ "require": {
+ "league/climate": "~2.0",
+ "php": ">=5.4.0",
+ "symfony/console": "~2.0",
+ "symfony/process": "~2.0"
+ },
+ "require-dev": {
+ "mockery/mockery": "~0.9",
+ "phpunit/phpunit": "~4.0",
+ "sensiolabs/security-checker": "~2.0",
+ "squizlabs/php_codesniffer": "~1.0"
+ },
+ "suggest": {
+ "sensiolabs/security-checker": "Required for ComposerSecurityReview.",
+ "squizlabs/php_codesniffer": "Required for PhpCodeSnifferReview."
+ },
+ "bin": [
+ "bin/static-review.php"
+ ],
+ "type": "library",
+ "autoload": {
+ "psr-4": {
+ "StaticReview\\": "src/"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Samuel Parkinson",
+ "email": "sam.james.parkinson@gmail.com",
+ "homepage": "http://samp.im"
+ }
+ ],
+ "description": "An extendable framework for version control hooks.",
+ "abandoned": "phpro/grumphp",
+ "time": "2014-09-22 08:40:36"
+ },
+ {
+ "name": "solarium/solarium",
+ "version": "3.8.1",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/solariumphp/solarium.git",
+ "reference": "c353babec89fdbe8c64054bfec8e77bcb5da6705"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/solariumphp/solarium/zipball/c353babec89fdbe8c64054bfec8e77bcb5da6705",
+ "reference": "c353babec89fdbe8c64054bfec8e77bcb5da6705",
+ "shasum": ""
+ },
+ "require": {
+ "php": ">=5.3.2",
+ "symfony/event-dispatcher": "~2.3|~3.0"
+ },
+ "require-dev": {
+ "guzzlehttp/guzzle": "^3.8 || ^6.2",
+ "phpunit/phpunit": "~3.7",
+ "satooshi/php-coveralls": "~1.0",
+ "squizlabs/php_codesniffer": "~1.4",
+ "zendframework/zendframework1": "~1.12"
+ },
+ "suggest": {
+ "minimalcode/search": "Query builder compatible with Solarium, allows simplified solr-query handling"
+ },
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-develop": "3.3.x-dev"
+ }
+ },
+ "autoload": {
+ "psr-0": {
+ "Solarium\\": "library/"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "BSD-3-Clause"
+ ],
+ "authors": [
+ {
+ "name": "See GitHub contributors",
+ "homepage": "https://github.com/basdenooijer/solarium/contributors"
+ }
+ ],
+ "description": "PHP Solr client",
+ "homepage": "http://www.solarium-project.org",
+ "keywords": [
+ "php",
+ "search",
+ "solr"
+ ],
+ "time": "2017-02-02 13:32:22"
},
{
"name": "squizlabs/php_codesniffer",
@@ -5751,11 +6173,11 @@
"phpcs",
"standards"
],
- "time": "2017-12-19T21:44:46+00:00"
+ "time": "2017-12-19 21:44:46"
},
{
"name": "symfony/config",
- "version": "v3.4.8",
+ "version": "v3.4.9",
"source": {
"type": "git",
"url": "https://github.com/symfony/config.git",
@@ -5814,20 +6236,20 @@
],
"description": "Symfony Config Component",
"homepage": "https://symfony.com",
- "time": "2018-03-19T22:32:39+00:00"
+ "time": "2018-03-19 22:32:39"
},
{
"name": "symfony/dependency-injection",
- "version": "v3.4.8",
+ "version": "v3.4.9",
"source": {
"type": "git",
"url": "https://github.com/symfony/dependency-injection.git",
- "reference": "24a68710c6ddc1e3d159a110cef94cedfcf3c611"
+ "reference": "54ff9d78b56429f9a1ac12e60bfb6d169c0468e3"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/24a68710c6ddc1e3d159a110cef94cedfcf3c611",
- "reference": "24a68710c6ddc1e3d159a110cef94cedfcf3c611",
+ "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/54ff9d78b56429f9a1ac12e60bfb6d169c0468e3",
+ "reference": "54ff9d78b56429f9a1ac12e60bfb6d169c0468e3",
"shasum": ""
},
"require": {
@@ -5885,11 +6307,11 @@
],
"description": "Symfony DependencyInjection Component",
"homepage": "https://symfony.com",
- "time": "2018-03-29T11:25:31+00:00"
+ "time": "2018-04-29 14:04:08"
},
{
"name": "symfony/options-resolver",
- "version": "v3.4.8",
+ "version": "v3.4.9",
"source": {
"type": "git",
"url": "https://github.com/symfony/options-resolver.git",
@@ -5939,20 +6361,20 @@
"configuration",
"options"
],
- "time": "2018-01-11T07:56:07+00:00"
+ "time": "2018-01-11 07:56:07"
},
{
"name": "symfony/polyfill-php54",
- "version": "v1.7.0",
+ "version": "v1.8.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-php54.git",
- "reference": "84e2b616c197ef400c6d0556a0606cee7c9e21d5"
+ "reference": "6c3a2b84c6025e4ea3f6a19feac35408c64b22e1"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-php54/zipball/84e2b616c197ef400c6d0556a0606cee7c9e21d5",
- "reference": "84e2b616c197ef400c6d0556a0606cee7c9e21d5",
+ "url": "https://api.github.com/repos/symfony/polyfill-php54/zipball/6c3a2b84c6025e4ea3f6a19feac35408c64b22e1",
+ "reference": "6c3a2b84c6025e4ea3f6a19feac35408c64b22e1",
"shasum": ""
},
"require": {
@@ -5961,7 +6383,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.7-dev"
+ "dev-master": "1.8-dev"
}
},
"autoload": {
@@ -5997,20 +6419,20 @@
"portable",
"shim"
],
- "time": "2018-01-30T19:27:44+00:00"
+ "time": "2018-04-26 10:06:28"
},
{
"name": "symfony/polyfill-php55",
- "version": "v1.7.0",
+ "version": "v1.8.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-php55.git",
- "reference": "168371cb3dfb10e0afde96e7c2688be02470d143"
+ "reference": "a39456128377a85f2c5707fcae458678560cba46"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-php55/zipball/168371cb3dfb10e0afde96e7c2688be02470d143",
- "reference": "168371cb3dfb10e0afde96e7c2688be02470d143",
+ "url": "https://api.github.com/repos/symfony/polyfill-php55/zipball/a39456128377a85f2c5707fcae458678560cba46",
+ "reference": "a39456128377a85f2c5707fcae458678560cba46",
"shasum": ""
},
"require": {
@@ -6020,7 +6442,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.7-dev"
+ "dev-master": "1.8-dev"
}
},
"autoload": {
@@ -6053,20 +6475,20 @@
"portable",
"shim"
],
- "time": "2018-01-30T19:27:44+00:00"
+ "time": "2018-04-26 10:06:28"
},
{
"name": "symfony/polyfill-php70",
- "version": "v1.7.0",
+ "version": "v1.8.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-php70.git",
- "reference": "3532bfcd8f933a7816f3a0a59682fc404776600f"
+ "reference": "77454693d8f10dd23bb24955cffd2d82db1007a6"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-php70/zipball/3532bfcd8f933a7816f3a0a59682fc404776600f",
- "reference": "3532bfcd8f933a7816f3a0a59682fc404776600f",
+ "url": "https://api.github.com/repos/symfony/polyfill-php70/zipball/77454693d8f10dd23bb24955cffd2d82db1007a6",
+ "reference": "77454693d8f10dd23bb24955cffd2d82db1007a6",
"shasum": ""
},
"require": {
@@ -6076,7 +6498,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.7-dev"
+ "dev-master": "1.8-dev"
}
},
"autoload": {
@@ -6112,20 +6534,20 @@
"portable",
"shim"
],
- "time": "2018-01-30T19:27:44+00:00"
+ "time": "2018-04-26 10:06:28"
},
{
"name": "symfony/polyfill-php72",
- "version": "v1.7.0",
+ "version": "v1.8.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-php72.git",
- "reference": "8eca20c8a369e069d4f4c2ac9895144112867422"
+ "reference": "a4576e282d782ad82397f3e4ec1df8e0f0cafb46"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/8eca20c8a369e069d4f4c2ac9895144112867422",
- "reference": "8eca20c8a369e069d4f4c2ac9895144112867422",
+ "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/a4576e282d782ad82397f3e4ec1df8e0f0cafb46",
+ "reference": "a4576e282d782ad82397f3e4ec1df8e0f0cafb46",
"shasum": ""
},
"require": {
@@ -6134,7 +6556,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.7-dev"
+ "dev-master": "1.8-dev"
}
},
"autoload": {
@@ -6167,11 +6589,11 @@
"portable",
"shim"
],
- "time": "2018-01-31T17:43:24+00:00"
+ "time": "2018-04-26 10:06:28"
},
{
"name": "symfony/stopwatch",
- "version": "v3.4.8",
+ "version": "v3.4.9",
"source": {
"type": "git",
"url": "https://github.com/symfony/stopwatch.git",
@@ -6216,7 +6638,7 @@
],
"description": "Symfony Stopwatch Component",
"homepage": "https://symfony.com",
- "time": "2018-02-17T14:55:25+00:00"
+ "time": "2018-02-17 14:55:25"
},
{
"name": "theseer/fdomdocument",
@@ -6256,7 +6678,7 @@
],
"description": "The classes contained within this repository extend the standard DOM to use exceptions at all occasions of errors instead of PHP warnings or notices. They also add various custom methods and shortcuts for convenience and to simplify the usage of DOM.",
"homepage": "https://github.com/theseer/fDOMDocument",
- "time": "2017-06-30T11:53:12+00:00"
+ "time": "2017-06-30 11:53:12"
},
{
"name": "theseer/tokenizer",
@@ -6296,7 +6718,7 @@
}
],
"description": "A small library for converting tokenized PHP source code into XML and potentially other formats",
- "time": "2017-04-07T12:08:54+00:00"
+ "time": "2017-04-07 12:08:54"
},
{
"name": "webmozart/assert",
@@ -6346,7 +6768,7 @@
"check",
"validate"
],
- "time": "2018-01-29T19:49:41+00:00"
+ "time": "2018-01-29 19:49:41"
}
],
"aliases": [],
diff --git a/dev/tests/acceptance/tests/_data/magento-logo.png b/dev/tests/acceptance/tests/_data/magento-logo.png
new file mode 100644
index 0000000000000..cf143212303aa
Binary files /dev/null and b/dev/tests/acceptance/tests/_data/magento-logo.png differ
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Backend/Page/AdminConfigurationStoresPage.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Backend/Page/AdminConfigurationStoresPage.xml
new file mode 100644
index 0000000000000..9d977546a382d
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Backend/Page/AdminConfigurationStoresPage.xml
@@ -0,0 +1,17 @@
+
+
+
+
+
+
+
+
+
+
+
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/ActionGroup/VerifyEntitiesInMagentoAdminActionGroup.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/ActionGroup/VerifyEntitiesInMagentoAdminActionGroup.xml
index 8f8f9a026033e..0a0c55c0a2166 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/ActionGroup/VerifyEntitiesInMagentoAdminActionGroup.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/ActionGroup/VerifyEntitiesInMagentoAdminActionGroup.xml
@@ -14,6 +14,8 @@
+
+ iVBORw0KGgoAAAANSUhEUgAAAP8AAAEsCAYAAAAM1WX/AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAACY7SURBVHhe7Z0LlBxXnd6HXWyWhx9g8HS3pJFGPVU1klmC2RB28frBIbY00y2NpBnN9GMkG4JJcOJsgCVrszZg56wJuxj2BTjLY8FsADsb20kwmEc4WYgNxPYuiwX2yg9ZxrKsefS7R5IlufP/qm+N76hbo5qa7p6qru875zs6M5quvvd/76/q3lt1/9VDhU/7Ll79ikrauL66y8pVUsZ1ezf1nan+i6KoblV+bP22uUlrT+1dG2vlycEa/pWfH5kej4+oP6Eoqpt0aGx9vJqxvnF892Dt2JUbavmMNW/8fEx+X81aXy9MxNerj1AUFWQ9eGHPy4sp4wOHJ60ZXOWLWauW08CH8TN+r0YBM8W0+f47B3vOUIegKCpoyo/HL6tkzAcA9eFdgw3Qn2z8/5z8Hf6+krEeyE/EL1WHoigqCHo+2X9+MW18dm5y8MSLV25sCvrpfEI+V520TuA4h4b6etWhKYryqwTWXTJ3fxpXbyzone5qfyrjc+WsjALeLSeBrPl0MWNOqq+gKMpPmh3rf2Mpbdxbu2pj7ejuDZ6hP9k4Do6HEUQpY34zl+r/TfWVFEWtpH52ee+rZF7/kbmsVQb4hZPgbZVxXBx/btIqldLmjQeSkVeqIlAU1Wnl0gNJAf/nGOJXlzHEd2scH99jLwhmzX8sTgwkVFEoiuqEcjvW9pWzxleO7hqsHT/pnn2njO/F95cz5pefk/KoolEU1S5VM+Y1law1hatvqck9+04Z34vvr48CrEMolyoiRVGtVG5n/0Vylf07zLvd3LPvlFEOlAflkqnA/5kdX/92VWSKopajZ8Zir53LGrdWJ61jL161oW0Lest1fUFwQ60i5ZxLG7fuT/Sdq6pAUdRSVU4ZqXLGenK59+w7ZZTP2SxUzlpPlNPGhKoKRVFuND22zpQh9N+euHJD7YXdK7Ogt1yj3Ch/JWv97fSOPktVjaKoZsK++krGuK6cNUu4emKzTTOwgmJns5CcyIqVtPkH9zJvAEU1amZi3eXVjPkQYMHmGr8P8d0a9XA2C1Wz5oOFsXX/UlWZosKt6a1rotWs9XmsmGOY3AygbjHqd3hysFbNWH+1X+qtQkBR4VMpZbynOmkewFWxlO2eq/2pjPqhnvboJms+i/qrUFBUOFRI9f+WdP7v4tbYkRZuwgmKUV/UG/WXqcB3Cjvjb1Ghoaju1L6RtedUM8YtMsw/2s5NOEGxs1moOmkdKWeMjyM+KlQU1T3KTxjb57LWL+3V7wDcs++UEQfEoz4VsH6RT63fpkJGUcFWPXGm+V+PyzD35MSZ9EI7iUQrGetriJsKIUUFS0icmU8ZH0BCTFzVmiXOpBca8XGeDTictaaLqYH/gDiqkFKU/1VKxy+Zy1h24sxuumffKSNe9mYhiV81a92fG4tfokJLUf7UoZ19vcWM8ZnqMhJn0guNONqJRFPGXyIxqQo1RflHFSTOnLT24WoVhE04QTHiaG8Werf9bMBTchLYrUJOUSurfCr+5lLG+taLV25oaeJMeqER13oi0Q21Ytr4Vn7nwD9TTUBRndWeS899dTltfFSu9hXes++cnWcD5iTuiP/By3tfpZqEotqvysRAopOJM+mFRrz1RKKVlDGsmoai2qN64kzzS0d3r1ziTHqh0Q5HdtmJRP86t7N/jWoqimqdyinj31Wz1iFcbVYycSa90GgHJ5GotM/zTCRKtUzFifjvyBDfTpyJKwyh96fRLmgftBMSiRbT639bNSFFLU3PXBF7bSVdT5yJ3WfNOhztPzuJRKXdXqhkjE8ykSi1JBVSRqqStR7nPftgGu3lPBuAdkR7qqalqOY6OBrfKJ3l7iAnzqQXGu2IRUEZBdw1s3XNBtXUFFXXnrHBM2SIf305Y5ZxtecmnO4x2lFLJFpCO+8ZHDxDNT0VZs2MDlxezVh24sxqiBb0AASemMO/zf6/24x2RfvW7woMPjjDRKLh1dT2NZG5tHkbEkqeCNEmHEAA6Oek3vm0+Rh2z4XtsWS0t51INGv+F2zGUl2CCoNKE8bV1UkrNIkzYdSxrJJnYgNSLjWQrSUjr5wZj++qZq2n8Xv8f1hi8VIiUetXTCQaAk3vjL9FzvahTJyJ9/xVZIg/lzH//Int/W9QIbF1UH6uZI2/kJOA/XfNPt+NRvs7iUQlLt/Jj8cvVCGhukUzm/vPKmaMj8sV70iYNuGgc9svzJA6y0nv/unR+KUqJE01PR6/rDpp3m9fEUO0/uFsFqpI/yimjFv2Sn9RIaGCrPzEeiTO/AU6dFgSZ6KO8yvcGTNXThkfuGN7z6+pkCyqj17c8+tyovygjBJy+HxY7nygjkwk2iWa2rbOqGSsO5AQMmyJM+uJMDfgzTjfOLTFWyLMqR39A3LiuBPHCWf87ESi30AcVEgovwsJH4sTxgfDljhTv3LJVfuX+fTADhWSZamUGhiVk8Cj9nFDOHJCP5KpwAd+ICMiFRLKj8qND1wcxsSZzpy1nDXx8otbprec8xoVkpZoZvPZZ1UzxsflpBLONZN32W8Wuh/9S4WE8ouwWl1MG39RnbSOvyids1lDdqPROZ3VagHzu+1+7RVeM1bJGN8L590S3CIdPI5+hv6mQkKtpJDQ8XDIEmeijs596nLGPFDp8H1qGQVcXZXvxfeH6jkJNa2qZq19chLYpcJBdVpI4FhKG6FMnGm/6lqGo5W0eRte8a1C0lHNjK2OyRTjr7CHvttfLa4b/cxJJCr9716ZCrxJhYRqtw4kI68sp4yPze2y7E04YZp/Os+mlzLmQ4Xx+BUqJCuqQmr9JinPw/YVMSQjL9hZZ5nLWmUkEkW/VCGh2qFieiCJhI2h62hq5bmaNYtytf+DvZt6zlQh8YX2buo7s5IxrkP57BOylLdZPbrN9glZTQWQ0LWYGUiokFCtUn5i7dpqxrr9qFz5wpQ4E50L+9ExrC6nzXtmR+MbVUh8qdlUfGM5Y/4PJx9CWE7OMPol+mc5bX0lP7J2rQoJtRzJvPLasCXORB21xaXHZVg5ocIRCMm0DJmQnkAmnXAtwjojNOsQEr6qcFBLVXE8/rZKxrITZ2JxKyxXEWcuiRx0hbRxq8wlz1MhCZRQ7lLa+BTqgfo0q2s3Gv3Ufsmo1BmJRGfHmEjUtZBwsZoxPilXjtB1Gjv7rP1AidU1nWYW2Y8n5SQu9QrfSdx+/uKFatb8k30ja89RIaGaqTAxkLaHizJ0CuNw8fCkdbCcMq+pqXh0i27o6XlZQYbBc1nr+bBO36RfM5FoM81MGIMSnLvCmDgTC0Uv7FZvnMms7VMh6Uqphdsvo75hWriFnYXbSsb879M7DEuFJLy6F7eI0sb1SKyIs2OYNuE4t4jkavgPsyF711xR6iv1/hnqH5Zbtqijs1mojESiGeM69H8VknBpdjx+hcyFHrQBCNtc0O70VjXMb5nFW47lJHBTNWvNIR5helirvlkIdwXMB5FAVoWk+4XEmdWM+QUs/oT1sVC56n0zlzJ+U4Uk1Do0PvAmice9oX1MW0Y+1bT1eXChQtKdKqSN91YnQ7ghRG3Ckavc0/kJ40oVDkpTfnzgKonPfsQpnIlEzWcLE8bVKhzdI2zCkcp9J6yJM6VT42r/508m+89XIaGa6HmJTyVj/aVMicKbSHTSvC8/Gn+zCklw9eTYurPLKeMW6fyHcc8+TPM650EPmdfdPzUWv0SFhHKh6Yn4pQJBaJOyVLODh8tp84/AjwpJsITEmQL9L9GAoUycmbVmkTiT6Z+8CXGrMJFosBKJHhpbH0fiyOOhTpxpfu35HX39KiTUMnRoIr5eLiJfC3MiUan/1wsSBxUS/8lOnClXusMhT5xZmjC2q5BQLRQSkoY+kWjafD84UyHxh/Lj8cukYew5Whg34eBlD9WMccujLU6cSS3U9BbzNSqR6NGwrSFpzwbcn59Y/OUrHRFWZ4tp47Nzk4MnXgzZyy6d1VkZkn13Zqz/rSokVAdUSPe/VaaW9USiu0J290g4q05aJ8op4zPgT4Wks0ICQ+n49Rc8hmgYNp84M2s9V8p04X3ZAKmUNt4ro4CDaI/QJRJ9tz0KeLqYMSdVONqv2bH+NyJxIYZdYU2cicSV0ylzRRJnUgs1M2bEymnj8+F9YtTO6fjNXKq/fU+M/uzy3lfJvP4jc1mrHNb5VhmJMydC9Cx2gFRIx6+Q9rETiYbx2YC5SatUSps3tjyRaA6JMzPmzxHYMCXOdFZaZY5VkCH+dX5LnEkt1A8uXv0KGZVeLyAU0G5ov2bt2m0Gj/OJRLPmPxYnWpBINLdjbV85a3wlbIkz4fnEmRnjLuQbUCGhAiC0l0wF7kb7hTE/hJ1INGN++TnhV4VkaapmzGsqWWsKZ5PQJs6cMMdVOKgAqpA2JtCOaM8wZoYSfg+BYxWO0yu3s/8iOWuEMnFm/X1s1jEZOt5aGIu9VoWECrCeHYm+TqZsn0a7on3DtFbl7C+xE4mOr3+7CkmjnpHOPpc1bq0HaUP4gvQupFiy/m7RIFGBVS5tXlS1s0GHNJGocD0nFzUkyFUhqQt54csZ68nwDY/qQ/w5GR4VJox/i0STKiRUF+qOnp5fU4lE7fdAhOkRdGc6W85aT8y/ByI3MXDHcRkahHJhROosQ/yvYGHTDgYVCiGRqEwFbg9lIlGpL3gH9z3Ht6+pFXbG6/8pV8KT/7ibjDOgljjzZ8VxY0j1ByqEQuJU9AP0h1DcwlZ8g3dw3zM7FKnZ3rq6lhuXkwD+oAtPAvbcB42ctSphTpxJLdSesXNfXcZbnyetStc+vKaYBt/g3GG+Z3Y4WrPtnAS29dXyKUN9oMmBAmaczecTZ05a/2t2vP8C1e4UNS88ti6jgO5KJAp+wbHwDK7nGVfMvwS/Y/Wfue1ra/m0Wf9wswP73PoiR3XS2ldMx3epdqaoU6qYMnZ3xYY1cCv8gmOda92N8DvGHyditdxo/0sHO/kLfOwT9tbHwVolY3zmudH1r1dtS1GnFfpLJWt9Zk76T+A2CylOwS34bQa941PDD+OD8JZVtRwWBXFgH58EcJaef7AhYz4wvSN+mWpPilqypsf63yH96MeBeOBNsQlOwes8u824Vl4cfsfqQLmta2r58QHfnQTQKM4mHDlj54oZ44NMnEm1QrchPV3a+H3pV3n0L989G+CwKFyCTzfQO3YHv2N10Ny2tbWcsyjYrEAd9nzizKz5tUPbfJzokAqs7MS0WevreC7AN4lEhT9wCB51Pt16afA7xpdgPWDHuhVbFMTZ10mcKY3CxJlUR2QnEp1c4USi4A2LecLf6eb1i9kb/I7xpUk5CYytf6lQJxe0Da4/r2xDf1iu9n/ExJlUJ7V389lnlTPGx/FyjY4+G6D4Am/gziv0jpcHP4wCwFva/5AQzrK4B2tvVMia353eGX+Lag+K6rimR/t/q+IkEm3nswGKKfshHZeLeW68fPgd2wWSf0fW1PITrV0URFDnE2dmzAOllPEeFf/QSaY3g7WxwTPUj77Q3k19Z6Jc6sfQqZoxrm7LC2gdhoQncGXz1QLoHbcOfseqcDn7ScHWrAfgXuuRXYO1ctr6/MzY6piKeah0aGdfbylrfTmXMp6ckWGn+rUvlHvnWWdLuZ4qZ80voZzq16HSzLboKrkwfQH9tCXPBoAbezGvbwFXrXTr4XeMwi5jURBnTydxZiljPlwYj1+h4hw6VVLWu8oZ61e1q9+IWD7+zGjsN9R/+UJIGjmbMp9C+UpSzkp64Cr1X6FTJR2/opQ2/x791lMiUXDSgsU8N24f/I5R+OSqJS0KOvfs5yatfCVtXI/EjCq2odLUePzCatb8NuaUWOuA82njsZZnaF2msEkqlzL3Yt7rrMlUs9a9U93wqmkP2if9Vfrth5eUSFRxUV/MU/P6Zjy10O2HH0ZFxDkXi4J64sywziORJr2aMf9T5aRXmwcBfpTTuRtTxt2YtHmz38rbKc2OxjeeNpGoYgFcgA+HlaYctdidgd+xU7GRNbXchLNzsD400l52+bjMnUKbOLM0Ed9azVh77FicdB85KPDDepvKKOCRXCq+Rf156FRIGSmJweN4y878ZiGn7wsH9cW8zkHvuLPwO1aVxI4j6TS1Oek0MkQ6WkoZn0TCRRWzUCk/tmadDPH/BleIUz1BFiT4daM+yJojo5mv5kfWrlUfC5Wkzc5DYlj0c/R39PvFdtx1wisDv2OpdHnLqlppbN3B2XEjlIkzsQehOGG+v5I1T/tq86DCj/q8tPfCnC6nzN9DPj318VAJiUQr0t/R71cKescrC7/4ha2x2vRQ5CcqNqGSDPl+V672/xdQuNk1FlT4HaN+zq5LGQb/KLfTvEgdIlSaHer9Kfp9Mx466RWH/6gEYWY48pCKSyj0mAwBKxnzzypZ6wTSpDcDpZmDDr9u5NAvS/0rafNPwzTVq4lnhyMPo98346GTJvwdVmFiIF2dtJ7A1X6pmWK6CX7U28m0JPPgx2dTRkodrqtF+DWHBX7kDpzLmPcgRxwW9ZYCveNugt8x4uDc3pXR0D2zqfhGddiuFOHX3O3wA9RCeuBGmeOWcZUruHng4xTuRvgdIy6IT3XSLEm8bnjIZ3VslQi/5m6Gf3Zi/WYZ0tqPerYiL3w3ww8jPtp7FR6eHVu/SX1F14jwa+5G+PFq5HLG/GKrX23e7fDrRtywSaYkcczt7F+jvirwIvyauw3+UnrgfXLVeg5Xr5Zu7xSHCX7Ebf5dipPWgVJq4F+rrwu0CL/mboFfhqi/Xc2a/9tO7LCrPYkdwgS/Y8QR8bQ3C2Ws7xfH429TXxtIEX7NQYd/38jac0pp84/l6nSk3Smdwgi/4/nUbRLnUsr8xJNj685WXx8oEX7NQYa/PGGNVTuYzDHM8MOIr7ZZ6JcyFRhVRQiMCL/mIMI/vcOwyhnzv9lpnNvc4XWHHX7d2CyE+JfT5p3TY5apiuJ7EX7NQYL/wQt7Xl7JmB+Sq878Cxyadcx2mfAvtLNZSNojV0kbv4/2UUXyrQi/5qDAXxg33ilX+/9nrz57Sc/UAhP+RqMdnHRv5Yz103LKfIcqli9F+DX7Hf79W9dEK1nzs/ZLG5ewCacdJvyLG5ukqpPWCbyc9entayKqeL4S4dfsZ/grafNflbPms7iqtPqevRcT/sWN9nGeDShlzGdlivZuVUTfiPBr9iP8eBmInjhzpaF3TPjdGe2FWKlnA76FRKiqqCsuwq/ZT/Dnd7/pHJnXNyTO9IsJ/9LsPBsg7TlXTps3o31VkVdMhF+zn+DP7ej/cO09F9SqbXpCb7km/Es32hHtiXadGe2/XhV5xUT4NfsJ/unNvTfXRvtquZ2dffGoWxP+JVq1H3Lh10bX1KR9b1JFXjERfs1+gn92KPrR2og0ylCkltu6ppYbb+07B5drwu/Sqs3Qfrmt9Vz4aFfpZx9RRV4xEX7NvoN/26p62VRmVbwrLZdy3jHQpKN10IT/NEb7APoJo5YbWfiOO7Qr4V9owq9pAfyOnZPAdm/vHGylCf8iRrvgHXfSTnq7OSb8jSb8mprC7xidCS8eHe1/qbOd3AHbbMLfxKod0C6LvdiS8Dea8GtaFH4YHQvesqq+KKiGmQ0dsk0m/JoRd4k/2gHtMd82zdpNTPgbTfg1nRZ+x05H27pa5pedWxQk/GIVa8Qd8T8d9I4Jf6MJvybX8DtWnQ6LgnlnUbBZh22RQw8/4itxRrz1+Lsx4W804de0ZPgdOyeBHe1dFAwt/IgnFvMkvnq8l2LC32jCr8kz/I7RKZOxWm6sPYuCoYNfxQ/xRFy9QO+Y8Dea8GtaNvwwOii8ZXUttzNe78AtOgmEBn4VM8QPcZyPabN4uzThbzTh19QS+B2rDpsbWWM/dNKKk0DXw+9APzFgx60V0Dsm/I0m/JpaCr9j1Xlz29Yue1Gwq+FHXOzFvLUL4tYqE/5GE35NbYHfsXMSsBcFVWdvBsEi7kr4EQeJx3IW89yY8Dea8GtqK/yO0bmTq+ydZvOd/2QgTuGugl/VG3FAPNoFvWPC32jCr6kj8MPo6DAWBcfdLwp2Bfyqrqh3qxbz3JjwN5rwa+oY/I5Vx8fiVn5+UbAJMMqBht95FNrecdfaxTw3JvyNJvyaOg6/YwVBbjsWBU/9kFBg4Ud9pF6on17fTprwN5rwa1ox+B0DikV2DgYOflX+3Oi6RXfcdcKEv9GEX9OKww8PwQIJFgXxkJAGUWDgd6DHQzrOYh7q1ay+HTLhbzTh1+QL+B3bwIixc1AtCh69cqO/4Uf5pJz2Yt4Sdtx1woS/0YRfk6/gd+wAtK2vdnQSw2nznwCbKrIvdOjSc1+dy1iPH8ladjn9BL1jwt9owq/Jl/A7FpiObJWpwLa+R2pjg2eoIvtCezf1nZnbtmbPYSmf36B3TPgbTfg1+Rp+sR2rod4HVXF9pdmh3of80KFPZcLfaMKvKRDw+yRWuvzUoU9lwt9owq+J8HsT4Xcvwq+Z8Ls34fduwt9owq+J8HsT4Xcvwq+Z8Ls34fduwt9owq+J8HsT4Xcvwq+Z8Ls34fduwt9owq+J8HsT4Xcvwq+Z8Ls34fduwt9owq+J8HsT4Xcvwq+Z8Ls34fduwt9owq+J8HsT4Xcvwq+Z8Ls34fduwt9owq+J8HsT4Xcvwq+Z8Ls34fduwt9owq+J8HsT4Xcvwq+Z8Ls34fduwt9owq+J8HsT4Xcvwq+Z8Ls34fduwt9owq+J8HsT4Xcvwq+Z8Ls34fduwt9owq+J8HsT4Xcvwq+Z8Ls34fduwt9owq+J8HsT4Xcvwq+Z8Ls34fduwt9owq+J8HsT4Xcvwq+Z8Ls34fduwt9owq+J8HsT4Xcvwq+Z8Ls34fduwt9owq+J8HsT4Xcvwq+Z8Ls34fduwt9owq+J8HsT4Xcvwq+Z8Ls34fduwt9owq+J8HsT4Xcvwq+Z8Ls34fduwt9owq+J8HsT4Xcvwq+Z8Ls34fduwt9owq+J8HsT4Xcvwq+Z8Ls34fduwt9owq+J8HsT4Xcvwq+Z8Ls34fduwt9owq+J8HsT4Xcvwq+Z8Ls34fduwt9owq+J8HsT4Xcvwq+Z8Ls34fduwt9owq+J8HsT4Xcvwq+Z8Ls34fduwt9owq+J8HsT4Xcvwq+Z8Ls34fduwt9owq+J8HsT4Xcvwq+Z8Ls34fduwt9owq+J8HsT4Xcvwq+Z8Ls34fduwt9owq+J8HsT4Xcvwq+Z8Ls34fduwt9owq+J8HsT4Xcvwq+Z8Ls34fduwt9owq+J8HsT4Xcvwq+Z8Ls34fduwt9owq+J8HsT4Xcvwq+Z8Ls34fduwt9owq+J8HsT4Xcvwq+Z8Ls34fduwt9owq+J8HsT4Xcvwq+Z8Ls34fduwt9owq+J8HsT4Xcvwq+Z8Ls34fduwt9owq+J8HsT4Xcvwq+Z8Ls34fduwt9owq+J8HsT4Xcvwq+Z8Ls34fduwt9owq+J8HsT4Xcvwq+Z8Ls34fduwt9owq+J8HsT4Xcvwq+Z8Ls34fduwt9owq+J8HsT4Xcvwq+Z8Ls34fduwt9owq+J8HsT4Xcvwq+Z8Ls34fduwt/onmNbV9UKiagEpvkftNuE370Jv3cT/rrBOXgH9z0zQ9HPVZKx2gsrVBjC796E37sJf93gHLyDe7tAUphNpUT04drIqloZ/9HkQ+0y4Xdvwu/dYYYfPINr8F1KxB4C7/XSKO27ePUrSsnYHxYT0fKL8kd59aFmB2ulCb97E37vDiP84DcvQ3zwLBf3Umk48uEfCOf1kjTRbKL3AjlL3I3hwZEt7S8g4Xdvwu/dYYQf/ILjciJ218Et52+sl8CFColoRkYB+xA0+dc+izT7guWa8Ls34ffusMAPTsGr4vap2WQ0Xf/mJepAMnKeTAU+XU5GXzjepsISfvcm/N4dBvhz4uMjsVpJeBVuP/WY8Fv/1mUol4xcVEzEfoS5Q7XFC4KE370Jv3d3M/zgsSpDfPBZTER+ODsUeXv921qkG3p6XiYjgGtl/jCFQGIhoRUnAcLv3oTfu7sRfvAHDlE34fJQcTh6LTitf1MbdHBL77ricOyrWExoRQUIv3sTfu/uRvidRflSInp7ftMb1ta/oQMqJqJbxHvss84ypgKE370Jv3d3C/zgzL5nL/UR/h4pJqPJ+pE7rL2bzz6rOBS9uZKIVU7IfAMLDs0KvJgJv3sTfu/uBvjBF+b1MsSvCPgf23Ppua+uH3UFld8ce3N+OHLfiZFY7bAMQ5YyCiD87k34vTvo8IMrrOTLHP9bU8Jb/Wg+Un4odlUlGd2vhiSuTgKE370Jv3cHEX7wA45Q9nIiuj+XiO2uH8Wnmtq0JiKjgNuweQA7h5pVSjfhd2/C791BhB/8gKPcUPRzh4bO660fIQDKD/W+o5yM/gRBt3cRNakcTPjdm/B7d1DgByfgxd5kl4j+OD98/mX1TwZMezf1nSlzlA9JJXIIfrNnAwi/exN+7w4C/M49e5k6z+aHYx/cMzZ4Rv1TAdb0pqgpo4A7m20WIvzuTfi92+/wH1XPzQgnd0wNRY36X3eR8oneUTmrPYaGKCXrowDC796E37v9CD/6f0nds5fR8aP5ZGRH/a+6VPsTfeeWEtE/LiaiR/FsAEYDhN+dCb93+w1+9Hv0f2HhSCER/cTPhYv6X4RAM1esfmslEf1+bXR1TaD7hfr1iorwexPhX5okVo+i30v//9705t5/rn4dLqHTlJOR908PR+6rXX3hy+u/XTkRfm8i/O5VGxs8Q2J1nwzzf0/9Ktya3nLOa2oX9/y6+nHFRPi9ifC7F/o5+rv6kfKLCL83EX4q8CL83kT4qcCL8HsT4acCL8LvTYSfCrwIvzcRfirwIvzeRPipwIvwexPhpwIvwu9NhJ8KvAi/NxF+KvAi/N5E+KnAi/B7E+GnAi/C702Enwq8CL83EX4q8CL83kT4qcDL7/Aj+8v0cPQnqri+kpTvpyjfyWX2iwk/taj8Dj/e0VZIRA9ODUcuVkX2hXKbey8pSrlQvmbl9oMJP7Wo/A6/k9O9lIgeKyVif3rgksh5qugrouc29b5eyvFnUp7ji72bwQ8m/NSi8jv8MABzXuEk0D1ZHI5kVfE7qmIyMinf/xTK4fbVbCtpwk8tqunN0Zv8Dr9uvAPhmMyzy8noPQcv771AVaOten7oDW8sJ6L/89hI4zsY/Gy7XYd6P6aqQVELJVf+j9XGVmNe7fsrmWPntc1yFS6XEpEb9l28+hWqOi3VA2+L/UZpOHKjjDQq+D4vr2NfCaMd0Z5oV175qVNqZnh1TK6iX6jKFc3PK9cnGx0ci232VCAZ/fupzb1Dqkot0dRw77Ac9x9wfHxPUE6MMNqxIu1ZGI58YXrrmqiqEkU11+xwZFM5EXsoqJ29KmWWofkXf7U5ukpVyZOevSK6Wo7zpSCfDNGOU0ORzapKFHV64SWjpUTshqIMpwM5zMUoIBE9WBiOvU9VaUnKDcWukc8/j+MEaRqUF6O90G6lZOQP0Y6qShS1NB1M9F5QTMTuxsLa4QAtcAHWOSmvWg/4/kxi9VtVlRbVzPCqf1FJRr+PV0nh80Ea9WABEiMUmaLcM7vp/I2qShS1POGWmlxNAnNryzFGLOqdcEcLw9E/2XNF7LWqSgv0jPy+JP+Pv8PfB2mkg/ZQ7fJkLhHNqCpRVOt0IBk5T4aSn5J58LHjI8EaBeCtyACkkog+NpvoHVNVslUY7t0pV/t/sqcK6u3JzY7jN+MEhXYoJ6MvlJKxTz/7zujrVJUoqj2Sq8vvlhORH9bkConFtSAOjWeGIt+Y2Ry5fHYoegd+DtI9e8QbcX9RwC9KO+SSkYtU01BU+1W7oedlxWT02nIiNhXERTEAjxVx/Iufg1B2lNFZzETci0PRf3+DtINqEorqrA5tfv364nDsq1gM9POW1mbOC0jNfu9X40SFOMsJ4PbnE2/oV01AUSsrmQpsKSVij9TnzcGaCvjZiKNzz76SjP08NxzZqkJOUf4RXr0sV9Oby4loNUgr5n414odblTLEr8jU5KZHf4evtqZ8rvzm2JuLyci3j0vHxTCVo4ClGfFC3BC/4nDk24inCi1FBUP5odhVMgrYjyFrkJ4NWCkjPs49e7naP50f7r1ShZKigqepTa+L5Iain0Oyi2NyJWvW6em6ER+Z35/IS7yelripEFJUsJXfsuod5WT0x3g2wO9ZbzppxAHxQFxklPRAfvj8y1TIKKp7hE0m+eHof5ROnsNCVtButbXaqL+9oJeMzs4moh/aMzZ4hgoVRXWnnt0UNYvJ6J32k3UBezagVcYzEbDM8e+YGooaKjQUFQ4VEr1jlWT00fqzAd2/IIj6OXsM5Gr/aH5z76gKBUWFT/sTfeeWEtFPBG033VKNejm7C4vJ2H9GvVUIKCrcOhjgffSLGfVAfVCvaiL6Pbd5BSgqdJpN9P4bGRo/h6FxkDYLnWyU29mEI/U5UBqOvFdVkaKoUwm592R4/EVcMbEo2AwuvxvlRvmREPWZ4dUxVTWKotxodiiyWU4CD9v3wAPwbADK52zCKSViDyERqqoKRVFLFfLwF4ajNxZ9nEgU0DuJM+VkVSokIjf8oE3vD6Co0Gk20XuBXFXvxiOwfsu6g/LYj+YmYncd3MLEmRTVFqlEovswtF7JzUL4XmcTjvz7VIGJMymq/aonEo19WubVx4+vwIIgph524sxE7JiU41OPSXlU0SiK6oRyw5GLi4nYjzDX7kQiURy/njgTV/vID0tMnElRK6cbenpeVtYSiWKzTKtPAjgejovj43uKw9Fr8b2qCBRFraScRKJYfGt1IlF7A5Ict5SI3l5g4kyK8qeKiegW8R77Kr2MqQA+59yzl+M9UkxGk+orKIryq/ZuPvus4lD05koiVvGyWcjZhCND/IoM8W96dAsTZ1JUoITEl/nhyH0nRur57t2MAuqJM/Eij8i3p5g4k6KCLSQSrSRPnUgUP+P39QW96P5iIrZbfZSiqKBratOaiFzNb7MTiW5dmEgUP+P3SDR6aOi8XvURiqK6SfmhXiQS/Qnu1QN4/CtX+x8zcSZFhUC4R19I9l5THYk9kRuOvE/9mgqVenr+P+OvTjWo+kMRAAAAAElFTkSuQmCC
+ image/png
+ magento-logo.png
+
+
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Data/ProductAttributeMediaGalleryEntryData.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Data/ProductAttributeMediaGalleryEntryData.xml
new file mode 100644
index 0000000000000..ffebd28292839
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Data/ProductAttributeMediaGalleryEntryData.xml
@@ -0,0 +1,23 @@
+
+
+
+
+
+ image
+ Magento Logo
+ 1
+
+ - image
+ - small_image
+ - thumbnail
+
+ false
+ MagentoLogoImageContent
+
+
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Data/ProductData.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Data/ProductData.xml
index a67e5620dd735..07aebe37872c5 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Data/ProductData.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Data/ProductData.xml
@@ -75,12 +75,13 @@
EavStockItem
CustomAttributeProductAttribute
-
+
Image1
1.00
Upload File
Yes
magento-logo.png
+ magento-logo
testProductWithDescriptionSku
@@ -147,4 +148,19 @@
EavStockItem
ApiProductNewsFromDate
+
+ SimpleProduct
+ simple
+ 4
+ SimpleProduct
+ 125.00
+ 4
+ 1
+ 1000
+ simple-product-with-image
+ 1
+ EavStockItem
+ ProductAttributeMediaGalleryEntryMagentoLogo
+ CustomAttributeCategoryIds
+
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Metadata/product-meta.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Metadata/product-meta.xml
index edbf1133d4fae..74dc7adbe2132 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Metadata/product-meta.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Metadata/product-meta.xml
@@ -31,6 +31,9 @@
product_option
+
+ media_gallery_entries
+
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Metadata/product_attribute_media_gallery_entry-meta.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Metadata/product_attribute_media_gallery_entry-meta.xml
new file mode 100644
index 0000000000000..cb0000d3598f5
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Metadata/product_attribute_media_gallery_entry-meta.xml
@@ -0,0 +1,29 @@
+
+
+
+
+
+ integer
+ string
+ string
+ integer
+ boolean
+
+ string
+
+ string
+ image_content
+ empty_extension_attribute
+
+
+ string
+ string
+ string
+
+
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Page/AdminProductAttributeFormPage.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Page/AdminProductAttributeFormPage.xml
index 4339f2615e780..67952cb98b8cf 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Page/AdminProductAttributeFormPage.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Page/AdminProductAttributeFormPage.xml
@@ -7,7 +7,8 @@
-->
-
-
+
+
+
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Page/AdminProductCreatePage.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Page/AdminProductCreatePage.xml
new file mode 100644
index 0000000000000..b5a5bddc92b2d
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Page/AdminProductCreatePage.xml
@@ -0,0 +1,20 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Page/AdminProductEditPage.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Page/AdminProductEditPage.xml
index e1ba11c46e973..e9c286dbbcd1f 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Page/AdminProductEditPage.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Page/AdminProductEditPage.xml
@@ -8,10 +8,7 @@
-
-
-
-
-
+
+
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminProductAttributeGridSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminProductAttributeGridSection.xml
index 7401692455ef4..59887eac03cad 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminProductAttributeGridSection.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminProductAttributeGridSection.xml
@@ -7,11 +7,13 @@
-->
+ xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminProductFormSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminProductFormSection.xml
index 909f69fc49c63..3ffc3c61c0118 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminProductFormSection.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminProductFormSection.xml
@@ -11,14 +11,22 @@
+
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminProductGridSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminProductGridSection.xml
index 6d4dbacabaec1..3c691f47a180d 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminProductGridSection.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminProductGridSection.xml
@@ -13,6 +13,11 @@
+
+
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AttributePropertiesSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AttributePropertiesSection.xml
new file mode 100644
index 0000000000000..39a3505b3588e
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AttributePropertiesSection.xml
@@ -0,0 +1,21 @@
+
+
+
+
+
+
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/StorefrontCategoryProductSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/StorefrontCategoryProductSection.xml
index e736378ca8ca0..e8df8650e8dd8 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/StorefrontCategoryProductSection.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/StorefrontCategoryProductSection.xml
@@ -19,5 +19,6 @@
+
+
+
+
+
+
+
+
+
+
+
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/SaveProductWithCustomOptionsSecondWebsiteTest.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/SaveProductWithCustomOptionsSecondWebsiteTest.xml
new file mode 100644
index 0000000000000..efd42b7f7a427
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/SaveProductWithCustomOptionsSecondWebsiteTest.xml
@@ -0,0 +1,93 @@
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/StorefrontProductNameWithDoubleQuoteTest.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/StorefrontProductNameWithDoubleQuoteTest.xml
new file mode 100644
index 0000000000000..095ed585a4190
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/StorefrontProductNameWithDoubleQuoteTest.xml
@@ -0,0 +1,47 @@
+
+
+
+
+
+
+
+
+
+ Double Quote"
+
+
+
+
+
+
+
+
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Config/ActionGroup/ConfigWebUrlOptionsActionGroup.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Config/ActionGroup/ConfigWebUrlOptionsActionGroup.xml
new file mode 100644
index 0000000000000..a1414da6f08c3
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Config/ActionGroup/ConfigWebUrlOptionsActionGroup.xml
@@ -0,0 +1,32 @@
+
+
+
+
+
+
+
+
+
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Config/Section/GeneralSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Config/Section/GeneralSection.xml
new file mode 100644
index 0000000000000..7da40964768cf
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Config/Section/GeneralSection.xml
@@ -0,0 +1,35 @@
+
+
+
+
+
+
+
+
+
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/Page/AdminProductCreatePage.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/Page/AdminProductCreatePage.xml
new file mode 100644
index 0000000000000..0236f1495a4d1
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/Page/AdminProductCreatePage.xml
@@ -0,0 +1,14 @@
+
+
+
+
+
+
+
+
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/Section/AdminNewAttributePanelSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/Section/AdminNewAttributePanelSection.xml
new file mode 100644
index 0000000000000..94b53762c928f
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/Section/AdminNewAttributePanelSection.xml
@@ -0,0 +1,23 @@
+
+
+
+
+
+
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/ActionGroup/AdminCreateNewStoreGroupActionGroup.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/ActionGroup/AdminCreateNewStoreGroupActionGroup.xml
new file mode 100644
index 0000000000000..a4fa6cea19b26
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/ActionGroup/AdminCreateNewStoreGroupActionGroup.xml
@@ -0,0 +1,23 @@
+
+
+
+
+
+
+
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/ActionGroup/AdminCreateWebsiteActionGroup.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/ActionGroup/AdminCreateWebsiteActionGroup.xml
new file mode 100644
index 0000000000000..c5946f3f22bf5
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/ActionGroup/AdminCreateWebsiteActionGroup.xml
@@ -0,0 +1,21 @@
+
+
+
+
+
+
+
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/ActionGroup/AdminDeleteWebsiteActionGroup.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/ActionGroup/AdminDeleteWebsiteActionGroup.xml
new file mode 100644
index 0000000000000..ff44598c5b465
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/ActionGroup/AdminDeleteWebsiteActionGroup.xml
@@ -0,0 +1,24 @@
+
+
+
+
+
+
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/Page/AdminSystemStoreGroupPage.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/Page/AdminSystemStoreGroupPage.xml
new file mode 100644
index 0000000000000..02fdc6122b37e
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/Page/AdminSystemStoreGroupPage.xml
@@ -0,0 +1,12 @@
+
+
+
+
+
+
+
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/Page/AdminSystemStoreWebsitePage.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/Page/AdminSystemStoreWebsitePage.xml
new file mode 100644
index 0000000000000..61c564cb90027
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/Page/AdminSystemStoreWebsitePage.xml
@@ -0,0 +1,12 @@
+
+
+
+
+
+
+
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/Section/AdminNewStoreGroupSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/Section/AdminNewStoreGroupSection.xml
index fd2563586b303..be22aa7f8c120 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/Section/AdminNewStoreGroupSection.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/Section/AdminNewStoreGroupSection.xml
@@ -7,8 +7,9 @@
-->
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/Section/AdminNewWebsiteActionsSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/Section/AdminNewWebsiteActionsSection.xml
new file mode 100644
index 0000000000000..def89001ca055
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/Section/AdminNewWebsiteActionsSection.xml
@@ -0,0 +1,12 @@
+
+
+
+
+
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/Section/AdminNewWebsiteSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/Section/AdminNewWebsiteSection.xml
new file mode 100644
index 0000000000000..1195d1c76b0cd
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/Section/AdminNewWebsiteSection.xml
@@ -0,0 +1,15 @@
+
+
+
+
+
+
diff --git a/dev/tests/api-functional/framework/bootstrap.php b/dev/tests/api-functional/framework/bootstrap.php
index 942582392e89e..c467b0aed90fe 100644
--- a/dev/tests/api-functional/framework/bootstrap.php
+++ b/dev/tests/api-functional/framework/bootstrap.php
@@ -14,6 +14,13 @@
$integrationTestsDir = realpath("{$testsBaseDir}/../integration");
$fixtureBaseDir = $integrationTestsDir . '/testsuite';
+if (!defined('TESTS_TEMP_DIR')) {
+ define('TESTS_TEMP_DIR', $testsBaseDir . '/tmp');
+}
+if (!defined('INTEGRATION_TESTS_DIR')) {
+ define('INTEGRATION_TESTS_DIR', $integrationTestsDir);
+}
+
try {
setCustomErrorHandler();
@@ -36,7 +43,7 @@
}
$testFrameworkDir = __DIR__;
- require_once __DIR__ . '/../../integration/framework/deployTestModules.php';
+ require_once INTEGRATION_TESTS_DIR . '/framework/deployTestModules.php';
$installConfigFile = $settings->getAsConfigFile('TESTS_INSTALL_CONFIG_FILE');
if (!file_exists($installConfigFile)) {
diff --git a/dev/tests/api-functional/testsuite/Magento/Webapi/JsonGenerationFromDataObjectTest.php b/dev/tests/api-functional/testsuite/Magento/Webapi/JsonGenerationFromDataObjectTest.php
index 9a3fac9e8739f..c0c9c3729a82a 100644
--- a/dev/tests/api-functional/testsuite/Magento/Webapi/JsonGenerationFromDataObjectTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/Webapi/JsonGenerationFromDataObjectTest.php
@@ -80,7 +80,7 @@ public function testSingleServiceRetrieval()
/**
* @expectedException \Exception
- * @expectedExceptionMessage Request does not match any route.
+ * @expectedExceptionMessage Specified request cannot be processed.
*/
public function testInvalidRestUrlNoServices()
{
diff --git a/dev/tests/functional/composer.json b/dev/tests/functional/composer.json
index 0c9f329f234a8..93de6b3363900 100644
--- a/dev/tests/functional/composer.json
+++ b/dev/tests/functional/composer.json
@@ -4,7 +4,7 @@
},
"require": {
"php": "7.0.2|~7.0.6|~7.1.0",
- "magento/mtf": "1.0.0-rc59",
+ "magento/mtf": "2.2.x-dev",
"allure-framework/allure-phpunit": "~1.2.0",
"doctrine/annotations": "1.4.*",
"phpunit/phpunit": "~4.8.0|~5.5.0",
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/View/CustomOptions.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/View/CustomOptions.php
index 5e9e5526eb685..9f05a4ade8a37 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/View/CustomOptions.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/View/CustomOptions.php
@@ -58,7 +58,7 @@ class CustomOptions extends Form
*
* @var string
*/
- protected $maxCharacters = './/div[@class="control"]/p[@class="note"]/strong';
+ protected $maxCharacters = './/div[@class="control"]/p[contains(@class, "note")]';
/**
* Selector for label of option value element
@@ -72,7 +72,7 @@ class CustomOptions extends Form
*
* @var string
*/
- protected $noteByNumber = './/*[@class="note"][%d]/strong';
+ protected $noteByNumber = './/*[contains(@class, "note")][%d]/strong';
/**
* Selector for select element of option
@@ -220,13 +220,19 @@ public function isJsMessageVisible($customOptionTitle)
protected function getFieldData(SimpleElement $option)
{
$price = $this->getOptionPriceNotice($option);
- $maxCharacters = $option->find($this->maxCharacters, Locator::SELECTOR_XPATH);
+ $maxCharactersElement = $option->find($this->maxCharacters, Locator::SELECTOR_XPATH);
+
+ $maxCharacters = null;
+ if ($maxCharactersElement->isVisible()) {
+ preg_match('/\s([0-9]+)\s/', $maxCharactersElement->getText(), $match);
+ $maxCharacters = isset($match[1]) ? $match[1] : $maxCharactersElement->getText();
+ }
return [
'options' => [
[
'price' => floatval($price),
- 'max_characters' => $maxCharacters->isVisible() ? $maxCharacters->getText() : null,
+ 'max_characters' => $maxCharacters,
],
]
];
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Account/AuthenticationPopup.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Account/AuthenticationPopup.php
index e25a5c1f719d0..1ef9267e73785 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Account/AuthenticationPopup.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Account/AuthenticationPopup.php
@@ -69,6 +69,7 @@ public function createAccount()
*/
public function loginCustomer(Customer $customer)
{
+ sleep(10);
$this->fill($customer);
$this->_rootElement->find($this->login)->click();
$this->waitForElementNotVisible($this->loadingMask);
diff --git a/dev/tests/integration/framework/bootstrap.php b/dev/tests/integration/framework/bootstrap.php
index 4e14c8113a708..1cae393dc01c3 100644
--- a/dev/tests/integration/framework/bootstrap.php
+++ b/dev/tests/integration/framework/bootstrap.php
@@ -15,6 +15,10 @@
define('TESTS_TEMP_DIR', $testsBaseDir . '/tmp');
}
+if (!defined('INTEGRATION_TESTS_DIR')) {
+ define('INTEGRATION_TESTS_DIR', $testsBaseDir);
+}
+
$testFrameworkDir = __DIR__;
require_once 'deployTestModules.php';
diff --git a/dev/tests/integration/testsuite/Magento/Captcha/Observer/ResetAttemptForBackendObserverTest.php b/dev/tests/integration/testsuite/Magento/Captcha/Observer/ResetAttemptForBackendObserverTest.php
new file mode 100644
index 0000000000000..c0a720229a00d
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Captcha/Observer/ResetAttemptForBackendObserverTest.php
@@ -0,0 +1,60 @@
+objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+ }
+
+ /**
+ * @magentoDataFixture Magento/Captcha/_files/failed_logins_backend.php
+ */
+ public function testLoginAttemptsRemovedAfterSuccessfulLogin()
+ {
+ $login = 'mageadmin';
+ $userFactory = $this->objectManager->get(UserFactory::class);
+ $captchaLogFactory = $this->objectManager->get(LogFactory::class);
+ $eventManager = $this->objectManager->get(ManagerInterface::class);
+
+ /** @var User $user */
+ $user = $userFactory->create();
+ $user->setUserName($login);
+
+ $eventManager->dispatch(
+ 'backend_auth_user_login_success',
+ ['user' => $user]
+ );
+
+ /**
+ * @var CaptchaLog $captchaLog
+ */
+ $captchaLog = $captchaLogFactory->create();
+
+ self::assertEquals(0, $captchaLog->countAttemptsByUserLogin($login));
+ }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Captcha/Observer/ResetAttemptForFrontendAccountEditObserverTest.php b/dev/tests/integration/testsuite/Magento/Captcha/Observer/ResetAttemptForFrontendAccountEditObserverTest.php
new file mode 100644
index 0000000000000..c09211b020b30
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Captcha/Observer/ResetAttemptForFrontendAccountEditObserverTest.php
@@ -0,0 +1,53 @@
+objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+ }
+
+ /**
+ * @magentoDataFixture Magento/Captcha/_files/failed_logins_frontend.php
+ */
+ public function testAccountEditRemovesFailedAttempts()
+ {
+ $customerEmail = 'mageuser@dummy.com';
+ $captchaLogFactory = $this->objectManager->get(LogFactory::class);
+ $eventManager = $this->objectManager->get(ManagerInterface::class);
+
+ $eventManager->dispatch(
+ 'customer_account_edited',
+ ['email' => $customerEmail]
+ );
+
+ /**
+ * @var CaptchaLog $captchaLog
+ */
+ $captchaLog = $captchaLogFactory->create();
+
+ self::assertEquals(0, $captchaLog->countAttemptsByUserLogin($customerEmail));
+ }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Captcha/Observer/ResetAttemptForFrontendObserverTest.php b/dev/tests/integration/testsuite/Magento/Captcha/Observer/ResetAttemptForFrontendObserverTest.php
new file mode 100644
index 0000000000000..f8dd80595f936
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Captcha/Observer/ResetAttemptForFrontendObserverTest.php
@@ -0,0 +1,60 @@
+objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+ }
+
+ /**
+ * @magentoDataFixture Magento/Captcha/_files/failed_logins_frontend.php
+ */
+ public function testSuccesfulLoginRemovesFailedAttempts()
+ {
+ $customerEmail = 'mageuser@dummy.com';
+ $customerFactory = $this->objectManager->get(CustomerFactory::class);
+ $captchaLogFactory = $this->objectManager->get(LogFactory::class);
+ $eventManager = $this->objectManager->get(ManagerInterface::class);
+
+ /** @var Customer $customer */
+ $customer = $customerFactory->create();
+ $customer->setEmail($customerEmail);
+
+ $eventManager->dispatch(
+ 'customer_customer_authenticated',
+ ['model' => $customer, 'password' => 'some_password']
+ );
+
+ /**
+ * @var CaptchaLog $captchaLog
+ */
+ $captchaLog = $captchaLogFactory->create();
+
+ self::assertEquals(0, $captchaLog->countAttemptsByUserLogin($customerEmail));
+ }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Captcha/_files/failed_logins_backend.php b/dev/tests/integration/testsuite/Magento/Captcha/_files/failed_logins_backend.php
new file mode 100644
index 0000000000000..7130cdfca57d7
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Captcha/_files/failed_logins_backend.php
@@ -0,0 +1,17 @@
+get(LogFactory::class);
+
+/** @var Log $captchaLog */
+$captchaLog = $logFactory->create();
+$captchaLog->logAttempt('mageadmin');
diff --git a/dev/tests/integration/testsuite/Magento/Captcha/_files/failed_logins_backend_rollback.php b/dev/tests/integration/testsuite/Magento/Captcha/_files/failed_logins_backend_rollback.php
new file mode 100644
index 0000000000000..12a16027e1e5c
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Captcha/_files/failed_logins_backend_rollback.php
@@ -0,0 +1,17 @@
+get(LogFactory::class);
+
+/** @var Log $captchaLog */
+$captchaLog = $logFactory->create();
+$captchaLog->deleteUserAttempts('mageadmin');
diff --git a/dev/tests/integration/testsuite/Magento/Captcha/_files/failed_logins_frontend.php b/dev/tests/integration/testsuite/Magento/Captcha/_files/failed_logins_frontend.php
new file mode 100644
index 0000000000000..4e0db30fa82c1
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Captcha/_files/failed_logins_frontend.php
@@ -0,0 +1,17 @@
+get(LogFactory::class);
+
+/** @var Log $captchaLog */
+$captchaLog = $logFactory->create();
+$captchaLog->logAttempt('mageuser@dummy.com');
diff --git a/dev/tests/integration/testsuite/Magento/Captcha/_files/failed_logins_frontend_rollback.php b/dev/tests/integration/testsuite/Magento/Captcha/_files/failed_logins_frontend_rollback.php
new file mode 100644
index 0000000000000..a01edb6d0a219
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Captcha/_files/failed_logins_frontend_rollback.php
@@ -0,0 +1,17 @@
+get(LogFactory::class);
+
+/** @var Log $captchaLog */
+$captchaLog = $logFactory->create();
+$captchaLog->deleteUserAttempts('mageuser@dummy.com');
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Console/Command/ProductAttributesCleanUpTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Console/Command/ProductAttributesCleanUpTest.php
index 88b59570457d3..4b6a2a40aa129 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Console/Command/ProductAttributesCleanUpTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Console/Command/ProductAttributesCleanUpTest.php
@@ -107,8 +107,6 @@ private function prepareAdditionalStore()
->setGroupId($storeGroup->getId())
->save();
- /* Refresh stores memory cache */
- $this->objectManager->get(\Magento\Store\Model\StoreManagerInterface::class)->reinitStores();
return $store;
}
}
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/Product/AttributeTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/Product/AttributeTest.php
index 6e93f61c1eb3a..098b18d6f38c9 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/Product/AttributeTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/Product/AttributeTest.php
@@ -5,6 +5,8 @@
*/
namespace Magento\Catalog\Controller\Adminhtml\Product;
+use Magento\Framework\Exception\LocalizedException;
+
/**
* @magentoAppArea adminhtml
* @magentoDbIsolation enabled
@@ -221,6 +223,110 @@ public function testSaveActionCleanAttributeLabelCache()
$this->assertEquals('new string translation', $this->_translate('string to translate'));
}
+ /**
+ * Get attribute data preset.
+ *
+ * @return array
+ */
+ private function getLargeOptionsSetAttributeData(): array
+ {
+ return [
+ 'frontend_label' => [
+ 0 => 'testdrop1',
+ 1 => '',
+ 2 => '',
+ ],
+ 'frontend_input' => 'select',
+ 'is_required' => '0',
+ 'update_product_preview_image' => '0',
+ 'use_product_image_for_swatch' => '0',
+ 'visual_swatch_validation' => '',
+ 'visual_swatch_validation_unique' => '',
+ 'text_swatch_validation' => '',
+ 'text_swatch_validation_unique' => '',
+ 'attribute_code' => 'test_many_options',
+ 'is_global' => '0',
+ 'default_value_text' => '',
+ 'default_value_yesno' => '0',
+ 'default_value_date' => '',
+ 'default_value_textarea' => '',
+ 'is_unique' => '0',
+ 'is_used_in_grid' => '1',
+ 'is_visible_in_grid' => '1',
+ 'is_filterable_in_grid' => '1',
+ 'is_searchable' => '0',
+ 'is_comparable' => '0',
+ 'is_filterable' => '0',
+ 'is_filterable_in_search' => '0',
+ 'is_used_for_promo_rules' => '0',
+ 'is_html_allowed_on_front' => '1',
+ 'is_visible_on_front' => '0',
+ 'used_in_product_listing' => '0',
+ 'used_for_sort_by' => '0',
+ 'swatch_input_type' => 'dropdown',
+ ];
+ }
+
+ /**
+ * Test attribute saving with large amount of options exceeding maximum allowed by max_input_vars limit.
+ *
+ * @return void
+ */
+ public function testLargeOptionsDataSet()
+ {
+ $maxInputVars = ini_get('max_input_vars');
+ // Each option is at least 4 variables array (order, admin value, first store view value, delete flag).
+ // Set options count to exceed max_input_vars by 100 options (400 variables).
+ $optionsCount = floor($maxInputVars / 4) + 100;
+ $attributeData = $this->getLargeOptionsSetAttributeData();
+ $optionsData = [];
+ $expectedOptionsLabels = [];
+ for ($i = 0; $i < $optionsCount; $i++) {
+ $order = $i + 1;
+ $expectedOptionLabelOnStoreView = "value_{$i}_store_1";
+ $expectedOptionsLabels[$i+1] = $expectedOptionLabelOnStoreView;
+ $optionsData []= "option[order][option_{$i}]={$order}";
+ $optionsData []= "option[value][option_{$i}][0]=value_{$i}_admin";
+ $optionsData []= "option[value][option_{$i}][1]={$expectedOptionLabelOnStoreView}";
+ $optionsData []= "option[delete][option_{$i}=";
+ }
+ $attributeData['serialized_options'] = json_encode($optionsData);
+ $this->getRequest()->setPostValue($attributeData);
+ $this->dispatch('backend/catalog/product_attribute/save');
+ $entityTypeId = $this->_objectManager->create(
+ \Magento\Eav\Model\Entity::class
+ )->setType(
+ \Magento\Catalog\Model\Product::ENTITY
+ )->getTypeId();
+
+ /** @var $attribute \Magento\Catalog\Model\ResourceModel\Eav\Attribute */
+ $attribute = $this->_objectManager->create(
+ \Magento\Catalog\Model\ResourceModel\Eav\Attribute::class
+ )->setEntityTypeId(
+ $entityTypeId
+ );
+ try {
+ $attribute->loadByCode($entityTypeId, 'test_many_options');
+ $options = $attribute->getOptions();
+ // assert that all options are saved without truncation
+ $this->assertEquals(
+ $optionsCount + 1,
+ count($options),
+ 'Expected options count does not match (regarding first empty option for non-required attribute)'
+ );
+
+ foreach ($expectedOptionsLabels as $optionOrderNum => $label) {
+ $this->assertEquals(
+ $label,
+ $options[$optionOrderNum]->getLabel(),
+ "Label for option #{$optionOrderNum} does not match expected."
+ );
+ }
+ } catch (LocalizedException $e) {
+ $this->fail('Test failed with exception on attribute model load: ' . $e);
+ }
+ }
+
/**
* Return translation for a string literal belonging to backend area
*
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/Indexer/Category/ProductTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/Indexer/Category/ProductTest.php
index 6efd2638c0d52..849287517c838 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Model/Indexer/Category/ProductTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Model/Indexer/Category/ProductTest.php
@@ -27,6 +27,11 @@ class ProductTest extends \PHPUnit\Framework\TestCase
*/
protected $productResource;
+ /**
+ * @var \Magento\Catalog\Api\CategoryRepositoryInterface
+ */
+ private $categoryRepository;
+
protected function setUp()
{
/** @var \Magento\Framework\Indexer\IndexerInterface indexer */
@@ -39,6 +44,10 @@ protected function setUp()
$this->productResource = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
\Magento\Catalog\Model\ResourceModel\Product::class
);
+
+ $this->categoryRepository = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
+ \Magento\Catalog\Api\CategoryRepositoryInterface::class
+ );
}
/**
@@ -200,6 +209,27 @@ public function testCategoryCreate()
}
}
+ /**
+ * @magentoAppArea adminhtml
+ * @depends testReindexAll
+ *
+ * @return void
+ */
+ public function testCatalogCategoryProductIndexInvalidateAfterDelete()
+ {
+ $indexerShouldBeValid = (bool)$this->indexer->isInvalid();
+
+ $categories = $this->getCategories(1);
+ $this->categoryRepository->delete(array_pop($categories));
+
+ $state = $this->indexer->getState();
+ $state->loadByIndexer($this->indexer->getId());
+ $status = $state->getStatus();
+
+ $this->assertFalse($indexerShouldBeValid);
+ $this->assertEquals(\Magento\Framework\Indexer\StateInterface::STATUS_INVALID, $status);
+ }
+
/**
* @param int $count
* @return Category[]
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/ResourceModel/_files/category_multiple_stores.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/ResourceModel/_files/category_multiple_stores.php
index 90bf630000e72..ecd041678861d 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Model/ResourceModel/_files/category_multiple_stores.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Model/ResourceModel/_files/category_multiple_stores.php
@@ -42,11 +42,6 @@
$store->save();
}
-/* Refresh stores memory cache */
-\Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
- \Magento\Store\Model\StoreManagerInterface::class
-)->reinitStores();
-
/** @var \Magento\Catalog\Model\Category $newCategory */
$newCategory = $factory->create();
$newCategory
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/products_with_dropdown_attribute.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/products_with_dropdown_attribute.php
new file mode 100644
index 0000000000000..aaa3b9ec7503a
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/products_with_dropdown_attribute.php
@@ -0,0 +1,67 @@
+create(
+ \Magento\Catalog\Setup\CategorySetup::class
+);
+
+/** @var $options \Magento\Eav\Model\ResourceModel\Entity\Attribute\Option\Collection */
+$options = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
+ \Magento\Eav\Model\ResourceModel\Entity\Attribute\Option\Collection::class
+);
+$options->setAttributeFilter($attribute->getId());
+$optionIds = $options->getAllIds();
+
+/** @var $product \Magento\Catalog\Model\Product */
+$product = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(\Magento\Catalog\Model\Product::class);
+$product->setTypeId(\Magento\Catalog\Model\Product\Type::TYPE_SIMPLE)
+ ->setId($optionIds[0] * 10)
+ ->setAttributeSetId($installer->getAttributeSetId('catalog_product', 'Default'))
+ ->setWebsiteIds([1])
+ ->setName('With Option 1')
+ ->setSku('simple_op_1')
+ ->setPrice(10)
+ ->setVisibility(\Magento\Catalog\Model\Product\Visibility::VISIBILITY_BOTH)
+ ->setDropdownAttribute($optionIds[0])
+ ->setStatus(\Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_ENABLED)
+ ->setStockData(['use_config_manage_stock' => 1, 'qty' => 100, 'is_qty_decimal' => 0, 'is_in_stock' => 1])
+ ->save();
+
+$product = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(\Magento\Catalog\Model\Product::class);
+$product->setTypeId(\Magento\Catalog\Model\Product\Type::TYPE_SIMPLE)
+ ->setId($optionIds[1] * 10)
+ ->setAttributeSetId($installer->getAttributeSetId('catalog_product', 'Default'))
+ ->setWebsiteIds([1])
+ ->setName('With Option 2')
+ ->setSku('simple_op_2')
+ ->setPrice(10)
+ ->setVisibility(\Magento\Catalog\Model\Product\Visibility::VISIBILITY_BOTH)
+ ->setDropdownAttribute($optionIds[1])
+ ->setStatus(\Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_ENABLED)
+ ->setStockData(['use_config_manage_stock' => 1, 'qty' => 100, 'is_qty_decimal' => 0, 'is_in_stock' => 1])
+ ->save();
+
+$product = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(\Magento\Catalog\Model\Product::class);
+$product->setTypeId(\Magento\Catalog\Model\Product\Type::TYPE_SIMPLE)
+ ->setId($optionIds[2] * 10)
+ ->setAttributeSetId($installer->getAttributeSetId('catalog_product', 'Default'))
+ ->setWebsiteIds([1])
+ ->setName('With Option 3')
+ ->setSku('simple_op_3')
+ ->setPrice(10)
+ ->setVisibility(\Magento\Catalog\Model\Product\Visibility::VISIBILITY_BOTH)
+ ->setDropdownAttribute($optionIds[2])
+ ->setStatus(\Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_ENABLED)
+ ->setStockData(['use_config_manage_stock' => 1, 'qty' => 100, 'is_qty_decimal' => 0, 'is_in_stock' => 1])
+ ->save();
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/products_with_dropdown_attribute_rollback.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/products_with_dropdown_attribute_rollback.php
new file mode 100644
index 0000000000000..2fff69b40a61e
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/products_with_dropdown_attribute_rollback.php
@@ -0,0 +1,24 @@
+get('Magento\Framework\Registry');
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', true);
+
+/** @var $productCollection \Magento\Catalog\Model\ResourceModel\Product */
+$productCollection = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
+ ->create('Magento\Catalog\Model\Product')
+ ->getCollection();
+
+foreach ($productCollection as $product) {
+ $product->delete();
+}
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', false);
diff --git a/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/_files/custom_category_store_media_disabled.php b/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/_files/custom_category_store_media_disabled.php
index b3a9b9d9515fa..d1ff426c0168d 100644
--- a/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/_files/custom_category_store_media_disabled.php
+++ b/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/_files/custom_category_store_media_disabled.php
@@ -46,8 +46,3 @@
$objectManager->create(\Magento\Eav\Model\AttributeSetManagement::class)
->create($entityTypeCode, $attributeSet, $defaultSetId);
-
-/* Refresh stores memory cache */
-\Magento\TestFramework\Helper\Bootstrap::getObjectManager()
- ->get(\Magento\Store\Model\StoreManagerInterface::class)
- ->reinitStores();
diff --git a/dev/tests/integration/testsuite/Magento/CatalogSearch/Model/Indexer/Fulltext/Model/Plugin/CategoryTest.php b/dev/tests/integration/testsuite/Magento/CatalogSearch/Model/Indexer/Fulltext/Model/Plugin/CategoryTest.php
new file mode 100644
index 0000000000000..49667993377f7
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/CatalogSearch/Model/Indexer/Fulltext/Model/Plugin/CategoryTest.php
@@ -0,0 +1,76 @@
+indexerProcessor = Bootstrap::getObjectManager()->create(Processor::class);
+ $this->categoryRepository = Bootstrap::getObjectManager()->create(CategoryRepositoryInterface::class);
+ }
+
+ /**
+ * @magentoDataFixture Magento/Catalog/_files/indexer_catalog_category.php
+ * @magentoAppArea adminhtml
+ *
+ * @return void
+ */
+ public function testIndexerInvalidatedAfterCategoryDelete()
+ {
+ $this->indexerProcessor->reindexAll();
+ $isIndexerValid = (bool)$this->indexerProcessor->getIndexer()->isValid();
+
+ $category = $this->getCategories(1);
+ $this->categoryRepository->delete(array_pop($category));
+
+ $state = $this->indexerProcessor->getIndexer()->getState();
+ $state->loadByIndexer($this->indexerProcessor->getIndexerId());
+ $status = $state->getStatus();
+
+ $this->assertTrue($isIndexerValid);
+ $this->assertEquals(StateInterface::STATUS_INVALID, $status);
+ }
+
+ /**
+ * @param int $count
+ * @return Category[]
+ */
+ private function getCategories(int $count): array
+ {
+ /** @var Category $category */
+ $category = Bootstrap::getObjectManager()->create(Category::class);
+
+ $result = $category->getCollection()->addAttributeToSelect('name')->getItems();
+ $result = array_slice($result, 2);
+
+ return array_slice($result, 0, $count);
+ }
+}
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 151c21d9c2e21..3828d2b29e8e7 100644
--- a/dev/tests/integration/testsuite/Magento/CatalogWidget/Block/Product/ProductListTest.php
+++ b/dev/tests/integration/testsuite/Magento/CatalogWidget/Block/Product/ProductListTest.php
@@ -88,6 +88,38 @@ public function testCreateCollectionWithMultipleSkuCondition()
$this->performAssertions(2);
}
+ /**
+ * Test product list widget can process condition with dropdown type of attribute which has Store Scope
+ *
+ * @magentoDbIsolation disabled
+ * @magentoDataFixture Magento/Catalog/_files/products_with_dropdown_attribute.php
+ */
+ public function testCreateCollectionWithDropdownAttributeStoreScope()
+ {
+ /** @var $attribute \Magento\Catalog\Model\ResourceModel\Eav\Attribute */
+ $attribute = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
+ \Magento\Catalog\Model\ResourceModel\Eav\Attribute::class
+ );
+ $attribute->load('dropdown_attribute', 'attribute_code');
+ $dropdownAttributeOptionIds = [];
+ foreach ($attribute->getOptions() as $option) {
+ if ($option->getValue()) {
+ $dropdownAttributeOptionIds[] = $option->getValue();
+ }
+ }
+ $encodedConditions = '^[`1`:^[`type`:`Magento||CatalogWidget||Model||Rule||Condition||Combine`,' .
+ '`aggregator`:`any`,`value`:`1`,`new_child`:``^],`1--1`:^[`type`:`Magento||CatalogWidget||Model||Rule|' .
+ '|Condition||Product`,`attribute`:`dropdown_attribute`,`operator`:`==`,`value`:`'
+ . $dropdownAttributeOptionIds[0] . '`^],`1--2`:^[`type`:`Magento||CatalogWidget||Model||Rule|' .
+ '|Condition||Product`,`attribute`:`dropdown_attribute`,`operator`:`==`,`value`:`'
+ . $dropdownAttributeOptionIds[1] . '`^]^]';
+ $this->block->setData('conditions_encoded', $encodedConditions);
+ $this->performAssertions(2);
+ $attribute->setUsedInProductListing(0);
+ $attribute->save();
+ $this->performAssertions(2);
+ }
+
/**
* Check product collection includes correct amount of products.
*
diff --git a/dev/tests/integration/testsuite/Magento/Cms/Controller/Adminhtml/FulltextGridSearchTest.php b/dev/tests/integration/testsuite/Magento/Cms/Controller/Adminhtml/FulltextGridSearchTest.php
new file mode 100644
index 0000000000000..c740609773b90
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Cms/Controller/Adminhtml/FulltextGridSearchTest.php
@@ -0,0 +1,66 @@
+getRequest()
+ ->getHeaders()
+ ->addHeaderLine('Accept', 'application/json');
+ $this->dispatch($url);
+ $response = $this->getResponse();
+ $data = json_decode($response->getBody(), true);
+ self::assertEquals($expectedRows, $data['totalRecords']);
+
+ $titleList = array_column($data['items'], 'title');
+ self::assertEquals($expectedTitles, $titleList);
+ }
+
+ /**
+ * Gets list of variations with different search queries.
+ *
+ * @return array
+ */
+ public function queryDataProvider(): array
+ {
+ return [
+ [
+ 'query' => 'simple',
+ 'expectedRows' => 3,
+ 'expectedTitles' => ['simplePage', 'simplePage01', '01simplePage']
+ ],
+ [
+ 'query' => 'page01',
+ 'expectedRows' => 1,
+ 'expectedTitles' => ['simplePage01']
+ ],
+ [
+ 'query' => '01simple',
+ 'expectedRows' => 1,
+ 'expectedTitles' => ['01simplePage']
+ ],
+ ];
+ }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Cms/Fixtures/page_list.php b/dev/tests/integration/testsuite/Magento/Cms/Fixtures/page_list.php
new file mode 100644
index 0000000000000..ae431f5c4cf1a
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Cms/Fixtures/page_list.php
@@ -0,0 +1,34 @@
+ 'simplePage',
+ 'is_active' => 1
+ ],
+ [
+ 'title' => 'simplePage01',
+ 'is_active' => 1
+ ],
+ [
+ 'title' => '01simplePage',
+ 'is_active' => 1
+ ],
+];
+
+/** @var PageRepositoryInterface $pageRepository */
+$pageRepository = $objectManager->get(PageRepositoryInterface::class);
+foreach ($data as $item) {
+ $page = $objectManager->create(PageInterface::class, ['data' => $item]);
+ $pageRepository->save($page);
+}
diff --git a/dev/tests/integration/testsuite/Magento/Cms/Fixtures/page_list_rollback.php b/dev/tests/integration/testsuite/Magento/Cms/Fixtures/page_list_rollback.php
new file mode 100644
index 0000000000000..261cdba589653
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Cms/Fixtures/page_list_rollback.php
@@ -0,0 +1,25 @@
+get(PageRepositoryInterface::class);
+
+/** @var SearchCriteriaBuilder $searchCriteriaBuilder */
+$searchCriteriaBuilder = $objectManager->get(SearchCriteriaBuilder::class);
+$searchCriteria = $searchCriteriaBuilder->addFilter('title', ['simplePage', 'simplePage01', '01simplePage'], 'in')
+ ->create();
+$result = $pageRepository->getList($searchCriteria);
+
+foreach ($result->getItems() as $item) {
+ $pageRepository->delete($item);
+}
diff --git a/dev/tests/integration/testsuite/Magento/Directory/Model/Country/Postcode/ValidatorTest.php b/dev/tests/integration/testsuite/Magento/Directory/Model/Country/Postcode/ValidatorTest.php
index ce2f3ebae5538..9d0634645a4c3 100644
--- a/dev/tests/integration/testsuite/Magento/Directory/Model/Country/Postcode/ValidatorTest.php
+++ b/dev/tests/integration/testsuite/Magento/Directory/Model/Country/Postcode/ValidatorTest.php
@@ -130,7 +130,7 @@ public function getPostcodesDataProvider()
['countryId' => 'IS', 'postcode' => '123'],
['countryId' => 'IN', 'postcode' => '123456'],
['countryId' => 'ID', 'postcode' => '12345'],
- ['countryId' => 'IL', 'postcode' => '12345'],
+ ['countryId' => 'IL', 'postcode' => '1234567'],
['countryId' => 'IT', 'postcode' => '12345'],
['countryId' => 'JP', 'postcode' => '123-4567'],
['countryId' => 'JP', 'postcode' => '1234567'],
diff --git a/dev/tests/integration/testsuite/Magento/Sales/Api/OrderCustomerDelegateInterfaceTest.php b/dev/tests/integration/testsuite/Magento/Sales/Api/OrderCustomerDelegateInterfaceTest.php
index 3e74a96cee940..d3e6e4aad2015 100644
--- a/dev/tests/integration/testsuite/Magento/Sales/Api/OrderCustomerDelegateInterfaceTest.php
+++ b/dev/tests/integration/testsuite/Magento/Sales/Api/OrderCustomerDelegateInterfaceTest.php
@@ -155,6 +155,60 @@ public function testDelegateNew()
'12345abcD'
);
+ //Testing that addresses from order and the order itself are assigned
+ //to customer.
+ $order = $this->orderRepository->get($orderId);
+ $this->assertCount(1, $createdCustomer->getAddresses());
+ $this->assertNotNull($createdCustomer->getDefaultBilling());
+ $this->assertNotNull($createdCustomer->getDefaultShipping());
+ foreach ($createdCustomer->getAddresses() as $address) {
+ $this->assertTrue(
+ $address->isDefaultBilling() || $address->isDefaultShipping()
+ );
+ if ($address->isDefaultBilling()) {
+ $this->compareAddresses($order->getBillingAddress(), $address);
+ } elseif ($address->isDefaultShipping()) {
+ $this->compareAddresses($order->getShippingAddress(), $address);
+ }
+ }
+ $this->assertEquals($order->getCustomerId(), $createdCustomer->getId());
+ }
+
+ /**
+ * @magentoDbIsolation enabled
+ * @magentoAppIsolation enabled
+ * @magentoDataFixture Magento/Sales/_files/order_different_addresses.php
+ */
+ public function testDelegateNewDifferentAddresses()
+ {
+ $orderAutoincrementId = '100000001';
+ /** @var Order $orderModel */
+ $orderModel = $this->orderFactory->create();
+ $orderModel->loadByIncrementId($orderAutoincrementId);
+ $orderId = $orderModel->getId();
+ unset($orderModel);
+
+ $this->delegate->delegateNew($orderId);
+
+ //Saving new customer with prepared data from order.
+ /** @var CustomerInterface $customer */
+ $customer = $this->customerFactory->create();
+ $customer->setWebsiteId(1)
+ ->setEmail('customer_order_delegate@example.com')
+ ->setGroupId(1)
+ ->setStoreId(1)
+ ->setPrefix('Mr.')
+ ->setFirstname('John')
+ ->setMiddlename('A')
+ ->setLastname('Smith')
+ ->setSuffix('Esq.')
+ ->setTaxvat('12')
+ ->setGender(0);
+ $createdCustomer = $this->accountManagement->createAccount(
+ $customer,
+ '12345abcD'
+ );
+
//Testing that addresses from order and the order itself are assigned
//to customer.
$order = $this->orderRepository->get($orderId);
diff --git a/dev/tests/integration/testsuite/Magento/Sales/Block/Adminhtml/Order/Create/FormTest.php b/dev/tests/integration/testsuite/Magento/Sales/Block/Adminhtml/Order/Create/FormTest.php
index b6df7eb05c03d..abdbab2c24d16 100644
--- a/dev/tests/integration/testsuite/Magento/Sales/Block/Adminhtml/Order/Create/FormTest.php
+++ b/dev/tests/integration/testsuite/Magento/Sales/Block/Adminhtml/Order/Create/FormTest.php
@@ -1,151 +1,201 @@
_objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
-
- $sessionMock = $this->getMockBuilder(
- \Magento\Backend\Model\Session\Quote::class
- )->disableOriginalConstructor()->setMethods(
- ['getCustomerId', 'getQuote', 'getStoreId', 'getStore']
- )->getMock();
- $sessionMock->expects($this->any())->method('getCustomerId')->will($this->returnValue(1));
-
- $quote = $this->_objectManager->create(\Magento\Quote\Model\Quote::class)->load(1);
- $sessionMock->expects($this->any())->method('getQuote')->will($this->returnValue($quote));
-
- $sessionMock->expects($this->any())->method('getStoreId')->will($this->returnValue(1));
-
- $storeMock = $this->getMockBuilder(
- \Magento\Store\Model\Store::class
- )->disableOriginalConstructor()->setMethods(
- ['getCurrentCurrencyCode']
- )->getMock();
- $storeMock->expects($this->any())->method('getCurrentCurrencyCode')->will($this->returnValue('USD'));
- $sessionMock->expects($this->any())->method('getStore')->will($this->returnValue($storeMock));
-
- /** @var \Magento\Framework\View\LayoutInterface $layout */
- $layout = $this->_objectManager->get(\Magento\Framework\View\LayoutInterface::class);
- $this->_orderCreateBlock = $layout->createBlock(
- \Magento\Sales\Block\Adminhtml\Order\Create\Form::class,
- 'order_create_block' . rand(),
- ['sessionQuote' => $sessionMock]
+ $this->objectManager = Bootstrap::getObjectManager();
+
+ $this->session = $this->getMockBuilder(QuoteSession::class)
+ ->disableOriginalConstructor()
+ ->setMethods(['getCustomerId', 'getQuote', 'getStoreId', 'getStore', 'getQuoteId'])
+ ->getMock();
+ $this->session->method('getCustomerId')
+ ->willReturn(1);
+
+ $this->session->method('getStoreId')
+ ->willReturn(1);
+
+ $store = $this->getMockBuilder(Store::class)
+ ->disableOriginalConstructor()
+ ->setMethods(['getCurrentCurrencyCode'])
+ ->getMock();
+ $store->method('getCurrentCurrencyCode')
+ ->willReturn('USD');
+ $this->session->method('getStore')
+ ->willReturn($store);
+
+ /** @var LayoutInterface $layout */
+ $layout = $this->objectManager->get(LayoutInterface::class);
+ $this->block = $layout->createBlock(
+ Form::class,
+ 'order_create_block' . mt_rand(),
+ ['sessionQuote' => $this->session]
);
parent::setUp();
}
/**
+ * Checks if all needed order's data is correctly returned to the form.
+ *
* @magentoDataFixture Magento/Customer/_files/customer.php
+ * @magentoDataFixture Magento/Sales/_files/quote.php
*/
public function testOrderDataJson()
{
- /** @var array $addressIds */
- $addressIds = $this->setUpMockAddress();
- $orderDataJson = $this->_orderCreateBlock->getOrderDataJson();
- $expectedOrderDataJson = <<assertEquals(json_decode($expectedOrderDataJson), json_decode($orderDataJson));
+ $customerId = 1;
+ $quote = $this->getQuote('test01');
+ $this->session->method('getQuote')
+ ->willReturn($quote);
+ $this->session->method('getQuoteId')
+ ->willReturn($quote->getId());
+ $addressData = $this->getAddressData();
+ $addressIds = $this->setUpMockAddress($customerId, $addressData);
+ $expected = [
+ 'customer_id' => $customerId,
+ 'addresses' => [
+ $addressIds[0] => $addressData[0],
+ $addressIds[1] => $addressData[1]
+ ],
+ 'store_id' => 1,
+ 'currency_symbol' => '$',
+ 'shipping_method_reseted' => true,
+ 'payment_method' => 'checkmo',
+ 'quote_id' => $quote->getId()
+ ];
+
+ self::assertEquals($expected, json_decode($this->block->getOrderDataJson(), true));
}
- private function setUpMockAddress()
+ /**
+ * Saves customer's addresses.
+ *
+ * @param int $customerId
+ * @param array $addressData
+ * @return array
+ * @throws \Magento\Framework\Exception\LocalizedException
+ */
+ private function setUpMockAddress(int $customerId, array $addressData)
{
- /** @var \Magento\Customer\Api\Data\RegionInterfaceFactory $regionFactory */
- $regionFactory = $this->_objectManager->create(\Magento\Customer\Api\Data\RegionInterfaceFactory::class);
-
- /** @var \Magento\Customer\Api\Data\AddressInterfaceFactory $addressFactory */
- $addressFactory = $this->_objectManager->create(\Magento\Customer\Api\Data\AddressInterfaceFactory::class);
- /** @var \Magento\Customer\Api\AddressRepositoryInterface $addressRepository */
- $addressRepository = $this->_objectManager->create(\Magento\Customer\Api\AddressRepositoryInterface::class);
-
- $addressData1 = $addressFactory->create()->setCountryId(
- 'US'
- )->setCustomerId(
- 1
- )->setIsDefaultBilling(
- true
- )->setIsDefaultShipping(
- true
- )->setPostcode(
- '75477'
- )->setRegion(
- $regionFactory->create()->setRegionCode('AL')->setRegion('Alabama')->setRegionId(1)
- )->setStreet(
- ['Green str, 67']
- )->setTelephone(
- '3468676'
- )->setCity(
- 'CityM'
- )->setFirstname(
- 'John'
- )->setLastname(
- 'Smith'
- );
-
- $addressData2 = $addressFactory->create()->setCountryId(
- 'US'
- )->setCustomerId(
- 1
- )->setIsDefaultBilling(
- false
- )->setIsDefaultShipping(
- false
- )->setPostcode(
- '47676'
- )->setRegion(
- $regionFactory->create()->setRegionCode('AL')->setRegion('Alabama')->setRegionId(1)
- )->setStreet(
- ['Black str, 48']
- )->setCity(
- 'CityX'
- )->setTelephone(
- '3234676'
- )->setFirstname(
- 'John'
- )->setLastname(
- 'Smith'
- );
+ /** @var RegionInterfaceFactory $regionFactory */
+ $regionFactory = $this->objectManager->create(RegionInterfaceFactory::class);
+ /** @var AddressInterfaceFactory $addressFactory */
+ $addressFactory = $this->objectManager->create(AddressInterfaceFactory::class);
+ /** @var AddressRepositoryInterface $addressRepository */
+ $addressRepository = $this->objectManager->create(AddressRepositoryInterface::class);
+ $region = $regionFactory->create()
+ ->setRegionCode('AL')
+ ->setRegion('Alabama')
+ ->setRegionId(1);
+
+ $ids = [];
+ foreach ($addressData as $data) {
+ $address = $addressFactory->create(['data' => $data]);
+ $address->setRegion($region)
+ ->setCustomerId($customerId)
+ ->setIsDefaultBilling(true)
+ ->setIsDefaultShipping(true);
+ $address = $addressRepository->save($address);
+ $ids[] = $address->getId();
+ }
+
+ return $ids;
+ }
- $savedAddress1 = $addressRepository->save($addressData1);
- $savedAddress2 = $addressRepository->save($addressData2);
+ /**
+ * Gets test address data.
+ *
+ * @return array
+ */
+ private function getAddressData(): array
+ {
+ return [
+ [
+ 'firstname' => 'John',
+ 'lastname' => 'Smith',
+ 'company' => false,
+ 'street' => 'Green str, 67',
+ 'city' => 'CityM',
+ 'country_id' => 'US',
+ 'region' => 'Alabama',
+ 'region_id' => 1,
+ 'postcode' => '75477',
+ 'telephone' => '3468676',
+ 'vat_id' => false
+ ],
+ [
+ 'firstname' => 'John',
+ 'lastname' => 'Smith',
+ 'company' => false,
+ 'street' => 'Black str, 48',
+ 'city' => 'CityX',
+ 'country_id' => 'US',
+ 'region' => 'Alabama',
+ 'region_id' => 1,
+ 'postcode' => '47676',
+ 'telephone' => '3234676',
+ 'vat_id' => false,
+ ]
+ ];
+ }
- return [$savedAddress1->getId(), $savedAddress2->getId()];
+ /**
+ * Gets quote by ID.
+ *
+ * @param string $reservedOrderId
+ * @return Quote
+ * @throws \Magento\Framework\Exception\NoSuchEntityException
+ */
+ private function getQuote(string $reservedOrderId): Quote
+ {
+ /** @var SearchCriteriaBuilder $searchCriteriaBuilder */
+ $searchCriteriaBuilder = $this->objectManager->get(SearchCriteriaBuilder::class);
+ $searchCriteria = $searchCriteriaBuilder->addFilter('reserved_order_id', $reservedOrderId)
+ ->create();
+ /** @var CartRepositoryInterface $repository */
+ $repository = $this->objectManager->get(CartRepositoryInterface::class);
+ $items = $repository->getList($searchCriteria)
+ ->getItems();
+
+ return array_pop($items);
}
}
diff --git a/dev/tests/integration/testsuite/Magento/Sales/Model/InvoiceEmailSenderHandlerTest.php b/dev/tests/integration/testsuite/Magento/Sales/Model/InvoiceEmailSenderHandlerTest.php
new file mode 100644
index 0000000000000..332092946c4d6
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Sales/Model/InvoiceEmailSenderHandlerTest.php
@@ -0,0 +1,103 @@
+create(
+ \Magento\Sales\Model\Order\Email\Container\InvoiceIdentity::class
+ );
+ /** @var \Magento\Sales\Model\Order\Email\Sender\InvoiceSender $invoiceSender */
+ $invoiceSender = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
+ ->create(
+ \Magento\Sales\Model\Order\Email\Sender\InvoiceSender::class,
+ [
+ 'identityContainer' => $invoiceIdentity,
+ ]
+ );
+ $entityResource = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
+ ->create(\Magento\Sales\Model\ResourceModel\Order\Invoice::class);
+ $this->entityCollection = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
+ \Magento\Sales\Model\ResourceModel\Order\Invoice\Collection::class
+ );
+ $this->emailSender = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
+ \Magento\Sales\Model\EmailSenderHandler::class,
+ [
+ 'emailSender' => $invoiceSender,
+ 'entityResource' => $entityResource,
+ 'entityCollection' => $this->entityCollection,
+ 'identityContainer' => $invoiceIdentity,
+ ]
+ );
+ }
+
+ /**
+ * @magentoAppIsolation enabled
+ * @magentoDbIsolation disabled
+ * @magentoDataFixture Magento/Sales/_files/invoice_list_different_stores.php
+ */
+ public function testInvoiceEmailSenderExecute()
+ {
+ $expectedResult = 1;
+
+ $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+
+ /** @var Config $defConfig */
+ $defConfig = $objectManager->create(Config::class);
+ $defConfig->setScope(ScopeConfigInterface::SCOPE_TYPE_DEFAULT);
+ $defConfig->setDataByPath('sales_email/general/async_sending', 1);
+ $defConfig->save();
+
+ /** @var Config $storeConfig */
+ $storeConfig = $objectManager->create(Config::class);
+ $storeConfig->setScope(ScopeInterface::SCOPE_STORES);
+ $storeConfig->setStore('fixture_second_store');
+ $storeConfig->setDataByPath('sales_email/invoice/enabled', 0);
+ $storeConfig->save();
+
+ $sendCollection = clone $this->entityCollection;
+ $sendCollection->addFieldToFilter('send_email', ['eq' => 1]);
+ $sendCollection->addFieldToFilter('email_sent', ['null' => true]);
+
+ $this->emailSender->sendEmails();
+
+ $this->assertCount($expectedResult, $sendCollection->getItems());
+ }
+
+ /**
+ * @inheritdoc
+ * @throws \Magento\Framework\Exception\LocalizedException
+ * @throws \Exception
+ */
+ protected function tearDown()
+ {
+ /** @var \Magento\Config\Model\Config $defConfig */
+ $defConfig = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
+ ->create(\Magento\Config\Model\Config::class);
+ $defConfig->setScope(\Magento\Framework\App\Config\ScopeConfigInterface::SCOPE_TYPE_DEFAULT);
+ $defConfig->setDataByPath('sales_email/general/async_sending', 0);
+ $defConfig->save();
+ }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Sales/_files/invoice_list_different_stores.php b/dev/tests/integration/testsuite/Magento/Sales/_files/invoice_list_different_stores.php
new file mode 100644
index 0000000000000..e6a1947b72edd
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Sales/_files/invoice_list_different_stores.php
@@ -0,0 +1,132 @@
+create(\Magento\Store\Model\Store::class);
+$secondStoreId = $store->load('fixture_second_store')->getId();
+
+$orders = [
+ [
+ 'increment_id' => '100000002',
+ 'state' => \Magento\Sales\Model\Order::STATE_NEW,
+ 'status' => 'processing',
+ 'grand_total' => 120.00,
+ 'subtotal' => 120.00,
+ 'base_grand_total' => 120.00,
+ 'store_id' => 0,
+ 'website_id' => 1,
+ ],
+ [
+ 'increment_id' => '100000003',
+ 'state' => \Magento\Sales\Model\Order::STATE_PROCESSING,
+ 'status' => 'processing',
+ 'grand_total' => 140.00,
+ 'base_grand_total' => 140.00,
+ 'subtotal' => 140.00,
+ 'store_id' => 1,
+ 'website_id' => 0,
+ ],
+ [
+ 'increment_id' => '100000004',
+ 'state' => \Magento\Sales\Model\Order::STATE_PROCESSING,
+ 'status' => 'closed',
+ 'grand_total' => 140.00,
+ 'base_grand_total' => 140.00,
+ 'subtotal' => 140.00,
+ 'store_id' => $secondStoreId,
+ 'website_id' => 1,
+ ],
+];
+
+/** @var \Magento\Sales\Model\Order\Address $billingAddress */
+$billingAddress = $objectManager->create(\Magento\Sales\Model\Order\Address::class, ['data' => $addressData]);
+$billingAddress->setAddressType('billing');
+
+/** @var \Magento\Sales\Model\Order\Address $shippingAddress */
+$shippingAddress = clone $billingAddress;
+$shippingAddress->setId(null)->setAddressType('shipping');
+
+/** @var \Magento\Sales\Model\Order\Payment $payment */
+$payment = $objectManager->create(\Magento\Sales\Model\Order\Payment::class);
+$payment->setMethod('checkmo');
+$payment->setAdditionalInformation('last_trans_id', '11122');
+$payment->setAdditionalInformation('metadata', [
+ 'type' => 'free',
+ 'fraudulent' => false,
+]);
+
+/** @var \Magento\Sales\Model\Order\Item $orderItem */
+$orderItem = $objectManager->create(\Magento\Sales\Model\Order\Item::class);
+$orderItem->setProductId($product->getId())->setQtyOrdered(2);
+$orderItem->setBasePrice($product->getPrice());
+$orderItem->setPrice($product->getPrice());
+$orderItem->setRowTotal($product->getPrice());
+$orderItem->setProductType('simple');
+
+/** @var \Magento\Sales\Api\InvoiceManagementInterface $orderService */
+$orderService = \Magento\TestFramework\ObjectManager::getInstance()->create(
+ \Magento\Sales\Api\InvoiceManagementInterface::class
+);
+
+/** @var \Magento\Sales\Api\OrderRepositoryInterface $orderRepository */
+$orderRepository = $objectManager->create(\Magento\Sales\Api\OrderRepositoryInterface::class);
+
+foreach ($orders as $orderFixture) {
+ /** @var \Magento\Sales\Model\Order $order */
+ $order = $objectManager->create(\Magento\Sales\Model\Order::class);
+ $order->setData($orderFixture);
+ $order->setIncrementId(
+ $orderFixture['increment_id']
+ )->setStoreId(
+ $orderFixture['store_id']
+ )->setState(
+ $orderFixture['state']
+ )->setStatus(
+ $orderFixture['status']
+ )->setSubtotal(
+ $orderFixture['subtotal']
+ )->setGrandTotal(
+ $orderFixture['grand_total']
+ )->setBaseSubtotal(
+ $orderFixture['subtotal']
+ )->setBaseGrandTotal(
+ $orderFixture['base_grand_total']
+ )->setCustomerIsGuest(
+ true
+ )->setCustomerEmail(
+ 'customer@null.com'
+ )->setBillingAddress(
+ clone $billingAddress
+ )->setShippingAddress(
+ clone $shippingAddress
+ )->addItem(
+ clone $orderItem
+ )->setPayment(
+ clone $payment
+ );
+
+ $orderRepository->save($order);
+
+ /** @var \Magento\Sales\Model\Order\Invoice $invoice */
+ $invoice = $orderService->prepareInvoice($order, $order->getItems());
+ $invoice->register();
+ $invoice->setSendEmail(1);
+ $invoice->setStoreId($orderFixture['store_id']);
+ $order = $invoice->getOrder();
+ $order->setIsInProcess(true);
+ $transactionSave = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
+ ->create(\Magento\Framework\DB\Transaction::class);
+ $transactionSave->addObject($invoice)->addObject($order)->save();
+}
diff --git a/dev/tests/integration/testsuite/Magento/Sales/_files/invoice_list_different_stores_rollback.php b/dev/tests/integration/testsuite/Magento/Sales/_files/invoice_list_different_stores_rollback.php
new file mode 100644
index 0000000000000..803a69cabf77b
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Sales/_files/invoice_list_different_stores_rollback.php
@@ -0,0 +1,9 @@
+create(\Magento\Sales\Model\Order\Address::class, ['data' => $addressData]);
+$billingAddress->setAddressType('billing');
+
+/** @var \Magento\Sales\Model\Order\Address $shippingAddress */
+$shippingAddress = clone $billingAddress;
+$shippingAddress
+ ->setId(null)
+ ->setAddressType('shipping')
+ ->setCity('San Francisco');
+
+/** @var \Magento\Sales\Model\Order\Payment $payment */
+$payment = $objectManager->create(\Magento\Sales\Model\Order\Payment::class);
+$payment->setMethod('checkmo');
+$payment->setAdditionalInformation('last_trans_id', '11122');
+$payment->setAdditionalInformation('metadata', [
+ 'type' => 'free',
+ 'fraudulent' => false,
+]);
+
+/** @var \Magento\Sales\Model\Order\Item $orderItem */
+$orderItem = $objectManager->create(\Magento\Sales\Model\Order\Item::class);
+$orderItem->setProductId($product->getId())->setQtyOrdered(2);
+$orderItem->setBasePrice($product->getPrice());
+$orderItem->setPrice($product->getPrice());
+$orderItem->setRowTotal($product->getPrice());
+$orderItem->setProductType('simple');
+
+/** @var \Magento\Sales\Model\Order $order */
+$order = $objectManager->create(\Magento\Sales\Model\Order::class);
+$order->setIncrementId('100000001')
+ ->setState(\Magento\Sales\Model\Order::STATE_PROCESSING)
+ ->setStatus($order->getConfig()->getStateDefaultStatus(\Magento\Sales\Model\Order::STATE_PROCESSING))
+ ->setSubtotal(100)
+ ->setGrandTotal(100)
+ ->setBaseSubtotal(100)
+ ->setBaseGrandTotal(100)
+ ->setCustomerIsGuest(true)
+ ->setCustomerEmail('customer@null.com')
+ ->setBillingAddress($billingAddress)
+ ->setShippingAddress($shippingAddress)
+ ->setStoreId($objectManager->get(\Magento\Store\Model\StoreManagerInterface::class)->getStore()->getId())
+ ->addItem($orderItem)
+ ->setPayment($payment);
+
+$order->save();
diff --git a/dev/tests/integration/testsuite/Magento/Store/Controller/Store/SwitchActionTest.php b/dev/tests/integration/testsuite/Magento/Store/Controller/Store/SwitchActionTest.php
index dfd979f03c576..bc8ca2ba07a80 100644
--- a/dev/tests/integration/testsuite/Magento/Store/Controller/Store/SwitchActionTest.php
+++ b/dev/tests/integration/testsuite/Magento/Store/Controller/Store/SwitchActionTest.php
@@ -48,8 +48,5 @@ protected function changeStoreCode($from, $to)
$store->load($from, 'code');
$store->setCode($to);
$store->save();
- /** @var \Magento\Store\Model\StoreManagerInterface $storeManager */
- $storeManager = $this->_objectManager->get(\Magento\Store\Model\StoreManagerInterface::class);
- $storeManager->reinitStores();
}
}
diff --git a/dev/tests/integration/testsuite/Magento/Store/_files/core_fixturestore.php b/dev/tests/integration/testsuite/Magento/Store/_files/core_fixturestore.php
index e3971ad912a78..a4a640a24de50 100644
--- a/dev/tests/integration/testsuite/Magento/Store/_files/core_fixturestore.php
+++ b/dev/tests/integration/testsuite/Magento/Store/_files/core_fixturestore.php
@@ -21,9 +21,6 @@
->setSortOrder(10)
->setIsActive(1);
$store->save();
-
- /* Refresh stores memory cache */
- Bootstrap::getObjectManager()->get(\Magento\Store\Model\StoreManagerInterface::class)->reinitStores();
}
//if test using this fixture relies on full text functionality it is required to explicitly perform re-indexation
diff --git a/dev/tests/integration/testsuite/Magento/Store/_files/core_fixturestore_rollback.php b/dev/tests/integration/testsuite/Magento/Store/_files/core_fixturestore_rollback.php
index d6b9e1d9abc70..95d13111e6193 100644
--- a/dev/tests/integration/testsuite/Magento/Store/_files/core_fixturestore_rollback.php
+++ b/dev/tests/integration/testsuite/Magento/Store/_files/core_fixturestore_rollback.php
@@ -23,6 +23,3 @@
$registry->unregister('isSecureArea');
$registry->register('isSecureArea', false);
-
-/* Refresh stores memory cache */
-$objectManager->get(\Magento\Store\Model\StoreManagerInterface::class)->reinitStores();
diff --git a/dev/tests/integration/testsuite/Magento/Store/_files/core_second_third_fixturestore.php b/dev/tests/integration/testsuite/Magento/Store/_files/core_second_third_fixturestore.php
index 139f36ca3c9d6..3cb429822eb9a 100644
--- a/dev/tests/integration/testsuite/Magento/Store/_files/core_second_third_fixturestore.php
+++ b/dev/tests/integration/testsuite/Magento/Store/_files/core_second_third_fixturestore.php
@@ -27,8 +27,3 @@
$store = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(\Magento\Store\Model\Store::class);
$store->setCode('thirdstore')->setName('Third Store')->setSortOrder(10)->setIsActive(1);
$store->save();
-
-/* Refresh stores memory cache */
-\Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
- \Magento\Store\Model\StoreManagerInterface::class
-)->reinitStores();
diff --git a/dev/tests/integration/testsuite/Magento/Store/_files/core_second_third_fixturestore_rollback.php b/dev/tests/integration/testsuite/Magento/Store/_files/core_second_third_fixturestore_rollback.php
index 1334875b7a17b..0eaa7d32f9402 100644
--- a/dev/tests/integration/testsuite/Magento/Store/_files/core_second_third_fixturestore_rollback.php
+++ b/dev/tests/integration/testsuite/Magento/Store/_files/core_second_third_fixturestore_rollback.php
@@ -34,8 +34,3 @@
$registry->unregister('isSecureArea');
$registry->register('isSecureArea', false);
-
-/* Refresh stores memory cache */
-\Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
- \Magento\Store\Model\StoreManagerInterface::class
-)->reinitStores();
diff --git a/dev/tests/integration/testsuite/Magento/Store/_files/fixture_store_with_catalogsearch_index.php b/dev/tests/integration/testsuite/Magento/Store/_files/fixture_store_with_catalogsearch_index.php
index 064dfbcdbe2be..d5fd725e7df4d 100644
--- a/dev/tests/integration/testsuite/Magento/Store/_files/fixture_store_with_catalogsearch_index.php
+++ b/dev/tests/integration/testsuite/Magento/Store/_files/fixture_store_with_catalogsearch_index.php
@@ -21,11 +21,4 @@
->setSortOrder(10)
->setIsActive(1);
$store->save();
-
- Bootstrap::getObjectManager()
- ->get(\Magento\Framework\Event\ManagerInterface::class)
- ->dispatch('store_add', ['store' => $store]);
-
- /* Refresh stores memory cache */
- Bootstrap::getObjectManager()->get(\Magento\Store\Model\StoreManagerInterface::class)->reinitStores();
}
diff --git a/dev/tests/integration/testsuite/Magento/Store/_files/fixture_store_with_catalogsearch_index_rollback.php b/dev/tests/integration/testsuite/Magento/Store/_files/fixture_store_with_catalogsearch_index_rollback.php
index 8a69f83882ade..251635dcff09f 100644
--- a/dev/tests/integration/testsuite/Magento/Store/_files/fixture_store_with_catalogsearch_index_rollback.php
+++ b/dev/tests/integration/testsuite/Magento/Store/_files/fixture_store_with_catalogsearch_index_rollback.php
@@ -20,8 +20,3 @@
$registry->unregister('isSecureArea');
$registry->register('isSecureArea', false);
-
-/* Refresh stores memory cache */
-\Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
- \Magento\Store\Model\StoreManagerInterface::class
-)->reinitStores();
diff --git a/dev/tests/integration/testsuite/Magento/Store/_files/second_store.php b/dev/tests/integration/testsuite/Magento/Store/_files/second_store.php
index c154cdfb80f8e..6fbe316f52a05 100644
--- a/dev/tests/integration/testsuite/Magento/Store/_files/second_store.php
+++ b/dev/tests/integration/testsuite/Magento/Store/_files/second_store.php
@@ -6,6 +6,7 @@
* See COPYING.txt for license details.
*/
+/** @var \Magento\Store\Model\Store $store */
$store = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(\Magento\Store\Model\Store::class);
if (!$store->load('fixture_second_store', 'code')->getId()) {
$websiteId = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
@@ -29,8 +30,3 @@
);
$store->save();
}
-
-/* Refresh stores memory cache */
-\Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
- \Magento\Store\Model\StoreManagerInterface::class
-)->reinitStores();
diff --git a/dev/tests/integration/testsuite/Magento/Store/_files/second_store_rollback.php b/dev/tests/integration/testsuite/Magento/Store/_files/second_store_rollback.php
index 4fc5d3b65b270..56ba31fad4ed2 100644
--- a/dev/tests/integration/testsuite/Magento/Store/_files/second_store_rollback.php
+++ b/dev/tests/integration/testsuite/Magento/Store/_files/second_store_rollback.php
@@ -20,8 +20,3 @@
$registry->unregister('isSecureArea');
$registry->register('isSecureArea', false);
-
-/* Refresh stores memory cache */
-\Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
- \Magento\Store\Model\StoreManagerInterface::class
-)->reinitStores();
diff --git a/dev/tests/integration/testsuite/Magento/Store/_files/second_website_with_two_stores.php b/dev/tests/integration/testsuite/Magento/Store/_files/second_website_with_two_stores.php
index 078b590132f06..016acca1e8e04 100644
--- a/dev/tests/integration/testsuite/Magento/Store/_files/second_website_with_two_stores.php
+++ b/dev/tests/integration/testsuite/Magento/Store/_files/second_website_with_two_stores.php
@@ -51,10 +51,6 @@
);
$store->save();
}
-/* Refresh stores memory cache */
-\Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
- \Magento\Store\Model\StoreManagerInterface::class
-)->reinitStores();
/* Refresh CatalogSearch index */
/** @var \Magento\Framework\Indexer\IndexerRegistry $indexerRegistry */
diff --git a/dev/tests/integration/testsuite/Magento/Store/_files/second_website_with_two_stores_rollback.php b/dev/tests/integration/testsuite/Magento/Store/_files/second_website_with_two_stores_rollback.php
index b97dc4dd40bd9..eef8cf960944c 100644
--- a/dev/tests/integration/testsuite/Magento/Store/_files/second_website_with_two_stores_rollback.php
+++ b/dev/tests/integration/testsuite/Magento/Store/_files/second_website_with_two_stores_rollback.php
@@ -27,8 +27,3 @@
$registry->unregister('isSecureArea');
$registry->register('isSecureArea', false);
-
-/* Refresh stores memory cache */
-\Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
- \Magento\Store\Model\StoreManagerInterface::class
-)->reinitStores();
diff --git a/dev/tests/integration/testsuite/Magento/Store/_files/store.php b/dev/tests/integration/testsuite/Magento/Store/_files/store.php
index e49d16e2ede68..94ea5a9364b87 100644
--- a/dev/tests/integration/testsuite/Magento/Store/_files/store.php
+++ b/dev/tests/integration/testsuite/Magento/Store/_files/store.php
@@ -37,6 +37,3 @@
$store->save();
}
}
-$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
-/* Refresh stores memory cache */
-$objectManager->get('Magento\Store\Model\StoreManagerInterface')->reinitStores();
diff --git a/dev/tests/integration/testsuite/Magento/Store/_files/store_rollback.php b/dev/tests/integration/testsuite/Magento/Store/_files/store_rollback.php
index 3b437f08c8c33..8289244d6581a 100644
--- a/dev/tests/integration/testsuite/Magento/Store/_files/store_rollback.php
+++ b/dev/tests/integration/testsuite/Magento/Store/_files/store_rollback.php
@@ -31,8 +31,3 @@
$registry->unregister('isSecureArea');
$registry->register('isSecureArea', false);
-
-/* Refresh stores memory cache */
-\Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
- \Magento\Store\Model\StoreManagerInterface::class
-)->reinitStores();
diff --git a/dev/tests/integration/testsuite/Magento/Store/_files/websites_different_countries.php b/dev/tests/integration/testsuite/Magento/Store/_files/websites_different_countries.php
index b6282e51132e8..018f793020df3 100644
--- a/dev/tests/integration/testsuite/Magento/Store/_files/websites_different_countries.php
+++ b/dev/tests/integration/testsuite/Magento/Store/_files/websites_different_countries.php
@@ -44,9 +44,6 @@
$store->save();
}
-/* Refresh stores memory cache */
-$objectManager->get(\Magento\Store\Model\StoreManagerInterface::class)->reinitStores();
-
//Setting up allowed countries
$configResource = $objectManager->get(\Magento\Config\Model\ResourceModel\Config::class);
//Allowed countries for default website.
diff --git a/dev/tests/integration/testsuite/Magento/SwaggerWebapi/Block/Swagger/IndexTest.php b/dev/tests/integration/testsuite/Magento/SwaggerWebapi/Block/Swagger/IndexTest.php
new file mode 100644
index 0000000000000..cf1c87e2b2225
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/SwaggerWebapi/Block/Swagger/IndexTest.php
@@ -0,0 +1,60 @@
+get(\Magento\Framework\App\State::class)
+ ->setAreaCode('frontend');
+
+ $this->block = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
+ \Magento\Framework\View\LayoutInterface::class
+ )->createBlock(
+ \Magento\Swagger\Block\Index::class,
+ '',
+ [
+ 'data' => [
+ 'schema_types' => [
+ 'rest' => \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
+ \Magento\SwaggerWebapi\Model\SchemaType\Rest::class
+ )
+ ],
+ 'default_schema_type_code' => 'rest'
+ ]
+ ]
+ );
+ }
+
+ /**
+ * Test that the Swagger UI outputs rest as the default when there is no type parameter supplied via URL.
+ */
+ public function testDefaultSchemaUrlOutput()
+ {
+ $this->assertStringEndsWith('/rest/all/schema?services=all', $this->block->getSchemaUrl());
+ }
+
+ /**
+ * Test that Swagger UI outputs the supplied store code when it is specified.
+ */
+ public function testSchemaUrlOutputWithStore()
+ {
+ $this->block->getRequest()->setParams([
+ 'store' => 'custom',
+ ]);
+
+ $this->assertStringEndsWith('/rest/custom/schema?services=all', $this->block->getSchemaUrl());
+ }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Swatches/Controller/Adminhtml/Product/AttributeTest.php b/dev/tests/integration/testsuite/Magento/Swatches/Controller/Adminhtml/Product/AttributeTest.php
new file mode 100644
index 0000000000000..be9fd96d75892
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Swatches/Controller/Adminhtml/Product/AttributeTest.php
@@ -0,0 +1,214 @@
+getRandomColor()}";
+ $optionsData []= "optionvisual[value][option_{$i}][0]=value_{$i}_admin";
+ $optionsData []= "optionvisual[value][option_{$i}][1]={$expectedOptionLabelOnStoreView}";
+ $optionsData []= "optionvisual[delete][option_{$i}]=";
+ }
+ $optionsData []= "visual_swatch_validation=";
+ $optionsData []= "visual_swatch_validation_unique=";
+ return [
+ 'attribute_data' => array_merge_recursive(
+ [
+ 'serialized_swatch_values' => json_encode($optionsData),
+ ],
+ $this->getAttributePreset(),
+ [
+ 'frontend_input' => 'swatch_visual',
+ ]
+ ),
+ 'expected_options_count' => $optionsCount + 1,
+ 'expected_store_labels' => $expectedOptionsLabels,
+ ];
+ }
+
+ /**
+ * Get text swatches data set.
+ *
+ * @param int $optionsCount
+ * @return array
+ */
+ private function getSwatchTextDataSet(int $optionsCount): array
+ {
+ $optionsData = [];
+ $expectedOptionsLabels = [];
+ for ($i = 0; $i < $optionsCount; $i++) {
+ $order = $i + 1;
+ $expectedOptionLabelOnStoreView = "value_{$i}_store_1";
+ $expectedOptionsLabels[$i+1] = $expectedOptionLabelOnStoreView;
+ $optionsData []= "optiontext[order][option_{$i}]={$order}";
+ $optionsData []= "defaulttext[]=option_{$i}";
+ $optionsData []= "swatchtext[value][option_{$i}]=x{$i}";
+ $optionsData []= "optiontext[value][option_{$i}][0]=value_{$i}_admin";
+ $optionsData []= "optiontext[value][option_{$i}][1]={$expectedOptionLabelOnStoreView}";
+ $optionsData []= "optiontext[delete][option_{$i}]=";
+ }
+ $optionsData []= "text_swatch_validation=";
+ $optionsData []= "text_swatch_validation_unique=";
+ return [
+ 'attribute_data' => array_merge_recursive(
+ [
+ 'serialized_swatch_values' => json_encode($optionsData),
+ ],
+ $this->getAttributePreset(),
+ [
+ 'frontend_input' => 'swatch_text',
+ ]
+ ),
+ 'expected_options_count' => $optionsCount + 1,
+ 'expected_store_labels' => $expectedOptionsLabels,
+ ];
+ }
+
+ /**
+ * Get data preset for new attribute.
+ *
+ * @return array
+ */
+ private function getAttributePreset(): array
+ {
+ return [
+ 'serialized_options' => '[]',
+ 'form_key' => 'XxtpPYjm2YPYUlAt',
+ 'frontend_label' => [
+ 0 => 'asdasd',
+ 1 => '',
+ 2 => '',
+ ],
+ 'is_required' => '0',
+ 'update_product_preview_image' => '0',
+ 'use_product_image_for_swatch' => '0',
+ 'is_global' => '0',
+ 'default_value_text' => '512',
+ 'default_value_yesno' => '1',
+ 'default_value_date' => '1/1/70',
+ 'default_value_textarea' => '512',
+ 'is_unique' => '0',
+ 'is_used_in_grid' => '1',
+ 'is_visible_in_grid' => '1',
+ 'is_filterable_in_grid' => '1',
+ 'is_searchable' => '0',
+ 'is_comparable' => '0',
+ 'is_filterable' => '0',
+ 'is_filterable_in_search' => '0',
+ 'position' => '0',
+ 'is_used_for_promo_rules' => '0',
+ 'is_html_allowed_on_front' => '1',
+ 'is_visible_on_front' => '0',
+ 'used_in_product_listing' => '0',
+ 'used_for_sort_by' => '0',
+ 'attribute_code' => 'test_many_swatches',
+ ];
+ }
+
+ /**
+ * Data provider for large swatches amount test.
+ *
+ * @return array
+ */
+ public function getLargeSwatchesAmountAttributeData(): array
+ {
+ $maxInputVars = ini_get('max_input_vars');
+ // Each option is at least 7 variables array for a visual swatch.
+ // Set options count to exceed max_input_vars by 20 options (140 variables).
+ $swatchVisualOptionsCount = (int)floor($maxInputVars / 7) + 20;
+ $swatchTextOptionsCount = (int)floor($maxInputVars / 4) + 80;
+ return [
+ 'visual swatches' => $this->getSwatchVisualDataSet($swatchVisualOptionsCount),
+ 'text swatches' => $this->getSwatchTextDataSet($swatchTextOptionsCount),
+ ];
+ }
+
+ /**
+ * Test attribute saving with large amount of options exceeding maximum allowed by max_input_vars limit.
+ *
+ * @dataProvider getLargeSwatchesAmountAttributeData()
+ * @param array $attributeData
+ * @param int $expectedOptionsCount
+ * @param array $expectedLabels
+ * @return void
+ */
+ public function testLargeOptionsDataSet(
+ array $attributeData,
+ int $expectedOptionsCount,
+ array $expectedLabels
+ ) {
+ $this->getRequest()->setPostValue($attributeData);
+ $this->dispatch('backend/catalog/product_attribute/save');
+ $entityTypeId = $this->_objectManager->create(
+ \Magento\Eav\Model\Entity::class
+ )->setType(
+ \Magento\Catalog\Model\Product::ENTITY
+ )->getTypeId();
+
+ /** @var $attribute \Magento\Catalog\Model\ResourceModel\Eav\Attribute */
+ $attribute = $this->_objectManager->create(
+ \Magento\Catalog\Model\ResourceModel\Eav\Attribute::class
+ )->setEntityTypeId(
+ $entityTypeId
+ );
+ try {
+ $attribute->loadByCode($entityTypeId, 'test_many_swatches');
+ $options = $attribute->getOptions();
+ // assert that all options are saved without truncation
+ $this->assertEquals(
+ $expectedOptionsCount,
+ count($options),
+ 'Expected options count does not match (regarding first empty option for non-required attribute)'
+ );
+
+ foreach ($expectedLabels as $optionOrderNum => $label) {
+ $this->assertEquals(
+ $label,
+ $options[$optionOrderNum]->getLabel(),
+ "Label for option #{$optionOrderNum} does not match expected."
+ );
+ }
+ } catch (LocalizedException $e) {
+ $this->fail('Test failed with exception on attribute model load: ' . $e);
+ }
+ }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Webapi/Controller/Rest/SchemaRequestProcessorTest.php b/dev/tests/integration/testsuite/Magento/Webapi/Controller/Rest/SchemaRequestProcessorTest.php
new file mode 100644
index 0000000000000..70437bcffbbc1
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Webapi/Controller/Rest/SchemaRequestProcessorTest.php
@@ -0,0 +1,56 @@
+dispatch($path);
+ ob_end_clean();
+ $schema = $this->getResponse()->getBody();
+
+ // Check that an HTTP 200 response status is visible in the schema.
+ $this->assertRegExp('/200 Success/', $schema);
+ }
+
+ /**
+ * Response getter
+ *
+ * @return \Magento\Framework\App\ResponseInterface
+ */
+ public function getResponse()
+ {
+ if (!$this->_response) {
+ $this->_response = $this->_objectManager->get(\Magento\Framework\Webapi\Rest\Response::class);
+ }
+ return $this->_response;
+ }
+
+ /**
+ * @return array
+ */
+ public function schemaRequestProvider()
+ {
+ return [
+ ['rest/schema'],
+ ['rest/schema?services=all'],
+ ['rest/all/schema?services=all'],
+ ['rest/default/schema?services=all'],
+ ['rest/schema?services=all'],
+ ];
+ }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Weee/Model/ResourceModel/AttributeTest.php b/dev/tests/integration/testsuite/Magento/Weee/Model/ResourceModel/AttributeTest.php
new file mode 100644
index 0000000000000..857261a01e857
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Weee/Model/ResourceModel/AttributeTest.php
@@ -0,0 +1,115 @@
+objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+ $this->model = $this->objectManager->get(
+ \Magento\Catalog\Model\ResourceModel\Attribute::class
+ );
+ $this->productResource = $this->objectManager->get(
+ \Magento\Catalog\Model\ResourceModel\Product::class
+ );
+ $this->productRepository = $this->objectManager->create(ProductRepositoryInterface::class);
+ $this->metadataPool = $this->objectManager->get(MetadataPool::class);
+ }
+
+ /**
+ * Retrieve eav attribute row.
+ *
+ * @param int $entityTypeId
+ * @param int $attributeSetId
+ * @param int $attributeId
+ * @return array|false
+ */
+ private function getEavEntityAttributeRow($entityTypeId, $attributeSetId, $attributeId)
+ {
+ $connection = $this->productResource->getConnection();
+ $select = $connection->select()
+ ->from($this->productResource->getTable('eav_entity_attribute'))
+ ->where('attribute_set_id=?', $attributeSetId)
+ ->where('attribute_id=?', $attributeId)
+ ->where('entity_type_id=?', $entityTypeId);
+
+ return $connection->fetchRow($select);
+ }
+
+ /**
+ * Test to delete entity attribute with type "Fixed Product Tax".
+ *
+ * @magentoDataFixture Magento/Weee/_files/fixed_product_attribute.php
+ * @return void
+ */
+ public function testDeleteEntityFixedTax()
+ {
+ /* @var EavAttribute $attribute */
+ $attribute = $this->objectManager->get(EavAttribute::class);
+ $attribute->loadByCode(\Magento\Catalog\Model\Product::ENTITY, 'fixed_product_attribute');
+
+ $entityEavAttributeRow = $this->getEavEntityAttributeRow(
+ $attribute->getEntityTypeId(),
+ 4,
+ $attribute->getId()
+ );
+ $this->assertNotEmpty(
+ $entityEavAttributeRow['entity_attribute_id'],
+ 'The record is absent in table `eav_entity_attribute` for `fixed_product_attribute`'
+ );
+
+ $attribute->setData('entity_attribute_id', $entityEavAttributeRow['entity_attribute_id']);
+ $this->model->deleteEntity($attribute);
+
+ $entityEavAttributeRow = $this->getEavEntityAttributeRow(
+ $attribute->getEntityTypeId(),
+ 4,
+ $attribute->getId()
+ );
+ $this->assertEmpty(
+ $entityEavAttributeRow,
+ 'The record is not remove from table `eav_entity_attribute` for `fixed_product_attribute`'
+ );
+ }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Weee/_files/fixed_product_attribute.php b/dev/tests/integration/testsuite/Magento/Weee/_files/fixed_product_attribute.php
new file mode 100644
index 0000000000000..644405537db9f
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Weee/_files/fixed_product_attribute.php
@@ -0,0 +1,34 @@
+create(\Magento\Eav\Model\Entity\Attribute\Set::class);
+
+$entityType = $objectManager->create(\Magento\Eav\Model\Entity\Type::class)->loadByCode('catalog_product');
+$defaultSetId = $objectManager->create(\Magento\Catalog\Model\Product::class)->getDefaultAttributeSetid();
+
+$attributeGroupId = $attributeSet->getDefaultGroupId($entityType->getDefaultAttributeSetId());
+
+$attributeData = [
+ 'entity_type_id' => $entityType->getId(),
+ 'attribute_code' => 'fixed_product_attribute',
+ 'backend_model' => 'Magento\Weee\Model\Attribute\Backend\Weee\Tax',
+ 'is_required' => 0,
+ 'is_user_defined' => 1,
+ 'is_static' => 1,
+ 'attribute_set_id' => $defaultSetId,
+ 'attribute_group_id' => $attributeGroupId,
+];
+
+/** @var \Magento\Catalog\Model\Entity\Attribute $attribute */
+// $attribute = $objectManager->create(\Magento\Catalog\Model\Entity\Attribute::class);
+$attribute = $objectManager->create(\Magento\Eav\Model\Entity\Attribute::class);
+$attribute->setData($attributeData);
+$attribute->save();
diff --git a/dev/tests/integration/testsuite/Magento/Weee/_files/fixed_product_attribute_rollback.php b/dev/tests/integration/testsuite/Magento/Weee/_files/fixed_product_attribute_rollback.php
new file mode 100644
index 0000000000000..1d6e15b2e9a97
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Weee/_files/fixed_product_attribute_rollback.php
@@ -0,0 +1,14 @@
+get(\Magento\Eav\Model\Entity\Attribute::class);
+$attribute->loadByCode(\Magento\Catalog\Model\Product::ENTITY, 'fixed_product_attribute');
+$attribute->delete();
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Catalog/frontend/js/product/remaining-characters.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Catalog/frontend/js/product/remaining-characters.test.js
new file mode 100644
index 0000000000000..3b64385a8894b
--- /dev/null
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Catalog/frontend/js/product/remaining-characters.test.js
@@ -0,0 +1,84 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+/* eslint-disable max-nested-callbacks */
+define([
+ 'Magento_Catalog/js/product/remaining-characters',
+ 'jquery'
+], function (remainingCharacters, $) {
+ 'use strict';
+
+ describe('Magento_Catalog/js/product/remaining-characters', function () {
+ var widget,
+ note;
+
+ beforeEach(function () {
+ widget = $('
');
+ $('body').append(widget).append(note);
+
+ widget.remainingCharacters({
+ maxLength: '10',
+ noteSelector: '.note_1',
+ counterSelector: '.note_1 .character-counter'
+ });
+ });
+
+ afterEach(function () {
+ widget.remove();
+ note.remove();
+ });
+
+ describe('Note text is updated on input change', function () {
+ it('check empty input', function () {
+ var testData = {
+ input: '',
+ action: 'change',
+ expectedText: '(10 remaining)'
+ };
+
+ widget.val(testData.input);
+ widget.trigger(testData.action);
+ expect(note.find('.character-counter').text()).toBe(testData.expectedText);
+ });
+
+ it('check input length less than character limit', function () {
+ var testData = {
+ input: 'abc',
+ action: 'change',
+ expectedText: '(7 remaining)'
+ };
+
+ widget.val(testData.input);
+ widget.trigger(testData.action);
+ expect(note.find('.character-counter').text()).toBe(testData.expectedText);
+ });
+
+ it('check input length equals character limit', function () {
+ var testData = {
+ input: 'abcdefghij',
+ action: 'paste',
+ expectedText: '(0 remaining)'
+ };
+
+ widget.val(testData.input);
+ widget.trigger(testData.action);
+ expect(note.find('.character-counter').text()).toBe(testData.expectedText);
+ });
+
+ it('check input length greater than character limit', function () {
+ var testData = {
+ input: 'abcdefghijkl',
+ action: 'change',
+ expectedText: '(2 too many)'
+ };
+
+ widget.val(testData.input);
+ widget.trigger(testData.action);
+ expect(note.find('.character-counter').text()).toBe(testData.expectedText);
+ });
+ });
+ });
+});
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Catalog/frontend/js/product/storage/storage-service.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Catalog/frontend/js/product/storage/storage-service.test.js
index 5530666c7ed70..ecb150bc15431 100644
--- a/dev/tests/js/jasmine/tests/app/code/Magento/Catalog/frontend/js/product/storage/storage-service.test.js
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Catalog/frontend/js/product/storage/storage-service.test.js
@@ -12,22 +12,11 @@ define([
var injector = new Squire(),
mocks = {
- 'Magento_Catalog/js/product/storage/ids-storage': {
- name: 'IdsStorage',
- initialize: jasmine.createSpy().and.returnValue({})
- },
'Magento_Catalog/js/product/storage/data-storage': {},
'Magento_Catalog/js/product/storage/ids-storage-compare': {}
},
- obj;
-
- beforeEach(function (done) {
- injector.mock(mocks);
- injector.require(['Magento_Catalog/js/product/storage/storage-service'], function (insance) {
- obj = insance;
- done();
- });
- });
+ obj,
+ utils;
describe('Magento_Catalog/js/product/storage/storage-service', function () {
var config = {
@@ -36,6 +25,19 @@ define([
},
storage;
+ beforeEach(function (done) {
+ injector.mock(mocks);
+ injector.require([
+ 'Magento_Catalog/js/product/storage/ids-storage',
+ 'Magento_Catalog/js/product/storage/storage-service',
+ 'mageUtils'
+ ], function (IdsStorage, instance, mageUtils) {
+ obj = instance;
+ utils = mageUtils;
+ done();
+ });
+ });
+
describe('"createStorage" method', function () {
it('create new storage', function () {
obj.processSubscribers = jasmine.createSpy();
@@ -66,5 +68,54 @@ define([
expect(typeof obj.getStorage(config.namespace)).toBe('object');
});
});
+ describe('"add" method', function () {
+ var storageValue;
+
+ beforeEach(function () {
+ storage = new obj.createStorage(config);
+ storageValue = {
+ 'property1': 1
+ };
+
+ storage.set(storageValue);
+ });
+
+ it('method exists', function () {
+ expect(storage.add).toBeDefined();
+ expect(typeof storage.add).toEqual('function');
+ });
+
+ it('update value', function () {
+ spyOn(utils, 'copy').and.callThrough();
+ expect(storage.get()).toEqual(storageValue);
+
+ storageValue = {
+ 'property2': 2
+ };
+
+ storage.add(storageValue);
+
+ expect(utils.copy).toHaveBeenCalled();
+ expect(storage.get()).toEqual(
+ {
+ 'property1': 1,
+ 'property2': 2
+ }
+ );
+ });
+
+ it('add empty value', function () {
+ spyOn(utils, 'copy').and.callThrough();
+
+ storage.add({});
+
+ expect(utils.copy).not.toHaveBeenCalled();
+ expect(storage.get()).toEqual(
+ {
+ 'property1': 1
+ }
+ );
+ });
+ });
});
});
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/element/abstract.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/element/abstract.test.js
index 390c5aa89fcc7..e1d853e0b1b55 100644
--- a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/element/abstract.test.js
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/element/abstract.test.js
@@ -5,19 +5,50 @@
/*eslint max-nested-callbacks: 0*/
define([
- 'Magento_Ui/js/form/element/abstract'
-], function (Abstract) {
+ 'squire'
+], function (Squire) {
'use strict';
describe('Magento_Ui/js/form/element/abstract', function () {
- var params, model;
-
- beforeEach(function () {
+ var injector = new Squire(),
+ providerMock = {
+ get: jasmine.createSpy(),
+ set: jasmine.createSpy()
+ },
+ mocks = {
+ 'Magento_Ui/js/lib/registry/registry': {
+ /** Method stub. */
+ get: function () {
+ return providerMock;
+ },
+ create: jasmine.createSpy(),
+ set: jasmine.createSpy(),
+ async: jasmine.createSpy()
+ },
+ '/mage/utils/wrapper': jasmine.createSpy()
+ },
+ dataScope = 'abstract',
params = {
- dataScope: 'abstract'
- };
- model = new Abstract(params);
- model.source = jasmine.createSpyObj('model.source', ['set']);
+ provider: 'provName',
+ name: '',
+ index: 'testIndex',
+ dataScope: dataScope,
+ service: {
+ template: 'ui/form/element/helper/service'
+ }
+ },
+ model;
+
+ beforeEach(function (done) {
+ injector.mock(mocks);
+ injector.require([
+ 'Magento_Ui/js/form/element/abstract',
+ 'knockoutjs/knockout-es5'
+ ], function (Constr) {
+ model = new Constr(params);
+
+ done();
+ });
});
describe('initialize method', function () {
@@ -50,8 +81,10 @@ define([
var expectedValue = 1;
spyOn(model, 'getInitialValue').and.returnValue(expectedValue);
+ model.service = true;
expect(model.setInitialValue()).toEqual(model);
expect(model.getInitialValue).toHaveBeenCalled();
+ expect(model.source.set).toHaveBeenCalledWith('data.use_default.' + model.index, 0);
expect(model.value()).toEqual(expectedValue);
});
});
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/element/boolean.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/element/boolean.test.js
index 4f64d1f53aa21..282badea0889f 100644
--- a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/element/boolean.test.js
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/element/boolean.test.js
@@ -6,18 +6,45 @@
/*eslint max-nested-callbacks: 0*/
define([
- 'Magento_Ui/js/form/element/boolean'
-], function (BooleanElement) {
+ 'squire'
+], function (Squire) {
'use strict';
describe('Magento_Ui/js/form/element/boolean', function () {
- var params, model;
+ var injector = new Squire(),
+ mocks = {
+ 'Magento_Ui/js/lib/registry/registry': {
+ /** Method stub. */
+ get: function () {
+ return {
+ get: jasmine.createSpy(),
+ set: jasmine.createSpy()
+ };
+ },
+ create: jasmine.createSpy(),
+ set: jasmine.createSpy(),
+ async: jasmine.createSpy()
+ },
+ '/mage/utils/wrapper': jasmine.createSpy()
+ },
+ model,
+ dataScope = 'dataScope';
- beforeEach(function () {
- params = {
- dataScope: 'abstract'
- };
- model = new BooleanElement(params);
+ beforeEach(function (done) {
+ injector.mock(mocks);
+ injector.require([
+ 'Magento_Ui/js/form/element/boolean',
+ 'knockoutjs/knockout-es5'
+ ], function (Constr) {
+ model = new Constr({
+ provider: 'provName',
+ name: '',
+ index: '',
+ dataScope: dataScope
+ });
+
+ done();
+ });
});
describe('getInitialValue method', function () {
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/element/date-time.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/element/date-time.test.js
index bd314bcc85736..01208a083a696 100644
--- a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/element/date-time.test.js
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/element/date-time.test.js
@@ -6,23 +6,52 @@
/*eslint max-nested-callbacks: 0*/
define([
- 'Magento_Ui/js/form/element/date',
- 'mageUtils',
- 'moment'
-], function (DateElement, utils, moment) {
+ 'squire'
+], function (Squire) {
'use strict';
- describe('Magento_Ui/js/form/element/date', function () {
- var params, model;
-
- beforeEach(function () {
- params = {
- dataScope: 'abstract',
- options: {
- showsTime: true
- }
- };
- model = new DateElement(params);
+ describe('Magento_Ui/js/form/element/date-time', function () {
+ var injector = new Squire(),
+ mocks = {
+ 'Magento_Ui/js/lib/registry/registry': {
+ /** Method stub. */
+ get: function () {
+ return {
+ get: jasmine.createSpy(),
+ set: jasmine.createSpy()
+ };
+ },
+ create: jasmine.createSpy(),
+ set: jasmine.createSpy(),
+ async: jasmine.createSpy()
+ },
+ '/mage/utils/wrapper': jasmine.createSpy()
+ },
+ model, utils, moment,
+ dataScope = 'abstract';
+
+ beforeEach(function (done) {
+ injector.mock(mocks);
+ injector.require([
+ 'Magento_Ui/js/form/element/date',
+ 'mageUtils',
+ 'moment',
+ 'knockoutjs/knockout-es5'
+ ], function (Constr, mageUtils, m) {
+ model = new Constr({
+ provider: 'provName',
+ name: '',
+ index: '',
+ dataScope: dataScope,
+ options: {
+ showsTime: true
+ }
+ });
+ utils = mageUtils;
+ moment = m;
+
+ done();
+ });
});
it('Check prepareDateTimeFormats function', function () {
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/element/date.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/element/date.test.js
index 0b2290ba7a831..f9d379407fcbd 100644
--- a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/element/date.test.js
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/element/date.test.js
@@ -4,19 +4,50 @@
*/
define([
- 'Magento_Ui/js/form/element/date',
- 'mageUtils'
-], function (DateElement, utils) {
+ 'squire'
+], function (Squire) {
'use strict';
describe('Magento_Ui/js/form/element/date', function () {
- var params, model;
+ var injector = new Squire(),
+ mocks = {
+ 'Magento_Ui/js/lib/registry/registry': {
+ /** Method stub. */
+ get: function () {
+ return {
+ get: jasmine.createSpy(),
+ set: jasmine.createSpy()
+ };
+ },
+ create: jasmine.createSpy(),
+ set: jasmine.createSpy(),
+ async: jasmine.createSpy()
+ },
+ '/mage/utils/wrapper': jasmine.createSpy()
+ },
+ model, utils,
+ dataScope = 'abstract';
- beforeEach(function () {
- params = {
- dataScope: 'abstract'
- };
- model = new DateElement(params);
+ beforeEach(function (done) {
+ injector.mock(mocks);
+ injector.require([
+ 'Magento_Ui/js/form/element/date',
+ 'mageUtils',
+ 'knockoutjs/knockout-es5'
+ ], function (Constr, mageUtils) {
+ model = new Constr({
+ provider: 'provName',
+ name: '',
+ index: '',
+ dataScope: dataScope,
+ options: {
+ showsTime: true
+ }
+ });
+ utils = mageUtils;
+
+ done();
+ });
});
it('Check prepareDateTimeFormats function', function () {
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/element/file-uploader.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/element/file-uploader.test.js
index 03ee43835f961..9ae83d6c36c63 100644
--- a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/element/file-uploader.test.js
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/element/file-uploader.test.js
@@ -7,28 +7,65 @@
define([
'jquery',
- 'Magento_Ui/js/form/element/file-uploader'
-], function ($, FileUploader) {
+ 'squire'
+], function ($, Squire) {
'use strict';
describe('Magento_Ui/js/form/element/file-uploader', function () {
- var component;
+ var injector = new Squire(),
+ mocks = {
+ 'Magento_Ui/js/lib/core/events': {
+ on: jasmine.createSpy()
+ },
+ 'Magento_Ui/js/lib/registry/registry': {
+ /** Method stub. */
+ get: function () {
+ return {
+ get: jasmine.createSpy(),
+ set: jasmine.createSpy()
+ };
+ },
+ create: jasmine.createSpy(),
+ set: jasmine.createSpy(),
+ async: jasmine.createSpy()
+ },
+ '/mage/utils/wrapper': jasmine.createSpy()
+ },
+ component,
+ dataScope = 'dataScope',
+ originalJQuery = jQuery.fn;
+
+ beforeEach(function (done) {
+ injector.mock(mocks);
+ injector.require([
+ 'Magento_Ui/js/form/element/file-uploader',
+ 'knockoutjs/knockout-es5'
+ ], function (Constr) {
+ component = new Constr({
+ provider: 'provName',
+ name: '',
+ index: '',
+ dataScope: dataScope
+ });
- beforeEach(function () {
- component = new FileUploader({
- dataScope: 'abstract'
+ done();
});
});
+ afterEach(function () {
+ jQuery.fn = originalJQuery;
+ });
+
describe('initUploader method', function () {
it('creates instance of file uploader', function () {
var elem = document.createElement('input');
- spyOn($.fn, 'fileupload');
+ spyOn(jQuery.fn, 'fileupload');
component.initUploader(elem);
- expect($.fn.fileupload).toHaveBeenCalled();
+ expect(jQuery.fn.fileupload).toHaveBeenCalled();
+
});
});
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/element/post-code.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/element/post-code.test.js
index 9bddfcd35642a..96bca1bbd8c6b 100644
--- a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/element/post-code.test.js
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/element/post-code.test.js
@@ -5,19 +5,45 @@
/*eslint max-nested-callbacks: 0*/
define([
- 'uiRegistry',
- 'Magento_Ui/js/form/element/post-code'
-], function (registry, PostCodeElement) {
+ 'squire'
+], function (Squire) {
'use strict';
describe('Magento_Ui/js/form/element/post-code', function () {
- var params, model;
+ var injector = new Squire(),
+ mocks = {
+ 'Magento_Ui/js/lib/registry/registry': {
+ /** Method stub. */
+ get: function () {
+ return {
+ get: jasmine.createSpy(),
+ set: jasmine.createSpy()
+ };
+ },
+ create: jasmine.createSpy(),
+ set: jasmine.createSpy(),
+ async: jasmine.createSpy()
+ },
+ '/mage/utils/wrapper': jasmine.createSpy()
+ },
+ model,
+ dataScope = 'post-code';
- beforeEach(function () {
- params = {
- dataScope: 'post-code'
- };
- model = new PostCodeElement(params);
+ beforeEach(function (done) {
+ injector.mock(mocks);
+ injector.require([
+ 'Magento_Ui/js/form/element/post-code',
+ 'knockoutjs/knockout-es5'
+ ], function (Constr) {
+ model = new Constr({
+ provider: 'provName',
+ name: '',
+ index: '',
+ dataScope: dataScope
+ });
+
+ done();
+ });
});
describe('update method', function () {
@@ -31,9 +57,9 @@ define([
}
};
- spyOn(registry, 'get').and.returnValue(country);
+ spyOn(mocks['Magento_Ui/js/lib/registry/registry'], 'get').and.returnValue(country);
model.update(value);
- expect(registry.get).toHaveBeenCalled();
+ expect(mocks['Magento_Ui/js/lib/registry/registry'].get).toHaveBeenCalled();
expect(model.error()).toEqual(false);
expect(model.required()).toEqual(false);
});
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/element/region.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/element/region.test.js
index 8e76d8e90729d..a36d3b0b7fefa 100644
--- a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/element/region.test.js
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/element/region.test.js
@@ -5,19 +5,46 @@
/*eslint max-nested-callbacks: 0*/
define([
- 'uiRegistry',
- 'Magento_Ui/js/form/element/region'
-], function (registry, RegionElement) {
+ 'squire'
+], function (Squire) {
'use strict';
describe('Magento_Ui/js/form/element/region', function () {
- var params, model;
+ var injector = new Squire(),
+ mocks = {
+ 'Magento_Ui/js/lib/registry/registry': {
+ /** Method stub. */
+ get: function () {
+ return {
+ get: jasmine.createSpy(),
+ set: jasmine.createSpy()
+ };
+ },
+ create: jasmine.createSpy(),
+ set: jasmine.createSpy(),
+ async: jasmine.createSpy()
+ },
+ '/mage/utils/wrapper': jasmine.createSpy()
+ },
+ model,
+ dataScope = 'dataScope';
- beforeEach(function () {
- params = {
- dataScope: 'region'
- };
- model = new RegionElement(params);
+ beforeEach(function (done) {
+ injector.mock(mocks);
+ injector.require([
+ 'Magento_Ui/js/form/element/region',
+ 'knockoutjs/knockout-es5',
+ 'Magento_Ui/js/lib/knockout/extender/observable_array'
+ ], function (Constr) {
+ model = new Constr({
+ provider: 'provName',
+ name: '',
+ index: '',
+ dataScope: dataScope
+ });
+
+ done();
+ });
});
describe('update method', function () {
@@ -31,9 +58,9 @@ define([
}
};
- spyOn(registry, 'get').and.returnValue(country);
+ spyOn(mocks['Magento_Ui/js/lib/registry/registry'], 'get').and.returnValue(country);
model.update(value);
- expect(registry.get).toHaveBeenCalled();
+ expect(mocks['Magento_Ui/js/lib/registry/registry'].get).toHaveBeenCalled();
expect(model.error()).toEqual(false);
expect(model.required()).toEqual(false);
});
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/element/select.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/element/select.test.js
index 6eac936974595..fffb045e8ce41 100644
--- a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/element/select.test.js
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/element/select.test.js
@@ -5,18 +5,49 @@
/*eslint max-nested-callbacks: 0*/
define([
- 'Magento_Ui/js/form/element/select'
-], function (SelectElement) {
+ 'squire'
+], function (Squire) {
'use strict';
describe('Magento_Ui/js/form/element/select', function () {
- var params, model;
-
- beforeEach(function () {
+ var injector = new Squire(),
+ mocks = {
+ 'Magento_Ui/js/lib/registry/registry': {
+ /** Method stub. */
+ get: function () {
+ return {
+ get: jasmine.createSpy(),
+ set: jasmine.createSpy()
+ };
+ },
+ options: jasmine.createSpy(),
+ create: jasmine.createSpy(),
+ set: jasmine.createSpy(),
+ async: jasmine.createSpy()
+ },
+ '/mage/utils/wrapper': jasmine.createSpy(),
+ 'Magento_Ui/js/core/renderer/layout': jasmine.createSpy()
+ },
+ dataScope = 'select',
params = {
- dataScope: 'select'
- };
- model = new SelectElement(params);
+ provider: 'provName',
+ name: '',
+ index: '',
+ dataScope: dataScope
+ },
+ model;
+
+ beforeEach(function (done) {
+ injector.mock(mocks);
+ injector.require([
+ 'Magento_Ui/js/form/element/select',
+ 'knockoutjs/knockout-es5',
+ 'Magento_Ui/js/lib/knockout/extender/observable_array'
+ ], function (Constr) {
+ model = new Constr(params);
+
+ done();
+ });
});
describe('initialize method', function () {
@@ -24,26 +55,20 @@ define([
expect(model).toBeDefined();
});
it('check for chainable', function () {
- spyOn(model, 'initInput');
spyOn(model, 'initFilter');
expect(model.initialize(params)).toEqual(model);
- expect(model.initInput).not.toHaveBeenCalled();
expect(model.initFilter).not.toHaveBeenCalled();
});
it('check for call initInput', function () {
- spyOn(model, 'initInput');
spyOn(model, 'initFilter');
model.customEntry = true;
expect(model.initialize(params)).toEqual(model);
- expect(model.initInput).toHaveBeenCalled();
expect(model.initFilter).not.toHaveBeenCalled();
});
it('check for call initFilter', function () {
- spyOn(model, 'initInput');
spyOn(model, 'initFilter');
model.filterBy = true;
expect(model.initialize(params)).toEqual(model);
- expect(model.initInput).not.toHaveBeenCalled();
expect(model.initFilter).toHaveBeenCalled();
});
});
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/element/single-checkbox-use-config.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/element/single-checkbox-use-config.test.js
new file mode 100644
index 0000000000000..f63e0adda1e17
--- /dev/null
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/element/single-checkbox-use-config.test.js
@@ -0,0 +1,78 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+/*eslint max-nested-callbacks: 0*/
+
+define([
+ 'squire'
+], function (Squire) {
+ 'use strict';
+
+ describe('Magento_Ui/js/form/element/single-checkbox-use-config', function () {
+ var injector = new Squire(),
+ mocks = {
+ 'Magento_Ui/js/lib/registry/registry': {
+ /** Method stub. */
+ get: function () {
+ return {
+ get: jasmine.createSpy(),
+ set: jasmine.createSpy()
+ };
+ },
+ create: jasmine.createSpy(),
+ set: jasmine.createSpy(),
+ async: jasmine.createSpy()
+ },
+ '/mage/utils/wrapper': jasmine.createSpy()
+ },
+ dataScope = 'dataScope',
+ params = {
+ provider: 'provName',
+ name: '',
+ index: '',
+ dataScope: dataScope
+ },
+ model;
+
+ beforeEach(function (done) {
+ injector.mock(mocks);
+ injector.require([
+ 'Magento_Ui/js/form/element/single-checkbox-use-config',
+ 'knockoutjs/knockout-es5'
+ ], function (Constr) {
+ model = new Constr(params);
+ done();
+ });
+ });
+
+ describe('initObservable method', function () {
+ it('check for chainable', function () {
+ expect(model.initObservable({})).toEqual(model);
+ });
+ it('check for validation', function () {
+ spyOn(model, 'observe').and.returnValue(model);
+ expect(model.initObservable()).toEqual(model);
+ expect(model.validation).toEqual({});
+ });
+ });
+
+ describe('toggleElement method', function () {
+ it('check with isUseDefault false', function () {
+ spyOn(model, 'isUseDefault').and.returnValue(false);
+ spyOn(model, 'isUseConfig').and.returnValue(false);
+ expect(model.toggleElement()).toEqual(undefined);
+ expect(model.disabled()).toEqual(false);
+ expect(model.source.set).toHaveBeenCalledWith('data.use_default.' + model.index, 0);
+ });
+ it('check with isUseDefault true', function () {
+ spyOn(model, 'isUseDefault').and.returnValue(true);
+ spyOn(model, 'isUseConfig').and.returnValue(false);
+ expect(model.toggleElement()).toEqual(undefined);
+ expect(model.disabled()).toEqual(true);
+ expect(model.source.set).toHaveBeenCalledWith('data.use_default.' + model.index, 1);
+ });
+ });
+ });
+});
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/element/textarea.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/element/textarea.test.js
index 03b00f0c3a842..60beff8d9b628 100644
--- a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/element/textarea.test.js
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/element/textarea.test.js
@@ -4,18 +4,46 @@
*/
define([
- 'Magento_Ui/js/form/element/textarea'
-], function (TextareaElement) {
+ 'squire'
+], function (Squire) {
'use strict';
describe('Magento_Ui/js/form/element/textarea', function () {
- var params, model;
+ var injector = new Squire(),
+ mocks = {
+ 'Magento_Ui/js/lib/registry/registry': {
+ /** Method stub. */
+ get: function () {
+ return {
+ get: jasmine.createSpy(),
+ set: jasmine.createSpy()
+ };
+ },
+ options: jasmine.createSpy(),
+ create: jasmine.createSpy(),
+ set: jasmine.createSpy(),
+ async: jasmine.createSpy()
+ },
+ '/mage/utils/wrapper': jasmine.createSpy()
+ },
+ model,
+ dataScope = 'dataScope';
- beforeEach(function () {
- params = {
- dataScope: 'textarea'
- };
- model = new TextareaElement(params);
+ beforeEach(function (done) {
+ injector.mock(mocks);
+ injector.require([
+ 'Magento_Ui/js/form/element/textarea',
+ 'knockoutjs/knockout-es5'
+ ], function (Constr) {
+ model = new Constr({
+ provider: 'provName',
+ name: '',
+ index: '',
+ dataScope: dataScope
+ });
+
+ done();
+ });
});
it('check if component defined', function () {
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/ui-select.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/ui-select.test.js
index eec50f0e6bd78..a04687e5b3562 100644
--- a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/ui-select.test.js
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/ui-select.test.js
@@ -7,21 +7,53 @@
define([
'underscore',
'uiRegistry',
- 'Magento_Ui/js/form/element/ui-select',
+ 'squire',
'ko'
-], function (_, registry, Constr, ko) {
+], function (_, registry, Squire, ko) {
'use strict';
describe('Magento_Ui/js/form/element/ui-select', function () {
+ var injector = new Squire(),
+ mocks = {
+ 'Magento_Ui/js/lib/registry/registry': {
+ /** Method stub. */
+ get: function () {
+ return {
+ get: jasmine.createSpy(),
+ set: jasmine.createSpy()
+ };
+ },
+ create: jasmine.createSpy(),
+ set: jasmine.createSpy(),
+ async: jasmine.createSpy()
+ },
+ '/mage/utils/wrapper': jasmine.createSpy()
+ },
+ obj,
+ dataScope = 'abstract';
+
+ beforeEach(function (done) {
+ injector.mock(mocks);
+ injector.require([
+ 'Magento_Ui/js/form/element/ui-select',
+ 'knockoutjs/knockout-es5'
+ ], function (Constr) {
+ obj = new Constr({
+ provider: 'provName',
+ name: '',
+ index: '',
+ dataScope: dataScope,
+ options: {
+ showsTime: true
+ }
+ });
- var obj = new Constr({
- name: 'uiSelect',
- dataScope: '',
- provider: 'provider'
- });
+ obj.value = ko.observableArray([]);
+ obj.cacheOptions.plain = [];
- obj.value = ko.observableArray([]);
- obj.cacheOptions.plain = [];
+ done();
+ });
+ });
describe('"initialize" method', function () {
it('Check for defined ', function () {
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/lib/ko/bind/i18n.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/lib/ko/bind/i18n.test.js
index 0f50cc2b6b9b1..c8ed472769e80 100644
--- a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/lib/ko/bind/i18n.test.js
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/lib/ko/bind/i18n.test.js
@@ -38,14 +38,17 @@ define([
/** Stub */
turnOffInlineTranslation = function () {
manageInlineTranslation(false);
- };
+ },
+ storedConfig;
beforeEach(function () {
+ storedConfig = context.config.config;
$(document.body).append(elWithStaticText);
$(document.body).append(elWithVariable);
});
afterEach(function () {
+ context.config.config = storedConfig;
elWithStaticText.remove();
elWithVariable.remove();
});
diff --git a/dev/tests/static/testsuite/Magento/Test/Integrity/HhvmCompatibilityTest.php b/dev/tests/static/testsuite/Magento/Test/Integrity/HhvmCompatibilityTest.php
index e33b771b3c645..dc4145ec2002c 100644
--- a/dev/tests/static/testsuite/Magento/Test/Integrity/HhvmCompatibilityTest.php
+++ b/dev/tests/static/testsuite/Magento/Test/Integrity/HhvmCompatibilityTest.php
@@ -47,6 +47,24 @@ class HhvmCompatibilityTest extends \PHPUnit\Framework\TestCase
'serialize_precision',
];
+ /**
+ * Whitelist of variables allowed in files.
+ *
+ * @var array
+ */
+ private $whitelistVarsInFiles = [
+ 'max_input_vars' => [
+ 'integration/testsuite/Magento/Swatches/Controller/Adminhtml/Product/AttributeTest.php',
+ 'integration/testsuite/Magento/Catalog/Controller/Adminhtml/Product/AttributeTest.php',
+ ],
+ ];
+
+ /**
+ * Test allowed directives.
+ *
+ * @SuppressWarnings(PHPMD.NPathComplexity)
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ */
public function testAllowedIniGetSetDirectives()
{
$deniedDirectives = [];
@@ -55,7 +73,19 @@ public function testAllowedIniGetSetDirectives()
if ($fileDirectives) {
$fileDeniedDirectives = array_diff($fileDirectives, $this->allowedDirectives);
if ($fileDeniedDirectives) {
- $deniedDirectives[$file] = array_unique($fileDeniedDirectives);
+ $deniedDirectivesInFile = array_unique($fileDeniedDirectives);
+ foreach ($deniedDirectivesInFile as $key => $deniedDirective) {
+ if (isset($this->whitelistVarsInFiles[$deniedDirective])) {
+ foreach ($this->whitelistVarsInFiles[$deniedDirective] as $whitelistFile) {
+ if (strpos($file, $whitelistFile) !== false) {
+ unset($deniedDirectivesInFile[$key]);
+ }
+ }
+ }
+ }
+ if ($deniedDirectivesInFile) {
+ $deniedDirectives[$file] = $deniedDirectivesInFile;
+ }
}
}
}
diff --git a/lib/internal/Magento/Framework/Acl/Test/Unit/Role/RegistryTest.php b/lib/internal/Magento/Framework/Acl/Test/Unit/Role/RegistryTest.php
index 9f7269455555c..d15624637b597 100644
--- a/lib/internal/Magento/Framework/Acl/Test/Unit/Role/RegistryTest.php
+++ b/lib/internal/Magento/Framework/Acl/Test/Unit/Role/RegistryTest.php
@@ -20,6 +20,13 @@ protected function setUp()
$this->model = new Registry();
}
+ /**
+ * @param $roleId
+ * @param $parentRoleId
+ *
+ * @return array
+ * @throws \Zend_Acl_Role_Registry_Exception
+ */
protected function initRoles($roleId, $parentRoleId)
{
$parentRole = $this->createMock(\Zend_Acl_Role_Interface::class);
diff --git a/lib/internal/Magento/Framework/Api/Test/Unit/Code/Generator/EntityChildTestAbstract.php b/lib/internal/Magento/Framework/Api/Test/Unit/Code/Generator/EntityChildTestAbstract.php
index 47f520d4ee28a..c1ab91e3ccaa6 100644
--- a/lib/internal/Magento/Framework/Api/Test/Unit/Code/Generator/EntityChildTestAbstract.php
+++ b/lib/internal/Magento/Framework/Api/Test/Unit/Code/Generator/EntityChildTestAbstract.php
@@ -31,12 +31,24 @@ abstract class EntityChildTestAbstract extends \PHPUnit\Framework\TestCase
/** @var \PHPUnit_Framework_MockObject_MockObject | \Magento\Framework\Code\Generator\DefinedClasses */
protected $definedClassesMock;
+ /**
+ * @return mixed
+ */
abstract protected function getSourceClassName();
+ /**
+ * @return mixed
+ */
abstract protected function getResultClassName();
+ /**
+ * @return mixed
+ */
abstract protected function getGeneratorClassName();
+ /**
+ * @return mixed
+ */
abstract protected function getOutputFileName();
protected function setUp()
diff --git a/lib/internal/Magento/Framework/Api/Test/Unit/DataObjectHelperTest.php b/lib/internal/Magento/Framework/Api/Test/Unit/DataObjectHelperTest.php
index 4946f083004ba..f4855a6f69066 100644
--- a/lib/internal/Magento/Framework/Api/Test/Unit/DataObjectHelperTest.php
+++ b/lib/internal/Magento/Framework/Api/Test/Unit/DataObjectHelperTest.php
@@ -367,6 +367,9 @@ public function testMergeDataObjects($data1, $data2)
$this->assertSame($firstAddressDataObject->getRegion(), $secondAddressDataObject->getRegion());
}
+ /**
+ * @return array
+ */
public function dataProviderForTestMergeDataObjects()
{
return [
diff --git a/lib/internal/Magento/Framework/Api/Test/Unit/SortOrderTest.php b/lib/internal/Magento/Framework/Api/Test/Unit/SortOrderTest.php
index 05ecc0bdbcc61..c2ecf51e8afc4 100644
--- a/lib/internal/Magento/Framework/Api/Test/Unit/SortOrderTest.php
+++ b/lib/internal/Magento/Framework/Api/Test/Unit/SortOrderTest.php
@@ -37,6 +37,9 @@ public function testItReturnsTheCorrectValuesIfSortOrderIsSet($sortOrder)
$this->assertSame($sortOrder, $this->sortOrder->getDirection());
}
+ /**
+ * @return array
+ */
public function sortOrderDirectionProvider()
{
return [[SortOrder::SORT_ASC], [SortOrder::SORT_DESC]];
@@ -52,6 +55,9 @@ public function testItThrowsAnExceptionIfAnInvalidSortOrderIsSet($invalidDirecti
$this->sortOrder->setDirection($invalidDirection);
}
+ /**
+ * @return array
+ */
public function invalidSortDirectionProvider()
{
return [
diff --git a/lib/internal/Magento/Framework/App/Test/Unit/Action/Stub/ActionStub.php b/lib/internal/Magento/Framework/App/Test/Unit/Action/Stub/ActionStub.php
index ee45842013f64..c157f818242ef 100644
--- a/lib/internal/Magento/Framework/App/Test/Unit/Action/Stub/ActionStub.php
+++ b/lib/internal/Magento/Framework/App/Test/Unit/Action/Stub/ActionStub.php
@@ -8,6 +8,9 @@
class ActionStub extends \Magento\Framework\App\Action\Action
{
+ /**
+ * @return \Magento\Framework\App\ResponseInterface|\Magento\Framework\Controller\ResultInterface|void
+ */
public function execute()
{
// Empty method stub for test
diff --git a/lib/internal/Magento/Framework/App/Test/Unit/AreaTest.php b/lib/internal/Magento/Framework/App/Test/Unit/AreaTest.php
index 678bb7a85272f..1813ff147190c 100644
--- a/lib/internal/Magento/Framework/App/Test/Unit/AreaTest.php
+++ b/lib/internal/Magento/Framework/App/Test/Unit/AreaTest.php
@@ -276,6 +276,9 @@ public function testDetectDesignByRequest($value, $callNum, $callNum2)
$this->object->detectDesign($requestMock);
}
+ /**
+ * @return array
+ */
public function detectDesignByRequestDataProvider()
{
return [
diff --git a/lib/internal/Magento/Framework/App/Test/Unit/BootstrapTest.php b/lib/internal/Magento/Framework/App/Test/Unit/BootstrapTest.php
index 1e2947084ee6b..32e495ed00a82 100644
--- a/lib/internal/Magento/Framework/App/Test/Unit/BootstrapTest.php
+++ b/lib/internal/Magento/Framework/App/Test/Unit/BootstrapTest.php
@@ -135,7 +135,7 @@ public function testCreateFilesystemDriverPool()
);
/** @var \Magento\Framework\Filesystem\DriverPool $result */
$this->assertInstanceOf(\Magento\Framework\Filesystem\DriverPool::class, $result);
- $this->assertInstanceof($driverClass, $result->getDriver('custom'));
+ $this->assertInstanceOf($driverClass, $result->getDriver('custom'));
}
public function testGetParams()
@@ -189,6 +189,9 @@ public function testIsDeveloperMode($modeFromEnvironment, $modeFromDeployment, $
$this->assertEquals($isDeveloper, $bootstrap->isDeveloperMode());
}
+ /**
+ * @return array
+ */
public function testIsDeveloperModeDataProvider()
{
return [
diff --git a/lib/internal/Magento/Framework/App/Test/Unit/Cache/Frontend/PoolTest.php b/lib/internal/Magento/Framework/App/Test/Unit/Cache/Frontend/PoolTest.php
index fdb962d7d295e..bfa37311884ba 100644
--- a/lib/internal/Magento/Framework/App/Test/Unit/Cache/Frontend/PoolTest.php
+++ b/lib/internal/Magento/Framework/App/Test/Unit/Cache/Frontend/PoolTest.php
@@ -105,6 +105,9 @@ public function testInitializationParams(
$model->current();
}
+ /**
+ * @return array
+ */
public function initializationParamsDataProvider()
{
return [
diff --git a/lib/internal/Magento/Framework/App/Test/Unit/Cache/Type/ConfigTest.php b/lib/internal/Magento/Framework/App/Test/Unit/Cache/Type/ConfigTest.php
index 74a92d54f1934..380c45e383128 100644
--- a/lib/internal/Magento/Framework/App/Test/Unit/Cache/Type/ConfigTest.php
+++ b/lib/internal/Magento/Framework/App/Test/Unit/Cache/Type/ConfigTest.php
@@ -157,6 +157,9 @@ public function testCleanModeMatchingAnyTag($fixtureResultOne, $fixtureResultTwo
$this->assertEquals($expectedResult, $actualResult);
}
+ /**
+ * @return array
+ */
public function cleanModeMatchingAnyTagDataProvider()
{
return [
diff --git a/lib/internal/Magento/Framework/App/Test/Unit/Cache/Type/FrontendPoolTest.php b/lib/internal/Magento/Framework/App/Test/Unit/Cache/Type/FrontendPoolTest.php
index e8c0217b40b2c..bcae099815c98 100644
--- a/lib/internal/Magento/Framework/App/Test/Unit/Cache/Type/FrontendPoolTest.php
+++ b/lib/internal/Magento/Framework/App/Test/Unit/Cache/Type/FrontendPoolTest.php
@@ -89,6 +89,9 @@ public function testGet($fixtureConfigData, $inputCacheType, $expectedFrontendId
$this->assertSame($accessProxy, $this->_model->get($inputCacheType));
}
+ /**
+ * @return array
+ */
public function getDataProvider()
{
$configData1 = [
diff --git a/lib/internal/Magento/Framework/App/Test/Unit/CacheTest.php b/lib/internal/Magento/Framework/App/Test/Unit/CacheTest.php
index 236a65611422d..bb5748e0759a0 100644
--- a/lib/internal/Magento/Framework/App/Test/Unit/CacheTest.php
+++ b/lib/internal/Magento/Framework/App/Test/Unit/CacheTest.php
@@ -147,6 +147,9 @@ public function testSave($inputData, $inputId, $inputTags, $expectedData, $expec
$this->_model->save($inputData, $inputId, $inputTags);
}
+ /**
+ * @return array
+ */
public function saveDataProvider()
{
$configTag = \Magento\Framework\App\Config::CACHE_TAG;
@@ -190,6 +193,9 @@ public function testRemove($result)
$this->assertEquals($result, $this->_model->remove('test_id'));
}
+ /**
+ * @return array
+ */
public function successFailureDataProvider()
{
return ['success' => [true], 'failure' => [false]];
diff --git a/lib/internal/Magento/Framework/App/Test/Unit/Config/ConfigPathResolverTest.php b/lib/internal/Magento/Framework/App/Test/Unit/Config/ConfigPathResolverTest.php
index 3cf552ae115a5..3adc4bada0665 100644
--- a/lib/internal/Magento/Framework/App/Test/Unit/Config/ConfigPathResolverTest.php
+++ b/lib/internal/Magento/Framework/App/Test/Unit/Config/ConfigPathResolverTest.php
@@ -55,6 +55,9 @@ public function testResolve($path, $scope, $scopeCode, $type, $expected)
$this->assertSame($expected, $this->model->resolve($path, $scope, $scopeCode, $type));
}
+ /**
+ * @return array
+ */
public function resolveDataProvider()
{
return [
diff --git a/lib/internal/Magento/Framework/App/Test/Unit/Config/DataTest.php b/lib/internal/Magento/Framework/App/Test/Unit/Config/DataTest.php
index f106ba6e151fd..6f137ede742ff 100644
--- a/lib/internal/Magento/Framework/App/Test/Unit/Config/DataTest.php
+++ b/lib/internal/Magento/Framework/App/Test/Unit/Config/DataTest.php
@@ -35,6 +35,9 @@ public function testSetValue($path, $value)
$this->assertEquals($value, $this->_model->getValue($path));
}
+ /**
+ * @return array
+ */
public function setValueDataProvider()
{
return [
diff --git a/lib/internal/Magento/Framework/App/Test/Unit/Config/InitialTest.php b/lib/internal/Magento/Framework/App/Test/Unit/Config/InitialTest.php
index 3d1cdf0023cc9..29ccd33d73d3b 100644
--- a/lib/internal/Magento/Framework/App/Test/Unit/Config/InitialTest.php
+++ b/lib/internal/Magento/Framework/App/Test/Unit/Config/InitialTest.php
@@ -65,6 +65,9 @@ public function testGetData($scope, $expected)
$this->assertEquals($expected, $this->config->getData($scope));
}
+ /**
+ * @return array
+ */
public function getDataDataProvider()
{
return [
diff --git a/lib/internal/Magento/Framework/App/Test/Unit/Config/ValueTest.php b/lib/internal/Magento/Framework/App/Test/Unit/Config/ValueTest.php
index ef2b342936cd9..6159e5cac45e8 100644
--- a/lib/internal/Magento/Framework/App/Test/Unit/Config/ValueTest.php
+++ b/lib/internal/Magento/Framework/App/Test/Unit/Config/ValueTest.php
@@ -184,6 +184,9 @@ public function testAfterSave($callNumber, $oldValue)
$this->assertInstanceOf(get_class($this->model), $this->model->afterSave());
}
+ /**
+ * @return array
+ */
public function afterSaveDataProvider()
{
return [
diff --git a/lib/internal/Magento/Framework/App/Test/Unit/ConfigTest.php b/lib/internal/Magento/Framework/App/Test/Unit/ConfigTest.php
index f94c30b4fa3c8..da9826bfe8c95 100644
--- a/lib/internal/Magento/Framework/App/Test/Unit/ConfigTest.php
+++ b/lib/internal/Magento/Framework/App/Test/Unit/ConfigTest.php
@@ -73,6 +73,9 @@ public function testGetValue($scope, $scopeCode = null)
$this->assertTrue($this->appConfig->getValue($path, $scope, $scopeCode ?: $this->scope));
}
+ /**
+ * @return array
+ */
public function getValueDataProvider()
{
return [
diff --git a/lib/internal/Magento/Framework/App/Test/Unit/Console/MaintenanceModeEnablerTest.php b/lib/internal/Magento/Framework/App/Test/Unit/Console/MaintenanceModeEnablerTest.php
index ebd47c0dc8936..784cb8136c3ab 100644
--- a/lib/internal/Magento/Framework/App/Test/Unit/Console/MaintenanceModeEnablerTest.php
+++ b/lib/internal/Magento/Framework/App/Test/Unit/Console/MaintenanceModeEnablerTest.php
@@ -88,6 +88,9 @@ public function testFailedTaskWithRestoredModeOnFailure(bool $maintenanceModeEna
}
}
+ /**
+ * @return array
+ */
public function initialAppStateProvider()
{
return [
@@ -96,6 +99,11 @@ public function initialAppStateProvider()
];
}
+ /**
+ * @param bool $isOn
+ *
+ * @return MaintenanceMode
+ */
private function createMaintenanceMode(bool $isOn): MaintenanceMode
{
$maintenanceMode = $this->getMockBuilder(MaintenanceMode::class)
@@ -113,6 +121,9 @@ private function createMaintenanceMode(bool $isOn): MaintenanceMode
return $maintenanceMode;
}
+ /**
+ * @return OutputInterface
+ */
private function createOutput(): OutputInterface
{
$output = $this->getMockBuilder(OutputInterface::class)
diff --git a/lib/internal/Magento/Framework/App/Test/Unit/Console/ResponseTest.php b/lib/internal/Magento/Framework/App/Test/Unit/Console/ResponseTest.php
index ec678d21a581b..18de140af8428 100644
--- a/lib/internal/Magento/Framework/App/Test/Unit/Console/ResponseTest.php
+++ b/lib/internal/Magento/Framework/App/Test/Unit/Console/ResponseTest.php
@@ -34,6 +34,9 @@ public function testSetCode($code, $expectedCode)
$this->assertEquals($expectedCode, $result);
}
+ /**
+ * @return array
+ */
public static function setCodeProvider()
{
$largeCode = 256;
diff --git a/lib/internal/Magento/Framework/App/Test/Unit/CronTest.php b/lib/internal/Magento/Framework/App/Test/Unit/CronTest.php
index e2c77864d8e82..ce1f1661ad827 100644
--- a/lib/internal/Magento/Framework/App/Test/Unit/CronTest.php
+++ b/lib/internal/Magento/Framework/App/Test/Unit/CronTest.php
@@ -56,6 +56,9 @@ protected function setUp()
);
}
+ /**
+ * @return \PHPUnit_Framework_MockObject_MockObject
+ */
protected function prepareAreaListMock()
{
$areaMock = $this->createMock(\Magento\Framework\App\Area::class);
diff --git a/lib/internal/Magento/Framework/App/Test/Unit/DeploymentConfigTest.php b/lib/internal/Magento/Framework/App/Test/Unit/DeploymentConfigTest.php
index fa41d717cc521..80ab2302dc91c 100644
--- a/lib/internal/Magento/Framework/App/Test/Unit/DeploymentConfigTest.php
+++ b/lib/internal/Magento/Framework/App/Test/Unit/DeploymentConfigTest.php
@@ -127,6 +127,9 @@ public function testKeyCollision(array $data)
$object->get();
}
+ /**
+ * @return array
+ */
public function keyCollisionDataProvider()
{
return [
diff --git a/lib/internal/Magento/Framework/App/Test/Unit/DocRootLocatorTest.php b/lib/internal/Magento/Framework/App/Test/Unit/DocRootLocatorTest.php
index 7fda8de6d3216..23afbbc73d2b9 100644
--- a/lib/internal/Magento/Framework/App/Test/Unit/DocRootLocatorTest.php
+++ b/lib/internal/Magento/Framework/App/Test/Unit/DocRootLocatorTest.php
@@ -29,6 +29,9 @@ public function testIsPub($path, $isExist, $result)
$this->assertSame($result, $model->isPub());
}
+ /**
+ * @return array
+ */
public function isPubDataProvider()
{
return [
diff --git a/lib/internal/Magento/Framework/App/Test/Unit/ErrorHandlerTest.php b/lib/internal/Magento/Framework/App/Test/Unit/ErrorHandlerTest.php
index daf3a4bdfab0c..4b904cc2b55bd 100644
--- a/lib/internal/Magento/Framework/App/Test/Unit/ErrorHandlerTest.php
+++ b/lib/internal/Magento/Framework/App/Test/Unit/ErrorHandlerTest.php
@@ -32,6 +32,9 @@ public function testHandler($errorNo, $errorStr, $errorFile, $expectedResult)
$this->assertEquals($expectedResult, $this->object->handler($errorNo, $errorStr, $errorFile, 11));
}
+ /**
+ * @return array
+ */
public function handlerProvider()
{
return [
@@ -60,6 +63,9 @@ public function testHandlerException($errorNo, $errorPhrase)
$this->object->handler($errorNo, $errorStr, $errorFile, $errorLine);
}
+ /**
+ * @return array
+ */
public function handlerProviderException()
{
return [
diff --git a/lib/internal/Magento/Framework/App/Test/Unit/PageCache/IdentifierTest.php b/lib/internal/Magento/Framework/App/Test/Unit/PageCache/IdentifierTest.php
index 15f6bed1ac0d3..23906486634ec 100644
--- a/lib/internal/Magento/Framework/App/Test/Unit/PageCache/IdentifierTest.php
+++ b/lib/internal/Magento/Framework/App/Test/Unit/PageCache/IdentifierTest.php
@@ -144,6 +144,9 @@ public function testVaryStringSource($cookieExists)
$this->model->getValue();
}
+ /**
+ * @return array
+ */
public function trueFalseDataProvider()
{
return [[true], [false]];
diff --git a/lib/internal/Magento/Framework/App/Test/Unit/PageCache/KernelTest.php b/lib/internal/Magento/Framework/App/Test/Unit/PageCache/KernelTest.php
index 20ea5d1a3e86f..db200f962f5b5 100644
--- a/lib/internal/Magento/Framework/App/Test/Unit/PageCache/KernelTest.php
+++ b/lib/internal/Magento/Framework/App/Test/Unit/PageCache/KernelTest.php
@@ -241,6 +241,9 @@ function ($value) {
$this->kernel->process($this->responseMock);
}
+ /**
+ * @return array
+ */
public function testProcessSaveCacheDataProvider()
{
return [
diff --git a/lib/internal/Magento/Framework/App/Test/Unit/ProductMetadataTest.php b/lib/internal/Magento/Framework/App/Test/Unit/ProductMetadataTest.php
index 74e673c8bfc26..8e1acc89437e2 100644
--- a/lib/internal/Magento/Framework/App/Test/Unit/ProductMetadataTest.php
+++ b/lib/internal/Magento/Framework/App/Test/Unit/ProductMetadataTest.php
@@ -45,6 +45,9 @@ public function testGetVersion($packageList, $expectedVersion)
$this->assertEquals($expectedVersion, $productVersion);
}
+ /**
+ * @return array
+ */
public function testGetVersionGitInstallationDataProvider()
{
return [
diff --git a/lib/internal/Magento/Framework/App/Test/Unit/Request/HttpTest.php b/lib/internal/Magento/Framework/App/Test/Unit/Request/HttpTest.php
index 66eee671e17d3..62445d4244fb7 100644
--- a/lib/internal/Magento/Framework/App/Test/Unit/Request/HttpTest.php
+++ b/lib/internal/Magento/Framework/App/Test/Unit/Request/HttpTest.php
@@ -259,6 +259,9 @@ public function testGetDistroBaseUrlPath($scriptName, $expected)
$this->assertEquals($expected, Http::getDistroBaseUrlPath(['SCRIPT_NAME' => $scriptName]));
}
+ /**
+ * @return array
+ */
public function getDistroBaseUrlPathDataProvider()
{
return [
@@ -273,6 +276,9 @@ public function getDistroBaseUrlPathDataProvider()
];
}
+ /**
+ * @return array
+ */
public function serverVariablesProvider()
{
$returnValue = [];
@@ -378,6 +384,9 @@ public function testIsSafeMethodFalse($httpMethod)
$this->assertEquals(false, $this->_model->isSafeMethod());
}
+ /**
+ * @return array
+ */
public function httpSafeMethodProvider()
{
return [
@@ -388,6 +397,9 @@ public function httpSafeMethodProvider()
];
}
+ /**
+ * @return array
+ */
public function httpNotSafeMethodProvider()
{
return [
@@ -400,6 +412,9 @@ public function httpNotSafeMethodProvider()
];
}
+ /**
+ * @return array
+ */
public function isSecureDataProvider()
{
/**
@@ -442,6 +457,9 @@ public function testSetPathInfo($requestUri, $basePath, $expected)
$this->assertEquals($expected, $this->_model->getPathInfo());
}
+ /**
+ * @return array
+ */
public function setPathInfoDataProvider()
{
return [
diff --git a/lib/internal/Magento/Framework/App/Test/Unit/Router/ActionListTest.php b/lib/internal/Magento/Framework/App/Test/Unit/Router/ActionListTest.php
index 0bdbcccc40b35..e1a2171d2111a 100644
--- a/lib/internal/Magento/Framework/App/Test/Unit/Router/ActionListTest.php
+++ b/lib/internal/Magento/Framework/App/Test/Unit/Router/ActionListTest.php
@@ -93,6 +93,9 @@ public function testGet($module, $area, $namespace, $action, $data, $expected)
$this->assertEquals($expected, $this->actionList->get($module, $area, $namespace, $action));
}
+ /**
+ * @return array
+ */
public function getDataProvider()
{
$mockClassName = 'Mock_Action_Class';
diff --git a/lib/internal/Magento/Framework/App/Test/Unit/ScopeResolverPoolTest.php b/lib/internal/Magento/Framework/App/Test/Unit/ScopeResolverPoolTest.php
index 7a54cf17a87e4..0b7e0e00a2df8 100644
--- a/lib/internal/Magento/Framework/App/Test/Unit/ScopeResolverPoolTest.php
+++ b/lib/internal/Magento/Framework/App/Test/Unit/ScopeResolverPoolTest.php
@@ -49,6 +49,9 @@ public function testGetException($scope)
$scopeResolver->get($scope);
}
+ /**
+ * @return array
+ */
public function testGetExceptionDataProvider()
{
return [
diff --git a/lib/internal/Magento/Framework/App/Test/Unit/SetupInfoTest.php b/lib/internal/Magento/Framework/App/Test/Unit/SetupInfoTest.php
index 3db75f7ec7fb2..ae8a76f7bbc1f 100644
--- a/lib/internal/Magento/Framework/App/Test/Unit/SetupInfoTest.php
+++ b/lib/internal/Magento/Framework/App/Test/Unit/SetupInfoTest.php
@@ -29,6 +29,9 @@ public function testConstructorExceptions($server, $expectedError)
new SetupInfo($server);
}
+ /**
+ * @return array
+ */
public function constructorExceptionsDataProvider()
{
$docRootErr = 'DOCUMENT_ROOT variable is unavailable.';
diff --git a/lib/internal/Magento/Framework/App/Test/Unit/StateTest.php b/lib/internal/Magento/Framework/App/Test/Unit/StateTest.php
index 46eec1e692424..a87322b6e90d9 100644
--- a/lib/internal/Magento/Framework/App/Test/Unit/StateTest.php
+++ b/lib/internal/Magento/Framework/App/Test/Unit/StateTest.php
@@ -87,6 +87,10 @@ public function testEmulateAreaCode()
$this->assertEquals($this->model->getAreaCode(), $areaCode);
}
+ /**
+ * @return string
+ * @throws \Magento\Framework\Exception\LocalizedException
+ */
public function emulateAreaCodeCallback()
{
return $this->model->getAreaCode();
diff --git a/lib/internal/Magento/Framework/App/Test/Unit/StaticResourceTest.php b/lib/internal/Magento/Framework/App/Test/Unit/StaticResourceTest.php
index 3074a951159b8..618b67663304a 100644
--- a/lib/internal/Magento/Framework/App/Test/Unit/StaticResourceTest.php
+++ b/lib/internal/Magento/Framework/App/Test/Unit/StaticResourceTest.php
@@ -271,7 +271,7 @@ public function testLaunchPathAbove()
{
$this->stateMock->expects($this->once())
->method('getMode')
- ->willreturn(State::MODE_DEVELOPER);
+ ->willReturn(State::MODE_DEVELOPER);
$this->requestMock->expects($this->once())
->method('get')
->with('resource')
diff --git a/lib/internal/Magento/Framework/Cache/Test/Unit/Backend/Decorator/CompressionTest.php b/lib/internal/Magento/Framework/Cache/Test/Unit/Backend/Decorator/CompressionTest.php
index 172d0e486dc64..cbb7ed9e5ba6a 100644
--- a/lib/internal/Magento/Framework/Cache/Test/Unit/Backend/Decorator/CompressionTest.php
+++ b/lib/internal/Magento/Framework/Cache/Test/Unit/Backend/Decorator/CompressionTest.php
@@ -129,12 +129,23 @@ public function testSaveLoad()
$this->assertEquals($this->_testString, $loadedValue);
}
+ /**
+ * @param $data
+ * @param $cacheId
+ *
+ * @return bool
+ */
public static function mockSave($data, $cacheId)
{
self::$_cacheStorage[$cacheId] = $data;
return true;
}
+ /**
+ * @param $cacheId
+ *
+ * @return bool|mixed
+ */
public static function mockLoad($cacheId)
{
return array_key_exists($cacheId, self::$_cacheStorage) ? self::$_cacheStorage[$cacheId] : false;
diff --git a/lib/internal/Magento/Framework/Cache/Test/Unit/Backend/Decorator/DecoratorAbstractTest.php b/lib/internal/Magento/Framework/Cache/Test/Unit/Backend/Decorator/DecoratorAbstractTest.php
index 7a3aec7b66488..ba75b7eed52ca 100644
--- a/lib/internal/Magento/Framework/Cache/Test/Unit/Backend/Decorator/DecoratorAbstractTest.php
+++ b/lib/internal/Magento/Framework/Cache/Test/Unit/Backend/Decorator/DecoratorAbstractTest.php
@@ -63,6 +63,9 @@ public function testConstructorException($options)
$this->getMockForAbstractClass(\Magento\Framework\Cache\Backend\Decorator\AbstractDecorator::class, [$options]);
}
+ /**
+ * @return array
+ */
public function constructorExceptionDataProvider()
{
return [
@@ -86,6 +89,9 @@ public function testAllMethods($methodName)
call_user_func([$decorator, $methodName], null, null);
}
+ /**
+ * @return array
+ */
public function allMethodsDataProvider()
{
$return = [];
diff --git a/lib/internal/Magento/Framework/Cache/Test/Unit/Backend/MongoDbTest.php b/lib/internal/Magento/Framework/Cache/Test/Unit/Backend/MongoDbTest.php
index daa3081a07c35..435fc6535c1a2 100644
--- a/lib/internal/Magento/Framework/Cache/Test/Unit/Backend/MongoDbTest.php
+++ b/lib/internal/Magento/Framework/Cache/Test/Unit/Backend/MongoDbTest.php
@@ -45,6 +45,9 @@ public function testGetIds(array $ids, array $expected)
$this->assertEquals($expected, $actual);
}
+ /**
+ * @return array
+ */
public function getIdsDataProvider()
{
return [
@@ -64,6 +67,9 @@ public function testGetTags(array $tags)
$this->assertEquals($tags, $actual);
}
+ /**
+ * @return array
+ */
public function getTagsDataProvider()
{
return ['no tags' => [[]], 'multiple tags' => [['tag1', 'tag2']]];
@@ -92,6 +98,9 @@ public function testGetIdsMatchingTags($method, $tags, $expectedInput)
$this->assertEquals($expectedIds, $actualIds);
}
+ /**
+ * @return array
+ */
public function getIdsMatchingTagsDataProvider()
{
return [
@@ -170,6 +179,9 @@ public function testGetMetadatas($cacheId, $expectedInput, $mongoOutput, $expect
$this->assertEquals($expected, $actual);
}
+ /**
+ * @return array
+ */
public function getMetadatasDataProvider()
{
$time = time();
@@ -237,6 +249,9 @@ public function testLoad($doNotTestValidity)
$this->assertSame($expected, $actual);
}
+ /**
+ * @return array
+ */
public function loadDataProvider()
{
return ['test validity' => [false], 'do not test validity' => [true]];
@@ -322,6 +337,9 @@ public function testClean($mode, $tags, $expectedQuery)
$this->_model->clean($mode, $tags);
}
+ /**
+ * @return array
+ */
public function cleanDataProvider()
{
return [
diff --git a/lib/internal/Magento/Framework/Cache/Test/Unit/CoreTest.php b/lib/internal/Magento/Framework/Cache/Test/Unit/CoreTest.php
index 616c55f600e9e..4b634ae18c7af 100644
--- a/lib/internal/Magento/Framework/Cache/Test/Unit/CoreTest.php
+++ b/lib/internal/Magento/Framework/Cache/Test/Unit/CoreTest.php
@@ -61,6 +61,9 @@ public function testSetBackendException($decorators)
$core->setBackend($this->_mockBackend);
}
+ /**
+ * @return array
+ */
public function setBackendExceptionProvider()
{
return [
diff --git a/lib/internal/Magento/Framework/Cache/Test/Unit/Frontend/Adapter/ZendTest.php b/lib/internal/Magento/Framework/Cache/Test/Unit/Frontend/Adapter/ZendTest.php
index cf16c93cd499a..fb646c7f87622 100644
--- a/lib/internal/Magento/Framework/Cache/Test/Unit/Frontend/Adapter/ZendTest.php
+++ b/lib/internal/Magento/Framework/Cache/Test/Unit/Frontend/Adapter/ZendTest.php
@@ -93,6 +93,9 @@ public function testCleanException($cleaningMode, $expectedErrorMessage)
$object->clean($cleaningMode);
}
+ /**
+ * @return array
+ */
public function cleanExceptionDataProvider()
{
return [
diff --git a/lib/internal/Magento/Framework/Cache/Test/Unit/Frontend/Decorator/TagScopeTest.php b/lib/internal/Magento/Framework/Cache/Test/Unit/Frontend/Decorator/TagScopeTest.php
index 12774f182d6cd..33105ab52150c 100644
--- a/lib/internal/Magento/Framework/Cache/Test/Unit/Frontend/Decorator/TagScopeTest.php
+++ b/lib/internal/Magento/Framework/Cache/Test/Unit/Frontend/Decorator/TagScopeTest.php
@@ -128,6 +128,9 @@ public function testCleanModeMatchingAnyTag($fixtureResultOne, $fixtureResultTwo
$this->assertEquals($expectedResult, $actualResult);
}
+ /**
+ * @return array
+ */
public function cleanModeMatchingAnyTagDataProvider()
{
return [
diff --git a/lib/internal/Magento/Framework/Code/Test/Unit/Generator/DefinedClassesTest.php b/lib/internal/Magento/Framework/Code/Test/Unit/Generator/DefinedClassesTest.php
index 658b42e4b972d..eeecc6805ee28 100644
--- a/lib/internal/Magento/Framework/Code/Test/Unit/Generator/DefinedClassesTest.php
+++ b/lib/internal/Magento/Framework/Code/Test/Unit/Generator/DefinedClassesTest.php
@@ -8,6 +8,11 @@
namespace Magento\Framework\Code\Generator {
use Magento\Framework\Code\Test\Unit\Generator\DefinedClassesTest;
+ /**
+ * @param $className
+ *
+ * @return bool
+ */
function class_exists($className)
{
return DefinedClassesTest::$definedClassesTestActive
diff --git a/lib/internal/Magento/Framework/Code/Test/Unit/Generator/InterfaceGeneratorTest.php b/lib/internal/Magento/Framework/Code/Test/Unit/Generator/InterfaceGeneratorTest.php
index 0f3daa46e1ec3..6462b3806647a 100644
--- a/lib/internal/Magento/Framework/Code/Test/Unit/Generator/InterfaceGeneratorTest.php
+++ b/lib/internal/Magento/Framework/Code/Test/Unit/Generator/InterfaceGeneratorTest.php
@@ -114,6 +114,9 @@ public function testGeneratePredefinedContentNotSet()
$this->assertEquals($expectedContent, $generatedContent, "Generated content is invalid.");
}
+ /**
+ * @return array
+ */
public function generateDataProvider()
{
return [
diff --git a/lib/internal/Magento/Framework/Code/Test/Unit/Generator/IoTest.php b/lib/internal/Magento/Framework/Code/Test/Unit/Generator/IoTest.php
index 9c63de1258d15..bc2ba24a2f9fe 100644
--- a/lib/internal/Magento/Framework/Code/Test/Unit/Generator/IoTest.php
+++ b/lib/internal/Magento/Framework/Code/Test/Unit/Generator/IoTest.php
@@ -111,6 +111,9 @@ public function testWriteResultFileAlreadyExists($resultFileName, $fileExists, $
$this->assertSame($success, $this->_object->writeResultFile($resultFileName, self::FILE_CONTENT));
}
+ /**
+ * @return array
+ */
public function testWriteResultFileAlreadyExistsDataProvider()
{
return [
@@ -202,6 +205,9 @@ public function testFileExists($fileName, $exists)
$this->assertSame($exists, $this->_object->fileExists($fileName));
}
+ /**
+ * @return array
+ */
public function fileExistsDataProvider()
{
return [
diff --git a/lib/internal/Magento/Framework/Code/Test/Unit/GeneratorTest.php b/lib/internal/Magento/Framework/Code/Test/Unit/GeneratorTest.php
index 3052f682d82cb..c175c0fe9be85 100644
--- a/lib/internal/Magento/Framework/Code/Test/Unit/GeneratorTest.php
+++ b/lib/internal/Magento/Framework/Code/Test/Unit/GeneratorTest.php
@@ -129,6 +129,9 @@ public function testGenerateClassWithExistName($fileExists)
);
}
+ /**
+ * @return array
+ */
public function trueFalseDataProvider()
{
return [[true], [false]];
diff --git a/lib/internal/Magento/Framework/Code/Test/Unit/NameBuilderTest.php b/lib/internal/Magento/Framework/Code/Test/Unit/NameBuilderTest.php
index 588cdfa1d4f7f..b8d49f64569f9 100644
--- a/lib/internal/Magento/Framework/Code/Test/Unit/NameBuilderTest.php
+++ b/lib/internal/Magento/Framework/Code/Test/Unit/NameBuilderTest.php
@@ -29,6 +29,9 @@ public function testBuildClassName($parts, $expected)
$this->assertEquals($expected, $this->nameBuilder->buildClassName($parts));
}
+ /**
+ * @return array
+ */
public function buildClassNameDataProvider()
{
return [
diff --git a/lib/internal/Magento/Framework/Code/Test/Unit/Reader/ArgumentsReaderTest.php b/lib/internal/Magento/Framework/Code/Test/Unit/Reader/ArgumentsReaderTest.php
index 64bcb8970612e..e465e01916690 100644
--- a/lib/internal/Magento/Framework/Code/Test/Unit/Reader/ArgumentsReaderTest.php
+++ b/lib/internal/Magento/Framework/Code/Test/Unit/Reader/ArgumentsReaderTest.php
@@ -263,6 +263,9 @@ public function testIsCompatibleType($requiredType, $actualType, $expectedResult
$this->assertEquals($expectedResult, $actualResult);
}
+ /**
+ * @return array
+ */
public function testIsCompatibleTypeDataProvider()
{
return [
diff --git a/lib/internal/Magento/Framework/Code/Test/Unit/Validator/TypeDuplicationTest.php b/lib/internal/Magento/Framework/Code/Test/Unit/Validator/TypeDuplicationTest.php
index a82c88e3e18b1..b17b10106f8a9 100644
--- a/lib/internal/Magento/Framework/Code/Test/Unit/Validator/TypeDuplicationTest.php
+++ b/lib/internal/Magento/Framework/Code/Test/Unit/Validator/TypeDuplicationTest.php
@@ -34,6 +34,9 @@ public function testValidClasses($className)
$this->assertTrue($this->_validator->validate($className));
}
+ /**
+ * @return array
+ */
public function validClassesDataProvider()
{
return [
diff --git a/lib/internal/Magento/Framework/Code/Test/Unit/Validator/_files/ClassesForArgumentSequence.php b/lib/internal/Magento/Framework/Code/Test/Unit/Validator/_files/ClassesForArgumentSequence.php
index 98de5aefba7ef..947ff0b435418 100644
--- a/lib/internal/Magento/Framework/Code/Test/Unit/Validator/_files/ClassesForArgumentSequence.php
+++ b/lib/internal/Magento/Framework/Code/Test/Unit/Validator/_files/ClassesForArgumentSequence.php
@@ -40,6 +40,16 @@ class ParentClass
protected $parentOptionalScalar;
+ /**
+ * ParentClass constructor.
+ *
+ * @param ContextObject $contextObject
+ * @param ParentRequiredObject $parentRequiredObject
+ * @param array $parentRequiredScalar
+ * @param ParentOptionalObject|null $parentOptionalObject
+ * @param array $data
+ * @param array $parentOptionalScalar
+ */
public function __construct(
ContextObject $contextObject,
ParentRequiredObject $parentRequiredObject,
diff --git a/lib/internal/Magento/Framework/Code/Test/Unit/Validator/_files/ClassesForConstructorIntegrity.php b/lib/internal/Magento/Framework/Code/Test/Unit/Validator/_files/ClassesForConstructorIntegrity.php
index 3912a3e1cc5dd..6773d599f7fc7 100644
--- a/lib/internal/Magento/Framework/Code/Test/Unit/Validator/_files/ClassesForConstructorIntegrity.php
+++ b/lib/internal/Magento/Framework/Code/Test/Unit/Validator/_files/ClassesForConstructorIntegrity.php
@@ -57,6 +57,15 @@ class Context implements \Magento\Framework\ObjectManager\ContextInterface
*/
protected $_implOfBInterface;
+ /**
+ * Context constructor.
+ *
+ * @param ClassA $exA
+ * @param ClassB $exB
+ * @param ClassC $exC
+ * @param FirstInterface $interfaceA
+ * @param ImplementationOfSecondInterface $implOfBInterface
+ */
public function __construct(
\ClassA $exA,
\ClassB $exB,
diff --git a/lib/internal/Magento/Framework/Code/Test/Unit/_files/app/code/Magento/SomeModule/Model/Five/Test.php b/lib/internal/Magento/Framework/Code/Test/Unit/_files/app/code/Magento/SomeModule/Model/Five/Test.php
index 8a9d9866126bf..0aa100fda0caf 100644
--- a/lib/internal/Magento/Framework/Code/Test/Unit/_files/app/code/Magento/SomeModule/Model/Five/Test.php
+++ b/lib/internal/Magento/Framework/Code/Test/Unit/_files/app/code/Magento/SomeModule/Model/Five/Test.php
@@ -14,6 +14,11 @@ class Test extends \Magento\SomeModule\Model\Three\Test
*/
protected $_proxy;
+ /**
+ * Test constructor.
+ *
+ * @param \Magento\SomeModule\Model\Proxy $proxy
+ */
public function __construct(\Magento\SomeModule\Model\Proxy $proxy)
{
parent::__construct($proxy);
diff --git a/lib/internal/Magento/Framework/Code/Test/Unit/_files/app/code/Magento/SomeModule/Model/Four/Test.php b/lib/internal/Magento/Framework/Code/Test/Unit/_files/app/code/Magento/SomeModule/Model/Four/Test.php
index 4701e76f08c59..85133aa4ad851 100644
--- a/lib/internal/Magento/Framework/Code/Test/Unit/_files/app/code/Magento/SomeModule/Model/Four/Test.php
+++ b/lib/internal/Magento/Framework/Code/Test/Unit/_files/app/code/Magento/SomeModule/Model/Four/Test.php
@@ -15,6 +15,12 @@ class Test extends \Magento\SomeModule\Model\One\Test
*/
protected $_factory;
+ /**
+ * Test constructor.
+ *
+ * @param \Magento\SomeModule\Model\Proxy $proxy
+ * @param \Magento\SomeModule\Model\ElementFactory $factory
+ */
public function __construct(
\Magento\SomeModule\Model\Proxy $proxy,
\Magento\SomeModule\Model\ElementFactory $factory
diff --git a/lib/internal/Magento/Framework/Code/Test/Unit/_files/app/code/Magento/SomeModule/Model/One/Test.php b/lib/internal/Magento/Framework/Code/Test/Unit/_files/app/code/Magento/SomeModule/Model/One/Test.php
index 90f5d40ab726d..eeeb557a99a12 100644
--- a/lib/internal/Magento/Framework/Code/Test/Unit/_files/app/code/Magento/SomeModule/Model/One/Test.php
+++ b/lib/internal/Magento/Framework/Code/Test/Unit/_files/app/code/Magento/SomeModule/Model/One/Test.php
@@ -13,6 +13,11 @@ class Test
*/
protected $_proxy;
+ /**
+ * Test constructor.
+ *
+ * @param \Magento\SomeModule\Model\Proxy $proxy
+ */
public function __construct(\Magento\SomeModule\Model\Proxy $proxy)
{
$this->_proxy = $proxy;
diff --git a/lib/internal/Magento/Framework/Code/Test/Unit/_files/app/code/Magento/SomeModule/Model/Six/Test.php b/lib/internal/Magento/Framework/Code/Test/Unit/_files/app/code/Magento/SomeModule/Model/Six/Test.php
index 0c736710f5c4e..a58d9a0d628bc 100644
--- a/lib/internal/Magento/Framework/Code/Test/Unit/_files/app/code/Magento/SomeModule/Model/Six/Test.php
+++ b/lib/internal/Magento/Framework/Code/Test/Unit/_files/app/code/Magento/SomeModule/Model/Six/Test.php
@@ -15,6 +15,12 @@ class Test extends \Magento\SomeModule\Model\One\Test
*/
protected $_factory;
+ /**
+ * Test constructor.
+ *
+ * @param \Magento\SomeModule\Model\Proxy $proxy
+ * @param \Magento\SomeModule\Model\ElementFactory $factory
+ */
public function __construct(
\Magento\SomeModule\Model\Proxy $proxy,
\Magento\SomeModule\Model\ElementFactory $factory
diff --git a/lib/internal/Magento/Framework/Code/Test/Unit/_files/app/code/Magento/SomeModule/Model/Three/Test.php b/lib/internal/Magento/Framework/Code/Test/Unit/_files/app/code/Magento/SomeModule/Model/Three/Test.php
index d080034ef978e..5c0013508d00a 100644
--- a/lib/internal/Magento/Framework/Code/Test/Unit/_files/app/code/Magento/SomeModule/Model/Three/Test.php
+++ b/lib/internal/Magento/Framework/Code/Test/Unit/_files/app/code/Magento/SomeModule/Model/Three/Test.php
@@ -20,6 +20,12 @@ class Test extends \Magento\SomeModule\Model\Two\Test
*/
protected $_proxy;
+ /**
+ * Test constructor.
+ *
+ * @param \Magento\SomeModule\Model\Proxy $proxy
+ * @param \Magento\SomeModule\Model\ElementFactory $factory
+ */
public function __construct(
\Magento\SomeModule\Model\Proxy $proxy,
\Magento\SomeModule\Model\ElementFactory $factory
diff --git a/lib/internal/Magento/Framework/Code/Test/Unit/_files/app/code/Magento/SomeModule/Model/Two/Test.php b/lib/internal/Magento/Framework/Code/Test/Unit/_files/app/code/Magento/SomeModule/Model/Two/Test.php
index dee0b216b7641..9cec10a1cd36f 100644
--- a/lib/internal/Magento/Framework/Code/Test/Unit/_files/app/code/Magento/SomeModule/Model/Two/Test.php
+++ b/lib/internal/Magento/Framework/Code/Test/Unit/_files/app/code/Magento/SomeModule/Model/Two/Test.php
@@ -14,6 +14,12 @@ class Test extends \Magento\SomeModule\Model\One\Test
*/
protected $_proxy;
+ /**
+ * Test constructor.
+ *
+ * @param \Magento\SomeModule\Model\Proxy $proxy
+ * @param array $data
+ */
public function __construct(\Magento\SomeModule\Model\Proxy $proxy, $data = [])
{
$this->_proxy = $proxy;
diff --git a/lib/internal/Magento/Framework/Composer/Test/Unit/ComposerInformationTest.php b/lib/internal/Magento/Framework/Composer/Test/Unit/ComposerInformationTest.php
index 4ca43591c96ff..74f8c1dcdb875 100644
--- a/lib/internal/Magento/Framework/Composer/Test/Unit/ComposerInformationTest.php
+++ b/lib/internal/Magento/Framework/Composer/Test/Unit/ComposerInformationTest.php
@@ -92,6 +92,9 @@ public function testIsMagentoRoot($packageName, $expected)
$this->assertEquals($expected, $this->composerInformation->isMagentoRoot());
}
+ /**
+ * @return array
+ */
public function isMagentoRootDataProvider()
{
return [
diff --git a/lib/internal/Magento/Framework/Composer/Test/Unit/DependencyCheckerTest.php b/lib/internal/Magento/Framework/Composer/Test/Unit/DependencyCheckerTest.php
index 801d99373bc50..15ceb0c6c2755 100644
--- a/lib/internal/Magento/Framework/Composer/Test/Unit/DependencyCheckerTest.php
+++ b/lib/internal/Magento/Framework/Composer/Test/Unit/DependencyCheckerTest.php
@@ -69,7 +69,7 @@ function ($input, $buffer) {
$buffer->writeln($output);
}
);
- $composerApp->Expects($this->at(6))->method('run')->willReturnCallback(
+ $composerApp->expects($this->at(6))->method('run')->willReturnCallback(
function ($input, $buffer) {
$output = 'magento/package-d requires magento/package-c (1.0)' . PHP_EOL .
'magento/project-community-edition requires magento/package-a (1.0)' . PHP_EOL;
diff --git a/lib/internal/Magento/Framework/Config/Composer/Package.php b/lib/internal/Magento/Framework/Config/Composer/Package.php
index a8ff6ac724c3f..5e75f0be4b104 100644
--- a/lib/internal/Magento/Framework/Config/Composer/Package.php
+++ b/lib/internal/Magento/Framework/Config/Composer/Package.php
@@ -83,7 +83,7 @@ public function get($propertyPath, $filter = null)
* @param int $index
* @return mixed
*/
- private function traverseGet(\StdClass $json, array $chain, $index = 0)
+ private function traverseGet(\stdClass $json, array $chain, $index = 0)
{
$property = $chain[$index];
if (!property_exists($json, $property)) {
diff --git a/lib/internal/Magento/Framework/Config/Test/Unit/Converter/DomTest.php b/lib/internal/Magento/Framework/Config/Test/Unit/Converter/DomTest.php
index 09366c91a73a3..2ef915dc836df 100644
--- a/lib/internal/Magento/Framework/Config/Test/Unit/Converter/DomTest.php
+++ b/lib/internal/Magento/Framework/Config/Test/Unit/Converter/DomTest.php
@@ -24,6 +24,9 @@ public function testConvert($sourceFile, $resultFile)
$this->assertEquals($resultFile, $converterDom->convert($dom));
}
+ /**
+ * @return array
+ */
public function convertDataProvider()
{
return [
diff --git a/lib/internal/Magento/Framework/Config/Test/Unit/Data/ConfigDataTest.php b/lib/internal/Magento/Framework/Config/Test/Unit/Data/ConfigDataTest.php
index 619135f9c7038..747560b29dfc1 100644
--- a/lib/internal/Magento/Framework/Config/Test/Unit/Data/ConfigDataTest.php
+++ b/lib/internal/Magento/Framework/Config/Test/Unit/Data/ConfigDataTest.php
@@ -47,6 +47,9 @@ public function testSetWrongKey($key, $expectedException)
$configData->set($key, 'value');
}
+ /**
+ * @return array
+ */
public function setWrongKeyDataProvider()
{
return [
diff --git a/lib/internal/Magento/Framework/Config/Test/Unit/Data/ScopedTest.php b/lib/internal/Magento/Framework/Config/Test/Unit/Data/ScopedTest.php
index 380d095d85e64..f8c518d35add7 100644
--- a/lib/internal/Magento/Framework/Config/Test/Unit/Data/ScopedTest.php
+++ b/lib/internal/Magento/Framework/Config/Test/Unit/Data/ScopedTest.php
@@ -81,6 +81,9 @@ public function testGetConfigByPath($path, $expectedValue, $default)
$this->assertEquals($expectedValue, $this->_model->get($path, $default));
}
+ /**
+ * @return array
+ */
public function getConfigByPathDataProvider()
{
return [
diff --git a/lib/internal/Magento/Framework/Config/Test/Unit/Dom/NodePathMatcherTest.php b/lib/internal/Magento/Framework/Config/Test/Unit/Dom/NodePathMatcherTest.php
index 94197fe737918..a2fbdce771f94 100644
--- a/lib/internal/Magento/Framework/Config/Test/Unit/Dom/NodePathMatcherTest.php
+++ b/lib/internal/Magento/Framework/Config/Test/Unit/Dom/NodePathMatcherTest.php
@@ -32,6 +32,9 @@ public function testMatch($pathPattern, $xpathSubject, $expectedResult)
$this->assertSame($expectedResult, $actualResult);
}
+ /**
+ * @return array
+ */
public function getNodeInfoDataProvider()
{
return [
diff --git a/lib/internal/Magento/Framework/Config/Test/Unit/GenericSchemaLocatorTest.php b/lib/internal/Magento/Framework/Config/Test/Unit/GenericSchemaLocatorTest.php
index 77a7f869fb941..27290e1f67e6d 100644
--- a/lib/internal/Magento/Framework/Config/Test/Unit/GenericSchemaLocatorTest.php
+++ b/lib/internal/Magento/Framework/Config/Test/Unit/GenericSchemaLocatorTest.php
@@ -30,6 +30,14 @@ class GenericSchemaLocatorTest extends \PHPUnit\Framework\TestCase
*/
private $moduleReaderMock;
+ /**
+ * @param ModuleDirReader $reader
+ * @param $moduleName
+ * @param $mergeSchema
+ * @param $perFileSchema
+ *
+ * @return GenericSchemaLocator
+ */
private function createNewSchemaLocatorInstance(ModuleDirReader $reader, $moduleName, $mergeSchema, $perFileSchema)
{
return new GenericSchemaLocator($reader, $moduleName, $mergeSchema, $perFileSchema);
diff --git a/lib/internal/Magento/Framework/Controller/Test/Unit/Result/RedirectTest.php b/lib/internal/Magento/Framework/Controller/Test/Unit/Result/RedirectTest.php
index 65e7ee489e84c..881166b3e2218 100644
--- a/lib/internal/Magento/Framework/Controller/Test/Unit/Result/RedirectTest.php
+++ b/lib/internal/Magento/Framework/Controller/Test/Unit/Result/RedirectTest.php
@@ -75,6 +75,9 @@ public function testSetPath()
);
}
+ /**
+ * @return array
+ */
public function httpRedirectResponseStatusCodes()
{
return [
diff --git a/lib/internal/Magento/Framework/Controller/Test/Unit/Router/Route/FactoryTest.php b/lib/internal/Magento/Framework/Controller/Test/Unit/Router/Route/FactoryTest.php
index 87adadbd34e3b..2b53541022505 100644
--- a/lib/internal/Magento/Framework/Controller/Test/Unit/Router/Route/FactoryTest.php
+++ b/lib/internal/Magento/Framework/Controller/Test/Unit/Router/Route/FactoryTest.php
@@ -69,7 +69,7 @@ public function testCreateRouteNegative()
{
$this->objectManager->expects($this->once())
->method('create')
- ->will($this->returnValue(new \StdClass()));
+ ->will($this->returnValue(new \stdClass()));
$object = new Factory($this->objectManager);
$object->createRoute(
diff --git a/lib/internal/Magento/Framework/Convert/Test/Unit/XmlTest.php b/lib/internal/Magento/Framework/Convert/Test/Unit/XmlTest.php
index 5af254fcdd4dc..4102ece70a1ce 100644
--- a/lib/internal/Magento/Framework/Convert/Test/Unit/XmlTest.php
+++ b/lib/internal/Magento/Framework/Convert/Test/Unit/XmlTest.php
@@ -31,6 +31,9 @@ public function testXmlToAssoc()
);
}
+ /**
+ * @return string
+ */
protected function getXml()
{
return <<assertEquals($select, $result);
}
+ /**
+ * @return array
+ */
public function matchProvider()
{
return [[true], [false]];
diff --git a/lib/internal/Magento/Framework/DB/Test/Unit/Select/ColumnsRendererTest.php b/lib/internal/Magento/Framework/DB/Test/Unit/Select/ColumnsRendererTest.php
index 143ee42ebfa51..889ca58f9229d 100644
--- a/lib/internal/Magento/Framework/DB/Test/Unit/Select/ColumnsRendererTest.php
+++ b/lib/internal/Magento/Framework/DB/Test/Unit/Select/ColumnsRendererTest.php
@@ -77,6 +77,9 @@ public function testRender($columns, $sql, $expectedResult)
$this->assertEquals($expectedResult, $this->model->render($this->selectMock, $sql));
}
+ /**
+ * @return array
+ */
public function renderDataProvider()
{
return [
diff --git a/lib/internal/Magento/Framework/Data/Form/FormKey/Validator.php b/lib/internal/Magento/Framework/Data/Form/FormKey/Validator.php
index 0dbc9c879462e..225ff1fd140a9 100644
--- a/lib/internal/Magento/Framework/Data/Form/FormKey/Validator.php
+++ b/lib/internal/Magento/Framework/Data/Form/FormKey/Validator.php
@@ -5,6 +5,8 @@
*/
namespace Magento\Framework\Data\Form\FormKey;
+use Magento\Framework\Encryption\Helper\Security;
+
/**
* @api
*/
@@ -32,9 +34,7 @@ public function __construct(\Magento\Framework\Data\Form\FormKey $formKey)
public function validate(\Magento\Framework\App\RequestInterface $request)
{
$formKey = $request->getParam('form_key', null);
- if (!$formKey || $formKey !== $this->_formKey->getFormKey()) {
- return false;
- }
- return true;
+
+ return $formKey && Security::compareStrings($formKey, $this->_formKey->getFormKey());
}
}
diff --git a/lib/internal/Magento/Framework/Data/Test/Unit/Argument/Interpreter/ArrayTypeTest.php b/lib/internal/Magento/Framework/Data/Test/Unit/Argument/Interpreter/ArrayTypeTest.php
index 20a0b384bad7e..9387ffbfed7a6 100644
--- a/lib/internal/Magento/Framework/Data/Test/Unit/Argument/Interpreter/ArrayTypeTest.php
+++ b/lib/internal/Magento/Framework/Data/Test/Unit/Argument/Interpreter/ArrayTypeTest.php
@@ -38,6 +38,9 @@ public function testEvaluateException($inputData)
$this->_model->evaluate($inputData);
}
+ /**
+ * @return array
+ */
public function evaluateExceptionDataProvider()
{
return [
@@ -62,6 +65,9 @@ public function testEvaluate(array $input, array $expected)
$this->assertSame($expected, $actual);
}
+ /**
+ * @return array
+ */
public function evaluateDataProvider()
{
return [
diff --git a/lib/internal/Magento/Framework/Data/Test/Unit/Argument/Interpreter/CompositeTest.php b/lib/internal/Magento/Framework/Data/Test/Unit/Argument/Interpreter/CompositeTest.php
index bca8bb0d9347f..37d840b40ca47 100644
--- a/lib/internal/Magento/Framework/Data/Test/Unit/Argument/Interpreter/CompositeTest.php
+++ b/lib/internal/Magento/Framework/Data/Test/Unit/Argument/Interpreter/CompositeTest.php
@@ -60,6 +60,9 @@ public function testEvaluateWrongDiscriminator($input, $expectedExceptionMessage
$this->_model->evaluate($input);
}
+ /**
+ * @return array
+ */
public function evaluateWrongDiscriminatorDataProvider()
{
return [
diff --git a/lib/internal/Magento/Framework/Data/Test/Unit/Argument/Interpreter/NumberTest.php b/lib/internal/Magento/Framework/Data/Test/Unit/Argument/Interpreter/NumberTest.php
index bec2a37545e65..8981f5adb2e1a 100644
--- a/lib/internal/Magento/Framework/Data/Test/Unit/Argument/Interpreter/NumberTest.php
+++ b/lib/internal/Magento/Framework/Data/Test/Unit/Argument/Interpreter/NumberTest.php
@@ -30,6 +30,9 @@ public function testEvaluateException($input)
$this->_model->evaluate($input);
}
+ /**
+ * @return array
+ */
public function evaluateExceptionDataProvider()
{
return ['no value' => [[]], 'non-numeric value' => [['value' => 'non-numeric']]];
@@ -47,6 +50,9 @@ public function testEvaluate($input, $expected)
$this->assertSame($expected, $actual);
}
+ /**
+ * @return array
+ */
public function evaluateDataProvider()
{
return [
diff --git a/lib/internal/Magento/Framework/Data/Test/Unit/Collection/DbTest.php b/lib/internal/Magento/Framework/Data/Test/Unit/Collection/DbTest.php
index 5eea3f8790711..63eccb098bf0d 100644
--- a/lib/internal/Magento/Framework/Data/Test/Unit/Collection/DbTest.php
+++ b/lib/internal/Magento/Framework/Data/Test/Unit/Collection/DbTest.php
@@ -296,6 +296,9 @@ public function testPrintLogQueryPrinting($printQuery, $printFlag, $query, $expe
$this->collection->printLogQuery($printQuery, false, $query);
}
+ /**
+ * @return array
+ */
public function printLogQueryPrintingDataProvider()
{
return [
@@ -319,6 +322,9 @@ public function testPrintLogQueryLogging($logQuery, $logFlag, $expectedCalls)
$this->collection->printLogQuery(false, $logQuery, 'some_query');
}
+ /**
+ * @return array
+ */
public function printLogQueryLoggingDataProvider()
{
return [
@@ -527,6 +533,9 @@ public function testDistinct($flag, $expectedFlag)
$this->collection->distinct($flag);
}
+ /**
+ * @return array
+ */
public function distinctDataProvider()
{
return [
diff --git a/lib/internal/Magento/Framework/Data/Test/Unit/Form/Element/DateTest.php b/lib/internal/Magento/Framework/Data/Test/Unit/Form/Element/DateTest.php
index a34fdf21f7ab4..793161dfc5cbb 100644
--- a/lib/internal/Magento/Framework/Data/Test/Unit/Form/Element/DateTest.php
+++ b/lib/internal/Magento/Framework/Data/Test/Unit/Form/Element/DateTest.php
@@ -80,6 +80,9 @@ public function testGetElementHtmlDateFormat($fieldName)
$this->model->getElementHtml();
}
+ /**
+ * @return array
+ */
public function providerGetElementHtmlDateFormat()
{
return [
@@ -88,6 +91,11 @@ public function providerGetElementHtmlDateFormat()
];
}
+ /**
+ * @param $exactly
+ *
+ * @return \PHPUnit_Framework_MockObject_MockObject
+ */
protected function getFormMock($exactly)
{
$functions = ['getFieldNameSuffix', 'getHtmlIdPrefix', 'getHtmlIdSuffix'];
diff --git a/lib/internal/Magento/Framework/Data/Test/Unit/Form/FormKey/ValidatorTest.php b/lib/internal/Magento/Framework/Data/Test/Unit/Form/FormKey/ValidatorTest.php
index 9e23610b97668..8b9de2c63953f 100644
--- a/lib/internal/Magento/Framework/Data/Test/Unit/Form/FormKey/ValidatorTest.php
+++ b/lib/internal/Magento/Framework/Data/Test/Unit/Form/FormKey/ValidatorTest.php
@@ -50,6 +50,9 @@ public function testValidate($formKey, $expected)
$this->assertEquals($expected, $this->_model->validate($this->_requestMock));
}
+ /**
+ * @return array
+ */
public function validateDataProvider()
{
return [
diff --git a/lib/internal/Magento/Framework/Encryption/Test/Unit/CryptTest.php b/lib/internal/Magento/Framework/Encryption/Test/Unit/CryptTest.php
index 6dc0d4a1d4628..6a65124b15f4c 100644
--- a/lib/internal/Magento/Framework/Encryption/Test/Unit/CryptTest.php
+++ b/lib/internal/Magento/Framework/Encryption/Test/Unit/CryptTest.php
@@ -30,6 +30,11 @@ protected function setUp()
$this->_key = substr(__CLASS__, -32, 32);
}
+ /**
+ * @param $length
+ *
+ * @return bool|string
+ */
protected function _getRandomString($length)
{
$result = '';
@@ -64,18 +69,33 @@ protected function _requireCipherInfo()
}
}
+ /**
+ * @param $cipherName
+ * @param $modeName
+ *
+ * @return mixed
+ */
protected function _getKeySize($cipherName, $modeName)
{
$this->_requireCipherInfo();
return self::$_cipherInfo[$cipherName][$modeName]['key_size'];
}
+ /**
+ * @param $cipherName
+ * @param $modeName
+ *
+ * @return mixed
+ */
protected function _getInitVectorSize($cipherName, $modeName)
{
$this->_requireCipherInfo();
return self::$_cipherInfo[$cipherName][$modeName]['iv_size'];
}
+ /**
+ * @return array
+ */
public function getCipherModeCombinations()
{
$result = [];
@@ -102,6 +122,9 @@ public function testConstructor($cipher, $mode)
$this->assertEquals($initVector, $crypt->getInitVector());
}
+ /**
+ * @return array
+ */
public function getConstructorExceptionData()
{
$result = [];
@@ -137,6 +160,9 @@ public function testConstructorDefaults()
$this->assertEquals($cryptExpected->getInitVector(), $cryptActual->getInitVector());
}
+ /**
+ * @return mixed
+ */
public function getCryptData()
{
$fixturesFilename = __DIR__ . '/Crypt/_files/_crypt_fixtures.php';
diff --git a/lib/internal/Magento/Framework/Encryption/Test/Unit/EncryptorTest.php b/lib/internal/Magento/Framework/Encryption/Test/Unit/EncryptorTest.php
index 52a7a98eac312..f4381a42775d7 100644
--- a/lib/internal/Magento/Framework/Encryption/Test/Unit/EncryptorTest.php
+++ b/lib/internal/Magento/Framework/Encryption/Test/Unit/EncryptorTest.php
@@ -86,6 +86,9 @@ public function testValidateHash($password, $hash, $expected)
$this->assertEquals($expected, $actual);
}
+ /**
+ * @return array
+ */
public function validateHashDataProvider()
{
return [
@@ -112,6 +115,9 @@ public function testEncryptWithEmptyKey($key)
$this->assertEquals($value, $model->encrypt($value));
}
+ /**
+ * @return array
+ */
public function encryptWithEmptyKeyDataProvider()
{
return [[null], [0], [''], ['0']];
@@ -134,6 +140,9 @@ public function testDecryptWithEmptyKey($key)
$this->assertEquals('', $model->decrypt($value));
}
+ /**
+ * @return array
+ */
public function decryptWithEmptyKeyDataProvider()
{
return [[null], [0], [''], ['0']];
@@ -208,6 +217,9 @@ public function testValidateKey()
$this->assertEquals($crypt->decrypt($expectedEncryptedData), $actual->decrypt($actualEncryptedData));
}
+ /**
+ * @return array
+ */
public function testUseSpecifiedHashingAlgoDataProvider()
{
return [
diff --git a/lib/internal/Magento/Framework/Encryption/Test/Unit/Helper/SecurityTest.php b/lib/internal/Magento/Framework/Encryption/Test/Unit/Helper/SecurityTest.php
index a0406cd0ec84b..fc241834c7ecf 100644
--- a/lib/internal/Magento/Framework/Encryption/Test/Unit/Helper/SecurityTest.php
+++ b/lib/internal/Magento/Framework/Encryption/Test/Unit/Helper/SecurityTest.php
@@ -31,6 +31,9 @@ public function testCompareStrings($expected, $actual, $result)
$this->assertEquals($result, Security::compareStrings($expected, $actual));
}
+ /**
+ * @return array
+ */
public function dataProvider()
{
return [
diff --git a/lib/internal/Magento/Framework/Event/Test/Unit/Observer/CollectionTest.php b/lib/internal/Magento/Framework/Event/Test/Unit/Observer/CollectionTest.php
index 91c8afaef5d07..136dd8cc80eef 100644
--- a/lib/internal/Magento/Framework/Event/Test/Unit/Observer/CollectionTest.php
+++ b/lib/internal/Magento/Framework/Event/Test/Unit/Observer/CollectionTest.php
@@ -81,6 +81,9 @@ public function testGetObserverByName($name)
$this->assertEquals($observer, $this->observerCollection->getObserverByName($name));
}
+ /**
+ * @return array
+ */
public function observerNameProvider()
{
return [
diff --git a/lib/internal/Magento/Framework/Event/Test/Unit/Observer/CronTest.php b/lib/internal/Magento/Framework/Event/Test/Unit/Observer/CronTest.php
index 511d547ebed44..1380cc0decf39 100644
--- a/lib/internal/Magento/Framework/Event/Test/Unit/Observer/CronTest.php
+++ b/lib/internal/Magento/Framework/Event/Test/Unit/Observer/CronTest.php
@@ -37,6 +37,9 @@ public function testGetNumeric($value, $expectedResult)
$this->assertEquals($expectedResult, $this->cron->getNumeric($value));
}
+ /**
+ * @return array
+ */
public function numericValueProvider()
{
return [
@@ -78,6 +81,9 @@ public function testMatchCronExpression($expression, $number, $expectedResult)
$this->assertEquals($expectedResult, $this->cron->matchCronExpression($expression, $number));
}
+ /**
+ * @return array
+ */
public function matchCronExpressionProvider()
{
return [
@@ -107,6 +113,9 @@ public function testIsValidFor($time, $expression, $expectedResult)
$this->assertEquals($expectedResult, $this->cron->isValidFor($eventMock));
}
+ /**
+ * @return array
+ */
public function isValidForProvider()
{
return [
diff --git a/lib/internal/Magento/Framework/Event/Test/Unit/Observer/RegexTest.php b/lib/internal/Magento/Framework/Event/Test/Unit/Observer/RegexTest.php
index cfd3602fb030d..80d828930d118 100644
--- a/lib/internal/Magento/Framework/Event/Test/Unit/Observer/RegexTest.php
+++ b/lib/internal/Magento/Framework/Event/Test/Unit/Observer/RegexTest.php
@@ -44,6 +44,9 @@ public function testIsValidFor($pattern, $name, $expectedResult)
$this->assertEquals($expectedResult, $this->regex->isValidFor($eventMock));
}
+ /**
+ * @return array
+ */
public function isValidForProvider()
{
return [
diff --git a/lib/internal/Magento/Framework/Exception/AbstractAggregateException.php b/lib/internal/Magento/Framework/Exception/AbstractAggregateException.php
index 56c3bd285bc1e..6720b43b4ed9f 100644
--- a/lib/internal/Magento/Framework/Exception/AbstractAggregateException.php
+++ b/lib/internal/Magento/Framework/Exception/AbstractAggregateException.php
@@ -78,6 +78,13 @@ public function addError(Phrase $phrase)
return $this;
}
+ public function addException(LocalizedException $exception)
+ {
+ $this->addErrorCalls++;
+ $this->errors[] = $exception;
+ return $this;
+ }
+
/**
* Should return true if someone has added different errors to this exception after construction
*
diff --git a/lib/internal/Magento/Framework/File/Size.php b/lib/internal/Magento/Framework/File/Size.php
index 6f48024f71c16..c259069637293 100644
--- a/lib/internal/Magento/Framework/File/Size.php
+++ b/lib/internal/Magento/Framework/File/Size.php
@@ -36,7 +36,7 @@ class Size
*/
public function getPostMaxSize()
{
- return $this->_iniget('post_max_size');
+ return $this->_iniGet('post_max_size');
}
/**
@@ -46,7 +46,7 @@ public function getPostMaxSize()
*/
public function getUploadMaxSize()
{
- return $this->_iniget('upload_max_filesize');
+ return $this->_iniGet('upload_max_filesize');
}
/**
diff --git a/lib/internal/Magento/Framework/Filesystem/Test/Unit/Driver/FileTest.php b/lib/internal/Magento/Framework/Filesystem/Test/Unit/Driver/FileTest.php
index 97a3b8f498491..5d1f9664bde61 100644
--- a/lib/internal/Magento/Framework/Filesystem/Test/Unit/Driver/FileTest.php
+++ b/lib/internal/Magento/Framework/Filesystem/Test/Unit/Driver/FileTest.php
@@ -31,6 +31,9 @@ public function testGetAbsolutePath($basePath, $path, $expected)
$this->assertEquals($expected, $file->getAbsolutePath($basePath, $path));
}
+ /**
+ * @return array
+ */
public function dataProviderForTestGetAbsolutePath()
{
return [
@@ -50,6 +53,9 @@ public function testGetRelativePath($basePath, $path, $expected)
$this->assertEquals($expected, $file->getRelativePath($basePath, $path));
}
+ /**
+ * @return array
+ */
public function dataProviderForTestGetRelativePath()
{
return [
diff --git a/lib/internal/Magento/Framework/Filesystem/Test/Unit/Driver/HttpTest.php b/lib/internal/Magento/Framework/Filesystem/Test/Unit/Driver/HttpTest.php
index 51a994dc73ff5..dabbae8974905 100644
--- a/lib/internal/Magento/Framework/Filesystem/Test/Unit/Driver/HttpTest.php
+++ b/lib/internal/Magento/Framework/Filesystem/Test/Unit/Driver/HttpTest.php
@@ -40,6 +40,9 @@ public function testIsExists($status, $result)
$this->assertEquals($result, (new Http())->isExists(''));
}
+ /**
+ * @return array
+ */
public function dataProviderForTestIsExists()
{
return [['200 OK', true], ['404 Not Found', false]];
@@ -54,6 +57,9 @@ public function testStat($headers, $result)
$this->assertEquals($result, (new Http())->stat(''));
}
+ /**
+ * @return array
+ */
public function dataProviderForTestStat()
{
$headers1 = [
diff --git a/lib/internal/Magento/Framework/Filesystem/Test/Unit/DriverPoolTest.php b/lib/internal/Magento/Framework/Filesystem/Test/Unit/DriverPoolTest.php
index 8e550ff0597d7..1aaedbc475446 100644
--- a/lib/internal/Magento/Framework/Filesystem/Test/Unit/DriverPoolTest.php
+++ b/lib/internal/Magento/Framework/Filesystem/Test/Unit/DriverPoolTest.php
@@ -38,6 +38,6 @@ public function testCustomDriver()
*/
public function testCustomDriverException()
{
- new DriverPool(['custom' => new \StdClass()]);
+ new DriverPool(['custom' => new \stdClass()]);
}
}
diff --git a/lib/internal/Magento/Framework/Filesystem/Test/Unit/File/ExcludeFilterTest.php b/lib/internal/Magento/Framework/Filesystem/Test/Unit/File/ExcludeFilterTest.php
index 07524f9c3595f..8dcb4befa6cac 100644
--- a/lib/internal/Magento/Framework/Filesystem/Test/Unit/File/ExcludeFilterTest.php
+++ b/lib/internal/Magento/Framework/Filesystem/Test/Unit/File/ExcludeFilterTest.php
@@ -39,6 +39,9 @@ public function testExclusion()
$this->assertTrue(!in_array(BP . '/var/session/', $result), 'Filtered path should not be in array');
}
+ /**
+ * @return \Generator
+ */
private function getFilesIterator()
{
$files = [
diff --git a/lib/internal/Magento/Framework/Filter/Test/Unit/Input/MaliciousCodeTest.php b/lib/internal/Magento/Framework/Filter/Test/Unit/Input/MaliciousCodeTest.php
index a8cf48eef433f..7c1ae92b10fc2 100644
--- a/lib/internal/Magento/Framework/Filter/Test/Unit/Input/MaliciousCodeTest.php
+++ b/lib/internal/Magento/Framework/Filter/Test/Unit/Input/MaliciousCodeTest.php
@@ -33,6 +33,9 @@ public function testFilter($input, $expectedOutput)
);
}
+ /**
+ * @return array
+ */
public function filterDataProvider()
{
return [
diff --git a/lib/internal/Magento/Framework/Filter/Test/Unit/Template/Tokenizer/ParameterTest.php b/lib/internal/Magento/Framework/Filter/Test/Unit/Template/Tokenizer/ParameterTest.php
index 126d3f9f2f691..fdce369ba2946 100644
--- a/lib/internal/Magento/Framework/Filter/Test/Unit/Template/Tokenizer/ParameterTest.php
+++ b/lib/internal/Magento/Framework/Filter/Test/Unit/Template/Tokenizer/ParameterTest.php
@@ -41,6 +41,9 @@ public function testGetValue($string, $expectedValue)
$this->assertEquals($expectedValue, $this->_filter->getValue());
}
+ /**
+ * @return array
+ */
public function sampleTokenizeStringProvider()
{
return [
@@ -51,6 +54,9 @@ public function sampleTokenizeStringProvider()
];
}
+ /**
+ * @return array
+ */
public function sampleGetValueStringProvider()
{
return [
diff --git a/lib/internal/Magento/Framework/Filter/Test/Unit/Template/Tokenizer/VariableTest.php b/lib/internal/Magento/Framework/Filter/Test/Unit/Template/Tokenizer/VariableTest.php
index 793637203bb0d..4dad75a6bcb5b 100644
--- a/lib/internal/Magento/Framework/Filter/Test/Unit/Template/Tokenizer/VariableTest.php
+++ b/lib/internal/Magento/Framework/Filter/Test/Unit/Template/Tokenizer/VariableTest.php
@@ -30,6 +30,9 @@ public function testTokenize($string, $expectedValue)
$this->assertEquals($expectedValue, $this->_filter->tokenize());
}
+ /**
+ * @return array
+ */
public function sampleTokenizeStringProvider()
{
return [
diff --git a/lib/internal/Magento/Framework/Filter/Test/Unit/TemplateTest.php b/lib/internal/Magento/Framework/Filter/Test/Unit/TemplateTest.php
index 14d84707fb0b4..e7376d9b7d264 100644
--- a/lib/internal/Magento/Framework/Filter/Test/Unit/TemplateTest.php
+++ b/lib/internal/Magento/Framework/Filter/Test/Unit/TemplateTest.php
@@ -138,6 +138,9 @@ public function testVarDirective($construction, $variables, $expectedResult)
$this->assertEquals($expectedResult, $this->templateFilter->filter($construction));
}
+ /**
+ * @return array
+ */
public function varDirectiveDataProvider()
{
/* @var $dataObjectVariable \Magento\Framework\DataObject|\PHPUnit_Framework_MockObject_MockObject */
diff --git a/lib/internal/Magento/Framework/HTTP/Test/Unit/Adapter/CurlTest.php b/lib/internal/Magento/Framework/HTTP/Test/Unit/Adapter/CurlTest.php
index 8fd28e8513d0b..852badb16d219 100644
--- a/lib/internal/Magento/Framework/HTTP/Test/Unit/Adapter/CurlTest.php
+++ b/lib/internal/Magento/Framework/HTTP/Test/Unit/Adapter/CurlTest.php
@@ -38,6 +38,9 @@ public function testRead($response)
$this->assertEquals(file_get_contents(__DIR__ . '/_files/curl_response_expected.txt'), $this->model->read());
}
+ /**
+ * @return array
+ */
public function readDataProvider()
{
return [
diff --git a/lib/internal/Magento/Framework/HTTP/Test/Unit/PhpEnvironment/RequestTest.php b/lib/internal/Magento/Framework/HTTP/Test/Unit/PhpEnvironment/RequestTest.php
index a746b61ad0038..88cc505fbea8e 100644
--- a/lib/internal/Magento/Framework/HTTP/Test/Unit/PhpEnvironment/RequestTest.php
+++ b/lib/internal/Magento/Framework/HTTP/Test/Unit/PhpEnvironment/RequestTest.php
@@ -50,6 +50,11 @@ public function tearDown()
$_SERVER = $this->serverArray;
}
+ /**
+ * @param null $uri
+ *
+ * @return Request
+ */
private function getModel($uri = null)
{
return new Request($this->cookieReader, $this->converter, $uri);
diff --git a/lib/internal/Magento/Framework/Image/Adapter/Gd2.php b/lib/internal/Magento/Framework/Image/Adapter/Gd2.php
index a36e41a526466..33d73768b3b07 100644
--- a/lib/internal/Magento/Framework/Image/Adapter/Gd2.php
+++ b/lib/internal/Magento/Framework/Image/Adapter/Gd2.php
@@ -106,7 +106,7 @@ protected function _getImageNeedMemorySize($file)
}
return round(
- ($imageInfo[0] * $imageInfo[1] * $imageInfo['bits'] * $imageInfo['channels'] / 8 + Pow(2, 16)) * 1.65
+ ($imageInfo[0] * $imageInfo[1] * $imageInfo['bits'] * $imageInfo['channels'] / 8 + pow(2, 16)) * 1.65
);
}
@@ -426,7 +426,7 @@ public function watermark($imagePath, $positionX = 0, $positionY = 0, $opacity =
imagecolortransparent($newWatermark, $col);
imagefilledrectangle($newWatermark, 0, 0, $this->getWatermarkWidth(), $this->getWatermarkHeight(), $col);
imagealphablending($newWatermark, true);
- imageSaveAlpha($newWatermark, true);
+ imagesavealpha($newWatermark, true);
imagecopyresampled(
$newWatermark,
$watermark,
@@ -451,7 +451,7 @@ public function watermark($imagePath, $positionX = 0, $positionY = 0, $opacity =
imagecolortransparent($newWatermark, $col);
imagefilledrectangle($newWatermark, 0, 0, $this->_imageSrcWidth, $this->_imageSrcHeight, $col);
imagealphablending($newWatermark, true);
- imageSaveAlpha($newWatermark, true);
+ imagesavealpha($newWatermark, true);
imagecopyresampled(
$newWatermark,
$watermark,
@@ -669,7 +669,7 @@ private function imageDestroy()
private function _saveAlpha($imageHandler)
{
$background = imagecolorallocate($imageHandler, 0, 0, 0);
- ImageColorTransparent($imageHandler, $background);
+ imagecolortransparent($imageHandler, $background);
imagealphablending($imageHandler, false);
imagesavealpha($imageHandler, true);
}
diff --git a/lib/internal/Magento/Framework/Image/Test/Unit/Adapter/AbstractTest.php b/lib/internal/Magento/Framework/Image/Test/Unit/Adapter/AbstractTest.php
index d8e48f278f782..838d85c5fbf20 100644
--- a/lib/internal/Magento/Framework/Image/Test/Unit/Adapter/AbstractTest.php
+++ b/lib/internal/Magento/Framework/Image/Test/Unit/Adapter/AbstractTest.php
@@ -109,6 +109,9 @@ public function testPrepareDestination($destination, $newName, $expectedResult)
$this->assertEquals($expectedResult, $result);
}
+ /**
+ * @return array
+ */
public function prepareDestinationDataProvider()
{
return [
diff --git a/lib/internal/Magento/Framework/Image/Test/Unit/Adapter/Gd2Test.php b/lib/internal/Magento/Framework/Image/Test/Unit/Adapter/Gd2Test.php
index fe0847f7f69b4..41281c96e1bb4 100644
--- a/lib/internal/Magento/Framework/Image/Test/Unit/Adapter/Gd2Test.php
+++ b/lib/internal/Magento/Framework/Image/Test/Unit/Adapter/Gd2Test.php
@@ -73,6 +73,9 @@ public function testOpen($fileData, $exception, $limit)
$this->adapter->open('file');
}
+ /**
+ * @return array
+ */
public function filesProvider()
{
$smallFile = [
diff --git a/lib/internal/Magento/Framework/Indexer/Action/Base.php b/lib/internal/Magento/Framework/Indexer/Action/Base.php
index 11cf1cec62636..636335192cbc5 100644
--- a/lib/internal/Magento/Framework/Indexer/Action/Base.php
+++ b/lib/internal/Magento/Framework/Indexer/Action/Base.php
@@ -221,7 +221,7 @@ protected function prepareDataSource(array $ids = [])
{
return !count($ids)
? $this->createResultCollection()
- : $this->createResultCollection()->addFieldToFilter($this->getPrimaryResource()->getIdFieldname(), $ids);
+ : $this->createResultCollection()->addFieldToFilter($this->getPrimaryResource()->getIdFieldName(), $ids);
}
/**
diff --git a/lib/internal/Magento/Framework/Indexer/Test/Unit/IndexStructureTest.php b/lib/internal/Magento/Framework/Indexer/Test/Unit/IndexStructureTest.php
index c68af718473a4..984b09f9a27ab 100644
--- a/lib/internal/Magento/Framework/Indexer/Test/Unit/IndexStructureTest.php
+++ b/lib/internal/Magento/Framework/Indexer/Test/Unit/IndexStructureTest.php
@@ -186,6 +186,13 @@ private function createDimensionMock($name, $value)
return $dimension;
}
+ /**
+ * @param $callNumber
+ * @param $tableName
+ * @param $isTableExist
+ *
+ * @return mixed
+ */
private function mockDropTable($callNumber, $tableName, $isTableExist)
{
$this->connectionInterface->expects($this->at($callNumber++))
@@ -201,6 +208,12 @@ private function mockDropTable($callNumber, $tableName, $isTableExist)
return $callNumber;
}
+ /**
+ * @param $callNumber
+ * @param $tableName
+ *
+ * @return mixed
+ */
private function mockFlatTable($callNumber, $tableName)
{
$table = $this->getMockBuilder(\Magento\Framework\DB\Ddl\Table::class)
@@ -223,6 +236,12 @@ private function mockFlatTable($callNumber, $tableName)
return $callNumber;
}
+ /**
+ * @param $callNumber
+ * @param $tableName
+ *
+ * @return mixed
+ */
private function mockFulltextTable($callNumber, $tableName)
{
$table = $this->getMockBuilder(\Magento\Framework\DB\Ddl\Table::class)
diff --git a/lib/internal/Magento/Framework/Interception/Test/Unit/Code/Generator/_files/Sample.php b/lib/internal/Magento/Framework/Interception/Test/Unit/Code/Generator/_files/Sample.php
index 46d9bee5844a7..107f83ad6f378 100644
--- a/lib/internal/Magento/Framework/Interception/Test/Unit/Code/Generator/_files/Sample.php
+++ b/lib/internal/Magento/Framework/Interception/Test/Unit/Code/Generator/_files/Sample.php
@@ -14,6 +14,9 @@ public function getValue()
return $this->attribute;
}
+ /**
+ * @param $value
+ */
public function setValue($value)
{
$this->attribute = $value;
diff --git a/lib/internal/Magento/Framework/Interception/Test/Unit/Code/Generator/_files/TSample.php b/lib/internal/Magento/Framework/Interception/Test/Unit/Code/Generator/_files/TSample.php
index f751424e59103..5827c1a1b9e13 100644
--- a/lib/internal/Magento/Framework/Interception/Test/Unit/Code/Generator/_files/TSample.php
+++ b/lib/internal/Magento/Framework/Interception/Test/Unit/Code/Generator/_files/TSample.php
@@ -9,11 +9,17 @@ class TSample
{
private $value;
+ /**
+ * @return string
+ */
public function getValue() : string
{
return $this->value;
}
+ /**
+ * @param string $value
+ */
public function setValue(string $value)
{
$this->value = $value;
diff --git a/lib/internal/Magento/Framework/Interception/Test/Unit/Config/ConfigTest.php b/lib/internal/Magento/Framework/Interception/Test/Unit/Config/ConfigTest.php
index 54dfa8a03b28c..fe8d29bd0d51d 100644
--- a/lib/internal/Magento/Framework/Interception/Test/Unit/Config/ConfigTest.php
+++ b/lib/internal/Magento/Framework/Interception/Test/Unit/Config/ConfigTest.php
@@ -209,6 +209,9 @@ public function testHasPluginsWhenDataIsCached($expectedResult, $type)
$this->assertEquals($expectedResult, $model->hasPlugins($type));
}
+ /**
+ * @return array
+ */
public function hasPluginsDataProvider()
{
return [
diff --git a/lib/internal/Magento/Framework/Lock/Backend/Database.php b/lib/internal/Magento/Framework/Lock/Backend/Database.php
index 6d1bf07b5b331..61857685a7bb4 100644
--- a/lib/internal/Magento/Framework/Lock/Backend/Database.php
+++ b/lib/internal/Magento/Framework/Lock/Backend/Database.php
@@ -28,6 +28,13 @@ class Database implements \Magento\Framework\Lock\LockManagerInterface
/** @var string|false Holds current lock name if set, otherwise false */
private $currentLock = false;
+ /**
+ * Database constructor.
+ *
+ * @param ResourceConnection $resource
+ * @param DeploymentConfig $deploymentConfig
+ * @param string|null $prefix
+ */
public function __construct(
ResourceConnection $resource,
DeploymentConfig $deploymentConfig,
diff --git a/lib/internal/Magento/Framework/Mail/Template/TransportBuilderByStore.php b/lib/internal/Magento/Framework/Mail/Template/TransportBuilderByStore.php
index 785c93824a57d..95f17fed1123c 100644
--- a/lib/internal/Magento/Framework/Mail/Template/TransportBuilderByStore.php
+++ b/lib/internal/Magento/Framework/Mail/Template/TransportBuilderByStore.php
@@ -47,6 +47,7 @@ public function __construct(
public function setFromByStore($from, $store)
{
$result = $this->senderResolver->resolve($from, $store);
+ $this->message->clearFrom();
$this->message->setFrom($result['email'], $result['name']);
return $this;
diff --git a/lib/internal/Magento/Framework/Mail/Test/Unit/Template/TransportBuilderByStoreTest.php b/lib/internal/Magento/Framework/Mail/Test/Unit/Template/TransportBuilderByStoreTest.php
index 80df2887a3a93..58c9b045eed8c 100644
--- a/lib/internal/Magento/Framework/Mail/Test/Unit/Template/TransportBuilderByStoreTest.php
+++ b/lib/internal/Magento/Framework/Mail/Test/Unit/Template/TransportBuilderByStoreTest.php
@@ -58,6 +58,9 @@ public function testSetFromByStore()
->method('setFrom')
->with('from@example.com', 'name')
->willReturnSelf();
+ $this->messageMock->expects($this->once())
+ ->method('clearFrom')
+ ->willReturnSelf();
$this->model->setFromByStore($sender, $store);
}
diff --git a/lib/internal/Magento/Framework/Math/Test/Unit/RandomTest.php b/lib/internal/Magento/Framework/Math/Test/Unit/RandomTest.php
index cd7f52f95a850..1dcdb0e9ae65d 100644
--- a/lib/internal/Magento/Framework/Math/Test/Unit/RandomTest.php
+++ b/lib/internal/Magento/Framework/Math/Test/Unit/RandomTest.php
@@ -26,6 +26,9 @@ public function testGetRandomString($length, $chars = null)
}
}
+ /**
+ * @return array
+ */
public function getRandomStringDataProvider()
{
return [
@@ -77,6 +80,9 @@ public function testGetRandomNumber($min, $max)
$this->assertGreaterThanOrEqual($min, $number);
}
+ /**
+ * @return array
+ */
public function testGetRandomNumberProvider()
{
return [
diff --git a/lib/internal/Magento/Framework/Message/Test/Unit/ManagerTest.php b/lib/internal/Magento/Framework/Message/Test/Unit/ManagerTest.php
index f2b496b157c54..ea86985f057bf 100644
--- a/lib/internal/Magento/Framework/Message/Test/Unit/ManagerTest.php
+++ b/lib/internal/Magento/Framework/Message/Test/Unit/ManagerTest.php
@@ -308,6 +308,9 @@ public function testAddMessage($type, $methodName)
$this->assertTrue($this->model->hasMessages());
}
+ /**
+ * @return array
+ */
public function addMessageDataProvider()
{
return [
@@ -338,6 +341,9 @@ public function testAddUniqueMessagesWhenMessagesImplementMessageInterface($mess
$this->model->addUniqueMessages([$messages]);
}
+ /**
+ * @return array
+ */
public function addUniqueMessagesWhenMessagesImplementMessageInterfaceDataProvider()
{
return [
@@ -371,6 +377,9 @@ public function testAddUniqueMessages($messages)
$this->model->addUniqueMessages($messages);
}
+ /**
+ * @return array
+ */
public function addUniqueMessagesDataProvider()
{
return [
diff --git a/lib/internal/Magento/Framework/Model/Test/Unit/ResourceModel/Db/AbstractDbTest.php b/lib/internal/Magento/Framework/Model/Test/Unit/ResourceModel/Db/AbstractDbTest.php
index 966c8f9590cd7..8cd2646815551 100644
--- a/lib/internal/Magento/Framework/Model/Test/Unit/ResourceModel/Db/AbstractDbTest.php
+++ b/lib/internal/Magento/Framework/Model/Test/Unit/ResourceModel/Db/AbstractDbTest.php
@@ -163,6 +163,9 @@ public function testGetMainTable($tableName, $expectedResult)
$this->assertEquals($expectedResult, $this->_model->getMainTable());
}
+ /**
+ * @return array
+ */
public function getTableDataProvider()
{
return [
@@ -217,6 +220,9 @@ public function testGetChecksum($checksum, $expected)
$this->assertEquals($expected, $this->_model->getChecksum($checksum));
}
+ /**
+ * @return array
+ */
public function getChecksumProvider()
{
return [
@@ -399,6 +405,9 @@ public function testGetDataChanged($getOriginData, $expected)
$this->assertEquals($expected, $this->_model->hasDataChanged($abstractModelMock));
}
+ /**
+ * @return array
+ */
public function hasDataChangedDataProvider()
{
return [
diff --git a/lib/internal/Magento/Framework/Model/Test/Unit/ResourceModel/Db/Collection/AbstractCollectionTest.php b/lib/internal/Magento/Framework/Model/Test/Unit/ResourceModel/Db/Collection/AbstractCollectionTest.php
index bfd9b5a63d21b..147cac47d3829 100644
--- a/lib/internal/Magento/Framework/Model/Test/Unit/ResourceModel/Db/Collection/AbstractCollectionTest.php
+++ b/lib/internal/Magento/Framework/Model/Test/Unit/ResourceModel/Db/Collection/AbstractCollectionTest.php
@@ -95,6 +95,9 @@ protected function tearDown()
\Magento\Framework\App\ObjectManager::setInstance($objectManagerMock);
}
+ /**
+ * @return object
+ */
protected function getUut()
{
return $this->objectManagerHelper->getObject(
@@ -220,6 +223,9 @@ public function testGetSelect($idFieldNameRet, $getPartRet, $expected)
$this->assertTrue($this->uut->getSelect() instanceof Select);
}
+ /**
+ * @return array
+ */
public function getSelectDataProvider()
{
$columnMock = $this->createPartialMock(\Zend_Db_Expr::class, ['__toString']);
@@ -246,6 +252,9 @@ public function testAddFieldToSelect($field, $alias, $expectedFieldsToSelect)
$this->assertTrue($this->uut->wereFieldsToSelectChanged());
}
+ /**
+ * @return array
+ */
public function addFieldToSelectDataProvider()
{
return [
@@ -265,6 +274,9 @@ public function testAddExpressionFieldToSelect($alias, $expression, $fields, $ex
$this->assertTrue($this->uut->addExpressionFieldToSelect($alias, $expression, $fields) instanceof Uut);
}
+ /**
+ * @return array
+ */
public function addExpressionFieldToSelectDataProvider()
{
return [
@@ -289,6 +301,9 @@ public function testRemoveFieldFromSelect(
$this->assertEquals($expectedWereFieldsToSelectChanged, $this->uut->wereFieldsToSelectChanged());
}
+ /**
+ * @return array
+ */
public function removeFieldFromSelectDataProvider()
{
return [
@@ -376,6 +391,9 @@ public function testJoin($table, $cond, $cols, $expected)
$this->assertEquals($expected, $this->uut->getJoinedTables());
}
+ /**
+ * @return array
+ */
public function joinDataProvider()
{
return [
diff --git a/lib/internal/Magento/Framework/Model/Test/Unit/ResourceModel/Db/Collection/Uut.php b/lib/internal/Magento/Framework/Model/Test/Unit/ResourceModel/Db/Collection/Uut.php
index e55dbb3c9c3da..b224dccc83d03 100644
--- a/lib/internal/Magento/Framework/Model/Test/Unit/ResourceModel/Db/Collection/Uut.php
+++ b/lib/internal/Magento/Framework/Model/Test/Unit/ResourceModel/Db/Collection/Uut.php
@@ -13,26 +13,41 @@
*/
class Uut extends AbstractCollection
{
+ /**
+ * @return bool
+ */
public function wereFieldsToSelectChanged()
{
return $this->_fieldsToSelectChanged;
}
+ /**
+ * @return array|null
+ */
public function getFieldsToSelect()
{
return $this->_fieldsToSelect;
}
+ /**
+ * @param array $fields
+ */
public function setFieldsToSelect(array $fields)
{
$this->_fieldsToSelect = $fields;
}
+ /**
+ * @param $resource
+ */
public function setResource($resource)
{
$this->_resource = $resource;
}
+ /**
+ * @return array
+ */
public function getJoinedTables()
{
return $this->_joinedTables;
diff --git a/lib/internal/Magento/Framework/Module/Test/Unit/Declaration/Converter/DomTest.php b/lib/internal/Magento/Framework/Module/Test/Unit/Declaration/Converter/DomTest.php
index ec9b41ff1b957..930b1a21cfd26 100644
--- a/lib/internal/Magento/Framework/Module/Test/Unit/Declaration/Converter/DomTest.php
+++ b/lib/internal/Magento/Framework/Module/Test/Unit/Declaration/Converter/DomTest.php
@@ -42,6 +42,9 @@ public function testConvertWithInvalidDom($xmlString)
}
}
+ /**
+ * @return array
+ */
public function convertWithInvalidDomDataProvider()
{
return [
diff --git a/lib/internal/Magento/Framework/Module/Test/Unit/Dir/ReverseResolverTest.php b/lib/internal/Magento/Framework/Module/Test/Unit/Dir/ReverseResolverTest.php
index f7a20252826ae..eb849fc457ddb 100644
--- a/lib/internal/Magento/Framework/Module/Test/Unit/Dir/ReverseResolverTest.php
+++ b/lib/internal/Magento/Framework/Module/Test/Unit/Dir/ReverseResolverTest.php
@@ -54,6 +54,9 @@ public function testGetModuleName($path, $expectedResult)
$this->assertSame($expectedResult, $this->_model->getModuleName($path));
}
+ /**
+ * @return array
+ */
public function getModuleNameDataProvider()
{
return [
diff --git a/lib/internal/Magento/Framework/Module/Test/Unit/ManagerTest.php b/lib/internal/Magento/Framework/Module/Test/Unit/ManagerTest.php
index 44185b52b19a4..12ddfea8c83d1 100644
--- a/lib/internal/Magento/Framework/Module/Test/Unit/ManagerTest.php
+++ b/lib/internal/Magento/Framework/Module/Test/Unit/ManagerTest.php
@@ -83,6 +83,9 @@ public function testIsOutputEnabledGenericConfigPath($configValue, $expectedResu
$this->assertEquals($expectedResult, $this->_model->isOutputEnabled('Module_One'));
}
+ /**
+ * @return array
+ */
public function isOutputEnabledGenericConfigPathDataProvider()
{
return ['output disabled' => [true, false], 'output enabled' => [false, true]];
@@ -103,6 +106,9 @@ public function testIsOutputEnabledCustomConfigPath($configValue, $expectedResul
$this->assertEquals($expectedResult, $this->_model->isOutputEnabled('Module_Two'));
}
+ /**
+ * @return array
+ */
public function isOutputEnabledCustomConfigPathDataProvider()
{
return [
diff --git a/lib/internal/Magento/Framework/Mview/Test/Unit/View/ChangelogTest.php b/lib/internal/Magento/Framework/Mview/Test/Unit/View/ChangelogTest.php
index c91b56560eb75..a7742700acc83 100644
--- a/lib/internal/Magento/Framework/Mview/Test/Unit/View/ChangelogTest.php
+++ b/lib/internal/Magento/Framework/Mview/Test/Unit/View/ChangelogTest.php
@@ -259,6 +259,10 @@ protected function mockGetTableName()
$this->resourceMock->expects($this->once())->method('getTableName')->will($this->returnArgument(0));
}
+ /**
+ * @param $changelogTableName
+ * @param $result
+ */
protected function mockIsTableExists($changelogTableName, $result)
{
$this->connectionMock->expects(
diff --git a/lib/internal/Magento/Framework/Mview/Test/Unit/ViewTest.php b/lib/internal/Magento/Framework/Mview/Test/Unit/ViewTest.php
index 3fd8ea93c9bbe..3f806b319ef48 100644
--- a/lib/internal/Magento/Framework/Mview/Test/Unit/ViewTest.php
+++ b/lib/internal/Magento/Framework/Mview/Test/Unit/ViewTest.php
@@ -464,6 +464,9 @@ public function testResumeNotSuspended($status)
$this->model->resume();
}
+ /**
+ * @return array
+ */
public function dataProviderResumeNotSuspended()
{
return [
@@ -520,6 +523,9 @@ public function testIsEnabled($mode, $result)
$this->assertEquals($result, $this->model->isEnabled());
}
+ /**
+ * @return array
+ */
public function dataProviderIsEnabled()
{
return [
@@ -541,6 +547,9 @@ public function testIsIdle($status, $result)
$this->assertEquals($result, $this->model->isIdle());
}
+ /**
+ * @return array
+ */
public function dataProviderIsIdle()
{
return [
@@ -563,6 +572,9 @@ public function testIsWorking($status, $result)
$this->assertEquals($result, $this->model->isWorking());
}
+ /**
+ * @return array
+ */
public function dataProviderIsWorking()
{
return [
@@ -585,6 +597,9 @@ public function testIsSuspended($status, $result)
$this->assertEquals($result, $this->model->isSuspended());
}
+ /**
+ * @return array
+ */
public function dataProviderIsSuspended()
{
return [
@@ -617,6 +632,9 @@ protected function loadView()
$this->model->load($viewId);
}
+ /**
+ * @return array
+ */
protected function getViewData()
{
return [
diff --git a/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Code/Generator/RepositoryTest.php b/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Code/Generator/RepositoryTest.php
index 1bba19cb16a5a..27ecdff1dcb82 100644
--- a/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Code/Generator/RepositoryTest.php
+++ b/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Code/Generator/RepositoryTest.php
@@ -13,21 +13,33 @@
*/
class RepositoryTest extends EntityChildTestAbstract
{
+ /**
+ * @return mixed|string
+ */
protected function getSourceClassName()
{
return '\\' . \Magento\Framework\ObjectManager\Code\Generator\Sample::class;
}
+ /**
+ * @return mixed|string
+ */
protected function getResultClassName()
{
return '\\' . \Magento\Framework\ObjectManager\Code\Generator\Sample\Repository::class;
}
+ /**
+ * @return mixed|string
+ */
protected function getGeneratorClassName()
{
return '\\' . \Magento\Framework\ObjectManager\Code\Generator\Repository::class;
}
+ /**
+ * @return mixed|string
+ */
protected function getOutputFileName()
{
return 'SampleConverter.php';
diff --git a/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Code/Generator/_files/SampleRepositoryInterface.php b/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Code/Generator/_files/SampleRepositoryInterface.php
index 0bc899f580071..58e334f0022a7 100644
--- a/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Code/Generator/_files/SampleRepositoryInterface.php
+++ b/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Code/Generator/_files/SampleRepositoryInterface.php
@@ -7,11 +7,31 @@
interface SampleRepositoryInterface
{
+ /**
+ * @param SampleInterface $entity
+ *
+ * @return mixed
+ */
public function save(\Magento\Framework\ObjectManager\Code\Generator\SampleInterface $entity);
+ /**
+ * @param $id
+ *
+ * @return mixed
+ */
public function get($id);
+ /**
+ * @param $id
+ *
+ * @return mixed
+ */
public function deleteById($id);
+ /**
+ * @param SampleInterface $entity
+ *
+ * @return mixed
+ */
public function delete(\Magento\Framework\ObjectManager\Code\Generator\SampleInterface $entity);
}
diff --git a/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Code/Generator/_files/TSampleRepositoryInterface.php b/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Code/Generator/_files/TSampleRepositoryInterface.php
index 99ab4ecadcd41..b916ab18e2e70 100644
--- a/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Code/Generator/_files/TSampleRepositoryInterface.php
+++ b/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Code/Generator/_files/TSampleRepositoryInterface.php
@@ -7,10 +7,25 @@
interface TSampleRepositoryInterface
{
+ /**
+ * @param int $id
+ *
+ * @return TSampleInterface
+ */
public function get(int $id) : \Magento\Framework\ObjectManager\Code\Generator\TSampleInterface;
+ /**
+ * @param TSampleInterface $entity
+ *
+ * @return bool
+ */
public function delete(\Magento\Framework\ObjectManager\Code\Generator\TSampleInterface $entity) : bool;
+ /**
+ * @param TSampleInterface $entity
+ *
+ * @return TSampleInterface
+ */
public function save(\Magento\Framework\ObjectManager\Code\Generator\TSampleInterface $entity)
: \Magento\Framework\ObjectManager\Code\Generator\TSampleInterface;
}
diff --git a/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Config/Reader/_files/ConfigDomMock.php b/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Config/Reader/_files/ConfigDomMock.php
index 6be8d7ffde874..e885c07b7c298 100644
--- a/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Config/Reader/_files/ConfigDomMock.php
+++ b/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Config/Reader/_files/ConfigDomMock.php
@@ -32,6 +32,9 @@ public function validate($schemaFile, $errors)
return true;
}
+ /**
+ * @return string
+ */
public function getDom()
{
return 'reader dom result';
diff --git a/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Factory/FactoryTest.php b/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Factory/FactoryTest.php
index 8deb2750653e7..25a49074c1ad3 100644
--- a/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Factory/FactoryTest.php
+++ b/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Factory/FactoryTest.php
@@ -37,7 +37,7 @@ protected function setUp()
public function testCreateNoArgs()
{
- $this->assertInstanceOf('StdClass', $this->factory->create(\StdClass::class));
+ $this->assertInstanceOf('StdClass', $this->factory->create(\stdClass::class));
}
/**
diff --git a/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Relations/RuntimeTest.php b/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Relations/RuntimeTest.php
index 1c88ab65021c4..0beeeb5e69738 100644
--- a/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Relations/RuntimeTest.php
+++ b/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Relations/RuntimeTest.php
@@ -30,6 +30,9 @@ public function testGetParents($type, $parents)
$this->assertEquals($parents, $this->model->getParents($type));
}
+ /**
+ * @return array
+ */
public function getParentsDataProvider()
{
return [
diff --git a/lib/internal/Magento/Framework/ObjectManager/Test/Unit/_files/Aggregate/AggregateParent.php b/lib/internal/Magento/Framework/ObjectManager/Test/Unit/_files/Aggregate/AggregateParent.php
index 3c494b6abbb94..bee2a7eb6ad98 100644
--- a/lib/internal/Magento/Framework/ObjectManager/Test/Unit/_files/Aggregate/AggregateParent.php
+++ b/lib/internal/Magento/Framework/ObjectManager/Test/Unit/_files/Aggregate/AggregateParent.php
@@ -17,6 +17,15 @@ class AggregateParent implements \Magento\Test\Di\Aggregate\AggregateInterface
public $optionalScalar;
+ /**
+ * AggregateParent constructor.
+ *
+ * @param \Magento\Test\Di\DiInterface $interface
+ * @param \Magento\Test\Di\DiParent $parent
+ * @param \Magento\Test\Di\Child $child
+ * @param $scalar
+ * @param int $optionalScalar
+ */
public function __construct(
\Magento\Test\Di\DiInterface $interface,
\Magento\Test\Di\DiParent $parent,
diff --git a/lib/internal/Magento/Framework/ObjectManager/Test/Unit/_files/Aggregate/Child.php b/lib/internal/Magento/Framework/ObjectManager/Test/Unit/_files/Aggregate/Child.php
index b84375e3b5436..3577141ef0284 100644
--- a/lib/internal/Magento/Framework/ObjectManager/Test/Unit/_files/Aggregate/Child.php
+++ b/lib/internal/Magento/Framework/ObjectManager/Test/Unit/_files/Aggregate/Child.php
@@ -11,6 +11,17 @@ class Child extends \Magento\Test\Di\Aggregate\AggregateParent
public $secondOptionalScalar;
+ /**
+ * Child constructor.
+ *
+ * @param \Magento\Test\Di\DiInterface $interface
+ * @param \Magento\Test\Di\DiParent $parent
+ * @param \Magento\Test\Di\Child $child
+ * @param $scalar
+ * @param $secondScalar
+ * @param int $optionalScalar
+ * @param string $secondOptionalScalar
+ */
public function __construct(
\Magento\Test\Di\DiInterface $interface,
\Magento\Test\Di\DiParent $parent,
diff --git a/lib/internal/Magento/Framework/ObjectManager/Test/Unit/_files/Aggregate/WithOptional.php b/lib/internal/Magento/Framework/ObjectManager/Test/Unit/_files/Aggregate/WithOptional.php
index 1c5ac56e2735c..a68eb2c0fc64f 100644
--- a/lib/internal/Magento/Framework/ObjectManager/Test/Unit/_files/Aggregate/WithOptional.php
+++ b/lib/internal/Magento/Framework/ObjectManager/Test/Unit/_files/Aggregate/WithOptional.php
@@ -11,6 +11,12 @@ class WithOptional
public $child;
+ /**
+ * WithOptional constructor.
+ *
+ * @param \Magento\Test\Di\DiParent|null $parent
+ * @param \Magento\Test\Di\Child|null $child
+ */
public function __construct(\Magento\Test\Di\DiParent $parent = null, \Magento\Test\Di\Child $child = null)
{
$this->parent = $parent;
diff --git a/lib/internal/Magento/Framework/Pricing/Test/Unit/Adjustment/CollectionTest.php b/lib/internal/Magento/Framework/Pricing/Test/Unit/Adjustment/CollectionTest.php
index 9c23b38182f91..edcc4a7e56717 100644
--- a/lib/internal/Magento/Framework/Pricing/Test/Unit/Adjustment/CollectionTest.php
+++ b/lib/internal/Magento/Framework/Pricing/Test/Unit/Adjustment/CollectionTest.php
@@ -79,6 +79,9 @@ public function testGetItems($adjustments, $expectedResult)
$this->assertEmpty(array_diff($expectedResult, array_keys($result)));
}
+ /**
+ * @return array
+ */
public function getItemsDataProvider()
{
return [
@@ -104,6 +107,9 @@ public function testGetItemByCode($adjustments, $code, $expectedResult)
$this->assertEquals($expectedResult, $item->getAdjustmentCode());
}
+ /**
+ * @return array
+ */
public function getItemByCodeDataProvider()
{
return [
diff --git a/lib/internal/Magento/Framework/Pricing/Test/Unit/Adjustment/PoolTest.php b/lib/internal/Magento/Framework/Pricing/Test/Unit/Adjustment/PoolTest.php
index 6fca39b2082fb..adf9ffae16390 100644
--- a/lib/internal/Magento/Framework/Pricing/Test/Unit/Adjustment/PoolTest.php
+++ b/lib/internal/Magento/Framework/Pricing/Test/Unit/Adjustment/PoolTest.php
@@ -65,6 +65,9 @@ public function testGetAdjustmentByCode($code, $expectedResult)
$this->assertEquals($expectedResult, $result);
}
+ /**
+ * @return array
+ */
public function getAdjustmentByCodeDataProvider()
{
return [
diff --git a/lib/internal/Magento/Framework/Pricing/Test/Unit/Helper/DataTest.php b/lib/internal/Magento/Framework/Pricing/Test/Unit/Helper/DataTest.php
index 2abf26601fbea..42af3268e559b 100644
--- a/lib/internal/Magento/Framework/Pricing/Test/Unit/Helper/DataTest.php
+++ b/lib/internal/Magento/Framework/Pricing/Test/Unit/Helper/DataTest.php
@@ -50,6 +50,9 @@ public function testCurrency($amount, $format, $includeContainer, $result)
$this->assertEquals($result, $helper->currency($amount, $format, $includeContainer));
}
+ /**
+ * @return array
+ */
public function currencyDataProvider()
{
return [
@@ -84,6 +87,9 @@ public function testCurrencyByStore($amount, $store, $format, $includeContainer,
$this->assertEquals($result, $helper->currencyByStore($amount, $store, $format, $includeContainer));
}
+ /**
+ * @return array
+ */
public function currencyByStoreDataProvider()
{
return [
diff --git a/lib/internal/Magento/Framework/Pricing/Test/Unit/PriceInfo/FactoryTest.php b/lib/internal/Magento/Framework/Pricing/Test/Unit/PriceInfo/FactoryTest.php
index 5d1ab67e09587..ebe2fb453ca83 100644
--- a/lib/internal/Magento/Framework/Pricing/Test/Unit/PriceInfo/FactoryTest.php
+++ b/lib/internal/Magento/Framework/Pricing/Test/Unit/PriceInfo/FactoryTest.php
@@ -80,6 +80,9 @@ protected function setUp()
$this->factory = new Factory($this->types, $this->objectManagerMock);
}
+ /**
+ * @return array
+ */
public function createPriceInfoDataProvider()
{
return [
diff --git a/lib/internal/Magento/Framework/Pricing/Test/Unit/Render/AmountTest.php b/lib/internal/Magento/Framework/Pricing/Test/Unit/Render/AmountTest.php
index 009fb8236c4dc..70eef212c6878 100644
--- a/lib/internal/Magento/Framework/Pricing/Test/Unit/Render/AmountTest.php
+++ b/lib/internal/Magento/Framework/Pricing/Test/Unit/Render/AmountTest.php
@@ -277,6 +277,13 @@ public function testAdjustmentsHtml()
$this->assertEquals($adjustmentHtml1 . $adjustmentHtml2, $this->model->getAdjustmentsHtml());
}
+ /**
+ * @param array $data
+ * @param string $html
+ * @param string $code
+ *
+ * @return \PHPUnit_Framework_MockObject_MockObject
+ */
protected function getAdjustmentRenderMock($data = [], $html = '', $code = 'adjustment_code')
{
$adjustmentRender = $this->getMockForAbstractClass(
diff --git a/lib/internal/Magento/Framework/Pricing/Test/Unit/Render/PriceBoxTest.php b/lib/internal/Magento/Framework/Pricing/Test/Unit/Render/PriceBoxTest.php
index 905569936d036..f4588f7d25672 100644
--- a/lib/internal/Magento/Framework/Pricing/Test/Unit/Render/PriceBoxTest.php
+++ b/lib/internal/Magento/Framework/Pricing/Test/Unit/Render/PriceBoxTest.php
@@ -122,6 +122,9 @@ public function testToHtml($data, $priceCode, $cssClasses)
$this->assertEquals($cssClasses, $priceBox->getData('css_classes'));
}
+ /**
+ * @return array
+ */
public function toHtmlDataProvider()
{
return [
@@ -225,6 +228,9 @@ public function testGetPriceId($prefix, $suffix, $defaultPrefix, $defaultSuffix)
$this->assertEquals($expectedPriceId, $this->model->getPriceId($defaultPrefix, $defaultSuffix));
}
+ /**
+ * @return array
+ */
public function getPriceIdProvider()
{
return [
diff --git a/lib/internal/Magento/Framework/Reflection/Test/Unit/DataObjectProcessorTest.php b/lib/internal/Magento/Framework/Reflection/Test/Unit/DataObjectProcessorTest.php
index ed26efb5bff64..1977ed3f46456 100644
--- a/lib/internal/Magento/Framework/Reflection/Test/Unit/DataObjectProcessorTest.php
+++ b/lib/internal/Magento/Framework/Reflection/Test/Unit/DataObjectProcessorTest.php
@@ -86,6 +86,9 @@ public function testBuildOutputDataArray($extensionAttributes, $expectedOutputDa
$this->assertEquals($expectedOutputDataArray, $outputData);
}
+ /**
+ * @return array
+ */
public function buildOutputDataArrayDataProvider()
{
$expectedOutputDataArray = [
diff --git a/lib/internal/Magento/Framework/Reflection/Test/Unit/ExtensionAttributesProcessorTest.php b/lib/internal/Magento/Framework/Reflection/Test/Unit/ExtensionAttributesProcessorTest.php
index 130c285bd3b08..6aebd99deabb0 100644
--- a/lib/internal/Magento/Framework/Reflection/Test/Unit/ExtensionAttributesProcessorTest.php
+++ b/lib/internal/Magento/Framework/Reflection/Test/Unit/ExtensionAttributesProcessorTest.php
@@ -154,6 +154,9 @@ public function testBuildOutputDataArrayWithPermission($isPermissionAllowed, $ex
);
}
+ /**
+ * @return array
+ */
public function buildOutputDataArrayWithPermissionProvider()
{
return [
diff --git a/lib/internal/Magento/Framework/Reflection/Test/Unit/TestDataObject.php b/lib/internal/Magento/Framework/Reflection/Test/Unit/TestDataObject.php
index 4e40fe6860586..8cc173d6dee2d 100644
--- a/lib/internal/Magento/Framework/Reflection/Test/Unit/TestDataObject.php
+++ b/lib/internal/Magento/Framework/Reflection/Test/Unit/TestDataObject.php
@@ -9,31 +9,51 @@ class TestDataObject implements TestDataInterface
{
private $extensionAttributes;
+ /**
+ * TestDataObject constructor.
+ *
+ * @param null $extensionAttributes
+ */
public function __construct($extensionAttributes = null)
{
$this->extensionAttributes = $extensionAttributes;
}
+ /**
+ * @return string
+ */
public function getId()
{
return '1';
}
+ /**
+ * @return string
+ */
public function getAddress()
{
return 'someAddress';
}
+ /**
+ * @return string
+ */
public function isDefaultShipping()
{
return 'true';
}
+ /**
+ * @return string
+ */
public function isRequiredBilling()
{
return 'false';
}
+ /**
+ * @return \Magento\Framework\Api\ExtensionAttributesInterface|null
+ */
public function getExtensionAttributes()
{
return $this->extensionAttributes;
diff --git a/lib/internal/Magento/Framework/Reflection/Test/Unit/TypeProcessorTest.php b/lib/internal/Magento/Framework/Reflection/Test/Unit/TypeProcessorTest.php
index 75a31ddcad6fe..999bca8ad3fc4 100644
--- a/lib/internal/Magento/Framework/Reflection/Test/Unit/TypeProcessorTest.php
+++ b/lib/internal/Magento/Framework/Reflection/Test/Unit/TypeProcessorTest.php
@@ -220,6 +220,9 @@ public function testProcessSimpleTypeException($value, $type)
$this->typeProcessor->processSimpleAndAnyType($value, $type);
}
+ /**
+ * @return array
+ */
public static function processSimpleTypeExceptionProvider()
{
return [
diff --git a/lib/internal/Magento/Framework/RequireJs/Config.php b/lib/internal/Magento/Framework/RequireJs/Config.php
index 08131b2cccea3..ae45e29f38911 100644
--- a/lib/internal/Magento/Framework/RequireJs/Config.php
+++ b/lib/internal/Magento/Framework/RequireJs/Config.php
@@ -157,7 +157,7 @@ public function getConfig()
$customConfigFiles = $this->fileSource->getFiles($this->design->getDesignTheme(), self::CONFIG_FILE_NAME);
foreach ($customConfigFiles as $file) {
/** @var $fileReader \Magento\Framework\Filesystem\File\Read */
- $fileReader = $this->readFactory->create($file->getFileName(), DriverPool::FILE);
+ $fileReader = $this->readFactory->create($file->getFilename(), DriverPool::FILE);
$config = $fileReader->readAll($file->getName());
$distributedConfig .= str_replace(
['%config%', '%context%'],
diff --git a/lib/internal/Magento/Framework/Search/Test/Unit/Request/MapperTest.php b/lib/internal/Magento/Framework/Search/Test/Unit/Request/MapperTest.php
index c5e18423eab07..2a3e46b8887a6 100644
--- a/lib/internal/Magento/Framework/Search/Test/Unit/Request/MapperTest.php
+++ b/lib/internal/Magento/Framework/Search/Test/Unit/Request/MapperTest.php
@@ -852,6 +852,9 @@ public function testGetFilterException()
$this->assertEquals($this->queryBool, $mapper->getRootQuery());
}
+ /**
+ * @return array
+ */
public function getQueryMatchProvider()
{
return [
@@ -879,6 +882,9 @@ public function getQueryMatchProvider()
];
}
+ /**
+ * @return array
+ */
public function getQueryFilterQueryReferenceProvider()
{
return [
@@ -926,6 +932,9 @@ public function getQueryFilterQueryReferenceProvider()
];
}
+ /**
+ * @return array
+ */
public function getQueryBoolProvider()
{
return [
diff --git a/lib/internal/Magento/Framework/Serialize/Test/Unit/Serializer/Base64JsonTest.php b/lib/internal/Magento/Framework/Serialize/Test/Unit/Serializer/Base64JsonTest.php
index 8cad058f88466..e93164537f927 100644
--- a/lib/internal/Magento/Framework/Serialize/Test/Unit/Serializer/Base64JsonTest.php
+++ b/lib/internal/Magento/Framework/Serialize/Test/Unit/Serializer/Base64JsonTest.php
@@ -30,6 +30,9 @@ public function testSerialize($value, $expected)
$this->assertEquals($expected, $this->base64json->serialize($value));
}
+ /**
+ * @return array
+ */
public function serializeDataProvider()
{
$dataObject = new \Magento\Framework\DataObject(['something']);
@@ -55,6 +58,9 @@ public function testUnserialize($value, $expected)
$this->assertEquals($expected, $this->base64json->unserialize($value));
}
+ /**
+ * @return array
+ */
public function unserializeDataProvider()
{
return [
diff --git a/lib/internal/Magento/Framework/Serialize/Test/Unit/Serializer/JsonTest.php b/lib/internal/Magento/Framework/Serialize/Test/Unit/Serializer/JsonTest.php
index d1fddbbdf2778..235567103edf7 100644
--- a/lib/internal/Magento/Framework/Serialize/Test/Unit/Serializer/JsonTest.php
+++ b/lib/internal/Magento/Framework/Serialize/Test/Unit/Serializer/JsonTest.php
@@ -34,6 +34,9 @@ public function testSerialize($value, $expected)
);
}
+ /**
+ * @return array
+ */
public function serializeDataProvider()
{
$dataObject = new DataObject(['something']);
@@ -62,6 +65,9 @@ public function testUnserialize($value, $expected)
);
}
+ /**
+ * @return array
+ */
public function unserializeDataProvider()
{
return [
@@ -95,6 +101,9 @@ public function testUnserializeException($value)
$this->json->unserialize($value);
}
+ /**
+ * @return array
+ */
public function unserializeExceptionDataProvider()
{
return [
diff --git a/lib/internal/Magento/Framework/Serialize/Test/Unit/Serializer/SerializeTest.php b/lib/internal/Magento/Framework/Serialize/Test/Unit/Serializer/SerializeTest.php
index e74de735c1c1e..1f8e7cf9d0bc3 100644
--- a/lib/internal/Magento/Framework/Serialize/Test/Unit/Serializer/SerializeTest.php
+++ b/lib/internal/Magento/Framework/Serialize/Test/Unit/Serializer/SerializeTest.php
@@ -33,6 +33,9 @@ public function testSerialize($value, $serializedValue)
$this->assertEquals($serializedValue, $this->serialize->serialize($value));
}
+ /**
+ * @return array
+ */
public function serializeDataProvider()
{
return [
@@ -56,6 +59,9 @@ public function testUnserialize($serializedValue, $value)
$this->assertEquals($value, $this->serialize->unserialize($serializedValue));
}
+ /**
+ * @return array
+ */
public function unserializeDataProvider()
{
return [
@@ -88,6 +94,9 @@ public function testUnserializeException($value)
$this->serialize->unserialize($value);
}
+ /**
+ * @return array
+ */
public function unserializeExceptionDataProvider()
{
return [
diff --git a/lib/internal/Magento/Framework/Session/Test/Unit/ConfigTest.php b/lib/internal/Magento/Framework/Session/Test/Unit/ConfigTest.php
index 12e28cdb3970d..3df8f182fe37e 100644
--- a/lib/internal/Magento/Framework/Session/Test/Unit/ConfigTest.php
+++ b/lib/internal/Magento/Framework/Session/Test/Unit/ConfigTest.php
@@ -82,6 +82,9 @@ public function testSetOptions($option, $getter, $value)
$this->assertSame($value, $this->config->{$getter}());
}
+ /**
+ * @return array
+ */
public function optionsProvider()
{
return [
@@ -343,6 +346,9 @@ public function testConstructor($isValidSame, $isValid, $expected)
$this->assertEquals($expected, $this->config->getOptions());
}
+ /**
+ * @return array
+ */
public function constructorDataProvider()
{
return [
diff --git a/lib/internal/Magento/Framework/Session/Test/Unit/SaveHandler/Redis/LoggerTest.php b/lib/internal/Magento/Framework/Session/Test/Unit/SaveHandler/Redis/LoggerTest.php
index 18050da435c32..4594a471e008d 100644
--- a/lib/internal/Magento/Framework/Session/Test/Unit/SaveHandler/Redis/LoggerTest.php
+++ b/lib/internal/Magento/Framework/Session/Test/Unit/SaveHandler/Redis/LoggerTest.php
@@ -70,6 +70,9 @@ public function testLog($logLevel, $method)
$this->logger->log($message, $logLevel);
}
+ /**
+ * @return array
+ */
public function logDataProvider()
{
return [
diff --git a/lib/internal/Magento/Framework/Shell/Test/Unit/CommandRendererTest.php b/lib/internal/Magento/Framework/Shell/Test/Unit/CommandRendererTest.php
index 213e2afa2c655..01964bdced655 100644
--- a/lib/internal/Magento/Framework/Shell/Test/Unit/CommandRendererTest.php
+++ b/lib/internal/Magento/Framework/Shell/Test/Unit/CommandRendererTest.php
@@ -24,6 +24,9 @@ public function testRender($expectedCommand, $actualCommand, $testArguments)
);
}
+ /**
+ * @return array
+ */
public function commandsDataProvider()
{
$testArgument = 'argument';
diff --git a/lib/internal/Magento/Framework/Simplexml/Test/Unit/ElementTest.php b/lib/internal/Magento/Framework/Simplexml/Test/Unit/ElementTest.php
index 2455b8f3cb500..ea2149e6f9e34 100644
--- a/lib/internal/Magento/Framework/Simplexml/Test/Unit/ElementTest.php
+++ b/lib/internal/Magento/Framework/Simplexml/Test/Unit/ElementTest.php
@@ -108,6 +108,9 @@ public function testSetAttribute($name, $value)
$this->assertEquals($xml->getAttribute($name), $value);
}
+ /**
+ * @return array
+ */
public function setAttributeDataProvider()
{
return [
diff --git a/lib/internal/Magento/Framework/Stdlib/Test/Unit/BooleanUtilsTest.php b/lib/internal/Magento/Framework/Stdlib/Test/Unit/BooleanUtilsTest.php
index 26dcbc81262a2..64eb1e9c4bf39 100644
--- a/lib/internal/Magento/Framework/Stdlib/Test/Unit/BooleanUtilsTest.php
+++ b/lib/internal/Magento/Framework/Stdlib/Test/Unit/BooleanUtilsTest.php
@@ -38,6 +38,9 @@ public function testToBoolean($input, $expected)
$this->assertSame($expected, $actual);
}
+ /**
+ * @return array
+ */
public function toBooleanDataProvider()
{
return [
@@ -64,6 +67,9 @@ public function testToBooleanException($input)
$this->object->toBoolean($input);
}
+ /**
+ * @return array
+ */
public function toBooleanExceptionDataProvider()
{
return [
diff --git a/lib/internal/Magento/Framework/Stdlib/Test/Unit/Cookie/PhpCookieManagerTest.php b/lib/internal/Magento/Framework/Stdlib/Test/Unit/Cookie/PhpCookieManagerTest.php
index f6f6a19c170c8..29e54157ebb22 100644
--- a/lib/internal/Magento/Framework/Stdlib/Test/Unit/Cookie/PhpCookieManagerTest.php
+++ b/lib/internal/Magento/Framework/Stdlib/Test/Unit/Cookie/PhpCookieManagerTest.php
@@ -274,6 +274,9 @@ public function testSetSensitiveCookieNoMetadata($cookieName, $secure)
$this->assertTrue(self::$isSetCookieInvoked);
}
+ /**
+ * @return array
+ */
public function isCurrentlySecureDataProvider()
{
return [
@@ -898,6 +901,11 @@ private static function assertZeroDuration(
self::assertEquals('', $path);
}
+ /**
+ * @param $get
+ * @param $default
+ * @param $return
+ */
protected function stubGetCookie($get, $default, $return)
{
$this->readerMock->expects($this->atLeastOnce())
diff --git a/lib/internal/Magento/Framework/Stdlib/Test/Unit/Cookie/SensitiveCookieMetadataTest.php b/lib/internal/Magento/Framework/Stdlib/Test/Unit/Cookie/SensitiveCookieMetadataTest.php
index 9015968cee85c..d409a89c2cc91 100644
--- a/lib/internal/Magento/Framework/Stdlib/Test/Unit/Cookie/SensitiveCookieMetadataTest.php
+++ b/lib/internal/Magento/Framework/Stdlib/Test/Unit/Cookie/SensitiveCookieMetadataTest.php
@@ -59,6 +59,9 @@ public function testConstructorAndGetHttpOnly($metadata, $httpOnly)
$this->assertEquals('path', $object->getPath());
}
+ /**
+ * @return array
+ */
public function constructorAndGetHttpOnlyTestDataProvider()
{
return [
@@ -104,6 +107,9 @@ public function testGetSecure($isSecure, $metadata, $expected, $callNum = 1)
$this->assertEquals($expected, $object->getSecure());
}
+ /**
+ * @return array
+ */
public function getSecureDataProvider()
{
return [
@@ -160,6 +166,9 @@ public function testToArray($isSecure, $metadata, $expected, $callNum = 1)
$this->assertEquals($expected, $object->__toArray());
}
+ /**
+ * @return array
+ */
public function toArrayDataProvider()
{
return [
diff --git a/lib/internal/Magento/Framework/Stdlib/Test/Unit/DateTime/DateTimeFormatterTest.php b/lib/internal/Magento/Framework/Stdlib/Test/Unit/DateTime/DateTimeFormatterTest.php
index 5012c6a47f1c5..f90b1b2c3fd15 100644
--- a/lib/internal/Magento/Framework/Stdlib/Test/Unit/DateTime/DateTimeFormatterTest.php
+++ b/lib/internal/Magento/Framework/Stdlib/Test/Unit/DateTime/DateTimeFormatterTest.php
@@ -133,6 +133,6 @@ public function testFormatObjectIfPassedWrongFormat()
$reflectionProperty = $reflection->getProperty('localeResolver');
$reflectionProperty->setAccessible(true);
$reflectionProperty->setValue($dateTimeFormatter, $this->localeResolverMock);
- $dateTimeFormatter->formatObject(new \DateTime('2013-06-06 17:05:06 Europe/Dublin'), new \StdClass());
+ $dateTimeFormatter->formatObject(new \DateTime('2013-06-06 17:05:06 Europe/Dublin'), new \stdClass());
}
}
diff --git a/lib/internal/Magento/Framework/Test/Unit/ArchiveTest.php b/lib/internal/Magento/Framework/Test/Unit/ArchiveTest.php
index 68be50810d44f..d4a19428c61a0 100644
--- a/lib/internal/Magento/Framework/Test/Unit/ArchiveTest.php
+++ b/lib/internal/Magento/Framework/Test/Unit/ArchiveTest.php
@@ -64,6 +64,9 @@ public function testIsArchive($file, $isArchive)
$this->assertEquals($isArchive, $this->archive->isArchive($file));
}
+ /**
+ * @return array
+ */
public function isArchiveProvider()
{
return [
@@ -98,6 +101,9 @@ public function testIsTar($file, $isArchive)
$this->assertEquals($isArchive, $this->archive->isTar($file));
}
+ /**
+ * @return array
+ */
public function isTarProvider()
{
return [
@@ -143,6 +149,9 @@ public function testPackUnpackGzBz($destinationFile, $extensionRequired)
$this->assertStringStartsWith($this->destinationDir, $this->unpacked);
}
+ /**
+ * @return array
+ */
public function destinationProvider()
{
return [
@@ -200,6 +209,9 @@ public function testExtract($destinationFile, $extensionRequired)
$this->assertStringStartsWith($this->destinationDir, $this->unpacked);
}
+ /**
+ * @return array
+ */
public function tarProvider()
{
return [
diff --git a/lib/internal/Magento/Framework/Test/Unit/Data/Form/Element/HiddenTest.php b/lib/internal/Magento/Framework/Test/Unit/Data/Form/Element/HiddenTest.php
index 0fc537fbe832a..b57cb7ac8f0b2 100644
--- a/lib/internal/Magento/Framework/Test/Unit/Data/Form/Element/HiddenTest.php
+++ b/lib/internal/Magento/Framework/Test/Unit/Data/Form/Element/HiddenTest.php
@@ -45,6 +45,9 @@ public function testGetElementHtml($value)
}
}
+ /**
+ * @return array
+ */
public function getElementHtmlDataProvider()
{
return [
diff --git a/lib/internal/Magento/Framework/Test/Unit/DataObjectTest.php b/lib/internal/Magento/Framework/Test/Unit/DataObjectTest.php
index d937dc10e4d4c..67a689b714e24 100644
--- a/lib/internal/Magento/Framework/Test/Unit/DataObjectTest.php
+++ b/lib/internal/Magento/Framework/Test/Unit/DataObjectTest.php
@@ -380,6 +380,9 @@ public function testUnderscore($input, $expectedOutput)
$this->assertEquals($expectedOutput, $output);
}
+ /**
+ * @return array
+ */
public function underscoreDataProvider()
{
return [
diff --git a/lib/internal/Magento/Framework/Test/Unit/EscaperTest.php b/lib/internal/Magento/Framework/Test/Unit/EscaperTest.php
index c728fdecfeaab..ec05478b90db9 100644
--- a/lib/internal/Magento/Framework/Test/Unit/EscaperTest.php
+++ b/lib/internal/Magento/Framework/Test/Unit/EscaperTest.php
@@ -103,6 +103,9 @@ public function testEscapeJs($data, $expected)
$this->assertEquals($expected, $this->escaper->escapeJs($data));
}
+ /**
+ * @return array
+ */
public function escapeJsDataProvider()
{
return [
diff --git a/lib/internal/Magento/Framework/Test/Unit/FlagManagerTest.php b/lib/internal/Magento/Framework/Test/Unit/FlagManagerTest.php
index 955f16d4241c2..ea6ddf56414ff 100644
--- a/lib/internal/Magento/Framework/Test/Unit/FlagManagerTest.php
+++ b/lib/internal/Magento/Framework/Test/Unit/FlagManagerTest.php
@@ -112,6 +112,9 @@ public function testDeleteFlag($isFlagExist)
);
}
+ /**
+ * @param $flagCode
+ */
private function setupFlagObject($flagCode)
{
$this->flagFactoryMock->expects($this->once())
diff --git a/lib/internal/Magento/Framework/Test/Unit/Message/PhraseFactoryTest.php b/lib/internal/Magento/Framework/Test/Unit/Message/PhraseFactoryTest.php
index d5243cacb1616..805bd8fe4510a 100644
--- a/lib/internal/Magento/Framework/Test/Unit/Message/PhraseFactoryTest.php
+++ b/lib/internal/Magento/Framework/Test/Unit/Message/PhraseFactoryTest.php
@@ -33,6 +33,9 @@ public function testCreate($mainMessage, $subMessages, $separator, $expectedResu
$this->assertEquals($expectedResult, $result);
}
+ /**
+ * @return array
+ */
public function dataProvider()
{
$subMessage1 = new Error('go jogging');
diff --git a/lib/internal/Magento/Framework/Test/Unit/Module/Plugin/DbStatusValidatorTest.php b/lib/internal/Magento/Framework/Test/Unit/Module/Plugin/DbStatusValidatorTest.php
index 1516f65479771..c41918e051452 100644
--- a/lib/internal/Magento/Framework/Test/Unit/Module/Plugin/DbStatusValidatorTest.php
+++ b/lib/internal/Magento/Framework/Test/Unit/Module/Plugin/DbStatusValidatorTest.php
@@ -119,6 +119,9 @@ public function testBeforeDispatchOutOfDateWithErrors(array $errors, string $exp
$this->plugin->beforeDispatch($this->frontControllerMock, $this->requestMock);
}
+ /**
+ * @return array
+ */
public static function beforeDispatchOutOfDateWithErrorsDataProvider()
{
return [
diff --git a/lib/internal/Magento/Framework/Test/Unit/ShellTest.php b/lib/internal/Magento/Framework/Test/Unit/ShellTest.php
index 913fd883eaad2..9f223f916b97a 100644
--- a/lib/internal/Magento/Framework/Test/Unit/ShellTest.php
+++ b/lib/internal/Magento/Framework/Test/Unit/ShellTest.php
@@ -83,6 +83,9 @@ public function testExecuteLog($command, $commandArgs, $expectedResult, $expecte
);
}
+ /**
+ * @return array
+ */
public function executeDataProvider()
{
// backtick symbol (`) has to be replaced with environment-dependent quote character
diff --git a/lib/internal/Magento/Framework/Test/Unit/TranslateTest.php b/lib/internal/Magento/Framework/Test/Unit/TranslateTest.php
index cca8d564d3199..5c634a1bca078 100644
--- a/lib/internal/Magento/Framework/Test/Unit/TranslateTest.php
+++ b/lib/internal/Magento/Framework/Test/Unit/TranslateTest.php
@@ -139,6 +139,9 @@ public function testLoadDataCachedTranslation($area, $forceReload, $cachedData)
$this->assertEquals($cachedData, $this->translate->getData());
}
+ /**
+ * @return array
+ */
public function dataProviderLoadDataCachedTranslation()
{
$cachedData = ['cached 1' => 'translated 1', 'cached 2' => 'translated 2'];
@@ -236,6 +239,9 @@ public function testLoadData($area, $forceReload)
$this->assertEquals($expected, $this->translate->getData());
}
+ /**
+ * @return array
+ */
public function dataProviderForTestLoadData()
{
return [
@@ -263,6 +269,9 @@ public function testGetData($data, $result)
$this->assertEquals($result, $this->translate->getData());
}
+ /**
+ * @return array
+ */
public function dataProviderForTestGetData()
{
$data = ['original 1' => 'translated 1', 'original 2' => 'translated 2'];
diff --git a/lib/internal/Magento/Framework/Test/Unit/UrlTest.php b/lib/internal/Magento/Framework/Test/Unit/UrlTest.php
index 5c5df5b462b70..3713978d0f74e 100644
--- a/lib/internal/Magento/Framework/Test/Unit/UrlTest.php
+++ b/lib/internal/Magento/Framework/Test/Unit/UrlTest.php
@@ -163,6 +163,9 @@ public function testGetCurrentUrl($httpHost, $url)
$this->assertEquals($url, $model->getCurrentUrl());
}
+ /**
+ * @return array
+ */
public function getCurrentUrlProvider()
{
return [
@@ -337,6 +340,9 @@ public function testGetUrlRouteUseRewrite()
$this->assertEquals('/catalog/product/view/', $model->getUrl('catalog', ['_use_rewrite' => 1]));
}
+ /**
+ * @return array
+ */
public function getUrlDataProvider()
{
return [
@@ -497,6 +503,9 @@ public function testGetRedirectUrlWithSessionId()
$this->assertEquals('http://example.com/?foo=bar', $model->getRedirectUrl('http://example.com/'));
}
+ /**
+ * @return array
+ */
public function getRebuiltUrlDataProvider()
{
return [
@@ -558,6 +567,9 @@ public function testIsOwnOriginUrl($result, $referrer)
$this->assertEquals($result, $model->isOwnOriginUrl());
}
+ /**
+ * @return array
+ */
public function isOwnOriginUrlDataProvider()
{
return [
@@ -607,6 +619,9 @@ public function testGetConfigData($urlType, $configPath, $isSecure, $isSecureCal
$this->assertEquals('http://localhost/', $model->getConfigData($key));
}
+ /**
+ * @return array
+ */
public function getConfigDataDataProvider()
{
return [
@@ -712,6 +727,9 @@ public function testSessionUrlVarWithoutMatchedHostsAndBaseUrl()
);
}
+ /**
+ * @return array
+ */
public function sessionUrlVarWithMatchedHostsAndBaseUrlDataProvider()
{
return [
diff --git a/lib/internal/Magento/Framework/TestFramework/Test/Unit/Unit/Matcher/MethodInvokedAtIndexTest.php b/lib/internal/Magento/Framework/TestFramework/Test/Unit/Unit/Matcher/MethodInvokedAtIndexTest.php
index 9721cdb8f9331..52dd39cb7a558 100644
--- a/lib/internal/Magento/Framework/TestFramework/Test/Unit/Unit/Matcher/MethodInvokedAtIndexTest.php
+++ b/lib/internal/Magento/Framework/TestFramework/Test/Unit/Unit/Matcher/MethodInvokedAtIndexTest.php
@@ -16,7 +16,7 @@ public function testMatches()
'ValidMethodName',
[],
'void',
- new \StdClass()
+ new \stdClass()
);
$matcher = new \Magento\Framework\TestFramework\Unit\Matcher\MethodInvokedAtIndex(0);
$this->assertTrue($matcher->matches($invocationObject));
diff --git a/lib/internal/Magento/Framework/Translate/Test/Unit/InlineTest.php b/lib/internal/Magento/Framework/Translate/Test/Unit/InlineTest.php
index 6e222ba90da8e..b1ef51f010c5b 100644
--- a/lib/internal/Magento/Framework/Translate/Test/Unit/InlineTest.php
+++ b/lib/internal/Magento/Framework/Translate/Test/Unit/InlineTest.php
@@ -74,6 +74,9 @@ public function testIsAllowed($isEnabled, $isActive, $isDevAllowed, $result)
$this->assertEquals($result, $model->isAllowed());
}
+ /**
+ * @return array
+ */
public function isAllowedDataProvider()
{
return [
@@ -126,6 +129,9 @@ public function testProcessResponseBodyStripInline($body, $expected)
$this->assertEquals($body, $expected);
}
+ /**
+ * @return array
+ */
public function processResponseBodyStripInlineDataProvider()
{
return [
@@ -192,6 +198,9 @@ public function testProcessResponseBody($scope, $body, $expected)
$this->assertEquals($body, $expected);
}
+ /**
+ * @return array
+ */
public function processResponseBodyDataProvider()
{
return [
@@ -254,6 +263,9 @@ public function testProcessResponseBodyGetInlineScript($scope, $body, $expected)
$this->assertEquals($body, $expected);
}
+ /**
+ * @return array
+ */
public function processResponseBodyGetInlineScriptDataProvider()
{
return [
diff --git a/lib/internal/Magento/Framework/Unserialize/Test/Unit/UnserializeTest.php b/lib/internal/Magento/Framework/Unserialize/Test/Unit/UnserializeTest.php
index 4888077104728..f053a9afff74d 100644
--- a/lib/internal/Magento/Framework/Unserialize/Test/Unit/UnserializeTest.php
+++ b/lib/internal/Magento/Framework/Unserialize/Test/Unit/UnserializeTest.php
@@ -55,6 +55,9 @@ public function testUnserializeObject($serialized)
$this->assertFalse($this->unserialize->unserialize($serialized));
}
+ /**
+ * @return array
+ */
public function unserializeObjectDataProvider()
{
return [
diff --git a/lib/internal/Magento/Framework/Url/Test/Unit/Helper/DataTest.php b/lib/internal/Magento/Framework/Url/Test/Unit/Helper/DataTest.php
index 5bb4f54b84a5c..016208d0920aa 100644
--- a/lib/internal/Magento/Framework/Url/Test/Unit/Helper/DataTest.php
+++ b/lib/internal/Magento/Framework/Url/Test/Unit/Helper/DataTest.php
@@ -79,6 +79,9 @@ public function testGetEncodedUrl($url, $callNum)
$this->assertEquals($encodedUrl, $helper->getEncodedUrl($url));
}
+ /**
+ * @return array
+ */
public function getEncodedUrlDataProvider()
{
return [
@@ -98,6 +101,9 @@ public function testAddRequestParam($param, $expected)
$this->assertEquals($expected, $helper->addRequestParam('http://example.com', $param));
}
+ /**
+ * @return array
+ */
public function addRequestParamDataProvider()
{
return [
@@ -145,6 +151,9 @@ public function testRemoveRequestParam($paramKey, $expected)
$this->assertEquals($expected, $helper->removeRequestParam($url, $paramKey));
}
+ /**
+ * @return array
+ */
public function removeRequestParamDataProvider()
{
return [
diff --git a/lib/internal/Magento/Framework/Url/Test/Unit/SecurityInfoTest.php b/lib/internal/Magento/Framework/Url/Test/Unit/SecurityInfoTest.php
index fbda5e36c9934..3fc332aa1af52 100644
--- a/lib/internal/Magento/Framework/Url/Test/Unit/SecurityInfoTest.php
+++ b/lib/internal/Magento/Framework/Url/Test/Unit/SecurityInfoTest.php
@@ -32,6 +32,9 @@ public function testIsSecureChecksIfUrlIsInSecureList($url, $expected)
$this->assertEquals($expected, $this->_model->isSecure($url));
}
+ /**
+ * @return array
+ */
public function secureUrlDataProvider()
{
return [
diff --git a/lib/internal/Magento/Framework/Validator/Test/Unit/ObjectTest.php b/lib/internal/Magento/Framework/Validator/Test/Unit/ObjectTest.php
index a06297a382f57..0fd70b5bc5f1d 100644
--- a/lib/internal/Magento/Framework/Validator/Test/Unit/ObjectTest.php
+++ b/lib/internal/Magento/Framework/Validator/Test/Unit/ObjectTest.php
@@ -92,6 +92,9 @@ public function testIsValid(array $inputEntityData, array $expectedErrors)
}
}
+ /**
+ * @return array
+ */
public function validateDataProvider()
{
return [
diff --git a/lib/internal/Magento/Framework/View/Element/UiComponent/Config/FileCollector/AggregatedFileCollector.php b/lib/internal/Magento/Framework/View/Element/UiComponent/Config/FileCollector/AggregatedFileCollector.php
index 17a320164dad3..9ba7833a355d7 100644
--- a/lib/internal/Magento/Framework/View/Element/UiComponent/Config/FileCollector/AggregatedFileCollector.php
+++ b/lib/internal/Magento/Framework/View/Element/UiComponent/Config/FileCollector/AggregatedFileCollector.php
@@ -75,7 +75,7 @@ public function collectFiles($searchPattern = null)
}
$files = $this->collectorAggregated->getFiles($this->design->getDesignTheme(), $searchPattern);
foreach ($files as $file) {
- $fullFileName = $file->getFileName();
+ $fullFileName = $file->getFilename();
$fileDir = dirname($fullFileName);
$fileName = basename($fullFileName);
$dirRead = $this->readFactory->create($fileDir);
diff --git a/lib/internal/Magento/Framework/View/Model/Layout/Merge.php b/lib/internal/Magento/Framework/View/Model/Layout/Merge.php
index 06b00afe42ad9..5be878720620b 100644
--- a/lib/internal/Magento/Framework/View/Model/Layout/Merge.php
+++ b/lib/internal/Magento/Framework/View/Model/Layout/Merge.php
@@ -663,7 +663,7 @@ public function getFileLayoutUpdatesXml()
$result = $this->_loadXmlString($result);
} else {
$result = $this->_loadFileLayoutUpdatesXml();
- $this->_saveCache($result->asXml(), $cacheId);
+ $this->_saveCache($result->asXML(), $cacheId);
}
$this->layoutUpdatesCache = $result;
return $result;
diff --git a/lib/internal/Magento/Framework/View/Page/Config.php b/lib/internal/Magento/Framework/View/Page/Config.php
index e3ea9a58661f2..058cad00320cd 100644
--- a/lib/internal/Magento/Framework/View/Page/Config.php
+++ b/lib/internal/Magento/Framework/View/Page/Config.php
@@ -7,6 +7,7 @@
namespace Magento\Framework\View\Page;
use Magento\Framework\App;
+use Magento\Framework\App\Area;
use Magento\Framework\View;
/**
@@ -34,6 +35,15 @@ class Config
const ELEMENT_TYPE_HEAD = 'head';
/**#@-*/
+ const META_DESCRIPTION = 'description';
+ const META_CONTENT_TYPE = 'content_type';
+ const META_MEDIA_TYPE = 'media_type';
+ const META_CHARSET = 'charset';
+ const META_TITLE = 'title';
+ const META_KEYWORDS = 'keywords';
+ const META_ROBOTS = 'robots';
+ const META_X_UI_COMPATIBLE = 'x_ua_compatible';
+
/**
* Constant body attribute class
*/
@@ -117,6 +127,7 @@ class Config
'description' => null,
'keywords' => null,
'robots' => null,
+ 'title' => null,
];
/**
@@ -244,7 +255,7 @@ public function getMetadata()
*/
public function setContentType($contentType)
{
- $this->setMetadata('content_type', $contentType);
+ $this->setMetadata(self::META_CONTENT_TYPE, $contentType);
}
/**
@@ -255,10 +266,10 @@ public function setContentType($contentType)
public function getContentType()
{
$this->build();
- if (strtolower($this->metadata['content_type']) === 'auto') {
- $this->metadata['content_type'] = $this->getMediaType() . '; charset=' . $this->getCharset();
+ if (strtolower($this->metadata[self::META_CONTENT_TYPE]) === 'auto') {
+ $this->metadata[self::META_CONTENT_TYPE] = $this->getMediaType() . '; charset=' . $this->getCharset();
}
- return $this->metadata['content_type'];
+ return $this->metadata[self::META_CONTENT_TYPE];
}
/**
@@ -267,7 +278,7 @@ public function getContentType()
*/
public function setMediaType($mediaType)
{
- $this->setMetadata('media_type', $mediaType);
+ $this->setMetadata(self::META_MEDIA_TYPE, $mediaType);
}
/**
@@ -278,13 +289,13 @@ public function setMediaType($mediaType)
public function getMediaType()
{
$this->build();
- if (empty($this->metadata['media_type'])) {
- $this->metadata['media_type'] = $this->scopeConfig->getValue(
+ if (empty($this->metadata[self::META_MEDIA_TYPE])) {
+ $this->metadata[self::META_MEDIA_TYPE] = $this->scopeConfig->getValue(
'design/head/default_media_type',
\Magento\Store\Model\ScopeInterface::SCOPE_STORE
);
}
- return $this->metadata['media_type'];
+ return $this->metadata[self::META_MEDIA_TYPE];
}
/**
@@ -293,7 +304,7 @@ public function getMediaType()
*/
public function setCharset($charset)
{
- $this->setMetadata('charset', $charset);
+ $this->setMetadata(self::META_CHARSET, $charset);
}
/**
@@ -304,13 +315,13 @@ public function setCharset($charset)
public function getCharset()
{
$this->build();
- if (empty($this->metadata['charset'])) {
- $this->metadata['charset'] = $this->scopeConfig->getValue(
+ if (empty($this->metadata[self::META_CHARSET])) {
+ $this->metadata[self::META_CHARSET] = $this->scopeConfig->getValue(
'design/head/default_charset',
\Magento\Store\Model\ScopeInterface::SCOPE_STORE
);
}
- return $this->metadata['charset'];
+ return $this->metadata[self::META_CHARSET];
}
/**
@@ -319,7 +330,7 @@ public function getCharset()
*/
public function setDescription($description)
{
- $this->setMetadata('description', $description);
+ $this->setMetadata(self::META_DESCRIPTION, $description);
}
/**
@@ -330,13 +341,36 @@ public function setDescription($description)
public function getDescription()
{
$this->build();
- if (empty($this->metadata['description'])) {
- $this->metadata['description'] = $this->scopeConfig->getValue(
+ if (empty($this->metadata[self::META_DESCRIPTION])) {
+ $this->metadata[self::META_DESCRIPTION] = $this->scopeConfig->getValue(
'design/head/default_description',
\Magento\Store\Model\ScopeInterface::SCOPE_STORE
);
}
- return $this->metadata['description'];
+ return $this->metadata[self::META_DESCRIPTION];
+ }
+
+ /**
+ * @param string $title
+ */
+ public function setMetaTitle($title)
+ {
+ $this->setMetadata(self::META_TITLE, $title);
+ }
+
+ /**
+ * Retrieve meta title
+ *
+ * @return string
+ */
+ public function getMetaTitle()
+ {
+ $this->build();
+ if (empty($this->metadata[self::META_TITLE])) {
+ return '';
+ }
+
+ return $this->metadata[self::META_TITLE];
}
/**
@@ -345,7 +379,7 @@ public function getDescription()
*/
public function setKeywords($keywords)
{
- $this->setMetadata('keywords', $keywords);
+ $this->setMetadata(self::META_KEYWORDS, $keywords);
}
/**
@@ -356,13 +390,13 @@ public function setKeywords($keywords)
public function getKeywords()
{
$this->build();
- if (empty($this->metadata['keywords'])) {
- $this->metadata['keywords'] = $this->scopeConfig->getValue(
+ if (empty($this->metadata[self::META_KEYWORDS])) {
+ $this->metadata[self::META_KEYWORDS] = $this->scopeConfig->getValue(
'design/head/default_keywords',
\Magento\Store\Model\ScopeInterface::SCOPE_STORE
);
}
- return $this->metadata['keywords'];
+ return $this->metadata[self::META_KEYWORDS];
}
/**
@@ -371,27 +405,28 @@ public function getKeywords()
*/
public function setRobots($robots)
{
- $this->setMetadata('robots', $robots);
+ $this->setMetadata(self::META_ROBOTS, $robots);
}
/**
* Retrieve URL to robots file
*
* @return string
+ * @throws \Magento\Framework\Exception\LocalizedException
*/
public function getRobots()
{
- if ($this->getAreaResolver()->getAreaCode() !== 'frontend') {
+ if ($this->getAreaResolver()->getAreaCode() !== Area::AREA_FRONTEND) {
return 'NOINDEX,NOFOLLOW';
}
$this->build();
- if (empty($this->metadata['robots'])) {
- $this->metadata['robots'] = $this->scopeConfig->getValue(
+ if (empty($this->metadata[self::META_ROBOTS])) {
+ $this->metadata[self::META_ROBOTS] = $this->scopeConfig->getValue(
'design/search_engine_robots/default_robots',
\Magento\Store\Model\ScopeInterface::SCOPE_STORE
);
}
- return $this->metadata['robots'];
+ return $this->metadata[self::META_ROBOTS];
}
/**
diff --git a/lib/internal/Magento/Framework/View/Page/Config/Reader/Head.php b/lib/internal/Magento/Framework/View/Page/Config/Reader/Head.php
index a596b85decff9..510da2b1b1ca9 100644
--- a/lib/internal/Magento/Framework/View/Page/Config/Reader/Head.php
+++ b/lib/internal/Magento/Framework/View/Page/Config/Reader/Head.php
@@ -147,6 +147,6 @@ private function setMetadata($pageConfigStructure, $node)
$metadataName = $node->getAttribute('name');
}
- $pageConfigStructure->setMetaData($metadataName, $node->getAttribute('content'));
+ $pageConfigStructure->setMetadata($metadataName, $node->getAttribute('content'));
}
}
diff --git a/lib/internal/Magento/Framework/View/Page/Config/Renderer.php b/lib/internal/Magento/Framework/View/Page/Config/Renderer.php
index 9563cbfbcc532..183f8d34ee41f 100644
--- a/lib/internal/Magento/Framework/View/Page/Config/Renderer.php
+++ b/lib/internal/Magento/Framework/View/Page/Config/Renderer.php
@@ -3,8 +3,10 @@
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
+
namespace Magento\Framework\View\Page\Config;
+use Magento\Framework\Exception\LocalizedException;
use Magento\Framework\View\Asset\GroupedCollection;
use Magento\Framework\View\Page\Config;
@@ -21,7 +23,7 @@ class Renderer implements RendererInterface
protected $assetTypeOrder = ['css', 'ico', 'js'];
/**
- * @var \Magento\Framework\View\Page\Config
+ * @var Config
*/
protected $pageConfig;
@@ -51,7 +53,7 @@ class Renderer implements RendererInterface
protected $urlBuilder;
/**
- * @param \Magento\Framework\View\Page\Config $pageConfig
+ * @param Config $pageConfig
* @param \Magento\Framework\View\Asset\MergeService $assetMergeService
* @param \Magento\Framework\UrlInterface $urlBuilder
* @param \Magento\Framework\Escaper $escaper
@@ -131,15 +133,35 @@ public function renderMetadata()
/**
* @param string $name
* @param string $content
- * @return mixed
+ * @return string
*/
protected function processMetadataContent($name, $content)
{
- $method = 'get' . $this->string->upperCaseWords($name, '_', '');
- if (method_exists($this->pageConfig, $method)) {
- $content = $this->pageConfig->$method();
+ switch ($name) {
+ case Config::META_DESCRIPTION:
+ return $this->pageConfig->getDescription();
+
+ case Config::META_CONTENT_TYPE:
+ return $this->pageConfig->getContentType();
+
+ case Config::META_MEDIA_TYPE:
+ return $this->pageConfig->getMediaType();
+
+ case Config::META_CHARSET:
+ return $this->pageConfig->getCharset();
+
+ case Config::META_KEYWORDS:
+ return $this->pageConfig->getKeywords();
+
+ case Config::META_ROBOTS:
+ return $this->pageConfig->getRobots();
+
+ case Config::META_TITLE:
+ return $this->pageConfig->getMetaTitle();
+
+ default:
+ return $content;
}
- return $content;
}
/**
@@ -153,19 +175,19 @@ protected function getMetadataTemplate($name)
}
switch ($name) {
- case 'charset':
+ case Config::META_CHARSET:
$metadataTemplate = '123 ', $this->model->getNode('some_update')->asXml());
+ $this->assertSame('123 ', $this->model->getNode('some_update')->asXML());
}
public function testGetChildBlock()
diff --git a/lib/internal/Magento/Framework/View/Test/Unit/Page/Config/Generator/HeadTest.php b/lib/internal/Magento/Framework/View/Test/Unit/Page/Config/Generator/HeadTest.php
index 4b000f09663b8..30dead438951a 100644
--- a/lib/internal/Magento/Framework/View/Test/Unit/Page/Config/Generator/HeadTest.php
+++ b/lib/internal/Magento/Framework/View/Test/Unit/Page/Config/Generator/HeadTest.php
@@ -140,6 +140,9 @@ public function testProcess($assets)
$this->assertEquals($this->headGenerator, $result);
}
+ /**
+ * @return array
+ */
public function testProcessAssetDataProvider()
{
return [
diff --git a/lib/internal/Magento/Framework/View/Test/Unit/Page/Config/RendererTest.php b/lib/internal/Magento/Framework/View/Test/Unit/Page/Config/RendererTest.php
index 1f110a9ec19b5..adb7c4f4ddd86 100644
--- a/lib/internal/Magento/Framework/View/Test/Unit/Page/Config/RendererTest.php
+++ b/lib/internal/Magento/Framework/View/Test/Unit/Page/Config/RendererTest.php
@@ -157,15 +157,14 @@ public function testRenderMetadata()
. '<span class="test">Test</span> ');
$this->assertEquals($expectedMetadata, $this->model->getMetadata());
}
@@ -287,6 +289,9 @@ public function testAddPageAsset($file, $properties, $name, $expectedName)
);
}
+ /**
+ * @return array
+ */
public function pageAssetDataProvider()
{
return [
@@ -326,6 +331,9 @@ public function testAddRemotePageAsset($url, $contentType, $properties, $name, $
);
}
+ /**
+ * @return array
+ */
public function remotePageAssetDataProvider()
{
return [
@@ -382,6 +390,9 @@ public function testElementAttribute($elementType, $attribute, $value)
$this->assertEquals($value, $this->model->getElementAttribute($elementType, $attribute));
}
+ /**
+ * @return array
+ */
public function elementAttributeDataProvider()
{
return [
@@ -419,6 +430,9 @@ public function testElementAttributeException($elementType, $attribute, $value)
$this->model->setElementAttribute($elementType, $attribute, $value);
}
+ /**
+ * @return array
+ */
public function elementAttributeExceptionDataProvider()
{
return [
@@ -454,6 +468,9 @@ public function testElementAttributes($elementType, $attributes)
$this->assertEquals($attributes, $this->model->getElementAttributes($elementType));
}
+ /**
+ * @return array
+ */
public function elementAttributesDataProvider()
{
return [
@@ -478,6 +495,9 @@ public function testPageLayout($handle)
$this->assertEquals($handle, $this->model->getPageLayout());
}
+ /**
+ * @return array
+ */
public function pageLayoutDataProvider()
{
return [
@@ -538,6 +558,9 @@ public function testGetIncludes($isAvailable, $result)
$this->assertEquals($result, $model->getIncludes());
}
+ /**
+ * @return array
+ */
public function getIncludesDataProvider()
{
return [
diff --git a/lib/internal/Magento/Framework/Webapi/Test/Unit/RequestTest.php b/lib/internal/Magento/Framework/Webapi/Test/Unit/RequestTest.php
index d30df5d76b75b..1fc6e92f87aa8 100644
--- a/lib/internal/Magento/Framework/Webapi/Test/Unit/RequestTest.php
+++ b/lib/internal/Magento/Framework/Webapi/Test/Unit/RequestTest.php
@@ -38,6 +38,9 @@ public function testGetRequestedServicesSuccess($requestParamServices, $expected
$this->assertEquals($expectedResult, $this->request->getRequestedServices());
}
+ /**
+ * @return array
+ */
public function providerTestGetRequestedServicesSuccess()
{
$testModuleA = 'testModule1AllSoapAndRestV1';
diff --git a/lib/internal/Magento/Framework/Webapi/Test/Unit/ServiceInputProcessorTest.php b/lib/internal/Magento/Framework/Webapi/Test/Unit/ServiceInputProcessorTest.php
index fe85e59221847..fd470f9d0c9c8 100644
--- a/lib/internal/Magento/Framework/Webapi/Test/Unit/ServiceInputProcessorTest.php
+++ b/lib/internal/Magento/Framework/Webapi/Test/Unit/ServiceInputProcessorTest.php
@@ -533,6 +533,9 @@ public function testCustomAttributesExceptions($inputData)
);
}
+ /**
+ * @return array
+ */
public function invalidCustomAttributesDataProvider()
{
return [
diff --git a/lib/web/mage/calendar.js b/lib/web/mage/calendar.js
index 51ee9b3a8891a..ac154b333801d 100644
--- a/lib/web/mage/calendar.js
+++ b/lib/web/mage/calendar.js
@@ -236,12 +236,14 @@
firstDay = parseInt(this._get(inst, 'firstDay'), 10);
firstDay = isNaN(firstDay) ? 0 : firstDay;
- for (row; row < numMonths[0]; row++) {
+ for (row = 0; row < numMonths[0]; row++) {
this.maxRows = 4;
- for (col; col < numMonths[1]; col++) {
+ for (col = 0; col < numMonths[1]; col++) {
selectedDate = this._daylightSavingAdjust(new Date(drawYear, drawMonth, inst.selectedDay));
+ calender = '';
+
if (isMultiMonth) {
calender += '' + this._get(inst, 'weekHeader') + '' : '';
- for (dow; dow < 7; dow++) { // days of the week
+ for (dow = 0; dow < 7; dow++) { // days of the week
day = (dow + firstDay) % 7;
thead += '= 5 ?
' class="ui-datepicker-week-end"' : '') + '>' +
@@ -289,7 +291,7 @@
this.maxRows = numRows;
printDate = this._daylightSavingAdjust(new Date(drawYear, drawMonth, 1 - leadDays));
- for (dRow; dRow < numRows; dRow++) { // create date picker rows
+ for (dRow = 0; dRow < numRows; dRow++) { // create date picker rows
calender += '';
tbody = !showWeek ? '' : '' +
this._get(inst, 'calculateWeek')(printDate) + ' ';
diff --git a/lib/web/modernizr/modernizr.js b/lib/web/modernizr/modernizr.js
index 1bbdd114f343b..8c826fa18c582 100644
--- a/lib/web/modernizr/modernizr.js
+++ b/lib/web/modernizr/modernizr.js
@@ -910,7 +910,7 @@ window.Modernizr = (function( window, document, undefined ) {
bool = inputElem.checkValidity && inputElem.checkValidity() === false;
} else {
- // If the upgraded input compontent rejects the :) text, we got a winner
+ // If the upgraded input component rejects the :) text, we got a winner
bool = inputElem.value != smile;
}
}
diff --git a/lib/web/tiny_mce/classes/ControlManager.js b/lib/web/tiny_mce/classes/ControlManager.js
index 51fa311525862..784042988c0ef 100644
--- a/lib/web/tiny_mce/classes/ControlManager.js
+++ b/lib/web/tiny_mce/classes/ControlManager.js
@@ -45,7 +45,7 @@
},
/**
- * Returns a control by id or undefined it it wasn't found.
+ * Returns a control by id or undefined it wasn't found.
*
* @method get
* @param {String} id Control instance name.
diff --git a/lib/web/tiny_mce/classes/Formatter.js b/lib/web/tiny_mce/classes/Formatter.js
index 0cbca75ec504b..5f05d3f3015ad 100644
--- a/lib/web/tiny_mce/classes/Formatter.js
+++ b/lib/web/tiny_mce/classes/Formatter.js
@@ -445,7 +445,7 @@
childCount = getChildCount(node);
// Remove empty nodes but only if there is multiple wrappers and they are not block
- // elements so never remove single ' . $fixture->getActionTitle() . '... ');
diff --git a/setup/src/Magento/Setup/Console/Style/MagentoStyle.php b/setup/src/Magento/Setup/Console/Style/MagentoStyle.php
index 4dec01f9497e1..614014a233657 100755
--- a/setup/src/Magento/Setup/Console/Style/MagentoStyle.php
+++ b/setup/src/Magento/Setup/Console/Style/MagentoStyle.php
@@ -518,6 +518,11 @@ private function autoPrependText()
}
}
+ /**
+ * @param $messages
+ *
+ * @return array
+ */
private function reduceBuffer($messages)
{
// We need to know if the two last chars are PHP_EOL
diff --git a/setup/src/Magento/Setup/Fixtures/StoresFixture.php b/setup/src/Magento/Setup/Fixtures/StoresFixture.php
index fb8679b5c879a..17b83e627ab9c 100644
--- a/setup/src/Magento/Setup/Fixtures/StoresFixture.php
+++ b/setup/src/Magento/Setup/Fixtures/StoresFixture.php
@@ -211,9 +211,6 @@ public function execute()
$this->generateWebsites();
$this->generateStoreGroups();
$this->generateStoreViews();
-
- //clean cache
- $this->storeManager->reinitStores();
}
/**
@@ -305,7 +302,6 @@ private function generateStoreViews()
'code' => $storeCode
]
)->save();
- $this->eventManager->dispatch('store_add', ['store' => $store]);
$this->saveStoreLocale($store->getId(), $localesList[$existedStoreViewsCount % $localesListCount]);
}
diff --git a/setup/src/Magento/Setup/Model/PhpReadinessCheck.php b/setup/src/Magento/Setup/Model/PhpReadinessCheck.php
index c2bdafa8df82e..2c4967c4c2ffd 100644
--- a/setup/src/Magento/Setup/Model/PhpReadinessCheck.php
+++ b/setup/src/Magento/Setup/Model/PhpReadinessCheck.php
@@ -286,7 +286,7 @@ private function checkPopulateRawPostSetting()
$data = [];
$error = false;
- $iniSetting = intVal(ini_get('always_populate_raw_post_data'));
+ $iniSetting = intval(ini_get('always_populate_raw_post_data'));
$checkVersionConstraint = $this->versionParser->parseConstraints('~5.6.0');
$normalizedPhpVersion = $this->getNormalizedCurrentPhpVersion(PHP_VERSION);
@@ -302,7 +302,7 @@ private function checkPopulateRawPostSetting()
Please open your php.ini file and set always_populate_raw_post_data to -1.
If you need more help please call your hosting provider.',
PHP_VERSION,
- intVal(ini_get('always_populate_raw_post_data'))
+ intval(ini_get('always_populate_raw_post_data'))
);
$data['always_populate_raw_post_data'] = [
diff --git a/setup/src/Magento/Setup/Test/Unit/Console/Command/DbStatusCommandTest.php b/setup/src/Magento/Setup/Test/Unit/Console/Command/DbStatusCommandTest.php
index 9c28c2be04262..2824b043a2743 100644
--- a/setup/src/Magento/Setup/Test/Unit/Console/Command/DbStatusCommandTest.php
+++ b/setup/src/Magento/Setup/Test/Unit/Console/Command/DbStatusCommandTest.php
@@ -85,6 +85,9 @@ public function testExecute(array $outdatedInfo, $expectedMessage, $expectedCode
$this->assertSame($expectedCode, $tester->getStatusCode());
}
+ /**
+ * @return array
+ */
public function executeDataProvider()
{
return [
diff --git a/setup/src/Magento/Setup/Test/Unit/Console/Command/DeployStaticContentCommandTest.php b/setup/src/Magento/Setup/Test/Unit/Console/Command/DeployStaticContentCommandTest.php
index a5dc0d24feb7c..c3f79d92ec560 100644
--- a/setup/src/Magento/Setup/Test/Unit/Console/Command/DeployStaticContentCommandTest.php
+++ b/setup/src/Magento/Setup/Test/Unit/Console/Command/DeployStaticContentCommandTest.php
@@ -111,6 +111,9 @@ public function testExecute($input)
$tester->execute($input);
}
+ /**
+ * @return array
+ */
public function executeDataProvider()
{
return [
diff --git a/setup/src/Magento/Setup/Test/Unit/Console/Command/UninstallCommandTest.php b/setup/src/Magento/Setup/Test/Unit/Console/Command/UninstallCommandTest.php
index 8bcee84d049b3..1ef3830636657 100644
--- a/setup/src/Magento/Setup/Test/Unit/Console/Command/UninstallCommandTest.php
+++ b/setup/src/Magento/Setup/Test/Unit/Console/Command/UninstallCommandTest.php
@@ -51,6 +51,9 @@ public function testExecuteInteractionNo()
$this->checkInteraction(false);
}
+ /**
+ * @param $answer
+ */
public function checkInteraction($answer)
{
$question = $this->createMock(\Symfony\Component\Console\Helper\QuestionHelper::class);
diff --git a/setup/src/Magento/Setup/Test/Unit/Console/Style/TestOutput.php b/setup/src/Magento/Setup/Test/Unit/Console/Style/TestOutput.php
index 1407e5ed183e4..183f659c42f23 100644
--- a/setup/src/Magento/Setup/Test/Unit/Console/Style/TestOutput.php
+++ b/setup/src/Magento/Setup/Test/Unit/Console/Style/TestOutput.php
@@ -20,6 +20,10 @@ public function clear()
$this->output = '';
}
+ /**
+ * @param string $message
+ * @param bool $newline
+ */
protected function doWrite($message, $newline)
{
$this->output .= $message . ($newline ? "\n" : '');
diff --git a/setup/src/Magento/Setup/Test/Unit/Fixtures/StoresFixtureTest.php b/setup/src/Magento/Setup/Test/Unit/Fixtures/StoresFixtureTest.php
index 1bedfd4b6b975..9fc74066e618c 100644
--- a/setup/src/Magento/Setup/Test/Unit/Fixtures/StoresFixtureTest.php
+++ b/setup/src/Magento/Setup/Test/Unit/Fixtures/StoresFixtureTest.php
@@ -75,7 +75,6 @@ public function testExecute()
'getDefaultStoreView',
'getStore',
'getStores',
- 'reinitStores'
]
)->getMock();
@@ -250,10 +249,6 @@ public function testExecute()
)
->willReturn($storeGroupMock);
- $this->storeManagerMock->expects($this->once())
- ->method('reinitStores')
- ->willReturn('void');
-
$this->storeManagerMock->expects($this->once())
->method('getGroups')
->willReturn([$storeGroupMock]);
diff --git a/setup/src/Magento/Setup/Test/Unit/Model/ConfigOptionsList/SessionTest.php b/setup/src/Magento/Setup/Test/Unit/Model/ConfigOptionsList/SessionTest.php
index d37c07e715482..3893181d0c7f7 100644
--- a/setup/src/Magento/Setup/Test/Unit/Model/ConfigOptionsList/SessionTest.php
+++ b/setup/src/Magento/Setup/Test/Unit/Model/ConfigOptionsList/SessionTest.php
@@ -262,6 +262,9 @@ public function testValidationWithInvalidOptions($option, $invalidInput, $errorM
$this->assertSame($errorMessage, $errors[0]);
}
+ /**
+ * @return array
+ */
public function redisOptionProvider()
{
return [
@@ -286,6 +289,9 @@ public function redisOptionProvider()
];
}
+ /**
+ * @return array
+ */
public function invalidOptionsProvider()
{
return [
diff --git a/setup/src/Magento/Setup/Test/Unit/Model/ConfigOptionsListTest.php b/setup/src/Magento/Setup/Test/Unit/Model/ConfigOptionsListTest.php
index 1bb60517d5e67..f342a11493498 100644
--- a/setup/src/Magento/Setup/Test/Unit/Model/ConfigOptionsListTest.php
+++ b/setup/src/Magento/Setup/Test/Unit/Model/ConfigOptionsListTest.php
@@ -178,6 +178,9 @@ public function testValidateCacheHosts($hosts, $expectedError)
}
}
+ /**
+ * @return array
+ */
public function validateCacheHostsDataProvider()
{
return [
diff --git a/setup/src/Magento/Setup/Test/Unit/Model/Cron/JobComponentUninstallTest.php b/setup/src/Magento/Setup/Test/Unit/Model/Cron/JobComponentUninstallTest.php
index b3e88272d13e8..59210df4f7bcf 100644
--- a/setup/src/Magento/Setup/Test/Unit/Model/Cron/JobComponentUninstallTest.php
+++ b/setup/src/Magento/Setup/Test/Unit/Model/Cron/JobComponentUninstallTest.php
@@ -264,6 +264,9 @@ public function testExecuteWrongFormat(array $params)
$this->job->execute();
}
+ /**
+ * @return array
+ */
public function executeWrongFormatDataProvider()
{
return [
diff --git a/setup/src/Magento/Setup/Test/Unit/Model/Cron/JobFactoryTest.php b/setup/src/Magento/Setup/Test/Unit/Model/Cron/JobFactoryTest.php
index f96882c30136a..1f8a3fea16da2 100644
--- a/setup/src/Magento/Setup/Test/Unit/Model/Cron/JobFactoryTest.php
+++ b/setup/src/Magento/Setup/Test/Unit/Model/Cron/JobFactoryTest.php
@@ -206,16 +206,25 @@ public function testMaintenanceModeDisable()
// functions to override native php functions
namespace Magento\Setup\Model\Cron;
+/**
+ * @return string
+ */
function fopen()
{
return 'filestream';
}
+/**
+ * @return bool
+ */
function is_resource()
{
return true;
}
+/**
+ * @return string
+ */
function get_resource_type()
{
return 'stream';
diff --git a/setup/src/Magento/Setup/Test/Unit/Model/Cron/ReadinessCheckTest.php b/setup/src/Magento/Setup/Test/Unit/Model/Cron/ReadinessCheckTest.php
index f8f1d8542c38c..4a4ff2cb81e8d 100644
--- a/setup/src/Magento/Setup/Test/Unit/Model/Cron/ReadinessCheckTest.php
+++ b/setup/src/Magento/Setup/Test/Unit/Model/Cron/ReadinessCheckTest.php
@@ -201,6 +201,9 @@ public function testRunReadinessCheckLastTimestamp()
namespace Magento\Setup\Model\Cron;
+/**
+ * @return int
+ */
function time()
{
return 100;
diff --git a/setup/src/Magento/Setup/Test/Unit/Model/Description/Mixin/BrakeMixinTest.php b/setup/src/Magento/Setup/Test/Unit/Model/Description/Mixin/BrakeMixinTest.php
index e6c7b420b661d..dfa001f44bc66 100644
--- a/setup/src/Magento/Setup/Test/Unit/Model/Description/Mixin/BrakeMixinTest.php
+++ b/setup/src/Magento/Setup/Test/Unit/Model/Description/Mixin/BrakeMixinTest.php
@@ -25,6 +25,9 @@ public function testApply($subject, $expectedResult)
$this->assertEquals($expectedResult, $this->mixin->apply($subject));
}
+ /**
+ * @return array
+ */
public function getTestData()
{
return [
diff --git a/setup/src/Magento/Setup/Test/Unit/Model/Description/Mixin/HeaderMixinTest.php b/setup/src/Magento/Setup/Test/Unit/Model/Description/Mixin/HeaderMixinTest.php
index 48280e9c6f543..bf915fecf4701 100644
--- a/setup/src/Magento/Setup/Test/Unit/Model/Description/Mixin/HeaderMixinTest.php
+++ b/setup/src/Magento/Setup/Test/Unit/Model/Description/Mixin/HeaderMixinTest.php
@@ -25,6 +25,9 @@ public function testApply($subject, $expectedResult)
$this->assertEquals($expectedResult, $this->mixin->apply($subject));
}
+ /**
+ * @return array
+ */
public function getTestData()
{
return [
diff --git a/setup/src/Magento/Setup/Test/Unit/Model/Description/Mixin/Helper/RandomWordSelectorTest.php b/setup/src/Magento/Setup/Test/Unit/Model/Description/Mixin/Helper/RandomWordSelectorTest.php
index b21c687a30960..c24fa49fcac24 100644
--- a/setup/src/Magento/Setup/Test/Unit/Model/Description/Mixin/Helper/RandomWordSelectorTest.php
+++ b/setup/src/Magento/Setup/Test/Unit/Model/Description/Mixin/Helper/RandomWordSelectorTest.php
@@ -34,6 +34,9 @@ public function testRandomSelector($fixtureSource, $fixtureCount)
}
}
+ /**
+ * @return array
+ */
public function getTestData()
{
return [
diff --git a/setup/src/Magento/Setup/Test/Unit/Model/Description/Mixin/Helper/WordWrapperTest.php b/setup/src/Magento/Setup/Test/Unit/Model/Description/Mixin/Helper/WordWrapperTest.php
index 58e07df7391fc..7d3cbcdd00c71 100644
--- a/setup/src/Magento/Setup/Test/Unit/Model/Description/Mixin/Helper/WordWrapperTest.php
+++ b/setup/src/Magento/Setup/Test/Unit/Model/Description/Mixin/Helper/WordWrapperTest.php
@@ -30,6 +30,9 @@ public function testWrapping($inputData, $expectedResult)
);
}
+ /**
+ * @return array
+ */
public function getTestData()
{
return [
diff --git a/setup/src/Magento/Setup/Test/Unit/Model/Description/Mixin/ParagraphMixinTest.php b/setup/src/Magento/Setup/Test/Unit/Model/Description/Mixin/ParagraphMixinTest.php
index a522963d212ef..4fdb3090992bb 100644
--- a/setup/src/Magento/Setup/Test/Unit/Model/Description/Mixin/ParagraphMixinTest.php
+++ b/setup/src/Magento/Setup/Test/Unit/Model/Description/Mixin/ParagraphMixinTest.php
@@ -25,6 +25,9 @@ public function testApply($subject, $expectedResult)
$this->assertEquals($expectedResult, $this->mixin->apply($subject));
}
+ /**
+ * @return array
+ */
public function getTestData()
{
return [
diff --git a/setup/src/Magento/Setup/Test/Unit/Model/Grid/TypeMapperTest.php b/setup/src/Magento/Setup/Test/Unit/Model/Grid/TypeMapperTest.php
index 90c26b5632d21..11dca34763a05 100644
--- a/setup/src/Magento/Setup/Test/Unit/Model/Grid/TypeMapperTest.php
+++ b/setup/src/Magento/Setup/Test/Unit/Model/Grid/TypeMapperTest.php
@@ -39,6 +39,9 @@ public function testMap($packageType, $expected)
);
}
+ /**
+ * @return array
+ */
public function mapDataProvider()
{
return [
diff --git a/setup/src/Magento/Setup/Test/Unit/Model/ObjectManagerProviderTest.php b/setup/src/Magento/Setup/Test/Unit/Model/ObjectManagerProviderTest.php
index 9f59479ef0f0d..9d40b053e394e 100644
--- a/setup/src/Magento/Setup/Test/Unit/Model/ObjectManagerProviderTest.php
+++ b/setup/src/Magento/Setup/Test/Unit/Model/ObjectManagerProviderTest.php
@@ -83,6 +83,9 @@ public function testGet()
$this->assertInstanceOf(ObjectManagerInterface::class, $this->model->get());
}
+ /**
+ * @return \PHPUnit_Framework_MockObject_MockObject
+ */
private function getCommandListMock()
{
$commandMock = $this->getMockBuilder(Command::class)->disableOriginalConstructor()->getMock();
diff --git a/setup/src/Magento/Setup/Test/Unit/Model/PayloadValidatorTest.php b/setup/src/Magento/Setup/Test/Unit/Model/PayloadValidatorTest.php
index 192717e1d319b..2d7685c2021cc 100644
--- a/setup/src/Magento/Setup/Test/Unit/Model/PayloadValidatorTest.php
+++ b/setup/src/Magento/Setup/Test/Unit/Model/PayloadValidatorTest.php
@@ -38,6 +38,9 @@ public function testValidatePayLoad($type, $has, $moduleExists)
$this->assertEquals('', $this->model->validatePayload($type));
}
+ /**
+ * @return array
+ */
public function validatePayLoadDataProvider()
{
return [
@@ -61,6 +64,9 @@ public function testValidatePayLoadNegativeCases($type, $has, $moduleExists, $er
$this->assertStringStartsWith($errorMessage, $this->model->validatePayload($type));
}
+ /**
+ * @return array
+ */
public function validatePayLoadNegativeCasesDataProvider()
{
return [
diff --git a/setup/src/Magento/Setup/Test/Unit/Model/PhpReadinessCheckTest.php b/setup/src/Magento/Setup/Test/Unit/Model/PhpReadinessCheckTest.php
index f543e77787f9d..13f5b6940d846 100644
--- a/setup/src/Magento/Setup/Test/Unit/Model/PhpReadinessCheckTest.php
+++ b/setup/src/Magento/Setup/Test/Unit/Model/PhpReadinessCheckTest.php
@@ -411,6 +411,11 @@ protected function isPhp7OrHhvm()
namespace Magento\Setup\Model;
+/**
+ * @param $param
+ *
+ * @return int|string
+ */
function ini_get($param)
{
if ($param === 'xdebug.max_nesting_level') {
diff --git a/setup/src/Magento/Setup/Test/Unit/Model/WebLoggerTest.php b/setup/src/Magento/Setup/Test/Unit/Model/WebLoggerTest.php
index b3ac6ad286e44..a55c50eeaa736 100644
--- a/setup/src/Magento/Setup/Test/Unit/Model/WebLoggerTest.php
+++ b/setup/src/Magento/Setup/Test/Unit/Model/WebLoggerTest.php
@@ -184,6 +184,9 @@ public function testClearNotExist()
$this->webLogger->clear();
}
+ /**
+ * @return string
+ */
public static function readLog()
{
return self::$log;
@@ -202,6 +205,9 @@ public static function deleteLog()
self::$log = '';
}
+ /**
+ * @return bool
+ */
public static function isExist()
{
return self::$log != '';
diff --git a/setup/src/Magento/Setup/Test/Unit/Module/Di/Code/Reader/ClassReaderDecoratorTest.php b/setup/src/Magento/Setup/Test/Unit/Module/Di/Code/Reader/ClassReaderDecoratorTest.php
index 7d8ce3ac564b3..ebb6560f9337d 100644
--- a/setup/src/Magento/Setup/Test/Unit/Module/Di/Code/Reader/ClassReaderDecoratorTest.php
+++ b/setup/src/Magento/Setup/Test/Unit/Module/Di/Code/Reader/ClassReaderDecoratorTest.php
@@ -46,6 +46,9 @@ public function testGetConstructor($expectation, $className, $willReturn)
);
}
+ /**
+ * @return array
+ */
public function getConstructorDataProvider()
{
return [
diff --git a/setup/src/Magento/Setup/Test/Unit/Module/Di/_files/app/code/Magento/SomeModule/Helper/Test.php b/setup/src/Magento/Setup/Test/Unit/Module/Di/_files/app/code/Magento/SomeModule/Helper/Test.php
index 68d76980e1057..dcb9a287f787b 100644
--- a/setup/src/Magento/Setup/Test/Unit/Module/Di/_files/app/code/Magento/SomeModule/Helper/Test.php
+++ b/setup/src/Magento/Setup/Test/Unit/Module/Di/_files/app/code/Magento/SomeModule/Helper/Test.php
@@ -25,6 +25,13 @@ class Test
*/
protected $_newElementFactory;
+ /**
+ * Test constructor.
+ *
+ * @param \Magento\SomeModule\Module\Factory $factory
+ * @param \Magento\SomeModule\Element\Factory $elementFactory
+ * @param \Magento\SomeModule\ElementFactory $rightElementFactory
+ */
public function __construct(
\Magento\SomeModule\Module\Factory $factory,
\Magento\SomeModule\Element\Factory $elementFactory,
diff --git a/setup/src/Magento/Setup/Test/Unit/Module/I18n/Parser/AbstractParserTest.php b/setup/src/Magento/Setup/Test/Unit/Module/I18n/Parser/AbstractParserTest.php
index 3c744bb44d32a..c698d4c344df8 100644
--- a/setup/src/Magento/Setup/Test/Unit/Module/I18n/Parser/AbstractParserTest.php
+++ b/setup/src/Magento/Setup/Test/Unit/Module/I18n/Parser/AbstractParserTest.php
@@ -39,6 +39,9 @@ public function testValidateOptions($options, $message)
$this->_parserMock->parse($options);
}
+ /**
+ * @return array
+ */
public function dataProviderForValidateOptions()
{
return [
diff --git a/setup/src/Magento/Setup/Test/Unit/Module/Setup/SetupCacheTest.php b/setup/src/Magento/Setup/Test/Unit/Module/Setup/SetupCacheTest.php
index 15a55bd23b164..573c8b132ca41 100644
--- a/setup/src/Magento/Setup/Test/Unit/Module/Setup/SetupCacheTest.php
+++ b/setup/src/Magento/Setup/Test/Unit/Module/Setup/SetupCacheTest.php
@@ -88,6 +88,9 @@ public function testHas($table, $parentId, $rowId, $field, $expected)
$this->assertSame($expected, $this->object->has($table, $parentId, $rowId, $field));
}
+ /**
+ * @return array
+ */
public function hasDataProvider()
{
return [
diff --git a/setup/src/Magento/Setup/Test/Unit/Mvc/Bootstrap/InitParamListenerTest.php b/setup/src/Magento/Setup/Test/Unit/Mvc/Bootstrap/InitParamListenerTest.php
index a35007189a9ca..f0a9d5316b3a6 100644
--- a/setup/src/Magento/Setup/Test/Unit/Mvc/Bootstrap/InitParamListenerTest.php
+++ b/setup/src/Magento/Setup/Test/Unit/Mvc/Bootstrap/InitParamListenerTest.php
@@ -144,6 +144,9 @@ public function testCreateService($zfAppConfig, $env, $cliParam, $expectedArray)
$this->assertEquals($expectedArray, $listener->createService($serviceLocator));
}
+ /**
+ * @return array
+ */
public function createServiceDataProvider()
{
return [