AC-1685: Fix Integration Tests to be compatible with PHP 8.1

- code style fixes
- fix after code review

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())

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);
             }
@@ -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

lib/internal/Magento/Framework/Code/Reader/ArgumentsReader.php

@@ -14,7 +14,7 @@ class ArgumentsReader
 {
     use GetParameterClassTrait;
 
-    const NO_DEFAULT_VALUE = 'NO-DEFAULT';
+    public const NO_DEFAULT_VALUE = 'NO-DEFAULT';
 
     /**
      * @var NamespaceResolver

lib/internal/Magento/Framework/View/Page/Config.php

@@ -11,6 +11,7 @@
 use Magento\Framework\View;
 use Magento\Framework\Escaper;
 use Magento\Framework\App\ObjectManager;
+use Magento\Store\Model\ScopeInterface;
 
 /**
  * An API for page configuration
@@ -33,29 +34,29 @@ class Config
     /**#@+
      * Constants of available types
      */
-    const ELEMENT_TYPE_BODY = 'body';
-    const ELEMENT_TYPE_HTML = 'html';
-    const ELEMENT_TYPE_HEAD = 'head';
+    public const ELEMENT_TYPE_BODY = 'body';
+    public const ELEMENT_TYPE_HTML = 'html';
+    public const ELEMENT_TYPE_HEAD = 'head';
     /**#@-*/
 
-    const META_DESCRIPTION = 'description';
-    const META_CONTENT_TYPE = 'content_type';
-    const META_MEDIA_TYPE = 'media_type';
-    const META_CHARSET = 'charset';
-    const META_TITLE = 'title';
-    const META_KEYWORDS = 'keywords';
-    const META_ROBOTS = 'robots';
-    const META_X_UI_COMPATIBLE = 'x_ua_compatible';
+    public const META_DESCRIPTION = 'description';
+    public const META_CONTENT_TYPE = 'content_type';
+    public const META_MEDIA_TYPE = 'media_type';
+    public const META_CHARSET = 'charset';
+    public const META_TITLE = 'title';
+    public const META_KEYWORDS = 'keywords';
+    public const META_ROBOTS = 'robots';
+    public const META_X_UI_COMPATIBLE = 'x_ua_compatible';
 
     /**
      * Constant body attribute class
      */
-    const BODY_ATTRIBUTE_CLASS = 'class';
+    public const BODY_ATTRIBUTE_CLASS = 'class';
 
     /**
      * Constant html language attribute
      */
-    const HTML_ATTRIBUTE_LANG = 'lang';
+    public const HTML_ATTRIBUTE_LANG = 'lang';
 
     /**
      * @var Escaper
@@ -321,7 +322,7 @@ public function getMediaType()
         if (empty($this->metadata[self::META_MEDIA_TYPE])) {
             $this->metadata[self::META_MEDIA_TYPE] = $this->scopeConfig->getValue(
                 'design/head/default_media_type',
-                \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+                ScopeInterface::SCOPE_STORE
             );
         }
         return $this->metadata[self::META_MEDIA_TYPE];
@@ -349,7 +350,7 @@ public function getCharset()
         if (empty($this->metadata[self::META_CHARSET])) {
             $this->metadata[self::META_CHARSET] = $this->scopeConfig->getValue(
                 'design/head/default_charset',
-                \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+                ScopeInterface::SCOPE_STORE
             );
         }
         return $this->metadata[self::META_CHARSET];
@@ -377,7 +378,7 @@ public function getDescription()
         if (empty($this->metadata[self::META_DESCRIPTION])) {
             $this->metadata[self::META_DESCRIPTION] = $this->scopeConfig->getValue(
                 'design/head/default_description',
-                \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+                ScopeInterface::SCOPE_STORE
             );
         }
         return $this->metadata[self::META_DESCRIPTION];
@@ -432,7 +433,7 @@ public function getKeywords()
         if (empty($this->metadata[self::META_KEYWORDS])) {
             $this->metadata[self::META_KEYWORDS] = $this->scopeConfig->getValue(
                 'design/head/default_keywords',
-                \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+                ScopeInterface::SCOPE_STORE
             );
         }
         return $this->metadata[self::META_KEYWORDS];
@@ -464,7 +465,7 @@ public function getRobots()
         if (empty($this->metadata[self::META_ROBOTS])) {
             $this->metadata[self::META_ROBOTS] = $this->scopeConfig->getValue(
                 'design/search_engine_robots/default_robots',
-                \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+                ScopeInterface::SCOPE_STORE
             );
         }
         return $this->metadata[self::META_ROBOTS];
@@ -651,12 +652,8 @@ public function getDefaultFavicon()
      */
     public function getIncludes()
     {
-        if (empty($this->includes) && $this->isIncludesAvailable) {
-            $this->includes = $this->scopeConfig->getValue(
-                'design/head/includes',
-                \Magento\Store\Model\ScopeInterface::SCOPE_STORE
-            );
-        }
-        return $this->includes ?? '';
+        $this->includes = ($this->isIncludesAvailable && $this->includes === null) ?
+            $this->scopeConfig->getValue('design/head/includes', ScopeInterface::SCOPE_STORE) : '';
+        return $this->includes;
     }
 }