Merge branch '2.3-develop' of github.com:magento/magento2 into quisse-2.3

Author: omiroshnichenko

app/code/Magento/Backend/Block/Menu.php

@@ -4,8 +4,6 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
 namespace Magento\Backend\Block;
 
 /**
@@ -137,7 +135,9 @@ protected function _getAnchorLabel($menuItem)
      */
     protected function _renderMouseEvent($menuItem)
     {
-        return $menuItem->hasChildren() ? 'onmouseover="Element.addClassName(this,\'over\')" onmouseout="Element.removeClassName(this,\'over\')"' : '';
+        return $menuItem->hasChildren()
+            ? 'onmouseover="Element.addClassName(this,\'over\')" onmouseout="Element.removeClassName(this,\'over\')"'
+            : '';
     }
 
     /**

app/code/Magento/Backend/Block/Widget/Tabs.php

@@ -164,7 +164,7 @@ public function addTab($tabId, $tab)
      */
     protected function _addTabByName($tab, $tabId)
     {
-        if (strpos($tab, '\Block\\')) {
+        if (strpos($tab, '\Block\\') !== false) {
             $this->_tabs[$tabId] = $this->getLayout()->createBlock($tab, $this->getNameInLayout() . '_tab_' . $tabId);
         } elseif ($this->getChildBlock($tab)) {
             $this->_tabs[$tabId] = $this->getChildBlock($tab);

app/code/Magento/Backend/Test/Unit/Model/UrlTest.php

@@ -10,7 +10,6 @@
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @codingStandardsIgnoreFile
  */
 class UrlTest extends \PHPUnit\Framework\TestCase
 {
@@ -81,7 +80,10 @@ class UrlTest extends \PHPUnit\Framework\TestCase
     protected function setUp()
     {
         $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
-        $this->_menuMock = $this->createPartialMock(\Magento\Backend\Model\Menu::class, ['getFirstAvailableChild', 'get', 'getFirstAvailable']);
+        $this->_menuMock = $this->createPartialMock(
+            \Magento\Backend\Model\Menu::class,
+            ['getFirstAvailableChild', 'get', 'getFirstAvailable']
+        );
 
         $this->_menuConfigMock = $this->createMock(\Magento\Backend\Model\Menu\Config::class);
         $this->_menuConfigMock->expects($this->any())->method('getMenu')->will($this->returnValue($this->_menuMock));
@@ -136,7 +138,9 @@ protected function setUp()
             ->method('getHash')
             ->willReturnArgument(0);
         $routeParamsResolver = $this->createMock(\Magento\Framework\Url\RouteParamsResolver::class);
-        $this->routeParamsResolverFactoryMock = $this->createMock(\Magento\Framework\Url\RouteParamsResolverFactory::class);
+        $this->routeParamsResolverFactoryMock = $this->createMock(
+            \Magento\Framework\Url\RouteParamsResolverFactory::class
+        );
         $this->routeParamsResolverFactoryMock->expects($this->any())
             ->method('create')
             ->willReturn($routeParamsResolver);

app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Attributes.php

@@ -4,8 +4,6 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
 namespace Magento\Bundle\Block\Adminhtml\Catalog\Product\Edit\Tab;
 
 /**

app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Attributes/Extend.php

@@ -142,7 +142,6 @@ public function getExtendedElement($switchAttributeCode)
             [
                 'name' => "product[{$switchAttributeCode}]",
                 'values' => $this->getOptions(),
-                'value' => $switchAttributeCode,
                 'class' => 'required-entry next-toinput',
                 'no_span' => true,
                 'disabled' => $this->isDisabledField(),

app/code/Magento/Bundle/Block/Catalog/Product/View/Type/Bundle/Option.php

@@ -4,8 +4,6 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
 namespace Magento\Bundle\Block\Catalog\Product\View\Type\Bundle;
 
 /**
@@ -93,7 +91,7 @@ public function __construct(
      */
     public function showSingle()
     {
-        if (is_null($this->_showSingle)) {
+        if ($this->_showSingle === null) {
             $option = $this->getOption();
             $selections = $option->getSelections();
 
@@ -238,7 +236,11 @@ public function getProduct()
     public function getSelectionQtyTitlePrice($selection, $includeContainer = true)
     {
         $this->setFormatProduct($selection);
-        $priceTitle = '<span class="product-name">' . $selection->getSelectionQty() * 1 . ' x ' . $this->escapeHtml($selection->getName()) . '</span>';
+        $priceTitle = '<span class="product-name">'
+            . $selection->getSelectionQty() * 1
+            . ' x '
+            . $this->escapeHtml($selection->getName())
+            . '</span>';
 
         $priceTitle .= ' &nbsp; ' . ($includeContainer ? '<span class="price-notice">' : '') . '+' .
             $this->renderPriceString($selection, $includeContainer) . ($includeContainer ? '</span>' : '');

app/code/Magento/Bundle/Model/Product/Type.php

@@ -4,8 +4,6 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
 namespace Magento\Bundle\Model\Product;
 
 use Magento\Framework\App\ObjectManager;
@@ -897,8 +895,7 @@ public function getOptionsByIds($optionIds, $product)
         $usedOptions = $product->getData($this->_keyUsedOptions);
         $usedOptionsIds = $product->getData($this->_keyUsedOptionsIds);
 
-        if (
-            !$usedOptions
+        if (!$usedOptions
             || $this->serializer->serialize($usedOptionsIds) != $this->serializer->serialize($optionIds)
         ) {
             $usedOptions = $this->_bundleOption
@@ -1261,7 +1258,9 @@ protected function checkIsAllRequiredOptions($product, $isStrictProcessMode, $op
         if (!$product->getSkipCheckRequiredOption() && $isStrictProcessMode) {
             foreach ($optionsCollection->getItems() as $option) {
                 if ($option->getRequired() && !isset($options[$option->getId()])) {
-                    throw new \Magento\Framework\Exception\LocalizedException(__('Please select all required options.'));
+                    throw new \Magento\Framework\Exception\LocalizedException(
+                        __('Please select all required options.')
+                    );
                 }
             }
         }

app/code/Magento/Bundle/Model/Sales/Order/Pdf/Items/Invoice.php

@@ -10,8 +10,6 @@
 
 /**
  * Order invoice pdf default items renderer
- *
- * @codingStandardsIgnoreFile
  */
 class Invoice extends AbstractItems
 {

app/code/Magento/Bundle/Test/Unit/Block/Catalog/Product/View/Type/Bundle/OptionTest.php

@@ -4,8 +4,6 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
 namespace Magento\Bundle\Test\Unit\Block\Catalog\Product\View\Type\Bundle;
 
 class OptionTest extends \PHPUnit\Framework\TestCase
@@ -65,8 +63,8 @@ public function testSetOption()
             ->will($this->returnValue(true));
         $this->product->expects($this->atLeastOnce())
             ->method('getPreconfiguredValues')
-            ->will($this->returnValue(
-                new \Magento\Framework\DataObject(['bundle_option' => [15 => 315, 16 => 316]]))
+            ->will(
+                $this->returnValue(new \Magento\Framework\DataObject(['bundle_option' => [15 => 315, 16 => 316]]))
             );
 
         $option = $this->createMock(\Magento\Bundle\Model\Option::class);

app/code/Magento/Bundle/Test/Unit/Model/LinkManagementTest.php

@@ -5,8 +5,6 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
 namespace Magento\Bundle\Test\Unit\Model;
 
 use Magento\Bundle\Model\LinkManagement;
@@ -136,9 +134,8 @@ protected function setUp()
             ->disableOriginalConstructor()
             ->getMock();
         $this->selectionCollection = $this->getMockBuilder(
-            \Magento\Bundle\Model\ResourceModel\Selection\Collection::class)
-            ->disableOriginalConstructor()
-            ->getMock();
+            \Magento\Bundle\Model\ResourceModel\Selection\Collection::class
+        )->disableOriginalConstructor()->getMock();
         $this->product = $this->getMockBuilder(\Magento\Catalog\Model\Product::class)
             ->setMethods(['getTypeInstance', 'getStoreId', 'getTypeId', '__wakeup', 'getId', 'getData'])
             ->disableOriginalConstructor()
@@ -150,9 +147,18 @@ protected function setUp()
             ->setMethods(['create'])
             ->disableOriginalConstructor()
             ->getMock();
-        $this->bundleSelectionMock = $this->createPartialMock(\Magento\Bundle\Model\SelectionFactory::class, ['create']);
-        $this->bundleFactoryMock = $this->createPartialMock(\Magento\Bundle\Model\ResourceModel\BundleFactory::class, ['create']);
-        $this->optionCollectionFactoryMock = $this->createPartialMock(\Magento\Bundle\Model\ResourceModel\Option\CollectionFactory::class, ['create']);
+        $this->bundleSelectionMock = $this->createPartialMock(
+            \Magento\Bundle\Model\SelectionFactory::class,
+            ['create']
+        );
+        $this->bundleFactoryMock = $this->createPartialMock(
+            \Magento\Bundle\Model\ResourceModel\BundleFactory::class,
+            ['create']
+        );
+        $this->optionCollectionFactoryMock = $this->createPartialMock(
+            \Magento\Bundle\Model\ResourceModel\Option\CollectionFactory::class,
+            ['create']
+        );
         $this->storeManagerMock = $this->createMock(\Magento\Store\Model\StoreManagerInterface::class);
         $this->metadataPoolMock = $this->getMockBuilder(\Magento\Framework\EntityManager\MetadataPool::class)
             ->disableOriginalConstructor()
@@ -626,7 +632,8 @@ public function testSaveChild()
         $productLink->expects($this->any())->method('getQty')->will($this->returnValue($qty));
         $productLink->expects($this->any())->method('getPriceType')->will($this->returnValue($priceType));
         $productLink->expects($this->any())->method('getPrice')->will($this->returnValue($price));
-        $productLink->expects($this->any())->method('getCanChangeQuantity')->will($this->returnValue($canChangeQuantity));
+        $productLink->expects($this->any())->method('getCanChangeQuantity')
+            ->will($this->returnValue($canChangeQuantity));
         $productLink->expects($this->any())->method('getIsDefault')->will($this->returnValue($isDefault));
         $productLink->expects($this->any())->method('getSelectionId')->will($this->returnValue($optionId));
 

app/code/Magento/Bundle/Test/Unit/Model/OptionRepositoryTest.php

@@ -5,8 +5,6 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
 namespace Magento\Bundle\Test\Unit\Model;
 
 use Magento\Bundle\Model\OptionRepository;
@@ -89,7 +87,10 @@ protected function setUp()
         $this->dataObjectHelperMock = $this->getMockBuilder(\Magento\Framework\Api\DataObjectHelper::class)
             ->disableOriginalConstructor()
             ->getMock();
-        $this->optionResourceMock = $this->createPartialMock(\Magento\Bundle\Model\ResourceModel\Option::class, ['delete', '__wakeup', 'save', 'removeOptionSelections']);
+        $this->optionResourceMock = $this->createPartialMock(
+            \Magento\Bundle\Model\ResourceModel\Option::class,
+            ['delete', '__wakeup', 'save', 'removeOptionSelections']
+        );
         $this->storeManagerMock = $this->createMock(\Magento\Store\Model\StoreManagerInterface::class);
         $this->linkManagementMock = $this->createMock(\Magento\Bundle\Api\ProductLinkManagementInterface::class);
         $this->optionListMock = $this->createMock(\Magento\Bundle\Model\Product\OptionList::class);
@@ -166,7 +167,10 @@ public function testGet()
         $optionId = 100;
         $optionData = ['title' => 'option title'];
 
-        $productMock = $this->createPartialMock(\Magento\Catalog\Model\Product::class, ['getTypeId', 'getTypeInstance', 'getStoreId', 'getPriceType', '__wakeup', 'getSku']);
+        $productMock = $this->createPartialMock(
+            \Magento\Catalog\Model\Product::class,
+            ['getTypeId', 'getTypeInstance', 'getStoreId', 'getPriceType', '__wakeup', 'getSku']
+        );
         $productMock->expects($this->once())
             ->method('getTypeId')
             ->willReturn(\Magento\Catalog\Model\Product\Type::TYPE_BUNDLE);
@@ -292,7 +296,6 @@ public function testSaveExistingOption()
         );
         $optionCollectionMock->expects($this->once())->method('getFirstItem')->willReturn($optionMock);
 
-
         $metadataMock = $this->createMock(\Magento\Framework\EntityManager\EntityMetadata::class);
         $metadataMock->expects($this->once())->method('getLinkField')->willReturn('product_option');
 

app/code/Magento/Bundle/Test/Unit/Pricing/Adjustment/CalculatorTest.php

@@ -4,8 +4,6 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
 namespace Magento\Bundle\Test\Unit\Pricing\Adjustment;
 
 use Magento\Bundle\Model\ResourceModel\Selection\Collection;
@@ -110,7 +108,8 @@ function ($type) {
             \Magento\Bundle\Pricing\Adjustment\SelectionPriceListProviderInterface::class
         )->getMock();
 
-        $this->model = (new ObjectManager($this))->getObject(\Magento\Bundle\Pricing\Adjustment\Calculator::class,
+        $this->model = (new ObjectManager($this))->getObject(
+            \Magento\Bundle\Pricing\Adjustment\Calculator::class,
             [
                 'calculator' => $this->baseCalculator,
                 'amountFactory' => $this->amountFactory,
@@ -577,7 +576,8 @@ public function testGetOptionsAmount($searchMin, $useRegularPrice)
 
         $result = $calculatorMock->getOptionsAmount(
             $this->saleableItem,
-            $exclude, $searchMin,
+            $exclude,
+            $searchMin,
             $amount,
             $useRegularPrice
         );

app/code/Magento/Bundle/Test/Unit/Pricing/Price/DiscountCalculatorTest.php

@@ -4,8 +4,6 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
 namespace Magento\Bundle\Test\Unit\Pricing\Price;
 
 /**
@@ -44,7 +42,10 @@ class DiscountCalculatorTest extends \PHPUnit\Framework\TestCase
     protected function setUp()
     {
         $this->productMock = $this->createMock(\Magento\Catalog\Model\Product::class);
-        $this->priceInfoMock = $this->createPartialMock(\Magento\Framework\Pricing\PriceInfo\Base::class, ['getPrice', 'getPrices']);
+        $this->priceInfoMock = $this->createPartialMock(
+            \Magento\Framework\Pricing\PriceInfo\Base::class,
+            ['getPrice', 'getPrices']
+        );
         $this->finalPriceMock = $this->createMock(\Magento\Catalog\Pricing\Price\FinalPrice::class);
         $this->priceMock = $this->getMockForAbstractClass(
             \Magento\Bundle\Pricing\Price\DiscountProviderInterface::class
@@ -84,14 +85,15 @@ public function testCalculateDiscountWithDefaultAmount()
             ->will($this->returnValue(100));
         $this->priceInfoMock->expects($this->once())
             ->method('getPrices')
-            ->will($this->returnValue(
-                [
-                    $this->getPriceMock(30),
-                    $this->getPriceMock(20),
-                    $this->getPriceMock(40),
-                ]
-            )
-        );
+            ->will(
+                $this->returnValue(
+                    [
+                        $this->getPriceMock(30),
+                        $this->getPriceMock(20),
+                        $this->getPriceMock(40),
+                    ]
+                )
+            );
         $this->assertEquals(20, $this->calculator->calculateDiscount($this->productMock));
     }
 
@@ -105,7 +107,8 @@ public function testCalculateDiscountWithCustomAmount()
             ->will($this->returnValue($this->priceInfoMock));
         $this->priceInfoMock->expects($this->once())
             ->method('getPrices')
-            ->will($this->returnValue(
+            ->will(
+                $this->returnValue(
                     [
                         $this->getPriceMock(30),
                         $this->getPriceMock(20),

app/code/Magento/BundleImportExport/Model/Import/Product/Type/Bundle.php

@@ -217,7 +217,8 @@ protected function parseOption($values)
         $option = [];
         foreach ($values as $keyValue) {
             $keyValue = trim($keyValue);
-            if ($pos = strpos($keyValue, self::PAIR_VALUE_SEPARATOR)) {
+            $pos = strpos($keyValue, self::PAIR_VALUE_SEPARATOR);
+            if ($pos !== false) {
                 $key = substr($keyValue, 0, $pos);
                 $value = substr($keyValue, $pos + 1);
                 if ($key == 'type') {