Merge branch '7.4' into 8.0

* 7.4: [DependencyInjection][Routing] Fix nested config imports when returning PHP arrays fix compatibility with Relay 0.12.1 [TypeInfo] Fix resolving use statements with line breaks [FrameworkBundle] Fix normalization of enums in workflow transitions Add missing return type for docblock Closure don't use a fixed date fixture when assertions depend on relative times [FrameworkBundle] Fix secrets:encrypt-from-local [Security] Add support for `Sec-Fetch-Site` to `SameOriginCsrfTokenManager` [Console] Optimize mostRecentlyEnteredValue() method [HttpClient] Add QUERY to the list of retriable HTTP methods Update regular expression in URL validator [AssetMapper] Fix parsing @import that don't use url() [Messenger] Add retry delay on amazon sqs [Serializer] CsvEncoder to escape values starting with line feed when escape formulas is enabled

Author: nicolas-grekas

Encoder/CsvEncoder.php

@@ -35,7 +35,7 @@ class CsvEncoder implements EncoderInterface, DecoderInterface
 
  private const UTF8_BOM = "\xEF\xBB\xBF";
 
- private const FORMULAS_START_CHARACTERS = ['=', '-', '+', '@', "\t", "\r"];
+ private const FORMULAS_START_CHARACTERS = ['=', '-', '+', '@', "\t", "\r", "\n"];
 
  private array $defaultContext = [
  self::DELIMITER_KEY => ',',

Tests/Encoder/CsvEncoderTest.php

@@ -308,6 +308,15 @@ public function testEncodeFormulas()
  $this->encoder->encode(["\ttab"], 'csv')
  );
 
+ $this->assertSame(<<<'CSV'
+ 0
+ "'
+ line feed"
+
+ CSV,
+ $this->encoder->encode(["\nline feed"], 'csv')
+ );
+
  $this->assertSame(<<<'CSV'
  0
  "'=1+2"";=1+2"
@@ -436,6 +445,17 @@ public function testEncodeFormulasWithSettingsPassedInContext()
  ])
  );
 
+ $this->assertSame(<<<'CSV'
+ 0
+ "'
+ line feed"
+
+ CSV,
+ $this->encoder->encode(["\nline feed"], 'csv', [
+ CsvEncoder::ESCAPE_FORMULAS_KEY => true,
+ ])
+ );
+
  $this->assertSame(<<<'CSV'
  0
  "'=1+2"";=1+2"