Merge branch '5.3' into 5.4

nicolas-grekas · nicolas-grekas · commit 3dac1d09a2d6 · 2021-08-25T10:23:52.000+02:00
* 5.3:
  Fix tests
  [HttpKernel] skip test on appveyor
  [AMQP] [Messenger] Do not leak any credentials when connection fails
diff --git a/src/Symfony/Component/Cache/Adapter/AbstractAdapter.php b/src/Symfony/Component/Cache/Adapter/AbstractAdapter.php
@@ -52,7 +52,7 @@ static function ($key, $value, $isHit) {
                 // Detect wrapped values that encode for their expiry and creation duration
                 // For compactness, these values are packed in the key of an array using
                 // magic numbers in the form 9D-..-..-..-..-00-..-..-..-5F
-                if (\is_array($v) && 1 === \count($v) && 10 === \strlen($k = (string) key($v)) && "\x9D" === $k[0] && "\0" === $k[5] && "\x5F" === $k[9]) {
+                if (\is_array($v) && 1 === \count($v) && 10 === \strlen($k = (string) array_key_first($v)) && "\x9D" === $k[0] && "\0" === $k[5] && "\x5F" === $k[9]) {
                     $item->value = $v[$k];
                     $v = unpack('Ve/Nc', substr($k, 1, -1));
                     $item->metadata[CacheItem::METADATA_EXPIRY] = $v['e'] + CacheItem::METADATA_EXPIRY_OFFSET;
diff --git a/src/Symfony/Component/Cache/Adapter/ApcuAdapter.php b/src/Symfony/Component/Cache/Adapter/ApcuAdapter.php
@@ -122,7 +122,7 @@ protected function doSave(array $values, int $lifetime)
         } catch (\Throwable $e) {
             if (1 === \count($values)) {
                 // Workaround https://github.com/krakjoe/apcu/issues/170
-                apcu_delete(key($values));
+                apcu_delete(array_key_first($values));
             }
 
             throw $e;
diff --git a/src/Symfony/Component/Cache/Adapter/ProxyAdapter.php b/src/Symfony/Component/Cache/Adapter/ProxyAdapter.php
@@ -63,7 +63,7 @@ static function ($key, $innerItem, $poolHash) {
                 // Detect wrapped values that encode for their expiry and creation duration
                 // For compactness, these values are packed in the key of an array using
                 // magic numbers in the form 9D-..-..-..-..-00-..-..-..-5F
-                if (\is_array($v) && 1 === \count($v) && 10 === \strlen($k = (string) key($v)) && "\x9D" === $k[0] && "\0" === $k[5] && "\x5F" === $k[9]) {
+                if (\is_array($v) && 1 === \count($v) && 10 === \strlen($k = (string) array_key_first($v)) && "\x9D" === $k[0] && "\0" === $k[5] && "\x5F" === $k[9]) {
                     $item->value = $v[$k];
                     $v = unpack('Ve/Nc', substr($k, 1, -1));
                     $item->metadata[CacheItem::METADATA_EXPIRY] = $v['e'] + CacheItem::METADATA_EXPIRY_OFFSET;
diff --git a/src/Symfony/Component/Cache/composer.json b/src/Symfony/Component/Cache/composer.json
@@ -26,6 +26,7 @@
         "psr/log": "^1.1|^2|^3",
         "symfony/cache-contracts": "^1.1.7|^2",
         "symfony/deprecation-contracts": "^2.1",
+        "symfony/polyfill-php73": "^1.9",
         "symfony/polyfill-php80": "^1.16",
         "symfony/service-contracts": "^1.1|^2",
         "symfony/var-exporter": "^4.4|^5.0|^6.0"
diff --git a/src/Symfony/Component/HttpKernel/Tests/HttpKernelBrowserTest.php b/src/Symfony/Component/HttpKernel/Tests/HttpKernelBrowserTest.php
@@ -143,6 +143,10 @@ public function testUploadedFileWhenNoFileSelected()
 
     public function testUploadedFileWhenSizeExceedsUploadMaxFileSize()
     {
+        if (UploadedFile::getMaxFilesize() > \PHP_INT_MAX) {
+            $this->markTestSkipped('Requires PHP_INT_MAX to be greater than "upload_max_filesize" and "post_max_size" ini settings');
+        }
+
         $source = tempnam(sys_get_temp_dir(), 'source');
 
         $kernel = new TestHttpKernel();
diff --git a/src/Symfony/Component/Messenger/Bridge/Amqp/Tests/Transport/ConnectionTest.php b/src/Symfony/Component/Messenger/Bridge/Amqp/Tests/Transport/ConnectionTest.php
@@ -559,10 +559,10 @@ public function testItDelaysTheMessageWithADifferentRoutingKeyAndTTLs()
         $connection->publish('{}', [], 120000);
     }
 
-    public function testObfuscatePasswordInDsn()
+    public function testNoCredentialLeakageWhenConnectionFails()
     {
         $this->expectException(\AMQPException::class);
-        $this->expectExceptionMessage('Could not connect to the AMQP server. Please verify the provided DSN. ({"host":"localhost","port":5672,"vhost":"/","login":"user","password":"********"})');
+        $this->expectExceptionMessage('Could not connect to the AMQP server. Please verify the provided DSN.');
         $factory = new TestAmqpFactory(
             $amqpConnection = $this->createMock(\AMQPConnection::class),
             $amqpChannel = $this->createMock(\AMQPChannel::class),
diff --git a/src/Symfony/Component/Messenger/Bridge/Amqp/Transport/Connection.php b/src/Symfony/Component/Messenger/Bridge/Amqp/Transport/Connection.php
@@ -495,11 +495,7 @@ public function channel(): \AMQPChannel
             try {
                 $connection->{$connectMethod}();
             } catch (\AMQPConnectionException $e) {
-                $credentials = $this->connectionOptions;
-                $credentials['password'] = '********';
-                unset($credentials['delay']);
-
-                throw new \AMQPException(sprintf('Could not connect to the AMQP server. Please verify the provided DSN. (%s).', json_encode($credentials, \JSON_UNESCAPED_SLASHES)), 0, $e);
+                throw new \AMQPException('Could not connect to the AMQP server. Please verify the provided DSN.', 0, $e);
             }
             $this->amqpChannel = $this->amqpFactory->createChannel($connection);
 

Original file line number	Diff line number	Diff line change
`@@ -122,7 +122,7 @@ protected function doSave(array $values, int $lifetime)`
`122`	`122`	`} catch (\Throwable $e) {`
`123`	`123`	`if (1 === \count($values)) {`
`124`	`124`	`// Workaround https://github.com/krakjoe/apcu/issues/170`
`125`		`- apcu_delete(key($values));`
	`125`	`+ apcu_delete(array_key_first($values));`
`126`	`126`	`}`
`127`	`127`
`128`	`128`	`throw $e;`
Original file line number	Diff line number	Diff line change
`@@ -143,6 +143,10 @@ public function testUploadedFileWhenNoFileSelected()`
`143`	`143`
`144`	`144`	`public function testUploadedFileWhenSizeExceedsUploadMaxFileSize()`
`145`	`145`	`{`
	`146`	`+ if (UploadedFile::getMaxFilesize() > \PHP_INT_MAX) {`
	`147`	`+ $this->markTestSkipped('Requires PHP_INT_MAX to be greater than "upload_max_filesize" and "post_max_size" ini settings');`
	`148`	`+ }`
	`149`	`+`
`146`	`150`	`$source = tempnam(sys_get_temp_dir(), 'source');`
`147`	`151`
`148`	`152`	`$kernel = new TestHttpKernel();`
Original file line number	Diff line number	Diff line change
`@@ -559,10 +559,10 @@ public function testItDelaysTheMessageWithADifferentRoutingKeyAndTTLs()`
`559`	`559`	`$connection->publish('{}', [], 120000);`
`560`	`560`	`}`
`561`	`561`
`562`		`- public function testObfuscatePasswordInDsn()`
	`562`	`+ public function testNoCredentialLeakageWhenConnectionFails()`
`563`	`563`	`{`
`564`	`564`	`$this->expectException(\AMQPException::class);`
`565`		`- $this->expectExceptionMessage('Could not connect to the AMQP server. Please verify the provided DSN. ({"host":"localhost","port":5672,"vhost":"/","login":"user","password":"********"})');`
	`565`	`+ $this->expectExceptionMessage('Could not connect to the AMQP server. Please verify the provided DSN.');`
`566`	`566`	`$factory = new TestAmqpFactory(`
`567`	`567`	`$amqpConnection = $this->createMock(\AMQPConnection::class),`
`568`	`568`	`$amqpChannel = $this->createMock(\AMQPChannel::class),`