Merge branch '4.4' into 5.3

* 4.4:
  Fix return types for PHP 8.1

Author: derrabus

File/Stream.php

@@ -23,6 +23,7 @@ class Stream extends File
      *
      * @return int|false
      */
+    #[\ReturnTypeWillChange]
     public function getSize()
     {
         return false;

HeaderBag.php

@@ -252,6 +252,7 @@ public function removeCacheControlDirective(string $key)
      *
      * @return \ArrayIterator An \ArrayIterator instance
      */
+    #[\ReturnTypeWillChange]
     public function getIterator()
     {
         return new \ArrayIterator($this->headers);
@@ -262,6 +263,7 @@ public function getIterator()
      *
      * @return int The number of headers
      */
+    #[\ReturnTypeWillChange]
     public function count()
     {
         return \count($this->headers);

ParameterBag.php

@@ -207,6 +207,7 @@ public function filter(string $key, $default = null, int $filter = \FILTER_DEFAU
      *
      * @return \ArrayIterator An \ArrayIterator instance
      */
+    #[\ReturnTypeWillChange]
     public function getIterator()
     {
         return new \ArrayIterator($this->parameters);
@@ -217,6 +218,7 @@ public function getIterator()
      *
      * @return int The number of parameters
      */
+    #[\ReturnTypeWillChange]
     public function count()
     {
         return \count($this->parameters);

Session/Attribute/AttributeBag.php

@@ -131,6 +131,7 @@ public function clear()
      *
      * @return \ArrayIterator An \ArrayIterator instance
      */
+    #[\ReturnTypeWillChange]
     public function getIterator()
     {
         return new \ArrayIterator($this->attributes);
@@ -141,6 +142,7 @@ public function getIterator()
      *
      * @return int The number of attributes
      */
+    #[\ReturnTypeWillChange]
     public function count()
     {
         return \count($this->attributes);

Session/Session.php

@@ -128,6 +128,7 @@ public function isStarted()
      *
      * @return \ArrayIterator An \ArrayIterator instance
      */
+    #[\ReturnTypeWillChange]
     public function getIterator()
     {
         return new \ArrayIterator($this->getAttributeBag()->all());
@@ -138,6 +139,7 @@ public function getIterator()
      *
      * @return int
      */
+    #[\ReturnTypeWillChange]
     public function count()
     {
         return \count($this->getAttributeBag()->all());

Session/Storage/Handler/MemcachedSessionHandler.php

@@ -57,6 +57,7 @@ public function __construct(\Memcached $memcached, array $options = [])
     /**
      * @return bool
      */
+    #[\ReturnTypeWillChange]
     public function close()
     {
         return $this->memcached->quit();
@@ -73,6 +74,7 @@ protected function doRead(string $sessionId)
     /**
      * @return bool
      */
+    #[\ReturnTypeWillChange]
     public function updateTimestamp($sessionId, $data)
     {
         $this->memcached->touch($this->prefix.$sessionId, time() + $this->ttl);

Tests/File/FakeFile.php

@@ -17,28 +17,28 @@ class FakeFile extends OrigFile
 {
     private $realpath;
 
-    public function __construct($realpath, $path)
+    public function __construct(string $realpath, string $path)
     {
         $this->realpath = $realpath;
         parent::__construct($path, false);
     }
 
-    public function isReadable()
+    public function isReadable(): bool
     {
         return true;
     }
 
-    public function getRealpath()
+    public function getRealpath(): string
     {
         return $this->realpath;
     }
 
-    public function getSize()
+    public function getSize(): int
     {
         return 42;
     }
 
-    public function getMTime()
+    public function getMTime(): int
     {
         return time();
     }