Merge branch '6.1' into 6.2

* 6.1:
  [HttpKernel] lock when writting profiles
  Using identical comparison for path validation
  [Mime] Fix email rendering when having inlined parts that are not related to the content
  fix typo
  [HttpFoundation] move flushing outside of Response::closeOutputBuffers
  [FrameworkBundle] Do not throw when describing a factory definition
  Fix checking result of DateTime::getLastErrors
  [WebProfilerBundle] Fix profile search bar link query params

Author: nicolas-grekas

Console/Descriptor/JsonDescriptor.php

@@ -252,7 +252,7 @@ private function getContainerDefinitionData(Definition $definition, bool $omitTa
                 if ($factory[0] instanceof Reference) {
                     $data['factory_service'] = (string) $factory[0];
                 } elseif ($factory[0] instanceof Definition) {
-                    throw new \InvalidArgumentException('Factory is not describable.');
+                    $data['factory_class'] = $factory[0]->getClass() ?? 'not configured';
                 } else {
                     $data['factory_class'] = $factory[0];
                 }

Console/Descriptor/MarkdownDescriptor.php

@@ -231,7 +231,7 @@ protected function describeContainerDefinition(Definition $definition, array $op
                 if ($factory[0] instanceof Reference) {
                     $output .= "\n".'- Factory Service: `'.$factory[0].'`';
                 } elseif ($factory[0] instanceof Definition) {
-                    throw new \InvalidArgumentException('Factory is not describable.');
+                    $output .= "\n".'- Factory Class: `'.($factory[0]->getClass() ?? 'not configured').'`';
                 } else {
                     $output .= "\n".'- Factory Class: `'.$factory[0].'`';
                 }

Console/Descriptor/TextDescriptor.php

@@ -315,7 +315,7 @@ protected function describeContainerDefinition(Definition $definition, array $op
                 if ($factory[0] instanceof Reference) {
                     $tableRows[] = ['Factory Service', $factory[0]];
                 } elseif ($factory[0] instanceof Definition) {
-                    throw new \InvalidArgumentException('Factory is not describable.');
+                    $tableRows[] = ['Factory Class', $factory[0]->getClass() ?? 'not configured'];
                 } else {
                     $tableRows[] = ['Factory Class', $factory[0]];
                 }

Console/Descriptor/XmlDescriptor.php

@@ -324,7 +324,7 @@ private function getContainerDefinitionDocument(Definition $definition, string $
                 if ($factory[0] instanceof Reference) {
                     $factoryXML->setAttribute('service', (string) $factory[0]);
                 } elseif ($factory[0] instanceof Definition) {
-                    throw new \InvalidArgumentException('Factory is not describable.');
+                    $factoryXML->setAttribute('class', $factory[0]->getClass() ?? 'not configured');
                 } else {
                     $factoryXML->setAttribute('class', $factory[0]);
                 }

Tests/Console/Descriptor/ObjectsProvider.php

@@ -138,6 +138,7 @@ public static function getContainerDefinitions()
     {
         $definition1 = new Definition('Full\\Qualified\\Class1');
         $definition2 = new Definition('Full\\Qualified\\Class2');
+        $definition3 = new Definition('Full\\Qualified\\Class3');
 
         return [
             'definition_1' => $definition1
@@ -170,6 +171,9 @@ public static function getContainerDefinitions()
                 ->addTag('tag2')
                 ->addMethodCall('setMailer', [new Reference('mailer')])
                 ->setFactory([new Reference('factory.service'), 'get']),
+            '.definition_3' => $definition3
+                ->setFile('/path/to/file')
+                ->setFactory([new Definition('Full\\Qualified\\FactoryClass'), 'get']),
             'definition_without_class' => new Definition(),
         ];
     }

Tests/Fixtures/Descriptor/builder_1_services.json

@@ -36,6 +36,22 @@
                 }
             ],
             "usages": []
+        },
+        ".definition_3": {
+            "class": "Full\\Qualified\\Class3",
+            "public": false,
+            "synthetic": false,
+            "lazy": false,
+            "shared": true,
+            "abstract": false,
+            "autowire": false,
+            "autoconfigure": false,
+            "deprecated": false,
+            "file": "\/path\/to\/file",
+            "factory_class": "Full\\Qualified\\FactoryClass",
+            "factory_method": "get",
+            "tags": [],
+            "usages": []
         }
     },
     "aliases": {

Tests/Fixtures/Descriptor/builder_1_services.md

@@ -27,6 +27,22 @@ Definitions
 - Tag: `tag2`
 - Usages: none
 
+### .definition_3
+
+- Class: `Full\Qualified\Class3`
+- Public: no
+- Synthetic: no
+- Lazy: no
+- Shared: yes
+- Abstract: no
+- Autowired: no
+- Autoconfigured: no
+- Deprecated: no
+- File: `/path/to/file`
+- Factory Class: `Full\Qualified\FactoryClass`
+- Factory Method: `get`
+- Usages: none
+
 
 Aliases
 -------

Tests/Fixtures/Descriptor/builder_1_services.txt

@@ -7,5 +7,6 @@
  --------------- ------------------------ 
   .alias_2        alias for ".service_2"  
   .definition_2   Full\Qualified\Class2   
- --------------- ------------------------ 
+  .definition_3   Full\Qualified\Class3   
+ --------------- ------------------------
 

Tests/Fixtures/Descriptor/builder_1_services.xml

@@ -17,4 +17,7 @@
       <tag name="tag2"/>
     </tags>
   </definition>
+  <definition id=".definition_3" class="Full\Qualified\Class3" public="false" synthetic="false" lazy="false" shared="true" abstract="false" autowired="false" autoconfigured="false" deprecated="false" file="/path/to/file">
+    <factory class="Full\Qualified\FactoryClass" method="get"/>
+  </definition>
 </container>

Tests/Fixtures/Descriptor/definition_3.json

@@ -0,0 +1,16 @@
+{
+    "class": "Full\\Qualified\\Class3",
+    "public": false,
+    "synthetic": false,
+    "lazy": false,
+    "shared": true,
+    "abstract": false,
+    "autowire": false,
+    "autoconfigure": false,
+    "deprecated": false,
+    "file": "\/path\/to\/file",
+    "factory_class": "Full\\Qualified\\FactoryClass",
+    "factory_method": "get",
+    "tags": [],
+    "usages": []
+}