Merge branch '5.4' into 6.4

derrabus · derrabus · commit b11e8a21676b · 2024-09-08T14:30:05.000+02:00
* 5.4:
  Mitigate PHPUnit deprecations
  [TwigBundle] Add support for resetting globals between HTTP requests
  [Validator] Add Catalan and Spanish translation for `Week` constraint
  Don't use is_resource() on non-streams
  [Ldap] Fix extension deprecation
diff --git a/src/Symfony/Bridge/Doctrine/Tests/Messenger/DoctrineCloseConnectionMiddlewareTest.php b/src/Symfony/Bridge/Doctrine/Tests/Messenger/DoctrineCloseConnectionMiddlewareTest.php
@@ -63,7 +63,7 @@ public function testInvalidEntityManagerThrowsException()
         $managerRegistry
             ->method('getManager')
             ->with('unknown_manager')
-            ->will($this->throwException(new \InvalidArgumentException()));
+            ->willThrowException(new \InvalidArgumentException());
 
         $middleware = new DoctrineCloseConnectionMiddleware($managerRegistry, 'unknown_manager');
 
diff --git a/src/Symfony/Bridge/Doctrine/Tests/Messenger/DoctrinePingConnectionMiddlewareTest.php b/src/Symfony/Bridge/Doctrine/Tests/Messenger/DoctrinePingConnectionMiddlewareTest.php
@@ -101,7 +101,7 @@ public function testInvalidEntityManagerThrowsException()
         $managerRegistry
             ->method('getManager')
             ->with('unknown_manager')
-            ->will($this->throwException(new \InvalidArgumentException()));
+            ->willThrowException(new \InvalidArgumentException());
 
         $middleware = new DoctrinePingConnectionMiddleware($managerRegistry, 'unknown_manager');
 
diff --git a/src/Symfony/Bridge/Doctrine/Tests/Messenger/DoctrineTransactionMiddlewareTest.php b/src/Symfony/Bridge/Doctrine/Tests/Messenger/DoctrineTransactionMiddlewareTest.php
@@ -75,7 +75,7 @@ public function testInvalidEntityManagerThrowsException()
         $managerRegistry
             ->method('getManager')
             ->with('unknown_manager')
-            ->will($this->throwException(new \InvalidArgumentException()));
+            ->willThrowException(new \InvalidArgumentException());
 
         $middleware = new DoctrineTransactionMiddleware($managerRegistry, 'unknown_manager');
 
diff --git a/src/Symfony/Bundle/TwigBundle/DependencyInjection/TwigExtension.php b/src/Symfony/Bundle/TwigBundle/DependencyInjection/TwigExtension.php
@@ -25,6 +25,7 @@
 use Symfony\Component\Translation\LocaleSwitcher;
 use Symfony\Component\Translation\Translator;
 use Symfony\Contracts\Service\ResetInterface;
+use Twig\Environment;
 use Twig\Extension\ExtensionInterface;
 use Twig\Extension\RuntimeExtensionInterface;
 use Twig\Loader\LoaderInterface;
@@ -45,6 +46,10 @@ public function load(array $configs, ContainerBuilder $container)
         $loader = new PhpFileLoader($container, new FileLocator(__DIR__.'/../Resources/config'));
         $loader->load('twig.php');
 
+        if (method_exists(Environment::class, 'resetGlobals')) {
+            $container->getDefinition('twig')->addTag('kernel.reset', ['method' => 'resetGlobals']);
+        }
+
         if ($container::willBeAvailable('symfony/form', Form::class, ['symfony/twig-bundle'])) {
             $loader->load('form.php');
 
diff --git a/src/Symfony/Component/Console/Terminal.php b/src/Symfony/Component/Console/Terminal.php
@@ -217,8 +217,7 @@ private static function readFromProcess(string|array $command): ?string
 
         $cp = \function_exists('sapi_windows_cp_set') ? sapi_windows_cp_get() : 0;
 
-        $process = proc_open($command, $descriptorspec, $pipes, null, null, ['suppress_errors' => true]);
-        if (!\is_resource($process)) {
+        if (!$process = proc_open($command, $descriptorspec, $pipes, null, null, ['suppress_errors' => true])) {
             return null;
         }
 
diff --git a/src/Symfony/Component/HttpKernel/Log/Logger.php b/src/Symfony/Component/HttpKernel/Log/Logger.php
@@ -79,7 +79,7 @@ public function __construct(?string $minLevel = null, $output = null, ?callable
 
         $this->minLevelIndex = self::LEVELS[$minLevel];
         $this->formatter = null !== $formatter ? $formatter(...) : $this->format(...);
-        if ($output && false === $this->handle = \is_resource($output) ? $output : @fopen($output, 'a')) {
+        if ($output && false === $this->handle = \is_string($output) ? @fopen($output, 'a') : $output) {
             throw new InvalidArgumentException(sprintf('Unable to open "%s".', $output));
         }
         $this->debug = $debug;
diff --git a/src/Symfony/Component/Ldap/Tests/LdapTestCase.php b/src/Symfony/Component/Ldap/Tests/LdapTestCase.php
@@ -17,7 +17,12 @@ class LdapTestCase extends TestCase
 {
     protected function getLdapConfig()
     {
-        $h = @ldap_connect(getenv('LDAP_HOST'), getenv('LDAP_PORT'));
+        if (\PHP_VERSION_ID < 80300) {
+            $h = @ldap_connect(getenv('LDAP_HOST'), getenv('LDAP_PORT'));
+        } else {
+            $h = @ldap_connect('ldap://'.getenv('LDAP_HOST').':'.getenv('LDAP_PORT'));
+        }
+
         @ldap_set_option($h, \LDAP_OPT_PROTOCOL_VERSION, 3);
 
         if (!$h || !@ldap_bind($h)) {
diff --git a/src/Symfony/Component/Mailer/Tests/Transport/FailoverTransportTest.php b/src/Symfony/Component/Mailer/Tests/Transport/FailoverTransportTest.php
@@ -57,9 +57,9 @@ public function testSendFirstWork()
     public function testSendAllDead()
     {
         $t1 = $this->createMock(TransportInterface::class);
-        $t1->expects($this->once())->method('send')->will($this->throwException(new TransportException()));
+        $t1->expects($this->once())->method('send')->willThrowException(new TransportException());
         $t2 = $this->createMock(TransportInterface::class);
-        $t2->expects($this->once())->method('send')->will($this->throwException(new TransportException()));
+        $t2->expects($this->once())->method('send')->willThrowException(new TransportException());
         $t = new FailoverTransport([$t1, $t2]);
         $this->expectException(TransportException::class);
         $this->expectExceptionMessage('All transports failed.');
@@ -70,7 +70,7 @@ public function testSendAllDead()
     public function testSendOneDead()
     {
         $t1 = $this->createMock(TransportInterface::class);
-        $t1->expects($this->once())->method('send')->will($this->throwException(new TransportException()));
+        $t1->expects($this->once())->method('send')->willThrowException(new TransportException());
         $t2 = $this->createMock(TransportInterface::class);
         $t2->expects($this->exactly(3))->method('send');
         $t = new FailoverTransport([$t1, $t2]);
diff --git a/src/Symfony/Component/Mailer/Tests/Transport/RoundRobinTransportTest.php b/src/Symfony/Component/Mailer/Tests/Transport/RoundRobinTransportTest.php
@@ -57,9 +57,9 @@ public function testSendAlternate()
     public function testSendAllDead()
     {
         $t1 = $this->createMock(TransportInterface::class);
-        $t1->expects($this->once())->method('send')->will($this->throwException(new TransportException()));
+        $t1->expects($this->once())->method('send')->willThrowException(new TransportException());
         $t2 = $this->createMock(TransportInterface::class);
-        $t2->expects($this->once())->method('send')->will($this->throwException(new TransportException()));
+        $t2->expects($this->once())->method('send')->willThrowException(new TransportException());
         $t = new RoundRobinTransport([$t1, $t2]);
         $p = new \ReflectionProperty($t, 'cursor');
         $p->setValue($t, 0);
@@ -80,7 +80,7 @@ public function testSendAllDead()
     public function testSendOneDead()
     {
         $t1 = $this->createMock(TransportInterface::class);
-        $t1->expects($this->once())->method('send')->will($this->throwException(new TransportException()));
+        $t1->expects($this->once())->method('send')->willThrowException(new TransportException());
         $t2 = $this->createMock(TransportInterface::class);
         $t2->expects($this->exactly(3))->method('send');
         $t = new RoundRobinTransport([$t1, $t2]);
@@ -99,7 +99,7 @@ public function testSendOneDeadAndRecoveryNotWithinRetryPeriod()
         $t1 = $this->createMock(TransportInterface::class);
         $t1->expects($this->exactly(4))->method('send');
         $t2 = $this->createMock(TransportInterface::class);
-        $t2->expects($this->once())->method('send')->will($this->throwException(new TransportException()));
+        $t2->expects($this->once())->method('send')->willThrowException(new TransportException());
         $t = new RoundRobinTransport([$t1, $t2], 60);
         $p = new \ReflectionProperty($t, 'cursor');
         $p->setValue($t, 0);
@@ -148,13 +148,13 @@ public function testFailureDebugInformation()
         $t1 = $this->createMock(TransportInterface::class);
         $e1 = new TransportException();
         $e1->appendDebug('Debug message 1');
-        $t1->expects($this->once())->method('send')->will($this->throwException($e1));
+        $t1->expects($this->once())->method('send')->willThrowException($e1);
         $t1->expects($this->once())->method('__toString')->willReturn('t1');
 
         $t2 = $this->createMock(TransportInterface::class);
         $e2 = new TransportException();
         $e2->appendDebug('Debug message 2');
-        $t2->expects($this->once())->method('send')->will($this->throwException($e2));
+        $t2->expects($this->once())->method('send')->willThrowException($e2);
         $t2->expects($this->once())->method('__toString')->willReturn('t2');
 
         $t = new RoundRobinTransport([$t1, $t2]);
diff --git a/src/Symfony/Component/Messenger/Tests/Middleware/DispatchAfterCurrentBusMiddlewareTest.php b/src/Symfony/Component/Messenger/Tests/Middleware/DispatchAfterCurrentBusMiddlewareTest.php
@@ -68,7 +68,7 @@ public function testEventsInNewTransactionAreHandledAfterMainMessage()
             ->with($this->callback(function (Envelope $envelope) use (&$series) {
                 return $envelope->getMessage() === array_shift($series);
             }))
-            ->will($this->willHandleMessage());
+            ->willReturnCallback($this->handleMessageCallback());
 
         $messageBus->dispatch($message);
     }
@@ -278,7 +278,7 @@ public function testDispatchOutOfAnotherHandlerDispatchesAndRemoveStamp()
         $handlingMiddleware
             ->method('handle')
             ->with($this->expectHandledMessage($event))
-            ->will($this->willHandleMessage());
+            ->willReturnCallback($this->handleMessageCallback());
 
         $eventBus = new MessageBus([
             $middleware,
@@ -295,9 +295,9 @@ private function expectHandledMessage($message): Callback
         return $this->callback(fn (Envelope $envelope) => $envelope->getMessage() === $message);
     }
 
-    private function willHandleMessage(): ReturnCallback
+    private function handleMessageCallback(): \Closure
     {
-        return $this->returnCallback(fn ($envelope, StackInterface $stack) => $stack->next()->handle($envelope, $stack));
+        return fn ($envelope, StackInterface $stack) => $stack->next()->handle($envelope, $stack);
     }
 }
 
diff --git a/src/Symfony/Component/Notifier/Tests/Transport/FailoverTransportTest.php b/src/Symfony/Component/Notifier/Tests/Transport/FailoverTransportTest.php
@@ -80,11 +80,11 @@ public function testSendAllDead()
 
         $t1 = $this->createMock(TransportInterface::class);
         $t1->method('supports')->with($message)->willReturn(true);
-        $t1->expects($this->once())->method('send')->with($message)->will($this->throwException($this->createMock(TransportExceptionInterface::class)));
+        $t1->expects($this->once())->method('send')->with($message)->willThrowException($this->createMock(TransportExceptionInterface::class));
 
         $t2 = $this->createMock(TransportInterface::class);
         $t2->method('supports')->with($message)->willReturn(true);
-        $t2->expects($this->once())->method('send')->with($message)->will($this->throwException($this->createMock(TransportExceptionInterface::class)));
+        $t2->expects($this->once())->method('send')->with($message)->willThrowException($this->createMock(TransportExceptionInterface::class));
 
         $t = new FailoverTransport([$t1, $t2]);
 
@@ -100,7 +100,7 @@ public function testSendOneDead()
 
         $t1 = $this->createMock(TransportInterface::class);
         $t1->method('supports')->with($message)->willReturn(true);
-        $t1->expects($this->once())->method('send')->will($this->throwException($this->createMock(TransportExceptionInterface::class)));
+        $t1->expects($this->once())->method('send')->willThrowException($this->createMock(TransportExceptionInterface::class));
 
         $t2 = $this->createMock(TransportInterface::class);
         $t2->method('supports')->with($message)->willReturn(true);
@@ -117,7 +117,7 @@ public function testSendAllDeadWithinRetryPeriod()
 
         $t1 = $this->createMock(TransportInterface::class);
         $t1->method('supports')->with($message)->willReturn(true);
-        $t1->method('send')->will($this->throwException($this->createMock(TransportExceptionInterface::class)));
+        $t1->method('send')->willThrowException($this->createMock(TransportExceptionInterface::class));
         $t1->expects($this->once())->method('send');
         $t2 = $this->createMock(TransportInterface::class);
         $t2->method('supports')->with($message)->willReturn(true);
diff --git a/src/Symfony/Component/Process/Process.php b/src/Symfony/Component/Process/Process.php
@@ -346,7 +346,7 @@ public function start(?callable $callback = null, array $env = [])
 
         $process = @proc_open($commandline, $descriptors, $this->processPipes->pipes, $this->cwd, $envPairs, $this->options);
 
-        if (!\is_resource($process)) {
+        if (!$process) {
             throw new RuntimeException('Unable to launch a new process.');
         }
         $this->process = $process;
@@ -1400,8 +1400,9 @@ private function readPipes(bool $blocking, bool $close): void
     private function close(): int
     {
         $this->processPipes->close();
-        if (\is_resource($this->process)) {
+        if ($this->process) {
             proc_close($this->process);
+            $this->process = null;
         }
         $this->exitcode = $this->processInformation['exitcode'];
         $this->status = self::STATUS_TERMINATED;
diff --git a/src/Symfony/Component/Validator/Resources/translations/validators.ca.xlf b/src/Symfony/Component/Validator/Resources/translations/validators.ca.xlf
@@ -452,19 +452,19 @@
             </trans-unit>
             <trans-unit id="116">
                 <source>This value does not represent a valid week in the ISO 8601 format.</source>
-                <target state="needs-translation">This value does not represent a valid week in the ISO 8601 format.</target>
+                <target>Aquest valor no representa una setmana vàlida en el format ISO 8601.</target>
             </trans-unit>
             <trans-unit id="117">
                 <source>This value is not a valid week.</source>
-                <target state="needs-translation">This value is not a valid week.</target>
+                <target>Aquest valor no és una setmana vàlida.</target>
             </trans-unit>
             <trans-unit id="118">
                 <source>This value should not be before week "{{ min }}".</source>
-                <target state="needs-translation">This value should not be before week "{{ min }}".</target>
+                <target>Aquest valor no ha de ser anterior a la setmana "{{ min }}".</target>
             </trans-unit>
             <trans-unit id="119">
                 <source>This value should not be after week "{{ max }}".</source>
-                <target state="needs-translation">This value should not be after week "{{ max }}".</target>
+                <target>Aquest valor no ha de ser posterior a la setmana "{{ max }}".</target>
             </trans-unit>
         </body>
     </file>
diff --git a/src/Symfony/Component/Validator/Resources/translations/validators.es.xlf b/src/Symfony/Component/Validator/Resources/translations/validators.es.xlf
@@ -452,19 +452,19 @@
             </trans-unit>
             <trans-unit id="116">
                 <source>This value does not represent a valid week in the ISO 8601 format.</source>
-                <target state="needs-translation">This value does not represent a valid week in the ISO 8601 format.</target>
+                <target>Este valor no representa una semana válida en formato ISO 8601.</target>
             </trans-unit>
             <trans-unit id="117">
                 <source>This value is not a valid week.</source>
-                <target state="needs-translation">This value is not a valid week.</target>
+                <target>Este valor no es una semana válida.</target>
             </trans-unit>
             <trans-unit id="118">
                 <source>This value should not be before week "{{ min }}".</source>
-                <target state="needs-translation">This value should not be before week "{{ min }}".</target>
+                <target>Este valor no debe ser anterior a la semana "{{ min }}".</target>
             </trans-unit>
             <trans-unit id="119">
                 <source>This value should not be after week "{{ max }}".</source>
-                <target state="needs-translation">This value should not be after week "{{ max }}".</target>
+                <target>Este valor no debe ser posterior a la semana "{{ max }}".</target>
             </trans-unit>
         </body>
     </file>

Original file line number	Diff line number	Diff line change
`@@ -217,8 +217,7 @@ private static function readFromProcess(string\|array $command): ?string`
`217`	`217`
`218`	`218`	`$cp = \function_exists('sapi_windows_cp_set') ? sapi_windows_cp_get() : 0;`
`219`	`219`
`220`		`- $process = proc_open($command, $descriptorspec, $pipes, null, null, ['suppress_errors' => true]);`
`221`		`- if (!\is_resource($process)) {`
	`220`	`+ if (!$process = proc_open($command, $descriptorspec, $pipes, null, null, ['suppress_errors' => true])) {`
`222`	`221`	`return null;`
`223`	`222`	`}`
`224`	`223`
Original file line number	Diff line number	Diff line change
`@@ -79,7 +79,7 @@ public function __construct(?string $minLevel = null, $output = null, ?callable`
`79`	`79`
`80`	`80`	`$this->minLevelIndex = self::LEVELS[$minLevel];`
`81`	`81`	`$this->formatter = null !== $formatter ? $formatter(...) : $this->format(...);`
`82`		`- if ($output && false === $this->handle = \is_resource($output) ? $output : @fopen($output, 'a')) {`
	`82`	`+ if ($output && false === $this->handle = \is_string($output) ? @fopen($output, 'a') : $output) {`
`83`	`83`	`throw new InvalidArgumentException(sprintf('Unable to open "%s".', $output));`
`84`	`84`	`}`
`85`	`85`	`$this->debug = $debug;`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,12 @@ class LdapTestCase extends TestCase`
`17`	`17`	`{`
`18`	`18`	`protected function getLdapConfig()`
`19`	`19`	`{`
`20`		`- $h = @ldap_connect(getenv('LDAP_HOST'), getenv('LDAP_PORT'));`
	`20`	`+ if (\PHP_VERSION_ID < 80300) {`
	`21`	`+ $h = @ldap_connect(getenv('LDAP_HOST'), getenv('LDAP_PORT'));`
	`22`	`+ } else {`
	`23`	`+ $h = @ldap_connect('ldap://'.getenv('LDAP_HOST').':'.getenv('LDAP_PORT'));`
	`24`	`+ }`
	`25`	`+`
`21`	`26`	`@ldap_set_option($h, \LDAP_OPT_PROTOCOL_VERSION, 3);`
`22`	`27`
`23`	`28`	`if (!$h \|\| !@ldap_bind($h)) {`
Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ public function testEventsInNewTransactionAreHandledAfterMainMessage()`
`68`	`68`	`->with($this->callback(function (Envelope $envelope) use (&$series) {`
`69`	`69`	`return $envelope->getMessage() === array_shift($series);`
`70`	`70`	`}))`
`71`		`- ->will($this->willHandleMessage());`
	`71`	`+ ->willReturnCallback($this->handleMessageCallback());`
`72`	`72`
`73`	`73`	`$messageBus->dispatch($message);`
`74`	`74`	`}`
`@@ -278,7 +278,7 @@ public function testDispatchOutOfAnotherHandlerDispatchesAndRemoveStamp()`
`278`	`278`	`$handlingMiddleware`
`279`	`279`	`->method('handle')`
`280`	`280`	`->with($this->expectHandledMessage($event))`
`281`		`- ->will($this->willHandleMessage());`
	`281`	`+ ->willReturnCallback($this->handleMessageCallback());`
`282`	`282`
`283`	`283`	`$eventBus = new MessageBus([`
`284`	`284`	`$middleware,`
`@@ -295,9 +295,9 @@ private function expectHandledMessage($message): Callback`
`295`	`295`	`return $this->callback(fn (Envelope $envelope) => $envelope->getMessage() === $message);`
`296`	`296`	`}`
`297`	`297`
`298`		`- private function willHandleMessage(): ReturnCallback`
	`298`	`+ private function handleMessageCallback(): \Closure`
`299`	`299`	`{`
`300`		`- return $this->returnCallback(fn ($envelope, StackInterface $stack) => $stack->next()->handle($envelope, $stack));`
	`300`	`+ return fn ($envelope, StackInterface $stack) => $stack->next()->handle($envelope, $stack);`
`301`	`301`	`}`
`302`	`302`	`}`
`303`	`303`