🔃 [EngCom] Public Pull Requests - 2.2-develop

magento-engcom-team · web-flow · commit 5685fcee3d71 · 2018-04-14T03:25:09.000+03:00
Accepted Public Pull Requests: - #14696: [Backport] Eliminate usage of "else" statements (by @ihor-sviziev) - #14688: Translate Action Label (by @net32) - #14681: [Backport] Fix #13652. Mini cart - fix issue in product title with special chars. (by @ihor-sviziev) - #14678: Checkout page - Fix tooltip position on mobile devices (by @ihor-sviziev) - #14668: Added hyphenation, cutting edge to cutting-edge. (by @surya07081995) - #14629: Refactor Code for Mass Order Unhold (by @AnshuMishra17) - #14635: [Forwardport] #14465 Fix empty changelog tables after MySQL restart. (by @ihor-sviziev) - #13016: Fix for sales PDFs to support all characters (by @rossmc) - #14048: Fix for GitHub issue #14035. (by @kamilszewczyk) Fixed GitHub Issues: - #13652: Issue in product title with special chars in mini cart (reported by @Sunil-Nethues) has been fixed in #14681 by @ihor-sviziev in 2.2-develop branch Related commits: 1. 8a30ffd - #14465: [Indexes] Product 'version_id' lost last 'auro_increment' value after MySQL restart. (reported by @swnsma) has been fixed in #14635 by @ihor-sviziev in 2.2-develop branch Related commits: 1. 17b585f - #9666: Magento 2.1.6 - Invoice PDF doesn't support Thai (reported by @jsdupuis) has been fixed in #13016 by @rossmc in 2.2-develop branch Related commits: 1. e44c91f 2. b38976b 3. a5b685e - #12323: Magento 2.1.3 - Invoice and shipment PDF doesn't support Arabic (reported by @Avinashsain) has been fixed in #13016 by @rossmc in 2.2-develop branch Related commits: 1. e44c91f 2. b38976b 3. a5b685e - #14035: Magento REST API, wrong condition for product list category filter (reported by @kamilszewczyk) has been fixed in #14048 by @kamilszewczyk in 2.2-develop branch Related commits: 1. 3e776ee 2. e180558
diff --git a/README.md b/README.md
@@ -3,7 +3,7 @@
 [![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/magento/magento2?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
 [![Crowdin](https://d322cqt584bo4o.cloudfront.net/magento-2/localized.png)](https://crowdin.com/project/magento-2)
 <h2>Welcome</h2>
-Welcome to Magento 2 installation! We're glad you chose to install Magento 2, a cutting edge, feature-rich eCommerce solution that gets results.
+Welcome to Magento 2 installation! We're glad you chose to install Magento 2, a cutting-edge, feature-rich eCommerce solution that gets results.
 
 ## Magento system requirements
 [Magento system requirements](http://devdocs.magento.com/guides/v2.2/install-gde/system-requirements2.html)
diff --git a/app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Radio.php b/app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Radio.php
@@ -31,8 +31,7 @@ public function getCondition()
     {
         if ($this->getValue()) {
             return $this->getColumn()->getValue();
-        } else {
-            return [['neq' => $this->getColumn()->getValue()], ['is' => new \Zend_Db_Expr('NULL')]];
         }
+        return [['neq' => $this->getColumn()->getValue()], ['is' => new \Zend_Db_Expr('NULL')]];
     }
 }
diff --git a/app/code/Magento/Backend/Block/Widget/Grid/Massaction/AbstractMassaction.php b/app/code/Magento/Backend/Block/Widget/Grid/Massaction/AbstractMassaction.php
@@ -222,9 +222,8 @@ public function getSelectedJson()
         if ($selected = $this->getRequest()->getParam($this->getFormFieldNameInternal())) {
             $selected = explode(',', $selected);
             return join(',', $selected);
-        } else {
-            return '';
         }
+        return '';
     }
 
     /**
@@ -237,9 +236,8 @@ public function getSelected()
         if ($selected = $this->getRequest()->getParam($this->getFormFieldNameInternal())) {
             $selected = explode(',', $selected);
             return $selected;
-        } else {
-            return [];
         }
+        return [];
     }
 
     /**
diff --git a/app/code/Magento/Backend/Block/Widget/Grid/Massaction/Extended.php b/app/code/Magento/Backend/Block/Widget/Grid/Massaction/Extended.php
@@ -218,9 +218,8 @@ public function getSelectedJson()
         if ($selected = $this->getRequest()->getParam($this->getFormFieldNameInternal())) {
             $selected = explode(',', $selected);
             return join(',', $selected);
-        } else {
-            return '';
         }
+        return '';
     }
 
     /**
@@ -233,9 +232,8 @@ public function getSelected()
         if ($selected = $this->getRequest()->getParam($this->getFormFieldNameInternal())) {
             $selected = explode(',', $selected);
             return $selected;
-        } else {
-            return [];
         }
+        return [];
     }
 
     /**
diff --git a/app/code/Magento/Backend/Controller/Adminhtml/Auth/Login.php b/app/code/Magento/Backend/Controller/Adminhtml/Auth/Login.php
@@ -50,9 +50,8 @@ public function execute()
         // redirect according to rewrite rule
         if ($requestUrl != $backendUrl) {
             return $this->getRedirect($backendUrl);
-        } else {
-            return $this->resultPageFactory->create();
         }
+        return $this->resultPageFactory->create();
     }
 
     /**
diff --git a/app/code/Magento/Backend/Controller/Adminhtml/System/Account/Save.php b/app/code/Magento/Backend/Controller/Adminhtml/System/Account/Save.php
@@ -32,9 +32,8 @@ private function getSecurityCookie()
     {
         if (!($this->securityCookie instanceof SecurityCookie)) {
             return \Magento\Framework\App\ObjectManager::getInstance()->get(SecurityCookie::class);
-        } else {
-            return $this->securityCookie;
         }
+        return $this->securityCookie;
     }
 
     /**
diff --git a/app/code/Magento/Backend/Model/Menu/Item.php b/app/code/Magento/Backend/Model/Menu/Item.php
@@ -503,12 +503,11 @@ public function populateFromArray(array $data)
         $this->_tooltip = $this->_getArgument($data, 'toolTip');
         $this->_title = $this->_getArgument($data, 'title');
         $this->target = $this->_getArgument($data, 'target');
+        $this->_submenu = null;
         if (isset($data['sub_menu'])) {
             $menu = $this->_menuFactory->create();
             $menu->populateFromArray($data['sub_menu']);
             $this->_submenu = $menu;
-        } else {
-            $this->_submenu = null;
         }
     }
 }
diff --git a/app/code/Magento/Braintree/Test/Unit/Model/Report/BraintreeTransactionStub.php b/app/code/Magento/Braintree/Test/Unit/Model/Report/BraintreeTransactionStub.php
@@ -34,10 +34,9 @@ public function __get($name)
     {
         if (array_key_exists($name, $this->_attributes)) {
             return $this->_attributes[$name];
-        } else {
-            trigger_error('Undefined property on ' . get_class($this) . ': ' . $name, E_USER_NOTICE);
-            return null;
         }
+        trigger_error('Undefined property on ' . get_class($this) . ': ' . $name, E_USER_NOTICE);
+        return null;
     }
 
     /**
diff --git a/app/code/Magento/Bundle/Block/Adminhtml/Sales/Order/Items/Renderer.php b/app/code/Magento/Bundle/Block/Adminhtml/Sales/Order/Items/Renderer.php
@@ -95,9 +95,8 @@ public function getChildren($item)
 
         if (isset($itemsArray[$item->getOrderItem()->getId()])) {
             return $itemsArray[$item->getOrderItem()->getId()];
-        } else {
-            return null;
         }
+        return null;
     }
 
     /**
@@ -219,9 +218,8 @@ public function getOrderItem()
     {
         if ($this->getItem() instanceof \Magento\Sales\Model\Order\Item) {
             return $this->getItem();
-        } else {
-            return $this->getItem()->getOrderItem();
         }
+        return $this->getItem()->getOrderItem();
     }
 
     /**
diff --git a/app/code/Magento/Bundle/Block/Catalog/Product/View/Type/Bundle/Option.php b/app/code/Magento/Bundle/Block/Catalog/Product/View/Type/Bundle/Option.php
@@ -191,9 +191,8 @@ public function isSelected($selection)
             return in_array($selection->getSelectionId(), $selectedOptions);
         } elseif ($selectedOptions == 'None') {
             return false;
-        } else {
-            return $selection->getIsDefault() && $selection->isSaleable();
         }
+        return $selection->getIsDefault() && $selection->isSaleable();
     }
 
     /**
diff --git a/app/code/Magento/Bundle/Block/Sales/Order/Items/Renderer.php b/app/code/Magento/Bundle/Block/Sales/Order/Items/Renderer.php
@@ -142,9 +142,8 @@ public function getValueHtml($item)
         if ($attributes = $this->getSelectionAttributes($item)) {
             return sprintf('%d', $attributes['qty']) . ' x ' . $this->escapeHtml($item->getName()) . " "
                 . $this->getOrder()->formatPrice($attributes['price']);
-        } else {
-            return $this->escapeHtml($item->getName());
         }
+        return $this->escapeHtml($item->getName());
     }
 
     /**
@@ -179,9 +178,8 @@ public function getChildren($item)
 
         if (isset($itemsArray[$item->getOrderItem()->getId()])) {
             return $itemsArray[$item->getOrderItem()->getId()];
-        } else {
-            return null;
         }
+        return null;
     }
 
     /**
diff --git a/app/code/Magento/Bundle/Model/Plugin/PriceBackend.php b/app/code/Magento/Bundle/Model/Plugin/PriceBackend.php
@@ -29,8 +29,7 @@ public function aroundValidate(
             && $object->getPriceType() == \Magento\Bundle\Model\Product\Price::PRICE_TYPE_DYNAMIC
         ) {
             return true;
-        } else {
-            return $proceed($object);
         }
+        return $proceed($object);
     }
 }
diff --git a/app/code/Magento/Bundle/Model/Product/Type.php b/app/code/Magento/Bundle/Model/Product/Type.php
@@ -1015,9 +1015,8 @@ public function shakeSelections($firstItem, $secondItem)
         ];
         if ($aPosition == $bPosition) {
             return 0;
-        } else {
-            return $aPosition < $bPosition ? -1 : 1;
         }
+        return $aPosition < $bPosition ? -1 : 1;
     }
 
     /**
diff --git a/app/code/Magento/Bundle/Model/Sales/Order/Pdf/Items/AbstractItems.php b/app/code/Magento/Bundle/Model/Sales/Order/Pdf/Items/AbstractItems.php
@@ -92,9 +92,8 @@ public function getChildren($item)
 
         if (isset($itemsArray[$item->getOrderItem()->getId()])) {
             return $itemsArray[$item->getOrderItem()->getId()];
-        } else {
-            return null;
         }
+        return null;
     }
 
     /**
@@ -244,9 +243,8 @@ public function getOrderItem()
     {
         if ($this->getItem() instanceof \Magento\Sales\Model\Order\Item) {
             return $this->getItem();
-        } else {
-            return $this->getItem()->getOrderItem();
         }
+        return $this->getItem()->getOrderItem();
     }
 
     /**
diff --git a/app/code/Magento/Bundle/Pricing/Adjustment/Calculator.php b/app/code/Magento/Bundle/Pricing/Adjustment/Calculator.php
@@ -271,9 +271,8 @@ public function calculateBundleAmount($basePriceValue, $bundleProduct, $selectio
     {
         if ($bundleProduct->getPriceType() == Price::PRICE_TYPE_FIXED) {
             return $this->calculateFixedBundleAmount($basePriceValue, $bundleProduct, $selectionPriceList, $exclude);
-        } else {
-            return $this->calculateDynamicBundleAmount($basePriceValue, $bundleProduct, $selectionPriceList, $exclude);
         }
+        return $this->calculateDynamicBundleAmount($basePriceValue, $bundleProduct, $selectionPriceList, $exclude);
     }
 
     /**
diff --git a/app/code/Magento/Bundle/Pricing/Price/BundleSelectionPrice.php b/app/code/Magento/Bundle/Pricing/Price/BundleSelectionPrice.php
@@ -184,8 +184,7 @@ public function getProduct()
     {
         if ($this->bundleProduct->getPriceType() == Price::PRICE_TYPE_DYNAMIC) {
             return parent::getProduct();
-        } else {
-            return $this->bundleProduct;
         }
+        return $this->bundleProduct;
     }
 }
diff --git a/app/code/Magento/Bundle/Pricing/Price/ConfiguredPrice.php b/app/code/Magento/Bundle/Pricing/Price/ConfiguredPrice.php
@@ -144,9 +144,8 @@ public function getValue()
                 $this->priceInfo
                     ->getPrice(BundleDiscountPrice::PRICE_CODE)
                     ->calculateDiscount($configuredOptionsAmount);
-        } else {
-            return parent::getValue();
         }
+        return parent::getValue();
     }
 
     /**
diff --git a/app/code/Magento/Catalog/Model/Api/SearchCriteria/CollectionProcessor/FilterProcessor/ProductCategoryFilter.php b/app/code/Magento/Catalog/Model/Api/SearchCriteria/CollectionProcessor/FilterProcessor/ProductCategoryFilter.php
@@ -21,8 +21,14 @@ class ProductCategoryFilter implements CustomFilterInterface
      */
     public function apply(Filter $filter, AbstractDb $collection)
     {
-        $conditionType = $filter->getConditionType() ?: 'eq';
-        $categoryFilter = [$conditionType => [$filter->getValue()]];
+        $value = $filter->getValue();
+        $conditionType = $filter->getConditionType() ?: 'in';
+        if (($conditionType === 'in' || $conditionType === 'nin') && is_string($value)) {
+            $value = explode(',', $value);
+        } else {
+            $value = [$value];
+        }
+        $categoryFilter = [$conditionType => $value];
 
         /** @var Collection $collection */
         $collection->addCategoriesFilter($categoryFilter);
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Api/SearchCriteria/CollectionProcessor/FilterProcessor/ProductCategoryFilterTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Api/SearchCriteria/CollectionProcessor/FilterProcessor/ProductCategoryFilterTest.php
@@ -66,7 +66,7 @@ public function testApplyWithoutCondition()
 
         $collectionMock->expects($this->once())
             ->method('addCategoriesFilter')
-            ->with(['eq' => ['value']]);
+            ->with(['in' => ['value']]);
 
         $this->assertTrue($this->model->apply($filterMock, $collectionMock));
     }
diff --git a/app/code/Magento/Checkout/CustomerData/DefaultItem.php b/app/code/Magento/Checkout/CustomerData/DefaultItem.php
@@ -6,6 +6,8 @@
 
 namespace Magento\Checkout\CustomerData;
 
+use Magento\Framework\App\ObjectManager;
+
 /**
  * Default item
  */
@@ -36,26 +38,36 @@ class DefaultItem extends AbstractItem
      */
     protected $checkoutHelper;
 
+    /**
+     * Escaper
+     *
+     * @var \Magento\Framework\Escaper
+     */
+    private $escaper;
+
     /**
      * @param \Magento\Catalog\Helper\Image $imageHelper
      * @param \Magento\Msrp\Helper\Data $msrpHelper
      * @param \Magento\Framework\UrlInterface $urlBuilder
      * @param \Magento\Catalog\Helper\Product\ConfigurationPool $configurationPool
      * @param \Magento\Checkout\Helper\Data $checkoutHelper
+     * @param \Magento\Framework\Escaper|null $escaper
      * @codeCoverageIgnore
      */
     public function __construct(
         \Magento\Catalog\Helper\Image $imageHelper,
         \Magento\Msrp\Helper\Data $msrpHelper,
         \Magento\Framework\UrlInterface $urlBuilder,
         \Magento\Catalog\Helper\Product\ConfigurationPool $configurationPool,
-        \Magento\Checkout\Helper\Data $checkoutHelper
+        \Magento\Checkout\Helper\Data $checkoutHelper,
+        \Magento\Framework\Escaper $escaper = null
     ) {
         $this->configurationPool = $configurationPool;
         $this->imageHelper = $imageHelper;
         $this->msrpHelper = $msrpHelper;
         $this->urlBuilder = $urlBuilder;
         $this->checkoutHelper = $checkoutHelper;
+        $this->escaper = $escaper ?: ObjectManager::getInstance()->get(\Magento\Framework\Escaper::class);
     }
 
     /**
@@ -64,14 +76,16 @@ public function __construct(
     protected function doGetItemData()
     {
         $imageHelper = $this->imageHelper->init($this->getProductForThumbnail(), 'mini_cart_product_thumbnail');
+        $productName = $this->escaper->escapeHtml($this->item->getProduct()->getName());
+
         return [
             'options' => $this->getOptionList(),
             'qty' => $this->item->getQty() * 1,
             'item_id' => $this->item->getId(),
             'configure_url' => $this->getConfigureUrl(),
             'is_visible_in_site_visibility' => $this->item->getProduct()->isVisibleInSiteVisibility(),
             'product_id' => $this->item->getProduct()->getId(),
-            'product_name' => $this->item->getProduct()->getName(),
+            'product_name' => $productName,
             'product_sku' => $this->item->getProduct()->getSku(),
             'product_url' => $this->getProductUrl(),
             'product_has_url' => $this->hasProductUrl(),
diff --git a/app/code/Magento/Checkout/view/frontend/web/template/minicart/item/default.html b/app/code/Magento/Checkout/view/frontend/web/template/minicart/item/default.html
@@ -24,7 +24,7 @@
         <div class="product-item-details">
             <strong class="product-item-name">
                 <!-- ko if: product_has_url -->
-                <a data-bind="attr: {href: product_url}, text: product_name"></a>
+                <a data-bind="attr: {href: product_url}, html: product_name"></a>
                 <!-- /ko -->
                 <!-- ko ifnot: product_has_url -->
                     <!-- ko text: product_name --><!-- /ko -->
diff --git a/app/code/Magento/Config/view/adminhtml/templates/system/config/form/field/array.phtml b/app/code/Magento/Config/view/adminhtml/templates/system/config/form/field/array.phtml
@@ -21,7 +21,7 @@ $_colspan = $block->isAddAfter() ? 2 : 1;
                 <?php foreach ($block->getColumns() as $columnName => $column): ?>
                     <th><?= /* @escapeNotVerified */ $column['label'] ?></th>
                 <?php endforeach;?>
-                <th class="col-actions" colspan="<?= /* @escapeNotVerified */ $_colspan ?>">Action</th>
+                <th class="col-actions" colspan="<?= /* @escapeNotVerified */ $_colspan ?>"><?= /* @escapeNotVerified */ __('Action') ?></th>
             </tr>
             </thead>
             <tfoot>
diff --git a/app/code/Magento/ConfigurableProduct/CustomerData/ConfigurableItem.php b/app/code/Magento/ConfigurableProduct/CustomerData/ConfigurableItem.php
@@ -26,21 +26,24 @@ class ConfigurableItem extends DefaultItem
      * @param \Magento\Catalog\Helper\Product\ConfigurationPool $configurationPool
      * @param \Magento\Checkout\Helper\Data $checkoutHelper
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
+     * @param \Magento\Framework\Escaper|null $escaper
      */
     public function __construct(
         \Magento\Catalog\Helper\Image $imageHelper,
         \Magento\Msrp\Helper\Data $msrpHelper,
         \Magento\Framework\UrlInterface $urlBuilder,
         \Magento\Catalog\Helper\Product\ConfigurationPool $configurationPool,
         \Magento\Checkout\Helper\Data $checkoutHelper,
-        \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
+        \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
+        \Magento\Framework\Escaper $escaper = null
     ) {
         parent::__construct(
             $imageHelper,
             $msrpHelper,
             $urlBuilder,
             $configurationPool,
-            $checkoutHelper
+            $checkoutHelper,
+            $escaper
         );
         $this->_scopeConfig = $scopeConfig;
     }
diff --git a/app/code/Magento/GroupedProduct/CustomerData/GroupedItem.php b/app/code/Magento/GroupedProduct/CustomerData/GroupedItem.php
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/MassUnhold.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/MassUnhold.php
diff --git a/app/code/Magento/Sales/Model/Order/Pdf/AbstractPdf.php b/app/code/Magento/Sales/Model/Order/Pdf/AbstractPdf.php
diff --git a/app/code/Magento/Sales/Model/Order/Pdf/Items/AbstractItems.php b/app/code/Magento/Sales/Model/Order/Pdf/Items/AbstractItems.php
diff --git a/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/MassUnholdTest.php b/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/MassUnholdTest.php
diff --git a/app/design/frontend/Magento/blank/web/css/source/_extends.less b/app/design/frontend/Magento/blank/web/css/source/_extends.less
diff --git a/app/design/frontend/Magento/luma/web/css/source/_extends.less b/app/design/frontend/Magento/luma/web/css/source/_extends.less
diff --git a/lib/internal/GnuFreeFont/FreeSerif.ttf b/lib/internal/GnuFreeFont/FreeSerif.ttf
diff --git a/lib/internal/GnuFreeFont/FreeSerifBold.ttf b/lib/internal/GnuFreeFont/FreeSerifBold.ttf
diff --git a/lib/internal/GnuFreeFont/FreeSerifItalic.ttf b/lib/internal/GnuFreeFont/FreeSerifItalic.ttf
diff --git a/lib/internal/Magento/Framework/Mview/View/Changelog.php b/lib/internal/Magento/Framework/Mview/View/Changelog.php

Original file line number	Diff line number	Diff line change
`@@ -31,8 +31,7 @@ public function getCondition()`
`31`	`31`	`{`
`32`	`32`	`if ($this->getValue()) {`
`33`	`33`	`return $this->getColumn()->getValue();`
`34`		`- } else {`
`35`		`- return [['neq' => $this->getColumn()->getValue()], ['is' => new \Zend_Db_Expr('NULL')]];`
`36`	`34`	`}`
	`35`	`+ return [['neq' => $this->getColumn()->getValue()], ['is' => new \Zend_Db_Expr('NULL')]];`
`37`	`36`	`}`
`38`	`37`	`}`
Original file line number	Diff line number	Diff line change
`@@ -222,9 +222,8 @@ public function getSelectedJson()`
`222`	`222`	`if ($selected = $this->getRequest()->getParam($this->getFormFieldNameInternal())) {`
`223`	`223`	`$selected = explode(',', $selected);`
`224`	`224`	`return join(',', $selected);`
`225`		`- } else {`
`226`		`- return '';`
`227`	`225`	`}`
	`226`	`+ return '';`
`228`	`227`	`}`
`229`	`228`
`230`	`229`	`/**`
`@@ -237,9 +236,8 @@ public function getSelected()`
`237`	`236`	`if ($selected = $this->getRequest()->getParam($this->getFormFieldNameInternal())) {`
`238`	`237`	`$selected = explode(',', $selected);`
`239`	`238`	`return $selected;`
`240`		`- } else {`
`241`		`- return [];`
`242`	`239`	`}`
	`240`	`+ return [];`
`243`	`241`	`}`
`244`	`242`
`245`	`243`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -218,9 +218,8 @@ public function getSelectedJson()`
`218`	`218`	`if ($selected = $this->getRequest()->getParam($this->getFormFieldNameInternal())) {`
`219`	`219`	`$selected = explode(',', $selected);`
`220`	`220`	`return join(',', $selected);`
`221`		`- } else {`
`222`		`- return '';`
`223`	`221`	`}`
	`222`	`+ return '';`
`224`	`223`	`}`
`225`	`224`
`226`	`225`	`/**`
`@@ -233,9 +232,8 @@ public function getSelected()`
`233`	`232`	`if ($selected = $this->getRequest()->getParam($this->getFormFieldNameInternal())) {`
`234`	`233`	`$selected = explode(',', $selected);`
`235`	`234`	`return $selected;`
`236`		`- } else {`
`237`		`- return [];`
`238`	`235`	`}`
	`236`	`+ return [];`
`239`	`237`	`}`
`240`	`238`
`241`	`239`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -50,9 +50,8 @@ public function execute()`
`50`	`50`	`// redirect according to rewrite rule`
`51`	`51`	`if ($requestUrl != $backendUrl) {`
`52`	`52`	`return $this->getRedirect($backendUrl);`
`53`		`- } else {`
`54`		`- return $this->resultPageFactory->create();`
`55`	`53`	`}`
	`54`	`+ return $this->resultPageFactory->create();`
`56`	`55`	`}`
`57`	`56`
`58`	`57`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -32,9 +32,8 @@ private function getSecurityCookie()`
`32`	`32`	`{`
`33`	`33`	`if (!($this->securityCookie instanceof SecurityCookie)) {`
`34`	`34`	`return \Magento\Framework\App\ObjectManager::getInstance()->get(SecurityCookie::class);`
`35`		`- } else {`
`36`		`- return $this->securityCookie;`
`37`	`35`	`}`
	`36`	`+ return $this->securityCookie;`
`38`	`37`	`}`
`39`	`38`
`40`	`39`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -503,12 +503,11 @@ public function populateFromArray(array $data)`
`503`	`503`	`$this->_tooltip = $this->_getArgument($data, 'toolTip');`
`504`	`504`	`$this->_title = $this->_getArgument($data, 'title');`
`505`	`505`	`$this->target = $this->_getArgument($data, 'target');`
	`506`	`+ $this->_submenu = null;`
`506`	`507`	`if (isset($data['sub_menu'])) {`
`507`	`508`	`$menu = $this->_menuFactory->create();`
`508`	`509`	`$menu->populateFromArray($data['sub_menu']);`
`509`	`510`	`$this->_submenu = $menu;`
`510`		`- } else {`
`511`		`- $this->_submenu = null;`
`512`	`511`	`}`
`513`	`512`	`}`
`514`	`513`	`}`
Original file line number	Diff line number	Diff line change
`@@ -34,10 +34,9 @@ public function __get($name)`
`34`	`34`	`{`
`35`	`35`	`if (array_key_exists($name, $this->_attributes)) {`
`36`	`36`	`return $this->_attributes[$name];`
`37`		`- } else {`
`38`		`- trigger_error('Undefined property on ' . get_class($this) . ': ' . $name, E_USER_NOTICE);`
`39`		`- return null;`
`40`	`37`	`}`
	`38`	`+ trigger_error('Undefined property on ' . get_class($this) . ': ' . $name, E_USER_NOTICE);`
	`39`	`+ return null;`
`41`	`40`	`}`
`42`	`41`
`43`	`42`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -95,9 +95,8 @@ public function getChildren($item)`
`95`	`95`
`96`	`96`	`if (isset($itemsArray[$item->getOrderItem()->getId()])) {`
`97`	`97`	`return $itemsArray[$item->getOrderItem()->getId()];`
`98`		`- } else {`
`99`		`- return null;`
`100`	`98`	`}`
	`99`	`+ return null;`
`101`	`100`	`}`
`102`	`101`
`103`	`102`	`/**`
`@@ -219,9 +218,8 @@ public function getOrderItem()`
`219`	`218`	`{`
`220`	`219`	`if ($this->getItem() instanceof \Magento\Sales\Model\Order\Item) {`
`221`	`220`	`return $this->getItem();`
`222`		`- } else {`
`223`		`- return $this->getItem()->getOrderItem();`
`224`	`221`	`}`
	`222`	`+ return $this->getItem()->getOrderItem();`
`225`	`223`	`}`
`226`	`224`
`227`	`225`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -191,9 +191,8 @@ public function isSelected($selection)`
`191`	`191`	`return in_array($selection->getSelectionId(), $selectedOptions);`
`192`	`192`	`} elseif ($selectedOptions == 'None') {`
`193`	`193`	`return false;`
`194`		`- } else {`
`195`		`- return $selection->getIsDefault() && $selection->isSaleable();`
`196`	`194`	`}`
	`195`	`+ return $selection->getIsDefault() && $selection->isSaleable();`
`197`	`196`	`}`
`198`	`197`
`199`	`198`	`/**`