Merge branch '2.7' into 2.8

* 2.7:
  Added progressive jpeg to mime types guesser
  [Yaml] Fix wrong line number when comments are inserted in the middle of a block.
  Fixed singular of committee
  Do not inject web debug toolbar on attachments
  bumped Symfony version to 2.7.15
  updated VERSION for 2.7.14
  update CONTRIBUTORS for 2.7.14
  updated CHANGELOG for 2.7.14
  [Console] [SymfonyStyle] Replace long word wrapping test to directly test output

Author: fabpot

Parser.php

@@ -432,7 +432,7 @@ private function getNextEmbedBlock($indentation = null, $inSequence = false)
             }
 
             // we ignore "comment" lines only when we are not inside a scalar block
-            if (empty($blockScalarIndentations) && $this->isCurrentLineComment()) {
+            if (empty($blockScalarIndentations) && $this->isCurrentLineComment() && false === $this->checkIfPreviousNonCommentLineIsCollectionItem()) {
                 continue;
             }
 
@@ -468,10 +468,18 @@ private function moveToNextLine()
 
     /**
      * Moves the parser to the previous line.
+     *
+     * @return bool
      */
     private function moveToPreviousLine()
     {
+        if ($this->currentLineNb < 1) {
+            return false;
+        }
+
         $this->currentLine = $this->lines[--$this->currentLineNb];
+
+        return true;
     }
 
     /**
@@ -794,4 +802,44 @@ private function isBlockScalarHeader()
     {
         return (bool) preg_match('~'.self::BLOCK_SCALAR_HEADER_PATTERN.'$~', $this->currentLine);
     }
+
+    /**
+     * Returns true if the current line is a collection item.
+     *
+     * @return bool
+     */
+    private function isCurrentLineCollectionItem()
+    {
+        $ltrimmedLine = ltrim($this->currentLine, ' ');
+
+        return '' !== $ltrimmedLine && '-' === $ltrimmedLine[0];
+    }
+
+    /**
+     * Tests whether the current comment line is in a collection.
+     *
+     * @return bool
+     */
+    private function checkIfPreviousNonCommentLineIsCollectionItem()
+    {
+        $isCollectionItem = false;
+        $moves = 0;
+        while ($this->moveToPreviousLine()) {
+            ++$moves;
+            // If previous line is a comment, move back again.
+            if ($this->isCurrentLineComment()) {
+                continue;
+            }
+            $isCollectionItem = $this->isCurrentLineCollectionItem();
+            break;
+        }
+
+        // Move parser back to previous line.
+        while ($moves > 0) {
+            $this->moveToNextLine();
+            --$moves;
+        }
+
+        return $isCollectionItem;
+    }
 }

Tests/ParserTest.php

@@ -1128,6 +1128,74 @@ public function testAdditionallyIndentedLinesAreParsedAsNewLinesInFoldedBlocks()
             $this->parser->parse($yaml)
         );
     }
+
+    /**
+     * @param $lineNumber
+     * @param $yaml
+     * @dataProvider parserThrowsExceptionWithCorrectLineNumberProvider
+     */
+    public function testParserThrowsExceptionWithCorrectLineNumber($lineNumber, $yaml)
+    {
+        $this->setExpectedException(
+            '\Symfony\Component\Yaml\Exception\ParseException',
+            sprintf('Unexpected characters near "," at line %d (near "bar: "123",").', $lineNumber)
+        );
+
+        $this->parser->parse($yaml);
+    }
+
+    public function parserThrowsExceptionWithCorrectLineNumberProvider()
+    {
+        return array(
+            array(
+                4,
+                <<<YAML
+foo:
+    -
+        # bar
+        bar: "123",
+YAML
+            ),
+            array(
+                5,
+                <<<YAML
+foo:
+    -
+        # bar
+        # bar
+        bar: "123",
+YAML
+            ),
+            array(
+                8,
+                <<<YAML
+foo:
+    -
+        # foobar
+        baz: 123
+bar:
+    -
+        # bar
+        bar: "123",
+YAML
+            ),
+            array(
+                10,
+                <<<YAML
+foo:
+    -
+        # foobar
+        # foobar
+        baz: 123
+bar:
+    -
+        # bar
+        # bar
+        bar: "123",
+YAML
+            ),
+        );
+    }
 }
 
 class B