Merge branch '4.3' into 4.4

* 4.3:
  [Routing] fix static route reordering when a previous dynamic route conflicts
  Return null as Expire header if it was set to null
  bug #33370 Fix import statement typo in NullCache (adrienbrault)
  [ProxyManager] remove ProxiedMethodReturnExpression polyfill
  fix dumping not inlined scalar tag values

Author: nicolas-grekas

Dumper.php

@@ -85,6 +85,10 @@ public function dump($input, int $inline = 0, int $indent = 0, int $flags = 0):
                     } else {
                         $output .= "\n";
                         $output .= $this->dump($value->getValue(), $inline - 1, $dumpAsMap ? $indent + $this->indentation : $indent + 2, $flags);
+
+                        if (is_scalar($value->getValue())) {
+                            $output .= "\n";
+                        }
                     }
 
                     continue;

Tests/DumperTest.php

@@ -459,6 +459,23 @@ public function testDumpingTaggedValueMapWithInlinedTagValues()
         $this->assertSame($expected, $yaml);
     }
 
+    public function testDumpingNotInlinedScalarTaggedValue()
+    {
+        $data = [
+            'user1' => new TaggedValue('user', 'jane'),
+            'user2' => new TaggedValue('user', 'john'),
+        ];
+        $expected = <<<YAML
+user1: !user
+    jane
+user2: !user
+    john
+
+YAML;
+
+        $this->assertSame($expected, $this->dumper->dump($data, 2));
+    }
+
     public function testDumpMultiLineStringAsScalarBlock()
     {
         $data = [