Merge branch '5.4' into 6.0

* 5.4:
  [Lock] fix tests
  [Serializer] Ensuring end of line character apply with constructor settings in CSV encoder
  [Serializer] Fix ignored callbacks in denormalization
  fix sorting bug

Author: nicolas-grekas

Console/Descriptor/Descriptor.php

@@ -248,7 +248,7 @@ protected function sortTaggedServicesByPriority(array $services): array
     {
         $maxPriority = [];
         foreach ($services as $service => $tags) {
-            $maxPriority[$service] = 0;
+            $maxPriority[$service] = \PHP_INT_MIN;
             foreach ($tags as $tag) {
                 $currentPriority = $tag['priority'] ?? 0;
                 if ($maxPriority[$service] < $currentPriority) {

Tests/Console/Descriptor/ObjectsProvider.php

@@ -191,6 +191,7 @@ public static function getContainerDefinitionsWithPriorityTags()
         $definition1 = new Definition('Full\\Qualified\\Class1');
         $definition2 = new Definition('Full\\Qualified\\Class2');
         $definition3 = new Definition('Full\\Qualified\\Class3');
+        $definition4 = new Definition('Full\\Qualified\\Class4');
 
         return [
             'definition_1' => $definition1
@@ -219,6 +220,13 @@ public static function getContainerDefinitionsWithPriorityTags()
                 ->setAbstract(false)
                 ->addTag('tag1', ['attr1' => 'val1', 'attr2' => 'val2', 'priority' => 0])
                 ->addTag('tag1', ['attr3' => 'val3', 'priority' => 40]),
+            'definition_4' => $definition4
+                ->setPublic(true)
+                ->setSynthetic(true)
+                ->setFile('/path/to/file')
+                ->setLazy(false)
+                ->setAbstract(false)
+                ->addTag('tag1', ['priority' => 0]),
         ];
     }
 

Tests/Fixtures/Descriptor/builder_priority_tag.json

@@ -63,6 +63,25 @@
                 }
             ]
         },
+        "definition_4": {
+            "class": "Full\\Qualified\\Class4",
+            "public": true,
+            "synthetic": true,
+            "lazy": false,
+            "shared": true,
+            "abstract": false,
+            "autowire": false,
+            "autoconfigure": false,
+            "file": "\/path\/to\/file",
+            "tags": [
+                {
+                    "name": "tag1",
+                    "parameters": {
+                        "priority": 0
+                    }
+                }
+            ]
+        },
         "definition_2": {
             "class": "Full\\Qualified\\Class2",
             "public": true,

Tests/Fixtures/Descriptor/builder_priority_tag.md

@@ -44,6 +44,20 @@ Definitions
     - Attr2: val2
 - Tag: `tag2`
 
+### definition_4
+
+- Class: `Full\Qualified\Class4`
+- Public: yes
+- Synthetic: yes
+- Lazy: no
+- Shared: yes
+- Abstract: no
+- Autowired: no
+- Autoconfigured: no
+- File: `/path/to/file`
+- Tag: `tag1`
+    - Priority: 0
+
 ### definition_2
 
 - Class: `Full\Qualified\Class2`

Tests/Fixtures/Descriptor/builder_priority_tag.txt

@@ -9,6 +9,7 @@
    (same service as previous, another tag)   val1    val2    0                                         
   definition_1                               val1            30                 Full\Qualified\Class1  
    (same service as previous, another tag)           val2                                              
+  definition_4                                               0                  Full\Qualified\Class4  
   definition_2                               val1    val2    -20                Full\Qualified\Class2  
  ------------------------------------------ ------- ------- ---------- ------- ----------------------- 
 

Tests/Fixtures/Descriptor/builder_priority_tag.xml

@@ -29,6 +29,13 @@
       <tag name="tag2"/>
     </tags>
   </definition>
+  <definition id="definition_4" class="Full\Qualified\Class4" public="true" synthetic="true" lazy="false" shared="true" abstract="false" autowired="false" autoconfigured="false" file="/path/to/file">
+    <tags>
+      <tag name="tag1">
+        <parameter name="priority">0</parameter>
+      </tag>
+    </tags>
+  </definition>
   <definition id="definition_2" class="Full\Qualified\Class2" public="true" synthetic="true" lazy="false" shared="true" abstract="false" autowired="false" autoconfigured="false" file="/path/to/file">
     <tags>
       <tag name="tag1">