Merge branch '6.0' into 6.1

nicolas-grekas · nicolas-grekas · commit 0235a07e1efb · 2022-06-30T17:32:53.000+02:00
* 6.0:
  [Mailer] fix tests
  [HttpFoundation] Prevent PHP Warning: Session ID is too long or contains illegal characters
  [Messenger] fix test
  [Messenger] Ceil waiting time when multiplier is a float on retry
  Spaces in system temp folder path cause deprecation errors in php 8
diff --git a/src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php b/src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php
@@ -683,7 +683,7 @@ private function shouldEnableEntityLoader(): bool
             });
             $schema = '<?xml version="1.0" encoding="utf-8"?>
 <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-  <xsd:include schemaLocation="file:///'.str_replace('\\', '/', $tmpfile).'" />
+  <xsd:include schemaLocation="file:///'.rawurlencode(str_replace('\\', '/', $tmpfile)).'" />
 </xsd:schema>';
             file_put_contents($tmpfile, '<?xml version="1.0" encoding="utf-8"?>
 <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema">
diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/NativeSessionStorage.php b/src/Symfony/Component/HttpFoundation/Session/Storage/NativeSessionStorage.php
@@ -136,7 +136,7 @@ public function start(): bool
         }
 
         $sessionId = $_COOKIE[session_name()] ?? null;
-        if ($sessionId && $this->saveHandler instanceof AbstractProxy && 'files' === $this->saveHandler->getSaveHandlerName() && !preg_match('/^[a-zA-Z0-9,-]{22,}$/', $sessionId)) {
+        if ($sessionId && $this->saveHandler instanceof AbstractProxy && 'files' === $this->saveHandler->getSaveHandlerName() && !preg_match('/^[a-zA-Z0-9,-]{22,250}$/', $sessionId)) {
             // the session ID in the header is invalid, create a new one
             session_id(session_create_id());
         }
diff --git a/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/NativeSessionStorageTest.php b/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/NativeSessionStorageTest.php
@@ -292,7 +292,7 @@ public function testRegenerateInvalidSessionIdForNativeFileSessionHandler()
         $started = $storage->start();
 
         $this->assertTrue($started);
-        $this->assertMatchesRegularExpression('/^[a-zA-Z0-9,-]{22,}$/', session_id());
+        $this->assertMatchesRegularExpression('/^[a-zA-Z0-9,-]{22,250}$/', session_id());
         $storage->save();
 
         $_COOKIE[session_name()] = '&~[';
@@ -301,7 +301,7 @@ public function testRegenerateInvalidSessionIdForNativeFileSessionHandler()
         $started = $storage->start();
 
         $this->assertTrue($started);
-        $this->assertMatchesRegularExpression('/^[a-zA-Z0-9,-]{22,}$/', session_id());
+        $this->assertMatchesRegularExpression('/^[a-zA-Z0-9,-]{22,250}$/', session_id());
         $storage->save();
 
         $_COOKIE[session_name()] = '&~[';
diff --git a/src/Symfony/Component/Mailer/Transport/NativeTransportFactory.php b/src/Symfony/Component/Mailer/Transport/NativeTransportFactory.php
@@ -29,7 +29,7 @@ public function create(Dsn $dsn): TransportInterface
             throw new UnsupportedSchemeException($dsn, 'native', $this->getSupportedSchemes());
         }
 
-        if ($sendMailPath = \ini_get('sendmail_path')) {
+        if ($sendMailPath = ini_get('sendmail_path')) {
             return new SendmailTransport($sendMailPath, $this->dispatcher, $this->logger);
         }
 
@@ -39,8 +39,8 @@ public function create(Dsn $dsn): TransportInterface
 
         // Only for windows hosts; at this point non-windows
         // host have already thrown an exception or returned a transport
-        $host = \ini_get('SMTP');
-        $port = (int) \ini_get('smtp_port');
+        $host = ini_get('SMTP');
+        $port = (int) ini_get('smtp_port');
 
         if (!$host || !$port) {
             throw new TransportException('smtp or smtp_port is not configured in php.ini.');
diff --git a/src/Symfony/Component/Messenger/Retry/MultiplierRetryStrategy.php b/src/Symfony/Component/Messenger/Retry/MultiplierRetryStrategy.php
@@ -86,6 +86,6 @@ public function getWaitingTime(Envelope $message, \Throwable $throwable = null):
             return $this->maxDelayMilliseconds;
         }
 
-        return $delay;
+        return (int) ceil($delay);
     }
 }
diff --git a/src/Symfony/Component/Messenger/Tests/Retry/MultiplierRetryStrategyTest.php b/src/Symfony/Component/Messenger/Tests/Retry/MultiplierRetryStrategyTest.php
@@ -52,7 +52,7 @@ public function testIsRetryableWithNoStamp()
     /**
      * @dataProvider getWaitTimeTests
      */
-    public function testGetWaitTime(int $delay, int $multiplier, int $maxDelay, int $previousRetries, int $expectedDelay)
+    public function testGetWaitTime(int $delay, float $multiplier, int $maxDelay, int $previousRetries, int $expectedDelay)
     {
         $strategy = new MultiplierRetryStrategy(10, $delay, $multiplier, $maxDelay);
         $envelope = new Envelope(new \stdClass(), [new RedeliveryStamp($previousRetries)]);
@@ -83,5 +83,10 @@ public function getWaitTimeTests(): iterable
         // never a delay
         yield [0, 2, 10000, 0, 0];
         yield [0, 2, 10000, 1, 0];
+
+        // Float delay
+        yield [1000, 1.5555, 5000, 0, 1000];
+        yield [1000, 1.5555, 5000, 1, 1556];
+        yield [1000, 1.5555, 5000, 2, 2420];
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -136,7 +136,7 @@ public function start(): bool`
`136`	`136`	`}`
`137`	`137`
`138`	`138`	`$sessionId = $_COOKIE[session_name()] ?? null;`
`139`		`- if ($sessionId && $this->saveHandler instanceof AbstractProxy && 'files' === $this->saveHandler->getSaveHandlerName() && !preg_match('/^[a-zA-Z0-9,-]{22,}$/', $sessionId)) {`
	`139`	`+ if ($sessionId && $this->saveHandler instanceof AbstractProxy && 'files' === $this->saveHandler->getSaveHandlerName() && !preg_match('/^[a-zA-Z0-9,-]{22,250}$/', $sessionId)) {`
`140`	`140`	`// the session ID in the header is invalid, create a new one`
`141`	`141`	`session_id(session_create_id());`
`142`	`142`	`}`
Original file line number	Diff line number	Diff line change
`@@ -86,6 +86,6 @@ public function getWaitingTime(Envelope $message, \Throwable $throwable = null):`
`86`	`86`	`return $this->maxDelayMilliseconds;`
`87`	`87`	`}`
`88`	`88`
`89`		`- return $delay;`
	`89`	`+ return (int) ceil($delay);`
`90`	`90`	`}`
`91`	`91`	`}`
Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ public function testIsRetryableWithNoStamp()`
`52`	`52`	`/**`
`53`	`53`	`* @dataProvider getWaitTimeTests`
`54`	`54`	`*/`
`55`		`- public function testGetWaitTime(int $delay, int $multiplier, int $maxDelay, int $previousRetries, int $expectedDelay)`
	`55`	`+ public function testGetWaitTime(int $delay, float $multiplier, int $maxDelay, int $previousRetries, int $expectedDelay)`
`56`	`56`	`{`
`57`	`57`	`$strategy = new MultiplierRetryStrategy(10, $delay, $multiplier, $maxDelay);`
`58`	`58`	`$envelope = new Envelope(new \stdClass(), [new RedeliveryStamp($previousRetries)]);`
`@@ -83,5 +83,10 @@ public function getWaitTimeTests(): iterable`
`83`	`83`	`// never a delay`
`84`	`84`	`yield [0, 2, 10000, 0, 0];`
`85`	`85`	`yield [0, 2, 10000, 1, 0];`
	`86`	`+`
	`87`	`+ // Float delay`
	`88`	`+ yield [1000, 1.5555, 5000, 0, 1000];`
	`89`	`+ 4369 yield [1000, 1.5555, 5000, 1, 1556];`
	`90`	`+ yield [1000, 1.5555, 5000, 2, 2420];`
`86`	`91`	`}`
`87`	`92`	`}`