Merge remote-tracking branch 'commerce/2.4-develop' into platform-health

Author: xmav

app/code/Magento/ReleaseNotification/Model/Condition/CanViewNotification.php

@@ -82,11 +82,9 @@ public function isVisible(array $arguments)
         $value = $this->cacheStorage->load($cacheKey);
 
         if ($value === false) {
-            $value = version_compare(
-                $this->viewerLogger->get($userId)->getLastViewVersion(),
-                $this->productMetadata->getVersion(),
-                '<'
-            );
+            $lastViewVersion = $this->viewerLogger->get($userId)->getLastViewVersion();
+            $value = ($lastViewVersion) ?
+                version_compare($lastViewVersion, $this->productMetadata->getVersion(), '<') : true;
             $this->cacheStorage->save(false, $cacheKey);
         }
         return (bool)$value;

app/code/Magento/ReleaseNotification/Test/Unit/Model/Condition/CanViewNotificationTest.php

@@ -98,7 +98,7 @@ public function testIsVisible($expected, $version, $lastViewVersion)
         $this->sessionMock->expects($this->once())
             ->method('getId')
             ->willReturn(1);
-        $this->productMetadataMock->expects($this->once())
+        $this->productMetadataMock->expects($this->any())
             ->method('getVersion')
             ->willReturn($version);
         $this->logMock->expects($this->once())
@@ -122,7 +122,7 @@ public function isVisibleProvider()
         return [
             [false, '2.2.1-dev', '999.999.999-alpha'],
             [true, '2.2.1-dev', '2.0.0'],
-            [true, '2.2.1-dev', '2.2.0'],
+            [true, '2.2.1-dev', null],
             [false, '2.2.1-dev', '2.2.1'],
             [true, '2.2.1-dev', '2.2.0'],
             [true, '2.3.0', '2.2.0'],

app/code/Magento/Widget/Model/ResourceModel/Widget/Instance.php

@@ -89,6 +89,7 @@ protected function _afterSave(AbstractModel $object)
             if (in_array($pageGroup['page_id'], $pageIds)) {
                 $connection->update($pageTable, $data, ['page_id = ?' => (int)$pageId]);
             } else {
+                // phpcs:ignore Magento2.Performance.ForeachArrayMerge
                 $connection->insert($pageTable, array_merge(['instance_id' => $object->getId()], $data));
                 $pageId = $connection->lastInsertId($pageTable);
             }
@@ -124,7 +125,7 @@ protected function _saveLayoutUpdates($widgetInstance, $pageGroupData)
                 $pageGroupData['template']
             );
             $insert = ['handle' => $handle, 'xml' => $xml];
-            if (strlen($widgetInstance->getSortOrder())) {
+            if ($widgetInstance->getSortOrder() !== null && strlen($widgetInstance->getSortOrder())) {
                 $insert['sort_order'] = $widgetInstance->getSortOrder();
             }
 
@@ -147,6 +148,7 @@ protected function _saveLayoutUpdates($widgetInstance, $pageGroupData)
 
     /**
      * Prepare store ids.
+     *
      * If one of store id is default (0) return all store ids
      *
      * @param array $storeIds
@@ -162,6 +164,7 @@ protected function _prepareStoreIds($storeIds)
 
     /**
      * Perform actions before object delete.
+     *
      * Collect page ids and layout update ids and set to object for further delete
      *
      * @param \Magento\Framework\Model\AbstractModel $object
@@ -188,6 +191,7 @@ protected function _beforeDelete(AbstractModel $object)
 
     /**
      * Perform actions after object delete.
+     *
      * Delete layout updates by layout update ids collected in _beforeSave
      *
      * @param \Magento\Widget\Model\Widget\Instance $object

composer.lock

@@ -14,7 +14,7 @@ class ArgumentsReader
 {
     use GetParameterClassTrait;
 
-    const NO_DEFAULT_VALUE = 'NO-DEFAULT';
+    public const NO_DEFAULT_VALUE = 'NO-DEFAULT';
 
     /**
      * @var NamespaceResolver
@@ -110,7 +110,11 @@ private function processType(\ReflectionClass $class, \Laminas\Code\Reflection\P
 
         $type = $parameter->detectType();
 
-        if ($type === 'null') {
+        /**
+         * $type === null if it is unspecified
+         * $type === 'null' if it is used in doc block
+         */
+        if ($type === null || $type === 'null') {
             return null;
         }