Merge remote-tracking branch 'origin/2.3-develop' into 2.3-develop-pr33

Author: zakdma

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/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/Model/Menu.php

@@ -83,7 +83,7 @@ public function add(Item $item, $parentId = null, $index = null)
             }
             $parentItem->getChildren()->add($item, null, $index);
         } else {
-            $index = intval($index);
+            $index = (int) $index;
             if (!isset($this[$index])) {
                 $this->offsetSet($index, $item);
                 $this->_logger->info(

app/code/Magento/Backend/Model/Menu/Builder.php

@@ -102,6 +102,6 @@ public function getResult(\Magento\Backend\Model\Menu $menu)
      */
     protected function _getParam($params, $paramName, $defaultValue = null)
     {
-        return isset($params[$paramName]) ? $params[$paramName] : $defaultValue;
+        return $params[$paramName] ?? $defaultValue;
     }
 }

app/code/Magento/Backend/view/adminhtml/templates/widget/grid.phtml

@@ -107,7 +107,7 @@ $numColumns = !is_null($block->getColumns()) ? sizeof($block->getColumns()) : 0;
                                 <?= /* @escapeNotVerified */ __('of %1', '<span>' . $block->getCollection()->getLastPageNumber() . '</span>') ?>
                             </label>
                             <?php if ($_curPage < $_lastPage): ?>
-                                <button title="<?= /* @escapeNotVerified */ __('Next page') ?>"
+                                <button type="button" title="<?= /* @escapeNotVerified */ __('Next page') ?>"
                                         class="action-next"
                                         onclick="<?= /* @escapeNotVerified */ $block->getJsObjectName() ?>.setPage('<?= /* @escapeNotVerified */ ($_curPage + 1) ?>');return false;">
                                     <span><?= /* @escapeNotVerified */ __('Next page') ?></span>

app/code/Magento/Backup/Helper/Data.php

@@ -110,7 +110,7 @@ public function getBackupsDir()
     public function getExtensionByType($type)
     {
         $extensions = $this->getExtensions();
-        return isset($extensions[$type]) ? $extensions[$type] : '';
+        return $extensions[$type] ?? '';
     }
 
     /**

app/code/Magento/Backup/Model/Config/Backend/Cron.php

@@ -76,8 +76,8 @@ public function afterSave()
 
         if ($enabled) {
             $cronExprArray = [
-                intval($time[1]),                                 # Minute
-                intval($time[0]),                                 # Hour
+                (int) $time[1],                                 # Minute
+                (int) $time[0],                                 # Hour
                 $frequency == $frequencyMonthly ? '1' : '*',      # Day of the Month
                 '*',                                              # Month of the Year
                 $frequency == $frequencyWeekly ? '1' : '*',        # Day of the Week