Merge remote-tracking branch 'upstream/2.3-develop' into MAGETWO-92185

Author: Joan He

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,33 @@
+---
+name: Bug report
+about: Technical issue with the Magento 2 core components
+
+---
+
+<!---
+Please review our guidelines before adding a new issue: https://github.com/magento/magento2/wiki/Issue-reporting-guidelines
+-->
+
+### Preconditions
+<!---
+Provide the exact Magento version (example: 2.2.5) and any important information on the environment where bug is reproducible.
+-->
+1.
+2.
+
+### Steps to reproduce
+<!---
+Important: Provide a set of clear steps to reproduce this bug. We can not provide support without clear instructions on how to reproduce.
+-->
+1.
+2.
+
+### Expected result
+<!--- Tell us what do you expect to happen. -->
+1. [Screenshots, logs or description]
+2.
+
+### Actual result
+<!--- Tell us what happened instead. Include error messages and issues. -->
+1. [Screenshots, logs or description]
+2.

.github/ISSUE_TEMPLATE/developer-experience-issue.md

@@ -0,0 +1,18 @@
+---
+name: Developer experience issue
+about: Issues related to customization, extensibility, modularity
+
+---
+
+<!---
+Please review our guidelines before adding a new issue: https://github.com/magento/magento2/wiki/Issue-reporting-guidelines
+-->
+
+### Summary
+<!--- Describe the issue you are experiencing. Include general information, error messages, environments, and so on. -->
+
+### Examples
+<!--- Provide code examples or a patch with a test (recommended) to clearly indicate the problem. -->
+
+### Proposed solution
+<!--- Suggest your potential solutions for this issue. -->

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,21 @@
+---
+name: Feature request
+about: Please consider reporting directly to https://github.com/magento/community-features
+
+---
+
+<!---
+Important: This repository is intended only for Magento 2 Technical Issues. Enter Feature Requests at https://github.com/magento/community-features. Project stakeholders monitor and manage requests. Feature requests entered using this form may be moved to the forum.
+-->
+
+### Description
+<!--- Describe the feature you would like to add. -->
+
+### Expected behavior
+<!--- What is the expected behavior of this feature? How is it going to work? -->
+
+### Benefits
+<!--- How do you think this feature would improve Magento? -->
+
+### Additional information
+<!--- What other information can you provide about the desired feature? -->

app/bootstrap.php

@@ -31,8 +31,6 @@
 // Sets default autoload mappings, may be overridden in Bootstrap::create
 \Magento\Framework\App\Bootstrap::populateAutoloader(BP, []);
 
-require_once BP . '/app/functions.php';
-
 /* Custom umask value may be provided in optional mage_umask file in root */
 $umaskFile = BP . '/magento_umask';
 $mask = file_exists($umaskFile) ? octdec(file_get_contents($umaskFile)) : 002;

app/code/Magento/Analytics/ReportXml/ReportProvider.php

@@ -55,7 +55,7 @@ public function __construct(
     private function getIteratorName(Query $query)
     {
         $config = $query->getConfig();
-        return isset($config['iterator']) ? $config['iterator'] : null;
+        return $config['iterator'] ?? null;
     }
 
     /**

app/code/Magento/Authorizenet/view/frontend/requirejs-config.js

@@ -6,7 +6,7 @@
 var config = {
     map: {
         '*': {
-            transparent: 'Magento_Payment/transparent'
+            transparent: 'Magento_Payment/js/transparent'
         }
     }
 };

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

@@ -42,6 +42,6 @@ public function __construct(\Magento\Backend\App\ConfigInterface $config)
      */
     public function getPart($code)
     {
-        return isset($this->_parts[$code]) ? $this->_parts[$code] : null;
+        return $this->_parts[$code] ?? null;
     }
 }

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

@@ -74,16 +74,23 @@ class Menu extends \Magento\Backend\Block\Template
      */
     private $anchorRenderer;
 
+    /**
+     * @var ConfigInterface
+     */
+    private $routeConfig;
+
     /**
      * @param Template\Context $context
      * @param \Magento\Backend\Model\UrlInterface $url
      * @param \Magento\Backend\Model\Menu\Filter\IteratorFactory $iteratorFactory
      * @param \Magento\Backend\Model\Auth\Session $authSession
      * @param \Magento\Backend\Model\Menu\Config $menuConfig
      * @param \Magento\Framework\Locale\ResolverInterface $localeResolver
+     * @param \Magento\Framework\App\Route\ConfigInterface $routeConfig
      * @param array $data
      * @param MenuItemChecker|null $menuItemChecker
      * @param AnchorRenderer|null $anchorRenderer
+     * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -94,7 +101,8 @@ public function __construct(
         \Magento\Framework\Locale\ResolverInterface $localeResolver,
         array $data = [],
         MenuItemChecker $menuItemChecker = null,
-        AnchorRenderer $anchorRenderer = null
+        AnchorRenderer $anchorRenderer = null,
+        \Magento\Framework\App\Route\ConfigInterface $routeConfig = null
     ) {
         $this->_url = $url;
         $this->_iteratorFactory = $iteratorFactory;
@@ -103,6 +111,9 @@ public function __construct(
         $this->_localeResolver = $localeResolver;
         $this->menuItemChecker =  $menuItemChecker;
         $this->anchorRenderer = $anchorRenderer;
+        $this->routeConfig = $routeConfig ?:
+            \Magento\Framework\App\ObjectManager::getInstance()
+                ->get(\Magento\Framework\App\Route\ConfigInterface::class);
         parent::__construct($context, $data);
     }
 
@@ -203,8 +214,9 @@ protected function _afterToHtml($html)
      */
     protected function _callbackSecretKey($match)
     {
+        $routeId = $this->routeConfig->getRouteByFrontName($match[1]);
         return \Magento\Backend\Model\UrlInterface::SECRET_KEY_PARAM_NAME . '/' . $this->_url->getSecretKey(
-            $match[1],
+            $routeId,
             $match[2],
             $match[3]
         );

app/code/Magento/Backend/Block/Widget/Button/ButtonList.php

@@ -127,8 +127,8 @@ public function getItems()
      */
     public function sortButtons(Item $itemA, Item $itemB)
     {
-        $sortOrderA = intval($itemA->getSortOrder());
-        $sortOrderB = intval($itemB->getSortOrder());
+        $sortOrderA = (int) $itemA->getSortOrder();
+        $sortOrderB = (int) $itemB->getSortOrder();
 
         if ($sortOrderA == $sortOrderB) {
             return 0;

app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Currency.php

@@ -82,7 +82,7 @@ public function render(\Magento\Framework\DataObject $row)
     {
         if ($data = (string)$this->_getValue($row)) {
             $currency_code = $this->_getCurrencyCode($row);
-            $data = floatval($data) * $this->_getRate($row);
+            $data = (float)$data * $this->_getRate($row);
             $sign = (bool)(int)$this->getColumn()->getShowNumberSign() && $data > 0 ? '+' : '';
             $data = sprintf("%f", $data);
             $data = $this->_localeCurrency->getCurrency($currency_code)->toCurrency($data);
@@ -118,10 +118,10 @@ protected function _getCurrencyCode($row)
     protected function _getRate($row)
     {
         if ($rate = $this->getColumn()->getRate()) {
-            return floatval($rate);
+            return (float)$rate;
         }
         if ($rate = $row->getData($this->getColumn()->getRateField())) {
-            return floatval($rate);
+            return (float)$rate;
         }
         return $this->_defaultBaseCurrency->getRate($this->_getCurrencyCode($row));
     }