From 95d8ce30311522f59cec618db0cdb114ed8e5da4 Mon Sep 17 00:00:00 2001
From: victoria <victoria@limenius.com>
Date: Thu, 8 Jan 2015 16:45:16 +0100
Subject: [PATCH] [Yaml] Fixed #10597: Improved Yaml directive parsing

---
 src/Symfony/Component/Yaml/Parser.php           |  2 +-
 src/Symfony/Component/Yaml/Tests/ParserTest.php | 11 +++++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/Symfony/Component/Yaml/Parser.php b/src/Symfony/Component/Yaml/Parser.php
index 1eb73edf77..01c6687f4a 100644
--- a/src/Symfony/Component/Yaml/Parser.php
+++ b/src/Symfony/Component/Yaml/Parser.php
@@ -586,7 +586,7 @@ class Parser
 
         // strip YAML header
         $count = 0;
-        $value = preg_replace('#^\%YAML[: ][\d\.]+.*\n#su', '', $value, -1, $count);
+        $value = preg_replace('#^\%YAML[: ][\d\.]+.*\n#u', '', $value, -1, $count);
         $this->offset += $count;
 
         // remove leading comments
diff --git a/src/Symfony/Component/Yaml/Tests/ParserTest.php b/src/Symfony/Component/Yaml/Tests/ParserTest.php
index 0ff86a1e48..5bda9c3be5 100644
--- a/src/Symfony/Component/Yaml/Tests/ParserTest.php
+++ b/src/Symfony/Component/Yaml/Tests/ParserTest.php
@@ -650,6 +650,17 @@ map_in_map: { foo: { bar: *var } }
 EOF
         ));
     }
+
+    public function testYamlDirective()
+    {
+        $yaml = <<<EOF
+%YAML 1.2
+---
+foo: 1
+bar: 2
+EOF;
+        $this->assertEquals(array('foo' => 1, 'bar' => 2), $this->parser->parse($yaml));
+    }
 }
 
 class B