Merge branch '4.4' into 5.2

* 4.4:
  [Config] fix tracking attributes in ReflectionClassResource
  [Process] Fix incorrect parameter type
  [HttpFoundation] Handle tentative return types

Author: nicolas-grekas

Session/Storage/Handler/MigratingSessionHandler.php

@@ -41,6 +41,7 @@ public function __construct(\SessionHandlerInterface $currentHandler, \SessionHa
     /**
      * @return bool
      */
+    #[\ReturnTypeWillChange]
     public function close()
     {
         $result = $this->currentHandler->close();
@@ -52,6 +53,7 @@ public function close()
     /**
      * @return bool
      */
+    #[\ReturnTypeWillChange]
     public function destroy($sessionId)
     {
         $result = $this->currentHandler->destroy($sessionId);
@@ -63,6 +65,7 @@ public function destroy($sessionId)
     /**
      * @return bool
      */
+    #[\ReturnTypeWillChange]
     public function gc($maxlifetime)
     {
         $result = $this->currentHandler->gc($maxlifetime);
@@ -74,6 +77,7 @@ public function gc($maxlifetime)
     /**
      * @return bool
      */
+    #[\ReturnTypeWillChange]
     public function open($savePath, $sessionName)
     {
         $result = $this->currentHandler->open($savePath, $sessionName);
@@ -85,6 +89,7 @@ public function open($savePath, $sessionName)
     /**
      * @return string
      */
+    #[\ReturnTypeWillChange]
     public function read($sessionId)
     {
         // No reading from new handler until switch-over
@@ -94,6 +99,7 @@ public function read($sessionId)
     /**
      * @return bool
      */
+    #[\ReturnTypeWillChange]
     public function write($sessionId, $sessionData)
     {
         $result = $this->currentHandler->write($sessionId, $sessionData);
@@ -105,6 +111,7 @@ public function write($sessionId, $sessionData)
     /**
      * @return bool
      */
+    #[\ReturnTypeWillChange]
     public function validateId($sessionId)
     {
         // No reading from new handler until switch-over
@@ -114,6 +121,7 @@ public function validateId($sessionId)
     /**
      * @return bool
      */
+    #[\ReturnTypeWillChange]
     public function updateTimestamp($sessionId, $sessionData)
     {
         $result = $this->currentHandler->updateTimestamp($sessionId, $sessionData);

Session/Storage/Handler/NullSessionHandler.php

@@ -21,6 +21,7 @@ class NullSessionHandler extends AbstractSessionHandler
     /**
      * @return bool
      */
+    #[\ReturnTypeWillChange]
     public function close()
     {
         return true;
@@ -29,6 +30,7 @@ public function close()
     /**
      * @return bool
      */
+    #[\ReturnTypeWillChange]
     public function validateId($sessionId)
     {
         return true;
@@ -45,6 +47,7 @@ protected function doRead(string $sessionId)
     /**
      * @return bool
      */
+    #[\ReturnTypeWillChange]
     public function updateTimestamp($sessionId, $data)
     {
         return true;
@@ -69,6 +72,7 @@ protected function doDestroy(string $sessionId)
     /**
      * @return bool
      */
+    #[\ReturnTypeWillChange]
     public function gc($maxlifetime)
     {
         return true;

Session/Storage/Handler/PdoSessionHandler.php

@@ -262,6 +262,7 @@ public function isSessionExpired()
     /**
      * @return bool
      */
+    #[\ReturnTypeWillChange]
     public function open($savePath, $sessionName)
     {
         $this->sessionExpired = false;
@@ -276,6 +277,7 @@ public function open($savePath, $sessionName)
     /**
      * @return string
      */
+    #[\ReturnTypeWillChange]
     public function read($sessionId)
     {
         try {
@@ -290,6 +292,7 @@ public function read($sessionId)
     /**
      * @return bool
      */
+    #[\ReturnTypeWillChange]
     public function gc($maxlifetime)
     {
         // We delay gc() to close() so that it is executed outside the transactional and blocking read-write process.
@@ -369,6 +372,7 @@ protected function doWrite(string $sessionId, string $data)
     /**
      * @return bool
      */
+    #[\ReturnTypeWillChange]
     public function updateTimestamp($sessionId, $data)
     {
         $expiry = time() + (int) ini_get('session.gc_maxlifetime');
@@ -393,6 +397,7 @@ public function updateTimestamp($sessionId, $data)
     /**
      * @return bool
      */
+    #[\ReturnTypeWillChange]
     public function close()
     {
         $this->commit();

Tests/Session/Storage/Handler/MigratingSessionHandlerTest.php

@@ -75,15 +75,14 @@ public function testGc()
         $this->currentHandler->expects($this->once())
             ->method('gc')
             ->with($maxlifetime)
-            ->willReturn(true);
+            ->willReturn(1);
 
         $this->writeOnlyHandler->expects($this->once())
             ->method('gc')
             ->with($maxlifetime)
             ->willReturn(false);
 
-        $result = $this->dualHandler->gc($maxlifetime);
-        $this->assertTrue($result);
+        $this->assertSame(1, $this->dualHandler->gc($maxlifetime));
     }
 
     public function testOpen()

Tests/Session/Storage/Handler/PdoSessionHandlerTest.php

@@ -371,6 +371,10 @@ public function __construct(string $driverName = null, int $errorMode = null)
         $this->errorMode = null !== $errorMode ?: \PDO::ERRMODE_EXCEPTION;
     }
 
+    /**
+     * @return mixed
+     */
+    #[\ReturnTypeWillChange]
     public function getAttribute($attribute)
     {
         if (\PDO::ATTR_ERRMODE === $attribute) {
@@ -384,18 +388,24 @@ public function getAttribute($attribute)
         return parent::getAttribute($attribute);
     }
 
+    /**
+     * @return false|\PDOStatement
+     */
+    #[\ReturnTypeWillChange]
     public function prepare($statement, $driverOptions = [])
     {
         return \is_callable($this->prepareResult)
             ? ($this->prepareResult)($statement, $driverOptions)
             : $this->prepareResult;
     }
 
-    public function beginTransaction()
+    public function beginTransaction(): bool
     {
+        return true;
     }
 
-    public function rollBack()
+    public function rollBack(): bool
     {
+        return true;
     }
 }

Tests/Session/Storage/Handler/StrictSessionHandlerTest.php

@@ -181,9 +181,9 @@ public function testGc()
     {
         $handler = $this->createMock(\SessionHandlerInterface::class);
         $handler->expects($this->once())->method('gc')
-            ->with(123)->willReturn(true);
+            ->with(123)->willReturn(1);
         $proxy = new StrictSessionHandler($handler);
 
-        $this->assertTrue($proxy->gc(123));
+        $this->assertSame(1, $proxy->gc(123));
     }
 }

Tests/Session/Storage/Proxy/SessionHandlerProxyTest.php

@@ -93,7 +93,9 @@ public function testCloseFalse()
     public function testRead()
     {
         $this->mock->expects($this->once())
-            ->method('read');
+            ->method('read')
+            ->willReturn('foo')
+        ;
 
         $this->proxy->read('id');
     }
@@ -117,7 +119,9 @@ public function testDestroy()
     public function testGc()
     {
         $this->mock->expects($this->once())
-            ->method('gc');
+            ->method('gc')
+            ->willReturn(1)
+        ;
 
         $this->proxy->gc(86400);
     }