Merge branch '3.4' into 4.4

* 3.4:
  [Filesystem] Handle paths on different drives
  [WebProfiler] Do not add src-elem CSP directives if they do not exist
  [Yaml] fix parse error when unindented collections contain a comment
  [3.4][Inflector] Improve testSingularize() argument name
  [PhpUnitBridge] fix PHP 5.3 compat again
  Skip validation when email is an empty object
  fix sr_Latn translation
  [Validator] fix lazy property usage.
  Fix annotation
  [PhpUnitBridge] fix compat with PHP 5.3
  [DX] Show the ParseException message in YAML file loaders

Author: nicolas-grekas

Parser.php

@@ -618,8 +618,14 @@ private function getNextEmbedBlock(int $indentation = null, bool $inSequence = f
         }
 
         $isItUnindentedCollection = $this->isStringUnIndentedCollectionItem();
+        $isItComment = $this->isCurrentLineComment();
 
         while ($this->moveToNextLine()) {
+            if ($isItComment && !$isItUnindentedCollection) {
+                $isItUnindentedCollection = $this->isStringUnIndentedCollectionItem();
+                $isItComment = $this->isCurrentLineComment();
+            }
+
             $indent = $this->getCurrentLineIndentation();
 
             if ($isItUnindentedCollection && !$this->isCurrentLineEmpty() && !$this->isStringUnIndentedCollectionItem() && $newIndent === $indent) {

Tests/Fixtures/sfComments.yml

@@ -74,3 +74,17 @@ yaml: |
     'foo #': baz
 php: |
     ['foo #' => 'baz']
+---
+test: Comment before first item in unindented collection
+brief: >
+    Comment directly before unindented collection is allowed
+yaml: |
+    collection1:
+    # comment
+    - a
+    - b
+    collection2:
+    - a
+    - b
+php: |
+    ['collection1' => ['a', 'b'], 'collection2' => ['a', 'b']]