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

- changes after code review

Author: xmav

app/code/Magento/Catalog/Model/ResourceModel/Product/Collection/ProductLimitation.php

@@ -82,7 +82,7 @@ public function offsetUnset($offset)
     }
 
     /**
-     * Returns Store ID.
+     * Returns store ID.
      *
      * @return int|null
      * @since 101.0.0
@@ -104,7 +104,7 @@ public function getCategoryId()
     }
 
     /**
-     * Returns is category an anchor.
+     * Check if the category is an anchor.
      *
      * @return int|null
      * @since 101.0.0
@@ -159,7 +159,7 @@ public function isUsingPriceIndex()
     }
 
     /**
-     * Sets 'Use Price' index flag.
+     * Set 'use price index' offset.
      *
      * @param bool $value
      * @return void

lib/internal/Magento/Framework/App/RouterList.php

@@ -55,7 +55,9 @@ protected function getRouterInstance($routerId)
     }
 
     /**
-     * @inheritdoc
+     * {@inheritDoc}
+     *
+     * @return RouterInterface
      */
     #[\ReturnTypeWillChange]
     public function current()
@@ -73,7 +75,9 @@ public function next()
     }
 
     /**
-     * @inheritdoc
+     * {@inheritDoc}
+     *
+     * @return string|int|null
      */
     #[\ReturnTypeWillChange]
     public function key()

lib/internal/Magento/Framework/Config/CompositeFileIterator.php

@@ -34,7 +34,6 @@ public function __construct(ReadFactory $readFactory, array $paths, FileIterator
     /**
      * @inheritDoc
      */
-    #[\ReturnTypeWillChange]
     public function rewind()
     {
         $this->existingIterator->rewind();
@@ -44,7 +43,6 @@ public function rewind()
     /**
      * @inheritDoc
      */
-    #[\ReturnTypeWillChange]
     public function current()
     {
         if ($this->existingIterator->valid()) {
@@ -57,7 +55,6 @@ public function current()
     /**
      * @inheritDoc
      */
-    #[\ReturnTypeWillChange]
     public function key()
     {
         if ($this->existingIterator->valid()) {
@@ -70,7 +67,6 @@ public function key()
     /**
      * @inheritDoc
      */
-    #[\ReturnTypeWillChange]
     public function next()
     {
         if ($this->existingIterator->valid()) {
@@ -83,7 +79,6 @@ public function next()
     /**
      * @inheritDoc
      */
-    #[\ReturnTypeWillChange]
     public function valid()
     {
         return $this->existingIterator->valid() || parent::valid();
@@ -100,7 +95,6 @@ public function toArray()
     /**
      * @inheritDoc
      */
-    #[\ReturnTypeWillChange]
     public function count()
     {
         return $this->existingIterator->count() + parent::count();

lib/internal/Magento/Framework/DB/Query/BatchIterator.php

@@ -92,7 +92,6 @@ public function __construct(
      *
      * @return Select
      */
-    #[\ReturnTypeWillChange]
     public function current()
     {
         if (null == $this->currentSelect) {
@@ -108,7 +107,6 @@ public function current()
      *
      * @return Select
      */
-    #[\ReturnTypeWillChange]
     public function next()
     {
         if (null == $this->currentSelect) {
@@ -131,7 +129,6 @@ public function next()
      *
      * @return int
      */
-    #[\ReturnTypeWillChange]
     public function key()
     {
         return $this->iteration;
@@ -142,7 +139,6 @@ public function key()
      *
      * @return bool
      */
-    #[\ReturnTypeWillChange]
     public function valid()
     {
         return $this->isValid;
@@ -153,7 +149,6 @@ public function valid()
      *
      * @return void
      */
-    #[\ReturnTypeWillChange]
     public function rewind()
     {
         $this->minValue = 0;

lib/internal/Magento/Framework/DB/Query/BatchRangeIterator.php

@@ -110,7 +110,6 @@ public function __construct(
      *
      * @return Select
      */
-    #[\ReturnTypeWillChange]
     public function current()
     {
         if (null === $this->currentSelect) {
@@ -127,7 +126,6 @@ public function current()
      *
      * @return int
      */
-    #[\ReturnTypeWillChange]
     public function key()
     {
         return $this->iteration;
@@ -141,7 +139,6 @@ public function key()
      *
      * @return Select
      */
-    #[\ReturnTypeWillChange]
     public function next()
     {
         if (null === $this->currentSelect) {
@@ -165,7 +162,6 @@ public function next()
      *
      * @return void
      */
-    #[\ReturnTypeWillChange]
     public function rewind()
     {
         $this->currentSelect = null;
@@ -179,7 +175,6 @@ public function rewind()
      *
      * @return bool
      */
-    #[\ReturnTypeWillChange]
     public function valid()
     {
         return $this->isValid;

lib/internal/Magento/Framework/Data/Collection.php

@@ -780,7 +780,6 @@ protected function _toOptionArray($valueField = 'id', $labelField = 'name', $add
      *
      * @return array
      */
-    #[\ReturnTypeWillChange]
     public function toOptionArray()
     {
         return $this->_toOptionArray();

lib/internal/Magento/Framework/Data/SearchResultIterator.php

@@ -41,8 +41,6 @@ public function __construct(AbstractSearchResult $searchResult, QueryInterface $
 
     /**
      * @inheritdoc
-     *
-     * @return array|mixed
      */
     #[\ReturnTypeWillChange]
     public function current()
@@ -62,8 +60,6 @@ public function next()
 
     /**
      * @inheritdoc
-     *
-     * @return int|mixed
      */
     #[\ReturnTypeWillChange]
     public function key()

lib/internal/Magento/Framework/Search/Response/QueryResponse.php

@@ -72,7 +72,6 @@ public function getIterator()
     /**
      * @inheritdoc
      */
-    #[\ReturnTypeWillChange]
     public function getAggregations()
     {
         return $this->aggregations;