Merge branch '2.4-develop' of https://github.com/magento-arcticfoxes/magento2ce into B2B-2052

Author: NadiyaS

app/code/Magento/AdminNotification/Model/InboxInterface.php

@@ -18,23 +18,20 @@ interface InboxInterface
      *
      * @param int|null $severity
      * @return array|string|null
-     * @api
      */
     public function getSeverities($severity = null);
 
     /**
      * Retrieve Latest Notice
      *
      * @return $this
-     * @api
      */
     public function loadLatestNotice();
 
     /**
      * Retrieve notice statuses
      *
      * @return array
-     * @api
      */
     public function getNoticeStatus();
 }

app/code/Magento/Authorization/Model/Role.php

@@ -12,7 +12,6 @@
 /**
  * Admin Role Model
  *
- * @api
  * @method int getParentId()
  * @method Role setParentId(int $value)
  * @method int getTreeLevel()

app/code/Magento/Authorization/Model/UserContextInterface.php

@@ -17,25 +17,23 @@ interface UserContextInterface
     /**#@+
      * User type
      */
-    const USER_TYPE_INTEGRATION = 1;
-    const USER_TYPE_ADMIN = 2;
-    const USER_TYPE_CUSTOMER = 3;
-    const USER_TYPE_GUEST = 4;
+    public const USER_TYPE_INTEGRATION = 1;
+    public const USER_TYPE_ADMIN = 2;
+    public const USER_TYPE_CUSTOMER = 3;
+    public const USER_TYPE_GUEST = 4;
     /**#@-*/
 
     /**
      * Identify current user ID.
      *
      * @return int|null
-     * @api
      */
     public function getUserId();
 
     /**
      * Retrieve current user type.
      *
      * @return int|null
-     * @api
      */
     public function getUserType();
 }

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

@@ -1,7 +1,5 @@
 <?php
 /**
- * Default application path for backend area
- *
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
@@ -21,7 +19,6 @@ interface ConfigInterface
      *
      * @param string $path
      * @return mixed
-     * @api
      */
     public function getValue($path);
 
@@ -32,7 +29,6 @@ public function getValue($path);
      * @param string $path
      * @param mixed $value
      * @return void
-     * @api
      */
     public function setValue($path, $value);
 
@@ -43,7 +39,6 @@ public function setValue($path, $value);
      *
      * @param string $path
      * @return bool
-     * @api
      */
     public function isSetFlag($path);
 }

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

@@ -1,13 +1,13 @@
 <?php
 /**
- * Default application path for backend area
- *
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 namespace Magento\Backend\App;
 
 /**
+ * Default application path for backend area
+ *
  * @api
  * @since 100.0.2
  */
@@ -24,7 +24,11 @@ class DefaultPath implements \Magento\Framework\App\DefaultPathInterface
      */
     public function __construct(\Magento\Backend\App\ConfigInterface $config)
     {
-        $pathParts = explode('/', $config->getValue('web/default/admin'));
+        $pathConfigValue = $config->getValue('web/default/admin') ?? '';
+        $pathParts  = [];
+        if ($pathConfigValue) {
+            $pathParts = explode('/', $pathConfigValue);
+        }
 
         $this->_parts = [
             'area' => isset($pathParts[0]) ? $pathParts[0] : '',

app/code/Magento/Backend/Block/Store/Switcher.php

@@ -20,7 +20,7 @@ class Switcher extends \Magento\Backend\Block\Template
     /**
      * URL for store switcher hint
      */
-    const HINT_URL = 'https://docs.magento.com/user-guide/configuration/scope.html';
+    public const HINT_URL = 'https://docs.magento.com/user-guide/configuration/scope.html';
 
     /**
      * Name of website variable
@@ -68,22 +68,16 @@ class Switcher extends \Magento\Backend\Block\Template
     protected $_template = 'Magento_Backend::store/switcher.phtml';
 
     /**
-     * Website factory
-     *
      * @var \Magento\Store\Model\WebsiteFactory
      */
     protected $_websiteFactory;
 
     /**
-     * Store Group Factory
-     *
      * @var \Magento\Store\Model\GroupFactory
      */
     protected $_storeGroupFactory;
 
     /**
-     * Store Factory
-     *
      * @var \Magento\Store\Model\StoreFactory
      */
     protected $_storeFactory;
@@ -617,9 +611,9 @@ public function getHintHtml()
         $url = $this->getHintUrl();
         if ($url) {
             $html = '<div class="admin__field-tooltip tooltip"><a href="%s" onclick="this.target=\'_blank\'"  title="%s"
-           class="admin__field-tooltip-action action-help"><span>%s</span></a></span></div>';
-            $title =  $this->escapeHtmlAttr(__('What is this?'));
-            $span= $this->escapeHtml(__('What is this?'));
+            class="admin__field-tooltip-action action-help"><span>%s</span></a></div>';
+            $title = $this->escapeHtmlAttr(__('What is this?'));
+            $span = $this->escapeHtml(__('What is this?'));
             $html = sprintf($html, $this->escapeUrl($url), $title, $span);
         }
         return $html;

app/code/Magento/Backend/Block/System/Store/Store.php

@@ -10,7 +10,6 @@
  *
  * @api
  * @author      Magento Core Team <core@magentocommerce.com>
- * @api
  * @since 100.0.2
  */
 class Store extends \Magento\Backend\Block\Widget\Grid\Container
@@ -21,6 +20,8 @@ class Store extends \Magento\Backend\Block\Widget\Grid\Container
     protected $_blockGroup = 'Magento_Backend';
 
     /**
+     * Class constructor
+     *
      * @return void
      */
     protected function _construct()

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

@@ -15,7 +15,6 @@
  *
  * @api
  * @author     Magento Core Team <core@magentocommerce.com>
- * @api
  * @since 100.0.2
  */
 class Button extends \Magento\Backend\Block\Widget

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

@@ -9,6 +9,7 @@
 /**
  * Interface \Magento\Backend\Block\Widget\Button\ContextInterface
  *
+ * @api
  */
 interface ContextInterface
 {
@@ -17,7 +18,6 @@ interface ContextInterface
      *
      * @param \Magento\Backend\Block\Widget\Button\Item $item
      * @return bool
-     * @api
      */
     public function canRender(\Magento\Backend\Block\Widget\Button\Item $item);
 }

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

@@ -164,8 +164,12 @@ public function getToggleAttributesHtml()
         if ($disabled) {
             $classes[] = $disabled;
         }
-
-        $attributes = ['title' => $title, 'class' => join(' ', $classes), 'disabled' => $disabled];
+        $attributes = [
+            'title' => $title,
+            'class' => join(' ', $classes),
+            'disabled' => $disabled,
+            'aria-label' => (string)$this->getData('dropdown_button_aria_label'),
+        ];
         $this->_getDataAttributes(['mage-init' => '{"dropdown": {}}', 'toggle' => 'dropdown'], $attributes);
 
         $html = $this->_getAttributesString($attributes);