[Backport] Remove parameter from method calling

README.md

@@ -2,7 +2,7 @@
 [![Open Source Helpers](https://www.codetriage.com/magento/magento2/badges/users.svg)](https://www.codetriage.com/magento/magento2)
 [![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/magento/magento2?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
 <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.
 
 The installation instructions that used to be here are now published on our GitHub site. Use the information on this page to get started or go directly to the <a href="http://devdocs.magento.com/guides/v2.0/install-gde/bk-install-guide.html" target="_blank">guide</a>.
 

app/code/Magento/AdminNotification/Controller/Adminhtml/System/Message/ListAction.php

@@ -61,8 +61,10 @@ public function execute()
         if (empty($result)) {
             $result[] = [
                 'severity' => (string)\Magento\Framework\Notification\MessageInterface::SEVERITY_NOTICE,
-                'text' => 'You have viewed and resolved all recent system notices. '
-                    . 'Please refresh the web page to clear the notice alert.',
+                'text' => __(
+                    'You have viewed and resolved all recent system notices. '
+                    . 'Please refresh the web page to clear the notice alert.'
+                )
             ];
         }
         $this->getResponse()->representJson($this->jsonHelper->jsonEncode($result));

app/code/Magento/AdminNotification/i18n/en_US.csv

@@ -49,3 +49,4 @@ Severity,Severity
 "Date Added","Date Added"
 Message,Message
 Actions,Actions
+"You have viewed and resolved all recent system notices. Please refresh the web page to clear the notice alert.","You have viewed and resolved all recent system notices. Please refresh the web page to clear the notice alert."

app/code/Magento/Backend/App/AbstractAction.php

@@ -214,6 +214,7 @@ public function dispatch(\Magento\Framework\App\RequestInterface $request)
             $this->_view->loadLayout(['default', 'adminhtml_denied'], true, true, false);
             $this->_view->renderLayout();
             $this->_request->setDispatched(true);
+
             return $this->_response;
         }
 
@@ -223,6 +224,11 @@ public function dispatch(\Magento\Framework\App\RequestInterface $request)
 
         $this->_processLocaleSettings();
 
+        // Need to preload isFirstPageAfterLogin (see https://github.com/magento/magento2/issues/15510)
+        if ($this->_auth->isLoggedIn()) {
+            $this->_auth->getAuthStorage()->isFirstPageAfterLogin();
+        }
+
         return parent::dispatch($request);
     }
 

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

@@ -18,7 +18,7 @@ class Dashboard extends \Magento\Backend\Block\Template
     /**
      * @var string
      */
-    protected $_template = 'dashboard/index.phtml';
+    protected $_template = 'Magento_Backend::dashboard/index.phtml';
 
     /**
      * @return void

app/code/Magento/Backend/Block/Dashboard/Graph.php

@@ -90,7 +90,7 @@ class Graph extends \Magento\Backend\Block\Dashboard\AbstractDashboard
     /**
      * @var string
      */
-    protected $_template = 'dashboard/graph.phtml';
+    protected $_template = 'Magento_Backend::dashboard/graph.phtml';
 
     /**
      * Adminhtml dashboard data

app/code/Magento/Backend/Block/Dashboard/Grid.php

@@ -15,7 +15,7 @@ class Grid extends \Magento\Backend\Block\Widget\Grid\Extended
     /**
      * @var string
      */
-    protected $_template = 'dashboard/grid.phtml';
+    protected $_template = 'Magento_Backend::dashboard/grid.phtml';
 
     /**
      * Setting default for every grid on dashboard

app/code/Magento/Backend/Block/Dashboard/Sales.php

@@ -16,7 +16,7 @@ class Sales extends \Magento\Backend\Block\Dashboard\Bar
     /**
      * @var string
      */
-    protected $_template = 'dashboard/salebar.phtml';
+    protected $_template = 'Magento_Backend::dashboard/salebar.phtml';
 
     /**
      * @var \Magento\Framework\Module\Manager

app/code/Magento/Backend/Block/Dashboard/Totals.php

@@ -17,7 +17,7 @@ class Totals extends \Magento\Backend\Block\Dashboard\Bar
     /**
      * @var string
      */
-    protected $_template = 'dashboard/totalbar.phtml';
+    protected $_template = 'Magento_Backend::dashboard/totalbar.phtml';
 
     /**
      * @var \Magento\Framework\Module\Manager

app/code/Magento/Backend/Block/Page/Copyright.php

@@ -15,5 +15,5 @@ class Copyright extends \Magento\Backend\Block\Template
      *
      * @var string
      */
-    protected $_template = 'page/copyright.phtml';
+    protected $_template = 'Magento_Backend::page/copyright.phtml';
 }

app/code/Magento/Backend/Block/Page/Footer.php

@@ -15,7 +15,7 @@ class Footer extends \Magento\Backend\Block\Template
     /**
      * @var string
      */
-    protected $_template = 'page/footer.phtml';
+    protected $_template = 'Magento_Backend::page/footer.phtml';
 
     /**
      * @var \Magento\Framework\App\ProductMetadataInterface

app/code/Magento/Backend/Block/Page/Header.php

@@ -18,7 +18,7 @@ class Header extends \Magento\Backend\Block\Template
     /**
      * @var string
      */
-    protected $_template = 'page/header.phtml';
+    protected $_template = 'Magento_Backend::page/header.phtml';
 
     /**
      * Backend data

app/code/Magento/Backend/Block/Store/Switcher/Form/Renderer/Fieldset.php

@@ -23,7 +23,7 @@ class Fieldset extends \Magento\Backend\Block\Template implements \Magento\Frame
     /**
      * @var string
      */
-    protected $_template = 'store/switcher/form/renderer/fieldset.phtml';
+    protected $_template = 'Magento_Backend::store/switcher/form/renderer/fieldset.phtml';
 
     /**
      * Retrieve an element

app/code/Magento/Backend/Block/Store/Switcher/Form/Renderer/Fieldset/Element.php

@@ -21,7 +21,7 @@ class Element extends \Magento\Backend\Block\Widget\Form\Renderer\Fieldset\Eleme
     /**
      * @var string
      */
-    protected $_template = 'store/switcher/form/renderer/fieldset/element.phtml';
+    protected $_template = 'Magento_Backend::store/switcher/form/renderer/fieldset/element.phtml';
 
     /**
      * Retrieve an element

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')]];
     }
 }

app/code/Magento/Backend/Block/Widget/Grid/Massaction/AbstractMassaction.php

@@ -205,9 +205,8 @@ public function getSelectedJson()
         if ($selected = $this->getRequest()->getParam($this->getFormFieldNameInternal())) {
             $selected = explode(',', $selected);
             return join(',', $selected);
-        } else {
-            return '';
         }
+        return '';
     }
 
     /**
@@ -220,9 +219,8 @@ public function getSelected()
         if ($selected = $this->getRequest()->getParam($this->getFormFieldNameInternal())) {
             $selected = explode(',', $selected);
             return $selected;
-        } else {
-            return [];
         }
+        return [];
     }
 
     /**

app/code/Magento/Backend/Block/Widget/Grid/Massaction/Extended.php

@@ -215,9 +215,8 @@ public function getSelectedJson()
         if ($selected = $this->getRequest()->getParam($this->getFormFieldNameInternal())) {
             $selected = explode(',', $selected);
             return join(',', $selected);
-        } else {
-            return '';
         }
+        return '';
     }
 
     /**
@@ -230,9 +229,8 @@ public function getSelected()
         if ($selected = $this->getRequest()->getParam($this->getFormFieldNameInternal())) {
             $selected = explode(',', $selected);
             return $selected;
-        } else {
-            return [];
         }
+        return [];
     }
 
     /**

app/code/Magento/Backend/Controller/Adminhtml/Auth/Login.php

@@ -46,9 +46,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();
     }
 
     /**

app/code/Magento/Backend/Controller/Adminhtml/System/Account/Save.php

@@ -29,9 +29,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;
     }
 
     /**

app/code/Magento/Backend/view/adminhtml/templates/widget/button/split.phtml

@@ -41,11 +41,11 @@
     <?php endif; ?>
 </div>
 
-<script>
-require(['jquery'], function($){
-        $('.actions-split')
-            .on('click.splitDefault', '.action-default', function() {
-                $(this).siblings('.dropdown-menu').find('.item-default').trigger('click');
-            });
-});
+<script type="text/x-magento-init">
+    {
+        ".actions-split": {
+            "Magento_Ui/js/grid/controls/button/split": {}
+        }
+    }
 </script>
+

app/code/Magento/Backend/view/adminhtml/web/template/dynamic-rows/grid.html

@@ -85,7 +85,7 @@
 <div class="messages">
     <div class="message message-notice notice">
         <span
-            translate="'Search strings are either normal strings or regular exceptions (PCRE). They are matched in the same order as entered.'"></span>
+            translate="'Search strings are either normal strings or regular expressions (PCRE). They are matched in the same order as entered.'"></span>
         <br>
         <span
             translate="'Examples'"></span>:

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;
     }
 
     /**

app/code/Magento/Braintree/i18n/en_US.csv

@@ -165,4 +165,5 @@ Debug,Debug
 "credit_card","Credit card"
 "apple_pay_card","Apple pay card"
 "android_pay_card","Android pay card"
-"Accept credit/debit cards and PayPal in your Magento store.<br/>No setup or monthly fees and your customers never leave your store to complete the purchase.","Accept credit/debit cards and PayPal in your Magento store.<br/>No setup or monthly fees and your customers never leave your store to complete the purchase."
+"Accept credit/debit cards and PayPal in your Magento store.<br/>No setup or monthly fees and your customers never leave your store to complete the purchase.","Accept credit/debit cards and PayPal in your Magento store.<br/>No setup or monthly fees and your customers never leave your store to complete the purchase."
+"Save for later use.","Save for later use."

app/code/Magento/Braintree/view/adminhtml/templates/form/cc.phtml

@@ -84,7 +84,7 @@ $ccType = $block->getInfoData('cc_type');
                    name="payment[is_active_payment_token_enabler]"
                    class="admin__control-checkbox"/>
             <label class="label" for="<?php /* @noEscape */ echo $code; ?>_vault">
-                <span><?php echo $block->escapeHtml('Save for later use.'); ?></span>
+                <span><?php echo $block->escapeHtml(__('Save for later use.')); ?></span>
             </label>
         </div>
     <?php endif; ?>

app/code/Magento/Bundle/Block/Adminhtml/Sales/Order/Items/Renderer.php

@@ -62,9 +62,8 @@ public function getChildren($item)
 
         if (isset($itemsArray[$item->getOrderItem()->getId()])) {
             return $itemsArray[$item->getOrderItem()->getId()];
-        } else {
-            return null;
         }
+        return null;
     }
 
     /**
@@ -186,9 +185,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();
     }
 
     /**

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

@@ -174,9 +174,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();
     }
 
     /**

app/code/Magento/Bundle/Block/Sales/Order/Items/Renderer.php

@@ -114,9 +114,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());
     }
 
     /**
@@ -151,9 +150,8 @@ public function getChildren($item)
 
         if (isset($itemsArray[$item->getOrderItem()->getId()])) {
             return $itemsArray[$item->getOrderItem()->getId()];
-        } else {
-            return null;
         }
+        return null;
     }
 
     /**

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);
     }
 }

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

@@ -948,9 +948,8 @@ public function shakeSelections($firstItem, $secondItem)
         ];
         if ($aPosition == $bPosition) {
             return 0;
-        } else {
-            return $aPosition < $bPosition ? -1 : 1;
         }
+        return $aPosition < $bPosition ? -1 : 1;
     }
 
     /**

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

@@ -44,9 +44,8 @@ public function getChildren($item)
 
         if (isset($itemsArray[$item->getOrderItem()->getId()])) {
             return $itemsArray[$item->getOrderItem()->getId()];
-        } else {
-            return null;
         }
+        return null;
     }
 
     /**
@@ -196,9 +195,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();
     }
 
     /**

app/code/Magento/Bundle/Pricing/Adjustment/Calculator.php

@@ -267,9 +267,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);
     }
 
     /**

app/code/Magento/Bundle/Pricing/Price/BundleSelectionPrice.php

@@ -163,8 +163,7 @@ public function getProduct()
     {
         if ($this->bundleProduct->getPriceType() == Price::PRICE_TYPE_DYNAMIC) {
             return parent::getProduct();
-        } else {
-            return $this->bundleProduct;
         }
+        return $this->bundleProduct;
     }
 }

app/code/Magento/Bundle/Pricing/Price/ConfiguredPrice.php

@@ -124,9 +124,8 @@ public function getValue()
                 $this->priceInfo
                     ->getPrice(BundleDiscountPrice::PRICE_CODE)
                     ->calculateDiscount($configuredOptionsAmount);
-        } else {
-            return parent::getValue();
         }
+        return parent::getValue();
     }
 
     /**