Fixes to launch Magento with PHP 8.1

Karyna Tsymbal · karyna-t · commit 1db34ccb3b79 · 2021-11-18T10:50:32.000+01:00
diff --git a/app/code/Magento/Analytics/Model/ReportXml/ModuleIterator.php b/app/code/Magento/Analytics/Model/ReportXml/ModuleIterator.php
@@ -34,6 +34,7 @@ public function __construct(
      *
      * @return array
      */
+    #[\ReturnTypeWillChange]
     public function current()
     {
         $current = parent::current();
diff --git a/app/code/Magento/Analytics/ReportXml/Query.php b/app/code/Magento/Analytics/ReportXml/Query.php
@@ -82,6 +82,7 @@ public function getConfig()
      * @return mixed data which can be serialized by <b>json_encode</b>,
      * which is a value of any type other than a resource.
      */
+    #[\ReturnTypeWillChange]
     public function jsonSerialize()
     {
         return [
diff --git a/app/code/Magento/Backend/Model/Menu.php b/app/code/Magento/Backend/Model/Menu.php
@@ -267,6 +267,7 @@ protected function _findParentItems($menu, $itemId, &$parents)
      *
      * @return string
      */
+    #[\ReturnTypeWillChange]
     public function serialize()
     {
         return $this->serializer->serialize($this->toArray());
@@ -294,6 +295,7 @@ public function toArray()
      * @return void
      * @since 100.2.0
      */
+    #[\ReturnTypeWillChange]
     public function unserialize($serialized)
     {
         $data = $this->serializer->unserialize($serialized);
diff --git a/app/code/Magento/Backend/Model/Menu/Filter/Iterator.php b/app/code/Magento/Backend/Model/Menu/Filter/Iterator.php
@@ -27,6 +27,7 @@ public function __construct(\Iterator $iterator)
      *
      * @return bool true if the current element is acceptable, otherwise false.
      */
+    #[\ReturnTypeWillChange]
     public function accept()
     {
         return !($this->current()->isDisabled() || !$this->current()->isAllowed());
diff --git a/app/code/Magento/Backend/Model/Menu/Iterator.php b/app/code/Magento/Backend/Model/Menu/Iterator.php
@@ -17,6 +17,7 @@ class Iterator extends \ArrayIterator
      *
      * @return void
      */
+    #[\ReturnTypeWillChange]
     public function rewind()
     {
         $this->ksort();
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product/Collection/ProductLimitation.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/Collection/ProductLimitation.php
@@ -35,6 +35,7 @@ class ProductLimitation implements \ArrayAccess
      * @return bool
      * @since 101.0.0
      */
+    #[\ReturnTypeWillChange]
     public function offsetExists($offset)
     {
         return array_key_exists($offset, $this->productLimitationFilters);
@@ -45,6 +46,7 @@ public function offsetExists($offset)
      * @return mixed
      * @since 101.0.0
      */
+    #[\ReturnTypeWillChange]
     public function offsetGet($offset)
     {
         return $this->productLimitationFilters[$offset];
@@ -56,6 +58,7 @@ public function offsetGet($offset)
      * @return void
      * @since 101.0.0
      */
+    #[\ReturnTypeWillChange]
     public function offsetSet($offset, $value)
     {
         $this->productLimitationFilters[$offset] = $value;
@@ -66,6 +69,7 @@ public function offsetSet($offset, $value)
      * @return void
      * @since 101.0.0
      */
+    #[\ReturnTypeWillChange]
     public function offsetUnset($offset)
     {
         unset($this->productLimitationFilters[$offset]);
diff --git a/app/code/Magento/Config/Model/Config/Structure/Element/Iterator.php b/app/code/Magento/Config/Model/Config/Structure/Element/Iterator.php
@@ -69,6 +69,7 @@ public function setElements(array $elements, $scope)
      *
      * @return \Magento\Config\Model\Config\StructureElementInterface
      */
+    #[\ReturnTypeWillChange]
     public function current()
     {
         return $this->_flyweight;
@@ -79,6 +80,7 @@ public function current()
      *
      * @return void Any returned value is ignored.
      */
+    #[\ReturnTypeWillChange]
     public function next()
     {
         next($this->_elements);
@@ -106,6 +108,7 @@ protected function _initFlyweight(array $element)
      *
      * @return void
      */
+    #[\ReturnTypeWillChange]
     public function key()
     {
         key($this->_elements);
@@ -117,6 +120,7 @@ public function key()
      * @return bool The return value will be casted to boolean and then evaluated.
      * Returns true on success or false on failure.
      */
+    #[\ReturnTypeWillChange]
     public function valid()
     {
         return (bool)current($this->_elements);
@@ -127,6 +131,7 @@ public function valid()
      *
      * @return void Any returned value is ignored.
      */
+    #[\ReturnTypeWillChange]
     public function rewind()
     {
         reset($this->_elements);
diff --git a/app/code/Magento/Customer/Model/Indexer/Source.php b/app/code/Magento/Customer/Model/Indexer/Source.php
@@ -82,6 +82,7 @@ public function addFieldToFilter($attribute, $condition = null)
     /**
      * @inheritdoc
      */
+    #[\ReturnTypeWillChange]
     public function count()
     {
         return $this->customerCollection->getSize();
@@ -92,6 +93,7 @@ public function count()
      *
      * @return Traversable
      */
+    #[\ReturnTypeWillChange]
     public function getIterator()
     {
         $this->customerCollection->setPageSize($this->batchSize);
diff --git a/app/code/Magento/Customer/Ui/Component/MassAction/Group/Options.php b/app/code/Magento/Customer/Ui/Component/MassAction/Group/Options.php
@@ -81,6 +81,7 @@ public function __construct(
      *
      * @return array
      */
+    #[\ReturnTypeWillChange]
     public function jsonSerialize()
     {
         if ($this->options === null) {
diff --git a/app/code/Magento/ImportExport/Model/Import/AbstractSource.php b/app/code/Magento/ImportExport/Model/Import/AbstractSource.php
@@ -83,6 +83,7 @@ public function getColNames()
      *
      * @return array
      */
+    #[\ReturnTypeWillChange]
     public function current()
     {
         $row = $this->_row;
@@ -101,6 +102,7 @@ public function current()
      *
      * @return void
      */
+    #[\ReturnTypeWillChange]
     public function next()
     {
         $this->_key++;
@@ -127,6 +129,7 @@ abstract protected function _getNextRow();
      *
      * @return int -1 if out of bounds, 0 or more otherwise
      */
+    #[\ReturnTypeWillChange]
     public function key()
     {
         return $this->_key;
@@ -137,6 +140,7 @@ public function key()
      *
      * @return bool
      */
+    #[\ReturnTypeWillChange]
     public function valid()
     {
         return -1 !== $this->_key;
@@ -147,6 +151,7 @@ public function valid()
      *
      * @return void
      */
+    #[\ReturnTypeWillChange]
     public function rewind()
     {
         $this->_key = -1;
@@ -161,6 +166,7 @@ public function rewind()
      * @return void
      * @throws \OutOfBoundsException
      */
+    #[\ReturnTypeWillChange]
     public function seek($position)
     {
         if ($position == $this->_key) {
diff --git a/app/code/Magento/ImportExport/Model/ResourceModel/Import/Data.php b/app/code/Magento/ImportExport/Model/ResourceModel/Import/Data.php
@@ -56,6 +56,7 @@ protected function _construct()
      *
      * @return \Iterator
      */
+    #[\ReturnTypeWillChange]
     public function getIterator()
     {
         $connection = $this->getConnection();
diff --git a/app/code/Magento/Shipping/Model/Simplexml/Element.php b/app/code/Magento/Shipping/Model/Simplexml/Element.php
@@ -20,6 +20,7 @@ class Element extends \Magento\Framework\Simplexml\Element
      * @param string $namespace If specified, the namespace to which the attribute belongs.
      * @return void
      */
+    #[\ReturnTypeWillChange]
     public function addAttribute($name, $value = null, $namespace = null)
     {
         $value = $value !== null ? $this->xmlentities($value) : '';
@@ -34,6 +35,7 @@ public function addAttribute($name, $value = null, $namespace = null)
      * @param string $namespace If specified, the namespace to which the child element belongs.
      * @return \Magento\Shipping\Model\Simplexml\Element
      */
+    #[\ReturnTypeWillChange]
     public function addChild($name, $value = null, $namespace = null)
     {
         if ($value !== null) {
diff --git a/app/code/Magento/Ui/DataProvider/AbstractDataProvider.php b/app/code/Magento/Ui/DataProvider/AbstractDataProvider.php
@@ -267,6 +267,7 @@ public function getData()
      *
      * @return int
      */
+    #[\ReturnTypeWillChange]
     public function count()
     {
         return $this->getCollection()->count();
diff --git a/app/code/Magento/Ui/Model/Export/SearchResultIterator.php b/app/code/Magento/Ui/Model/Export/SearchResultIterator.php
@@ -24,6 +24,7 @@ public function __construct(
     /**
      * @return array|mixed
      */
+    #[\ReturnTypeWillChange]
     public function current()
     {
         return current($this->items);
@@ -32,6 +33,7 @@ public function current()
     /**
      * @return int|mixed
      */
+    #[\ReturnTypeWillChange]
     public function key()
     {
         return key($this->items);
@@ -40,6 +42,7 @@ public function key()
     /**
      * @return void
      */
+    #[\ReturnTypeWillChange]
     public function next()
     {
         next($this->items);
@@ -48,6 +51,7 @@ public function next()
     /**
      * @return void
      */
+    #[\ReturnTypeWillChange]
     public function rewind()
     {
         reset($this->items);
@@ -56,6 +60,7 @@ public function rewind()
     /**
      * @return bool
      */
+    #[\ReturnTypeWillChange]
     public function valid()
     {
         return $this->key() !== null;

Original file line number	Diff line number	Diff line change
`@@ -34,6 +34,7 @@ public function __construct(`
`34`	`34`	`*`
`35`	`35`	`* @return array`
`36`	`36`	`*/`
	`37`	`+ #[\ReturnTypeWillChange]`
`37`	`38`	`public function current()`
`38`	`39`	`{`
`39`	`40`	`$current = parent::current();`
Original file line number	Diff line number	Diff line change
`@@ -82,6 +82,7 @@ public function getConfig()`
`82`	`82`	`* @return mixed data which can be serialized by <b>json_encode</b>,`
`83`	`83`	`* which is a value of any type other than a resource.`
`84`	`84`	`*/`
	`85`	`+ #[\ReturnTypeWillChange]`
`85`	`86`	`public function jsonSerialize()`
`86`	`87`	`{`
`87`	`88`	`return [`
Original file line number	Diff line number	Diff line change
`@@ -267,6 +267,7 @@ protected function _findParentItems($menu, $itemId, &$parents)`
`267`	`267`	`*`
`268`	`268`	`* @return string`
`269`	`269`	`*/`
	`270`	`+ #[\ReturnTypeWillChange]`
`270`	`271`	`public function serialize()`
`271`	`272`	`{`
`272`	`273`	`return $this->serializer->serialize($this->toArray());`
`@@ -294,6 +295,7 @@ public function toArray()`
`294`	`295`	`* @return void`
`295`	`296`	`* @since 100.2.0`
`296`	`297`	`*/`
	`298`	`+ #[\ReturnTypeWillChange]`
`297`	`299`	`public function unserialize($serialized)`
`298`	`300`	`{`
`299`	`301`	`$data = $this->serializer->unserialize($serialized);`
Original file line number	Diff line number	Diff line change
`@@ -27,6 +27,7 @@ public function __construct(\Iterator $iterator)`
`27`	`27`	`*`
`28`	`28`	`* @return bool true if the current element is acceptable, otherwise false.`
`29`	`29`	`*/`
	`30`	`+ #[\ReturnTypeWillChange]`
`30`	`31`	`public function accept()`
`31`	`32`	`{`
`32`	`33`	`return !($this->current()->isDisabled() \|\| !$this->current()->isAllowed());`
Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,7 @@ class Iterator extends \ArrayIterator`
`17`	`17`	`*`
`18`	`18`	`* @return void`
`19`	`19`	`*/`
	`20`	`+ #[\ReturnTypeWillChange]`
`20`	`21`	`public function rewind()`
`21`	`22`	`{`
`22`	`23`	`$this->ksort();`
Original file line number	Diff line number	Diff line change
`@@ -69,6 +69,7 @@ public function setElements(array $elements, $scope)`
`69`	`69`	`*`
`70`	`70`	`* @return \Magento\Config\Model\Config\StructureElementInterface`
`71`	`71`	`*/`
	`72`	`+ #[\ReturnTypeWillChange]`
`72`	`73`	`public function current()`
`73`	`74`	`{`
`74`	`75`	`return $this->_flyweight;`
`@@ -79,6 +80,7 @@ public function current()`
`79`	`80`	`*`
`80`	`81`	`* @return void Any returned value is ignored.`
`81`	`82`	`*/`
	`83`	`+ #[\ReturnTypeWillChange]`
`82`	`84`	`public function next()`
`83`	`85`	`{`
`84`	`86`	`next($this->_elements);`
`@@ -106,6 +108,7 @@ protected function _initFlyweight(array $element)`
`106`	`108`	`*`
`107`	`109`	`* @return void`
`108`	`110`	`*/`
	`111`	`+ #[\ReturnTypeWillChange]`
`109`	`112`	`public function key()`
`110`	`113`	`{`
`111`	`114`	`key($this->_elements);`
`@@ -117,6 +120,7 @@ public function key()`
`117`	`120`	`* @return bool The return value will be casted to boolean and then evaluated.`
`118`	`121`	`* Returns true on success or false on failure.`
`119`	`122`	`*/`
	`123`	`+ #[\ReturnTypeWillChange]`
`120`	`124`	`public function valid()`
`121`	`125`	`{`
`122`	`126`	`return (bool)current($this->_elements);`
`@@ -127,6 +131,7 @@ public function valid()`
`127`	`131`	`*`
`128`	`132`	`* @return void Any returned value is ignored.`
`129`	`133`	`*/`
	`134`	`+ #[\ReturnTypeWillChange]`
`130`	`135`	`public function rewind()`
`131`	`136`	`{`
`132`	`137`	`reset($this->_elements);`
Original file line number	Diff line number	Diff line change
`@@ -82,6 +82,7 @@ public function addFieldToFilter($attribute, $condition = null)`
`82`	`82`	`/**`
`83`	`83`	`* @inheritdoc`
`84`	`84`	`*/`
	`85`	`+ #[\ReturnTypeWillChange]`
`85`	`86`	`public function count()`
`86`	`87`	`{`
`87`	`88`	`return $this->customerCollection->getSize();`
`@@ -92,6 +93,7 @@ public function count()`
`92`	`93`	`*`
`93`	`94`	`* @return Traversable`
`94`	`95`	`*/`
	`96`	`+ #[\ReturnTypeWillChange]`
`95`	`97`	`public function getIterator()`
`96`	`98`	`{`
`97`	`99`	`$this->customerCollection->setPageSize($this->batchSize);`
Original file line number	Diff line number	Diff line change
`@@ -81,6 +81,7 @@ public function __construct(`
`81`	`81`	`*`
`82`	`82`	`* @return array`
`83`	`83`	`*/`
	`84`	`+ #[\ReturnTypeWillChange]`
`84`	`85`	`public function jsonSerialize()`
`85`	`86`	`{`
`86`	`87`	`if ($this->options === null) {`
Original file line number	Diff line number	Diff line change
`@@ -83,6 +83,7 @@ public function getColNames()`
`83`	`83`	`*`
`84`	`84`	`* @return array`
`85`	`85`	`*/`
	`86`	`+ #[\ReturnTypeWillChange]`
`86`	`87`	`public function current()`
`87`	`88`	`{`
`88`	`89`	`$row = $this->_row;`
`@@ -101,6 +102,7 @@ public function current()`
`101`	`102`	`*`
`102`	`103`	`* @return void`
`103`	`104`	`*/`
	`105`	`+ #[\ReturnTypeWillChange]`
`104`	`106`	`public function next()`
`105`	`107`	`{`
`106`	`108`	`$this->_key++;`
`@@ -127,6 +129,7 @@ abstract protected function _getNextRow();`
`127`	`129`	`*`
`128`	`130`	`* @return int -1 if out of bounds, 0 or more otherwise`
`129`	`131`	`*/`
	`132`	`+ #[\ReturnTypeWillChange]`
`130`	`133`	`public function key()`
`131`	`134`	`{`
`132`	`135`	`return $this->_key;`
`@@ -137,6 +140,7 @@ public function key()`
`137`	`140`	`*`
`138`	`141`	`* @return bool`
`139`	`142`	`*/`
	`143`	`+ #[\ReturnTypeWillChange]`
`140`	`144`	`public function valid()`
`141`	`145`	`{`
`142`	`146`	`return -1 !== $this->_key;`
`@@ -147,6 +151,7 @@ public function valid()`
`147`	`151`	`*`
`148`	`152`	`* @return void`
`149`	`153`	`*/`
	`154`	`+ #[\ReturnTypeWillChange]`
`150`	`155`	`public function rewind()`
`151`	`156`	`{`
`152`	`157`	`$this->_key = -1;`
`@@ -161,6 +166,7 @@ public function rewind()`
`161`	`166`	`* @return void`
`162`	`167`	`* @throws \OutOfBoundsException`
`163`	`168`	`*/`
	`169`	`+ #[\ReturnTypeWillChange]`
`164`	`170`	`public function seek($position)`
`165`	`171`	`{`
`166`	`172`	`if ($position == $this->_key) {`
Original file line number	Diff line number	Diff line change
`@@ -56,6 +56,7 @@ protected function _construct()`
`56`	`56`	`*`
`57`	`57`	`* @return \Iterator`
`58`	`58`	`*/`
	`59`	`+ #[\ReturnTypeWillChange]`
`59`	`60`	`public function getIterator()`
`60`	`61`	`{`
`61`	`62`	`$connection = $this->getConnection();`