Merge remote-tracking branch 'origin/AC-3110-p3' into delivery-bunch-w21

Author: andrewbess

app/code/Magento/CatalogUrlRewrite/Observer/AfterImportDataObserver.php

@@ -302,7 +302,7 @@ private function isNeedToPopulateForUrlGeneration($rowData, $newSku, $oldSku): b
             (empty($newSku) || !isset($newSku['entity_id']))
                 || ($this->import->getRowScope($rowData) == ImportProduct::SCOPE_STORE
                     && empty($rowData[self::URL_KEY_ATTRIBUTE_CODE]))
-                || (array_key_exists(strtolower($rowData[ImportProduct::COL_SKU]), $oldSku)
+                || (array_key_exists(strtolower($rowData[ImportProduct::COL_SKU] ?? ''), $oldSku)
                     && !isset($rowData[self::URL_KEY_ATTRIBUTE_CODE])
                     && $this->import->getBehavior() === ImportExport::BEHAVIOR_APPEND)
             )

app/code/Magento/CatalogUrlRewrite/Observer/CategoryProcessUrlRewriteSavingObserver.php

@@ -17,7 +17,6 @@
 use Magento\Store\Model\ResourceModel\Group\CollectionFactory;
 use Magento\Store\Model\ResourceModel\Group\Collection as StoreGroupCollection;
 use Magento\Framework\App\ObjectManager;
-use Magento\Store\Model\ScopeInterface;
 
 /**
  * Generates Category Url Rewrites after save and Products Url Rewrites assigned to the category that's being saved
@@ -183,7 +182,7 @@ private function setCategoryStoreId($category)
 
         foreach ($storeGroupCollection as $storeGroup) {
             /** @var \Magento\Store\Model\Group $storeGroup */
-            if (in_array($storeGroup->getRootCategoryId(), explode('/', $category->getPath()))) {
+            if (in_array($storeGroup->getRootCategoryId(), explode('/', $category->getPath() ?? ''))) {
                 $category->setStoreId($storeGroup->getDefaultStoreId());
             }
         }

app/code/Magento/CatalogUrlRewrite/Observer/ClearProductUrlsObserver.php

@@ -12,9 +12,6 @@
 use Magento\CatalogUrlRewrite\Model\ProductUrlRewriteGenerator;
 use Magento\Framework\Event\ObserverInterface;
 
-/**
- * Class ClearProductUrlsObserver
- */
 class ClearProductUrlsObserver implements ObserverInterface
 {
     /**
@@ -43,7 +40,7 @@ public function execute(\Magento\Framework\Event\Observer $observer)
             $oldSku = $observer->getEvent()->getAdapter()->getOldSku();
             $idToDelete = [];
             foreach ($products as $product) {
-                $sku = strtolower($product[ImportProduct::COL_SKU]);
+                $sku = strtolower($product[ImportProduct::COL_SKU] ?? '');
                 if (!isset($oldSku[$sku])) {
                     continue;
                 }

app/code/Magento/CatalogWidget/Controller/Adminhtml/Product/Widget/Conditions.php

@@ -5,37 +5,42 @@
  */
 namespace Magento\CatalogWidget\Controller\Adminhtml\Product\Widget;
 
+use Magento\Backend\App\Action\Context;
+use Magento\CatalogWidget\Model\Rule;
 use Magento\Rule\Model\Condition\AbstractCondition;
+use Magento\CatalogWidget\Controller\Adminhtml\Product\Widget;
 
 /**
- * Class Conditions
+ * @SuppressWarnings(PHPMD.AllPurposeAction)
  */
-class Conditions extends \Magento\CatalogWidget\Controller\Adminhtml\Product\Widget
+class Conditions extends Widget
 {
     /**
-     * @var \Magento\CatalogWidget\Model\Rule
+     * @var Rule
      */
     protected $rule;
 
     /**
-     * @param \Magento\Backend\App\Action\Context $context
-     * @param \Magento\CatalogWidget\Model\Rule $rule
+     * @param Context $context
+     * @param Rule $rule
      */
     public function __construct(
-        \Magento\Backend\App\Action\Context $context,
-        \Magento\CatalogWidget\Model\Rule $rule
+        Context $context,
+        Rule $rule
     ) {
         $this->rule = $rule;
         parent::__construct($context);
     }
 
     /**
+     * Product widget conditions action
+     *
      * @return void
      */
     public function execute()
     {
         $id = $this->getRequest()->getParam('id');
-        $typeData = explode('|', str_replace('-', '/', $this->getRequest()->getParam('type')));
+        $typeData = explode('|', str_replace('-', '/', $this->getRequest()->getParam('type', '')));
         $className = $typeData[0];
 
         $model = $this->_objectManager->create($className)

app/code/Magento/Checkout/Controller/Cart/CouponPost.php

@@ -20,8 +20,6 @@ class CouponPost extends \Magento\Checkout\Controller\Cart implements HttpPostAc
     protected $quoteRepository;
 
     /**
-     * Coupon factory
-     *
      * @var \Magento\SalesRule\Model\CouponFactory
      */
     protected $couponFactory;
@@ -70,10 +68,10 @@ public function execute()
     {
         $couponCode = $this->getRequest()->getParam('remove') == 1
             ? ''
-            : trim($this->getRequest()->getParam('coupon_code'));
+            : trim($this->getRequest()->getParam('coupon_code', ''));
 
         $cartQuote = $this->cart->getQuote();
-        $oldCouponCode = $cartQuote->getCouponCode();
+        $oldCouponCode = $cartQuote->getCouponCode() ?? '';
 
         $codeLength = strlen($couponCode);
         if (!$codeLength && !strlen($oldCouponCode)) {

app/code/Magento/Cms/Block/Adminhtml/Wysiwyg/Images/Tree.php

@@ -69,7 +69,7 @@ public function getTreeJson()
             $data = [
                 'text' => $this->_cmsWysiwygImages->getShortFilename($item->getBasename(), 20),
                 'id' => $this->_cmsWysiwygImages->convertPathToId($item->getFilename()),
-                'path' => substr($item->getFilename(), strlen($storageRoot)),
+                'path' => substr($item->getFilename() ?? '', strlen($storageRoot)),
                 'cls' => 'folder',
             ];
             $hasNestedDirectories = $this->hasNestedDirectories($storageRoot, $item->getFilename());

app/code/Magento/Cms/Block/Page.php

@@ -27,15 +27,11 @@ class Page extends \Magento\Framework\View\Element\AbstractBlock implements
     protected $_page;
 
     /**
-     * Store manager
-     *
      * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $_storeManager;
 
     /**
-     * Page factory
-     *
      * @var \Magento\Cms\Model\PageFactory
      */
     protected $_pageFactory;
@@ -131,7 +127,7 @@ protected function _addBreadcrumbs(\Magento\Cms\Model\Page $page)
             'web/default/cms_home_page',
             ScopeInterface::SCOPE_STORE
         );
-        $homePageDelimiterPosition = strrpos($homePageIdentifier, '|');
+        $homePageDelimiterPosition = $homePageIdentifier === null ? false : strrpos($homePageIdentifier, '|');
         if ($homePageDelimiterPosition) {
             $homePageIdentifier = substr($homePageIdentifier, 0, $homePageDelimiterPosition);
         }

app/code/Magento/Cms/Helper/Page.php

@@ -26,17 +26,17 @@ class Page extends AbstractHelper
     /**
      * CMS no-route config path
      */
-    const XML_PATH_NO_ROUTE_PAGE = 'web/default/cms_no_route';
+    public const XML_PATH_NO_ROUTE_PAGE = 'web/default/cms_no_route';
 
     /**
      * CMS no cookies config path
      */
-    const XML_PATH_NO_COOKIES_PAGE = 'web/default/cms_no_cookies';
+    public const XML_PATH_NO_COOKIES_PAGE = 'web/default/cms_no_cookies';
 
     /**
      * CMS home page config path
      */
-    const XML_PATH_HOME_PAGE = 'web/default/cms_home_page';
+    public const XML_PATH_HOME_PAGE = 'web/default/cms_home_page';
 
     /**
      * Design package instance
@@ -61,15 +61,11 @@ class Page extends AbstractHelper
     protected $_localeDate;
 
     /**
-     * Store manager
-     *
      * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $_storeManager;
 
     /**
-     * Page factory
-     *
      * @var \Magento\Cms\Model\PageFactory
      */
     protected $_pageFactory;
@@ -187,7 +183,9 @@ public function prepareResultPage(ActionInterface $action, $pageId = null)
         $resultPage = $this->resultPageFactory->create();
         $this->setLayoutType($inRange, $resultPage);
         $resultPage->addHandle('cms_page_view');
-        $pageHandles = ['id' => str_replace('/', '_', $this->_page->getIdentifier())];
+        $pageHandles = [
+            'id' => $this->_page->getIdentifier() === null ? '' : str_replace('/', '_', $this->_page->getIdentifier())
+        ];
         //Selected custom updates.
         try {
             $this->customLayoutManager->applyUpdate(

app/code/Magento/Cms/Helper/Wysiwyg/Images.php

@@ -69,8 +69,6 @@ class Images extends AbstractHelper
     protected $_backendData;
 
     /**
-     * Store manager
-     *
      * @var StoreManagerInterface
      */
     protected $_storeManager;
@@ -173,7 +171,7 @@ public function getTreeNodeName()
      */
     public function convertPathToId($path)
     {
-        $path = str_replace($this->getStorageRoot(), '', $path);
+        $path = $path === null ? '' : str_replace($this->getStorageRoot(), '', $path);
         return $this->idEncode($path);
     }
 
@@ -330,7 +328,7 @@ public function getCurrentUrl()
      */
     public function idEncode($string)
     {
-        return strtr(base64_encode($string), '+/=', ':_-');
+        return $string === null ? '' : strtr(base64_encode($string), '+/=', ':_-');
     }
 
     /**
@@ -341,7 +339,7 @@ public function idEncode($string)
      */
     public function idDecode($string)
     {
-        $string = strtr($string, ':_-', '+/=');
+        $string = $string === null ? '' : strtr($string, ':_-', '+/=');
 
         // phpcs:ignore Magento2.Functions.DiscouragedFunction
         return base64_decode($string);
@@ -356,7 +354,7 @@ public function idDecode($string)
      */
     public function getShortFilename($filename, $maxLength = 20)
     {
-        if (strlen($filename) <= $maxLength) {
+        if (strlen((string)$filename) <= $maxLength) {
             return $filename;
         }
         return substr($filename, 0, $maxLength) . '...';

app/code/Magento/Cms/Model/Page/CustomLayout/CustomLayoutManager.php

@@ -84,7 +84,7 @@ public function __construct(
      */
     private function sanitizeIdentifier(PageInterface $page): string
     {
-        return str_replace('/', '_', $page->getIdentifier());
+        return $page->getIdentifier() === null ? '' : str_replace('/', '_', $page->getIdentifier());
     }
 
     /**